From 86d99e38a2c44e85983d2b8adccf332902a8f2a2 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 15 三月 2024 15:00:56 +0800
Subject: [PATCH] xg

---
 src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue |  349 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 202 insertions(+), 147 deletions(-)

diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index 522f636..457d549 100644
--- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
+++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
@@ -6,7 +6,7 @@
         <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
-            <a-col :md="4" :sm="4" >
+            <a-col :md="5" :sm="5" >
               <a-form-item label="璁惧绫诲瀷">
                 <a-select placeholder="璇烽�夋嫨璁惧绫诲瀷" :triggerChange="true" v-model="queryParam.equipmentType" :allowClear="true">
                   <a-select-option v-for='item in selectList' :key='item.id' :value='item.equipmentTypeName'>
@@ -15,9 +15,19 @@
                 </a-select>
               </a-form-item>
             </a-col>
+            <a-col :md="5" :sm="5">
+              <a-form-item label="椹卞姩绫诲瀷">
+                <a-auto-complete
+                  v-model="queryParam.driveType"
+                  :data-source="driveTypeList"
+                  placeholder="璇烽�夋嫨椹卞姩绫诲瀷"
+                  :filter-option="filterOption"
+                />
+              </a-form-item>
+            </a-col>
             <a-col :md="5" :sm="5" :xs="5">
               <a-form-item label="鏃堕棿">
-                <a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD" v-model="dates"/>
+                <a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD" v-model="dates" :allowClear="false"/>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="4" :xs="4">
@@ -39,20 +49,25 @@
                 </a-select>
               </a-form-item>
             </a-col>
+            <!--<a-col :md="7" :sm="7" :xs="7">-->
+              <!--<a-space>-->
+                <!--<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>-->
+                <!--<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>-->
+                <!--<a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>-->
+              <!--</a-space>-->
+            <!--</a-col>-->
           </a-row>
-          <a-row :gutter="24">
-            <a-col :md="9" :sm="9" :xs="9">
-              <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
-                                @change="efficiencyOptionsOnChange"/>
-            </a-col>
-            <a-col :md="5" :sm="5">
-              <a-space>
-                <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
-                <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
-                <a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>
-              </a-space>
-            </a-col>
-            <a-col :md="10" :sm="10">
+          <a-row :gutter="24" type="flex" align="middle">
+            <a-col :md="24" :sm="24" :xs="24" style="display: flex;justify-content: space-between;align-items: flex-start">
+              <div>
+                <a-space style="margin-right: 20px">
+                  <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+                  <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+                  <a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>
+                </a-space>
+                <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
+                                  @change="efficiencyOptionsOnChange"/>
+              </div>
               <table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;">
                 <tr>
                   <td v-for="(item, index) in identifying">{{item.title}}</td>
@@ -80,87 +95,102 @@
           <!--</table>-->
         <!--</div>-->
       </div>
-      <div class="container" id="EfficiencyShift" style="margin-top: 20px;">
-        <div class="table2">
-          <table class="dataContent table" border="1" cellspacing="0" cellpadding="0" style="white-space: nowrap">
-            <thead>
-            <tr class="thead fixed equipname">
-              <th class="thgu dong1 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;"></th>
-              <th  class="thgu dong2 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;"></th>
-              <th  class="thgu dong3 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;"></th>
-              <th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧缂栧彿</th>
-              <th class="thgu dong5 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">璁惧鍚嶇О</th>
-              <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷</th>
-              <th class="thgu dong7 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">鐝</th>
-              <template v-for="(tableHead, index) in tableHeads">
-                <th  class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
-              </template>
-              <!--average-->
-              <!--<th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 150px;width: 150px;">骞冲潎鍊�(鐝鍒╃敤鐜�)</th>-->
+      <a-spin :spinning="spinning">
+        <div class="container" id="EfficiencyShift" style="margin-top: 20px;">
+          <div class="table2">
+            <table class="dataContent table" border="1" cellspacing="0" cellpadding="0" style="white-space: nowrap" v-if="dataList.length>0">
+              <thead>
+              <tr class="thead fixed equipname">
+                <th class="thgu dong1 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">鍏徃</th>
+                <th  class="thgu dong2 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">杞﹂棿</th>
+                <th  class="thgu dong3 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">宸ユ</th>
+                <th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧缂栧彿</th>
+                <th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">璁惧鍚嶇О</th>
+                <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷</th>
+                <th class="thgu dong7 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">鐝</th>
+                <template v-for="(tableHead, index) in tableHeads">
+                  <th  class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
+                </template>
+                <!--average-->
+                <!--<th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 150px;width: 150px;">骞冲潎鍊�(鐝鍒╃敤鐜�)</th>-->
 
