Commit 09307de496d550e86c8829eaf75397b0034df433

Authored by liuqimichale
2 parents 0efcfd88 ddae00cf

Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test

resource/public/commoncss.css
... ... @@ -144,4 +144,28 @@ header{
144 144 }
145 145 .vertical-align-middle{
146 146 vertical-align: middle;
  147 +}
  148 +/*bootstrap table 表头样式*/
  149 +/*
  150 + table 无border
  151 +*/
  152 +.fixed-table-container{
  153 + border:none;
  154 +}
  155 +/*
  156 + table 样式
  157 +*/
  158 +.table>thead>tr>th {
  159 + vertical-align: middle !important;
  160 +}
  161 +
  162 +.fixed-table-container thead th {
  163 + border-left: none !important;
  164 +}
  165 +.fixed-table-container thead th {
  166 + border-left: none !important;
  167 +}
  168 +
  169 +.fixed-table-container tbody td {
  170 + border-left: none !important;
147 171 }
148 172 \ No newline at end of file
... ...
topages/staffmanage/staffmanage.css
... ... @@ -88,4 +88,7 @@ thead tr{
88 88 }
89 89  
90 90  
91   -/*-----------------------内容*/
92 91 \ No newline at end of file
  92 +/*-----------------------内容*/
  93 +.table-striped>tbody>tr>td{
  94 + padding: 0 0 0 24px !important;
  95 +}