-            </tr>
-            <tr class="thead notfixed gudingth">
-              <template v-for="(tableHead, index) in tableHeads">
-                <th>鐝鍒╃敤鐜�(%)</th>
-                <!--<th v-if="checkedList.indexOf('gzl') > -1">鏁呴殰鐜�(%)</th>-->
-                <!--<th v-if="checkedList.indexOf('processingLong') > -1">杩愯鏃堕棿(s)</th>-->
-                <!--<th v-if="checkedList.indexOf('totalLong') > -1">鏈夋晥鏃堕棿(s)</th>-->
-                <!--<th v-if="checkedList.indexOf('faultLong') > -1">鏁呴殰鏃堕棿(s)</th>-->
-                <!--&lt;!&ndash;<th v-if="checkedList.indexOf('gjsj') > -1">鍏虫満鏃堕棿(s)</th>&ndash;&gt;-->
-                <th v-if="checkedList.indexOf('kjsj') > -1">寮�鏈烘椂闂�(s)</th>
-                <th v-if="checkedList.indexOf('jgsj') > -1">鍔犲伐鏃堕棿(s)</th>
-                <th v-if="checkedList.indexOf('djsj') > -1">寰呮満鏃堕棿(s)</th>
-                <th v-if="checkedList.indexOf('gjsj') > -1">鍏虫満鏃堕棿(s)</th>
-              </template>
-            </tr>
-<!--            <tr>-->
-<!--              <th rowspan="2">骞冲潎鍊�</th>-->
-<!--            </tr>-->
-            </thead>
-            <tbody>
-            <tr class="mathData" v-for="(item, index) in dataList">
-              <td  class="tdgu kaitou wenzi" :rowspan="item.level1span" :class="{hidden: item.level1dis,noExl:item.level1dis}"  v-show="!item.level1dis">{{item.level1}}</td>
-              <td  class="tdgu1 kaitou wenzi" :rowspan="item.level2span" :class="{hidden: item.level2dis,noExl:item.level2dis}"  v-show="!item.level2dis">{{item.level2}}</td>
-              <td  class="tdgu2 kaitou wenzi" :rowspan="item.level3span" :class="{hidden: item.level3dis,noExl:item.level3dis}"  v-show="!item.level3dis">{{item.level3}}</td>
-              <td class="tdgu3  kaitou">{{item.equipmentId}}</td>
-              <td class="tdgu4  kaitou">{{item.equipmentName}}</td>
-              <td class="tdgu5  kaitou">{{item.equipmentType}}</td>
-              <td class="tdgu6  kaitou">{{item.shiftSubName}}</td>
+              </tr>
+              <tr class="thead notfixed gudingth">
+                <template v-for="(tableHead, index) in tableHeads">
+                  <th>鐝鍒╃敤鐜�(%)</th>
+                  <!--<th v-if="checkedList.indexOf('gzl') > -1">鏁呴殰鐜�(%)</th>-->
+                  <!--<th v-if="checkedList.indexOf('processingLong') > -1">杩愯鏃堕棿(s)</th>-->
+                  <!--<th v-if="checkedList.indexOf('totalLong') > -1">鏈夋晥鏃堕棿(s)</th>-->
+                  <!--<th v-if="checkedList.indexOf('faultLong') > -1">鏁呴殰鏃堕棿(s)</th>-->
+                  <!--&lt;!&ndash;<th v-if="checkedList.indexOf('gjsj') > -1">鍏虫満鏃堕棿(s)</th>&ndash;&gt;-->
+                  <th v-if="checkedList.indexOf('kjsj') > -1">寮�鏈烘椂闂�(灏忔椂)</th>
+                  <th v-if="checkedList.indexOf('jgsj') > -1">鍔犲伐鏃堕棿(灏忔椂)</th>
+                  <th v-if="checkedList.indexOf('djsj') > -1">寰呮満鏃堕棿(灏忔椂)</th>
+                  <th v-if="checkedList.indexOf('gjsj') > -1">鍏虫満鏃堕棿(灏忔椂)</th>
+                </template>
+              </tr>
+              </thead>
+              <tbody>
+              <tr class="mathData" v-for="(item, index) in dataList">
+                <template v-if="item.level1!=='鍚堣'&&item.level1!=='骞冲潎鍊�'">
+                  <td  class="tdgu kaitou" :rowspan="item.level1span" :class="{hidden: item.level1dis,noExl:item.level1dis}"  v-show="!item.level1dis">
+                    <div class="wenzi">
+                    {{item.level1}}
+                  </div></td>
+                  <td  class="tdgu1 kaitou" :rowspan="item.level2span" :class="{hidden: item.level2dis,noExl:item.level2dis}"  v-show="!item.level2dis">
+                    <div class="wenzi">
+                      {{item.level2}}
+                    </div>
+                  </td>
+                  <td  class="tdgu2 kaitou" :rowspan="item.level3span" :class="{hidden: item.level3dis,noExl:item.level3dis}"  v-show="!item.level3dis">
+                    <div class="wenzi">
+                      {{item.level3}}
+                    </div>
+                  </td>
+                  <td class="tdgu3  kaitou">{{item.equipmentId}}</td>
+                  <td class="tdgu4  kaitou" style="min-width: 162px; max-width: 162px;width: 162px;">{{item.equipmentName}}</td>
+                  <td class="tdgu5  kaitou">{{item.equipmentType}}</td>
+                  <td class="tdgu6  kaitou">{{item.shiftSubName}}</td>
+                </template>
 