... ...
topages/staffmanage/staffmanage.html
... ... @@ -7,4 +7,4 @@
7 7 <!--查询 end-->
8 8  
9 9 <!--------------------------------------------内容-->
10   -<table id="staffmanageTable" class="common-tableh47 ITD-fix-table table table-hover table-striped"><thead><tr><th style="text-align: left; width: 10%; " data-field="plName" tabindex="0"><div class="th-inner "><span class="information-icon"> </span>车场名称</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum0" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>0次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum1" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>1次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum2" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>2-5次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum3" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>5-10次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum4" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>10-20次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum5" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>20-50次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum6" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>50次以上</div><div class="fht-cell"></div></th></tr></thead><tbody><tr data-index="0"><td style="text-align: left; width: 10%; ">水岸天街</td><td style="text-align: left; width: 10%; ">115</td><td style="text-align: left; width: 10%; ">16</td><td style="text-align: left; width: 10%; ">117</td><td style="text-align: left; width: 10%; ">85</td><td style="text-align: left; width: 10%; ">18</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="1"><td style="text-align: left; width: 10%; ">接官厅西区</td><td style="text-align: left; width: 10%; ">40</td><td style="text-align: left; width: 10%; ">1</td><td style="text-align: left; width: 10%; ">6</td><td style="text-align: left; width: 10%; ">7</td><td style="text-align: left; width: 10%; ">4</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="2"><td style="text-align: left; width: 10%; ">百柳西区</td><td style="text-align: left; width: 10%; ">20</td><td style="text-align: left; width: 10%; ">2</td><td style="text-align: left; width: 10%; ">15</td><td style="text-align: left; width: 10%; ">5</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="3"><td style="text-align: left; width: 10%; ">百柳南区</td><td style="text-align: left; width: 10%; ">58</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="4"><td style="text-align: left; width: 10%; ">银马北区</td><td style="text-align: left; width: 10%; ">37</td><td style="text-align: left; width: 10%; ">5</td><td style="text-align: left; width: 10%; ">21</td><td style="text-align: left; width: 10%; ">21</td><td style="text-align: left; width: 10%; ">7</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="5"><td style="text-align: left; width: 10%; ">银马东区</td><td style="text-align: left; width: 10%; ">22</td><td style="text-align: left; width: 10%; ">3</td><td style="text-align: left; width: 10%; ">13</td><td style="text-align: left; width: 10%; ">8</td><td style="text-align: left; width: 10%; ">4</td><td style="text-align: left; width: 10%; ">1</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="6"><td style="text-align: left; width: 10%; ">八一北区</td><td style="text-align: left; width: 10%; ">122</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="7"><td style="text-align: left; width: 10%; ">松州园北区</td><td style="text-align: left; width: 10%; ">135</td><td style="text-align: left; width: 10%; ">14</td><td style="text-align: left; width: 10%; ">10</td><td style="text-align: left; width: 10%; ">6</td><td style="text-align: left; width: 10%; ">1</td><td style="text-align: left; width: 10%; ">3</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="8"><td style="text-align: left; width: 10%; ">八一东区</td><td style="text-align: left; width: 10%; ">8</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="9"><td style="text-align: left; width: 10%; ">园丁北区</td><td style="text-align: left; width: 10%; ">43</td><td style="text-align: left; width: 10%; ">1</td><td style="text-align: left; width: 10%; ">11</td><td style="text-align: left; width: 10%; ">12</td><td style="text-align: left; width: 10%; ">2</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr></tbody></table>
11 10 \ No newline at end of file
  11 +<table id="staffmanageTable" class="common-tableh47 bootstrap-table ITD-fix-table fixed-table-container table table-hover table-striped"><thead><tr><th style="text-align: left; width: 10%; " data-field="plName" tabindex="0"><div class="th-inner "><span class="information-icon"> </span>车场名称</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum0" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>0次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum1" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>1次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum2" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>2-5次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum3" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>5-10次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum4" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>10-20次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum5" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>20-50次</div><div class="fht-cell"></div></th><th style="text-align: left; width: 10%; " data-field="normalNum6" tabindex="0"><div class="th-inner "><span class="business-icon"> </span>50次以上</div><div class="fht-cell"></div></th></tr></thead><tbody><tr data-index="0"><td style="text-align: left; width: 10%; ">水岸天街</td><td style="text-align: left; width: 10%; ">115</td><td style="text-align: left; width: 10%; ">16</td><td style="text-align: left; width: 10%; ">117</td><td style="text-align: left; width: 10%; ">85</td><td style="text-align: left; width: 10%; ">18</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="1"><td style="text-align: left; width: 10%; ">接官厅西区</td><td style="text-align: left; width: 10%; ">40</td><td style="text-align: left; width: 10%; ">1</td><td style="text-align: left; width: 10%; ">6</td><td style="text-align: left; width: 10%; ">7</td><td style="text-align: left; width: 10%; ">4</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="2"><td style="text-align: left; width: 10%; ">百柳西区</td><td style="text-align: left; width: 10%; ">20</td><td style="text-align: left; width: 10%; ">2</td><td style="text-align: left; width: 10%; ">15</td><td style="text-align: left; width: 10%; ">5</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="3"><td style="text-align: left; width: 10%; ">百柳南区</td><td style="text-align: left; width: 10%; ">58</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="4"><td style="text-align: left; width: 10%; ">银马北区</td><td style="text-align: left; width: 10%; ">37</td><td style="text-align: left; width: 10%; ">5</td><td style="text-align: left; width: 10%; ">21</td><td style="text-align: left; width: 10%; ">21</td><td style="text-align: left; width: 10%; ">7</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="5"><td style="text-align: left; width: 10%; ">银马东区</td><td style="text-align: left; width: 10%; ">22</td><td style="text-align: left; width: 10%; ">3</td><td style="text-align: left; width: 10%; ">13</td><td style="text-align: left; width: 10%; ">8</td><td style="text-align: left; width: 10%; ">4</td><td style="text-align: left; width: 10%; ">1</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="6"><td style="text-align: left; width: 10%; ">八一北区</td><td style="text-align: left; width: 10%; ">122</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="7"><td style="text-align: left; width: 10%; ">松州园北区</td><td style="text-align: left; width: 10%; ">135</td><td style="text-align: left; width: 10%; ">14</td><td style="text-align: left; width: 10%; ">10</td><td style="text-align: left; width: 10%; ">6</td><td style="text-align: left; width: 10%; ">1</td><td style="text-align: left; width: 10%; ">3</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="8"><td style="text-align: left; width: 10%; ">八一东区</td><td style="text-align: left; width: 10%; ">8</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr><tr data-index="9"><td style="text-align: left; width: 10%; ">园丁北区</td><td style="text-align: left; width: 10%; ">43</td><td style="text-align: left; width: 10%; ">1</td><td style="text-align: left; width: 10%; ">11</td><td style="text-align: left; width: 10%; ">12</td><td style="text-align: left; width: 10%; ">2</td><td style="text-align: left; width: 10%; ">0</td><td style="text-align: left; width: 10%; ">0</td></tr></tbody></table>
12 12 \ No newline at end of file
... ...