-              <!--<td>{{item.tierType}}</td>-->
-              <template v-for="(tableHead, index) in item.dataList">
-                <!--<td :style="{background:tableHead.color }" v-if='tableHead.utilizationRate !== 0'>{{tableHead.utilizationRate | numFilter}}</td>-->
-                <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 1'>缁翠慨</td>-->
-                <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 2'>浼戠彮</td>-->
-                <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 10'>{{tableHead.lyl | numFilter}}</td>-->
-                <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 11'>鏈绠�</td>-->
-                <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 12'>鏃犵彮娆�</td>-->
-                <td :style="{background:tableHead.color }">{{tableHead.utilizationRate | numFilter}}</td>
-                <!--<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('gzl') > -1">-->
+                <template v-else>
+                  <td colspan="7" class="tdgu kaitou">{{item.level1}}</td>
+                </template>
+                <!--<td>{{item.tierType}}</td>-->
+                <template v-for="(tableHead, index) in item.dataList">
+                  <!--<td :style="{background:tableHead.color }" v-if='tableHead.utilizationRate !== 0'>{{tableHead.utilizationRate | numFilter}}</td>-->
+                  <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 1'>缁翠慨</td>-->
+                  <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 2'>浼戠彮</td>-->
+                  <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 10'>{{tableHead.lyl | numFilter}}</td>-->
+                  <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 11'>鏈绠�</td>-->
+                  <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 12'>鏃犵彮娆�</td>-->
+                  <td :style="{background:tableHead.color }">{{tableHead.utilizationRate | numFilter}}</td>
+                  <!--<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('gzl') > -1">-->
                   <!--{{tableHead.gzl | numFilter}}-->
-                <!--</td>-->
-                <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjsj') > -1">
-                  {{tableHead.openLong}}
-                </td>
-                <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('jgsj') > -1">
-                  {{tableHead.processLong}}
-                </td>
-                <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('djsj') > -1">
-                  {{tableHead.waitLong}}
-                </td>
-                <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('gjsj') > -1">
-                  {{tableHead.closeLong}}
-                </td>
-                <!--<td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('gjsj') > -1">-->
+                  <!--</td>-->
+                  <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjsj') > -1">
+                    {{tableHead.openLong | getFormattedTime}}
+                  </td>
+                  <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('jgsj') > -1">
+                    {{tableHead.processLong | getFormattedTime}}
+                  </td>
+                  <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('djsj') > -1">
+                    {{tableHead.waitLong | getFormattedTime}}
+                  </td>
+                  <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('gjsj') > -1">
+                    {{tableHead.closeLong | getFormattedTime}}
+                  </td>
+                  <!--<td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('gjsj') > -1">-->
                   <!--{{item[tableHead].gjsj}}-->
-                <!--</td>-->
-              </template>
-              <!--<td :style="{background:item.average.color }" >{{item.average.lyl | numFilter}}</td>-->
-            </tr>
-            </tbody>
-          </table>
+                  <!--</td>-->
+                </template>
+                <!--<td :style="{background:item.average.color }" >{{item.average.lyl | numFilter}}</td>-->
+              </tr>
+              </tbody>
+            </table>
+          </div>
         </div>
-      </div>
+      </a-spin>
     </div>
   </div>
 </template>
@@ -171,6 +201,8 @@
   import $ from 'jquery'
   import '@/components/table2excel/table2excel'
   import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
+  import api from '@/api/mdc'
+
   export default {
     name: 'EfficiencyShiftList',
     components: {},
@@ -183,6 +215,7 @@
         allowClearSu:true,
         dates: [],
         selectList:[],
+        driveTypeList:[],
         identifying: [],
         queryParam: {},
         queryParamEquip:{},
@@ -210,7 +243,8 @@
         },
         tableHeads: [],
         shiftList: [],
-        shiftSubList: []
+        shiftSubList: [],
+        spinning:false
       }
     },
     props: {  nodeTree: '', Type:'',nodePeople: ''  },
@@ -223,6 +257,7 @@
       this.queryParam.typeTree = "1"
       this.loadData();
       this.queryGroup()
+      this.getDriveTypeByApi()
     },
     watch: {
       Type(valmath){
@@ -262,7 +297,20 @@
         } else {
           return '0'
         }
-      }
+      },
+
+      /**
+       * 鏍煎紡鍖栨椂闂�
+       * @param seconds 绉掓暟
+       * @returns '' 鏍煎紡鍖栧悗鏃堕棿瀛楃涓�
+       */
+      getFormattedTime(seconds) {
+        if (seconds) {
+          return parseFloat((seconds / 3600).toFixed(2))
+        } else {
+          return '0'
+        }
+      },
     },
     methods: {
       checkSameData(dataList){
@@ -428,7 +476,7 @@
         this.queryParam.startTime = v2[0]
         this.queryParam.endTime = v2[1]
         // 鐐瑰嚮鏃堕棿閫夋嫨鍣ㄧ殑娓呯┖鎸夐挳鏃朵細瑙﹀彂姝ゅ垽鏂�(鐐瑰嚮閲嶇疆鎸夐挳涓嶄細瑙﹀彂)锛屽疄鐜伴噸缃垪琛ㄥ姛鑳斤紝鍒囧疄鏀瑰彉鍒楄〃鏄剧ず鏁堟灉
-        if(!this.queryParam.startTime&&!this.queryParam.endTime)this.searchReset()
+        // if(!this.queryParam.startTime&&!this.queryParam.endTime)this.searchReset()
       },
       efficiencyOptionsOnChange(checkedList) {
         let index = checkedList.indexOf('lyl')
@@ -443,22 +491,14 @@
         this.checkedList = checkedList
       },
       searchQuery() {
-        if(this.dates != ''){
-          if(this.queryParam.typeTree == "1"){
-            this.queryParam.parentId =  this.queryParamEquip.parentId
-            this.queryParam.equipmentId = this.queryParamEquip.equipmentId
-          }else{
-            this.queryParam.parentId = this.queryParamPeople.parentId
-            this.queryParam.equipmentId = ""
-          }
-          this.loadData()
+        if(this.queryParam.typeTree == "1"){
+          this.queryParam.parentId =  this.queryParamEquip.parentId
+          this.queryParam.equipmentId = this.queryParamEquip.equipmentId
         }else{
-          // this.$message.warning("璇烽�夋嫨鏃堕棿")
-          this.$notification.warning({
-            message:'娑堟伅',
-            description:"璇烽�夋嫨鏃堕棿"
-          });
+          this.queryParam.parentId = this.queryParamPeople.parentId
+          this.queryParam.equipmentId = ""
         }
+        this.loadData()
         // this.onClearSelected()
       },
       searchReset() {
@@ -466,7 +506,9 @@
         this.typeParent =  this.queryParam.parentId
         this.typeEquipment = this.queryParam.equipmentId
         this.queryParam = {}
-        this.dates = []
+        this.dates = [moment().subtract('days', 7), moment().subtract('days', 1)]
+        this.queryParam.startTime = moment(this.dates[0]).format('YYYYMMDD')
+        this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
         this.queryParam.typeTree = this.typeTree
         this.queryParam.parentId = this.typeParent
         this.queryParam.equipmentId =  this.typeEquipment
@@ -474,18 +516,27 @@
         // this.onClearSelected()
       },
       loadData() {
+        this.spinning=true
         this.tableHeads = []
         this.dataList = []
         getAction(this.url.list, this.queryParam).then(res => {
           if (res.success) {
             this.tableHeads = res.result.dates
             this.dataList = res.result.mdcEfficiencyList
+            if (res.result.mdcEfficiencyList && !res.result.mdcEfficiencyList.length) {
+              this.$notification.info({
+                message: '娑堟伅',
+                description: '鏆傛棤璇ヨ澶囩被鍨嬫暟鎹�'
+              })
+            }
             this.checkSameData(this.dataList)
             this.checkSameData1(this.dataList)
             this.checkSameData2(this.dataList)
             this.combineCell();
             // this.initDeviceType(this.dataList)
           }
+        }).finally(()=>{
+          this.spinning=false
         })
       },
       queryGroup() {
@@ -505,7 +556,28 @@
         }).finally(() => {
           this.loading = false
         })
-      }
+      },
+
+      /**
+       * 璋冪敤鎺ュ彛鑾峰彇鎺у埗绯荤粺绫诲瀷
+       */
+      getDriveTypeByApi(){
+        api.getDriveTypeApi().then((res)=>{
+          this.driveTypeList=res.result.map(item=>item.value)
+        })
+      },
+
+      /**
+       * 鑱旀兂杈撳叆妗嗙瓫閫夊姛鑳�
+       * @param input 杈撳叆鐨勫唴瀹�
+       * @param option 閰嶇疆
+       * @returns {boolean} 鍒ゆ柇鏄惁绛涢��
+       */
+      filterOption(input, option) {
+        return (
+          option.componentOptions.children[0].text.toUpperCase().indexOf(input.toUpperCase()) >= 0
+        );
+      },
     }
   }
 </script>
@@ -554,12 +626,12 @@
   }
   .table tbody tr .tdgu5{
     position: sticky;
-    left: 400px;
+    left: 412px;
     z-index: 2;
   }
   .table tbody tr .tdgu6{
     position: sticky;
-    left: 500px;
+    left: 512px;
     z-index: 2;
   }
 
@@ -569,27 +641,32 @@
     top:0;
     z-index: 3;
   }
+
   .table2 thead .gudingth th{
     position: sticky;
     top: 32px;
     z-index: 2;
   }
+
   .table2 thead .equipname .name{
     z-index: 3;
   }
+
   .table2 thead .equipname .dong1{
     z-index: 4;
     left: 0;
-    /*border: 1px solid #000;*/
   }
+
   .table2 thead .equipname .dong2{
     z-index: 5;
     left: 50px;
   }
+
   .table2 thead .equipname .dong3{
     z-index: 5;
     left: 100px;
   }
+
   .table2 thead .equipname .dong4{
     z-index: 5;
     left: 150px;
@@ -598,43 +675,48 @@
     z-index: 5;
     left: 250px;
   }
+
   .table2 thead .equipname .dong6{
     z-index: 5;
-    left: 400px;
+    left: 412px;
   }
+
   .table2 thead .equipname .dong7{
     z-index: 6;
-    left: 500px;
+    left: 512px;
+  }
+
+  #EfficiencyShift{
+    overflow: hidden;
   }
 
   @media screen and (min-width: 1920px){
     #EfficiencyShift{
       height: 670px!important;
-      overflow: scroll;
     }
   }
+
   @media screen and (min-width: 1680px) and (max-width: 1920px){
     #EfficiencyShift{
       height: 670px!important;
-      overflow: scroll;
     }
   }
+
   @media screen and (min-width: 1400px) and (max-width: 1680px){
     #EfficiencyShift{
       height: 522px!important;
-      overflow: scroll;
     }
   }
+
   @media screen and (min-width: 1280px) and (max-width: 1400px){
     #EfficiencyShift{
       height: 414px!important;
-      overflow: scroll;
     }
   }
+
   @media screen and (max-width: 1280px){
     #EfficiencyShift{
       height: 414px!important;
-      overflow: scroll;
     }
   }
 
@@ -660,10 +742,6 @@
     text-align: center;
   }
 
-  .dataContent .fixed th {
-    width: 50px;
-  }
-
   .dataContent .thead th {
     background-color: #fafafa;
     text-align: center;
@@ -671,31 +749,8 @@
     padding: 5px;
   }
 
-  .dataContent .notfixed th {
-    width: auto;
-  }
-
-  /*.dataContent tr td {*/
-    /*height: 35px*/
-  /*}*/
-
   .dataContent .mathData td {
     padding: 10px;
-    /*display: none;*/
   }
-
-  .dataContent .mathData .td {
-    /*background-color: #ff9bd2;*/
-    display: inline-block;
-    padding: 10px;
-  }
-
-  .dataContent .mathData .tdd {
-    /*display: none;*/
-  }
-  /*.seach-content{*/
-    /*display: flex;*/
-    /*justify-content: space-between;*/
-  /*}*/
 
 </style>
\ No newline at end of file

--
Gitblit v1.9.3