班次利用率调取接口，渲染，测试，样式调整

zhuzhuanzhuan

2023-07-28 4a13d58a1ce705e93b84d186a0e27cbd4bd8c4a6

班次利用率调取接口，渲染，测试，样式调整

 src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue

@@ -79,7 +79,7 @@
              <td  class="tdgu5 kaitou">{{item.equipmentType}}</td>
              <!--<td>{{item.tierType}}</td>-->
              <template v-for="(tableHead, index) in item.dataList">
                <td :style="{background:tableHead.color }">{{tableHead.lyl | numFilter}}</td>
                <td :style="{background:tableHead.color }">{{tableHead.startRate | numFilter}}</td>
                <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjl') > -1">
                  {{tableHead.openRate | numFilter}}
                </td>
@@ -157,24 +157,24 @@
    },
    nodeTree(val) { //监听currSelected 变化，将变化后的数值传递给 getCurrSelected 事件
      if (JSON.stringify(val) != '{}') {
        if (val.entity.equipmentId) {
        if (val.equipmentId != null) {
          this.queryParamEquip.parentId = ''
          this.queryParamEquip.equipmentIds = val.entity.equipmentId
          this.queryParamEquip.equipmentId = val.equipmentId
        } else {
          this.queryParamEquip.parentId = val.entity.id
          this.queryParamEquip.equipmentIds = ''
          this.queryParamEquip.parentId = val.key
          this.queryParamEquip.equipmentId = ''
        }
        this.searchQuery()
      }
    },
    nodePeople(val){
      if (JSON.stringify(val) != '{}') {
        if (val.entity.equipmentId) {
          this.queryParamPeople.parentId = val.entity.equipmentId
          this.queryParamPeople.equipmentIds = ''
        if (val.equipmentId != null) {
          this.queryParamPeople.parentId = val.equipmentId
          this.queryParamPeople.equipmentId = ''
        } else {
          this.queryParamPeople.parentId = val.entity.id
          this.queryParamPeople.equipmentIds = ''
          this.queryParamPeople.parentId = val.key
          this.queryParamPeople.equipmentId = ''
        }
        this.searchQuery()
      }
@@ -285,6 +285,7 @@
      let dictCode = 'mdc_equipmentType'
      let items = []
      items = getDictItemsFromCache(dictCode)
      console.log(items)
      if (deviceList && items.length > 0) {
        for (let a = 0; a < deviceList.length; a++) {
          if (items && items.length > 0) {
@@ -341,10 +342,10 @@
    searchQuery() {
      if(this.queryParam.typeTree == "1"){
        this.queryParam.parentId =  this.queryParamEquip.parentId
        this.queryParam.equipmentIds = this.queryParamEquip.equipmentIds
        this.queryParam.equipmentId = this.queryParamEquip.equipmentId
      }else{
        this.queryParam.parentId = this.queryParamPeople.parentId
        this.queryParam.equipmentIds = ""
        this.queryParam.equipmentId = ""
      }
      this.loadData()
      // this.onClearSelected()
@@ -352,12 +353,12 @@
    searchReset() {
      this.typeTree = this.queryParam.typeTree
      this.typeParent =  this.queryParam.parentId
      this.typeEquipment = this.queryParam.equipmentIds
      this.typeEquipment = this.queryParam.equipmentId
      this.queryParam = {}
      this.dates = []
      this.queryParam.typeTree = this.typeTree
      this.queryParam.parentId = this.typeParent
      this.queryParam.equipmentIds =  this.typeEquipment
      this.queryParam.equipmentId =  this.typeEquipment
      // this.ipagination.current = 1
      this.loadData();
      // this.queryParam = {}
@@ -377,7 +378,7 @@
          this.checkSameData1(this.dataList)
          this.checkSameData2(this.dataList)
          this.combineCell();
          this.initDeviceType(this.dataList)
          // this.initDeviceType(this.dataList)
        }
      })
    }

 src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue

@@ -345,13 +345,34 @@
      }
      this.checkedList = checkedList
    },
    // searchQuery() {
    //   if(this.queryParam.typeTree == "1"){
    //     // this.queryParam.TreeIDTwo = ""
    //     this.queryParam.parentId =  this.queryParamEquip.parentId
    //     this.queryParam.equipmentId = this.queryParamEquip.equipmentId
    //   }else{
    //     // this.queryParam.TreeIDOne = ""
    //     this.queryParam.parentId = this.queryParamPeople.parentId
    //     this.queryParam.equipmentId = ""
    //   }
    //   this.loadData()
    //   // this.onClearSelected()
    // },
    // searchReset() {
    //   this.typeTree = this.queryParam.typeTree
    //   this.typeParent =  this.queryParams.parentId
    //   this.queryParam = {}
    //   this.dates = []
    //   this.queryParam.typeTree = this.typeTree
    //   this.queryParam.parentId = this.typeParent
    //   this.loadData()
    //   // this.onClearSelected()
    // },
    searchQuery() {
      if(this.queryParam.typeTree == "1"){
        // this.queryParam.TreeIDTwo = ""
        this.queryParam.parentId =  this.queryParamEquip.parentId
        this.queryParam.equipmentId = this.queryParamEquip.equipmentId
      }else{
        // this.queryParam.TreeIDOne = ""
        this.queryParam.parentId = this.queryParamPeople.parentId
        this.queryParam.equipmentId = ""
      }
@@ -360,12 +381,18 @@
    },
    searchReset() {
      this.typeTree = this.queryParam.typeTree
      this.typeParent =  this.queryParams.parentId
      this.typeParent =  this.queryParam.parentId
      this.typeEquipment = this.queryParam.equipmentId
      this.queryParam = {}
      this.dates = []
      this.queryParam.typeTree = this.typeTree
      this.queryParam.parentId = this.typeParent
      this.loadData()
      this.queryParam.equipmentId =  this.typeEquipment
      // this.ipagination.current = 1
      this.loadData();
      // this.queryParam = {}
      // this.dates = []
      // this.loadData()
      // this.onClearSelected()
    },
    loadData() {
@@ -379,7 +406,7 @@
          this.checkSameData1(this.dataList)
          this.checkSameData2(this.dataList)
          this.combineCell();
          this.initDeviceType(this.dataList)
          // this.initDeviceType(this.dataList)

        }
      })

 src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue

@@ -15,8 +15,8 @@
              <a-form-item label="班制">
                <a-select v-model="queryParam.shiftId" placeholder="请选择班制"
                          @change="initShiftSubList" :allowClear = "allowClear">
                  <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.id">
                    {{ em.shiftName }}
                  <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
                    {{ em.label }}
                  </a-select-option>
                </a-select>
              </a-form-item>
@@ -24,8 +24,8 @@
            <a-col :md="6" :sm="6" :xs="6">
              <a-form-item label="班次">
                <a-select v-model="queryParam.shiftSubId" placeholder="请选择班次" @change="initShiftSubListChange"  :allowClear = "allowClearSu">
                  <a-select-option v-for="(em,index) in shiftSubList" :key="index" :value="em.id">
                    {{ em.shiftSubName }}
                  <a-select-option v-for="(em,index) in shiftSubList" :key="index" :value="em.value">
                    {{ em.label }}
                  </a-select-option>
                </a-select>
              </a-form-item>
@@ -67,25 +67,32 @@
          <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: 100px; max-width: 100px;width: 100px;">设备编号</th>
              <th class="thgu dong2 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">设备名称</th>
              <th class="thgu dong3 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备类型</th>
              <th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">班次</th>
              <th class="thgu dong1 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;"></th>
              <th  class="thgu dong2 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;"></th>
              <th  class="thgu dong3 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;"></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>
              <!--<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>
                <!--<th v-if="checkedList.indexOf('gjsj') > -1">关机时间(s)</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>-->
@@ -94,36 +101,43 @@
            </thead>
            <tbody>
            <tr class="mathData" v-for="(item, index) in dataList">
              <td class="tdgu  kaitou">{{item.equipmentId}}</td>
              <td class="tdgu1  kaitou">{{item.equipmentName}}</td>
              <td class="tdgu2  kaitou">{{item.equipmentType}}</td>
              <td class="tdgu3  kaitou">{{item.shiftSubName}}</td>
              <td  class="tdgu kaitou" :rowspan="item.level1span" :class="{hidden: item.level1dis}"  v-show="!item.level1dis">{{item.level1}}</td>
              <td  class="tdgu1 kaitou" :rowspan="item.level2span" :class="{hidden: item.level2dis}"  v-show="!item.level2dis">{{item.level2}}</td>
              <td  class="tdgu2 kaitou" :rowspan="item.level3span" :class="{hidden: 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>

              <!--<td>{{item.tierType}}</td>-->
              <template v-for="(tableHead, index) in tableHeads">
                <td :style="{background:item[tableHead].color }" v-if='item[tableHead].lyl !== 0'>{{item[tableHead].lyl | numFilter}}</td>
                <td :style="{background:item[tableHead].color }" v-if='item[tableHead].lyl == 0 && item[tableHead].status == 1'>维修</td>
                <td :style="{background:item[tableHead].color }" v-if='item[tableHead].lyl == 0 && item[tableHead].status == 2'>休班</td>
                <td :style="{background:item[tableHead].color }" v-if='item[tableHead].lyl == 0 && item[tableHead].status == 10'>{{item[tableHead].lyl | numFilter}}</td>
                <td :style="{background:item[tableHead].color }" v-if='item[tableHead].lyl == 0 && item[tableHead].status == 11'>未计算</td>
                <td :style="{background:item[tableHead].color }" v-if='item[tableHead].lyl == 0 && item[tableHead].status == 12'>无班次</td>
                <td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('gzl') > -1">
                  {{item[tableHead].gzl | numFilter}}
              <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:item[tableHead].color }" v-if="checkedList.indexOf('processingLong') > -1">
                  {{item[tableHead].processingLong}}
                <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('jgsj') > -1">
                  {{tableHead.processLong}}
                </td>
                <td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('totalLong') > -1">
                  {{item[tableHead].totalLong}}
                <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('djsj') > -1">
                  {{tableHead.waitLong}}
                </td>
                <td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('faultLong') > -1">
                  {{item[tableHead].faultLong}}
                <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">-->
                  <!--{{item[tableHead].gjsj}}-->
                <!--</td>-->
              </template>
              <td :style="{background:item.average.color }" >{{item.average.lyl | numFilter}}</td>
              <!--<td :style="{background:item.average.color }" >{{item.average.lyl | numFilter}}</td>-->
            </tr>
            </tbody>
          </table>
@@ -156,19 +170,23 @@
        queryParamPeople:{},
        efficiencyOptions: [
          { label: '班次利用率', value: 'lyl' },
          { label: '故障率', value: 'gzl' },
          { label: '运行时间', value: 'processingLong' },
          { label: '有效时间', value: 'totalLong' },
          { label: '故障时间', value: 'faultLong' },
          // { label: '故障率', value: 'gzl' },
          // { label: '运行时间', value: 'processingLong' },
          // { label: '有效时间', value: 'totalLong' },
          // { label: '故障时间', value: 'faultLong' },
          // { label: '关机时间', value: 'gjsj' }
          { label: '开机时间', value: 'kjsj' },
          { label: '加工时间', value: 'jgsj' },
          { label: '待机时间', value: 'djsj' },
          { label: '关机时间', value: 'gjsj' }
        ],
        checkedList: ['lyl'],
        dataList: [],
        url: {
          list: '/mdc/efficiencyReport/efficiencyShiftList',
          listByType: '/mdc/MdcUtilizationRate/listByType',
          initShiftList: '/mdc/mdcshift/initShiftList',
          initShiftSubList: '/mdc/mdcshiftsub/initShiftSubList'
          listByType: '/mdc/MdcUtilizationRate/getByType',
          initShiftList: '/mdc/mdcMdcShift/initShiftList',
          initShiftSubList: '/mdc/mdcShiftSub/initShiftSubList'
        },
        tableHeads: [],
        shiftList: [],
@@ -187,35 +205,30 @@
    },
    watch: {
      Type(valmath){
        // console.log(valmath);
        // this.rightcolval = 0
        this.dataList = [];
        // this.selectedRowKeys1 = []
        // this.selectionRows1 = []
        this.queryParam.typeTree = valmath
        // this.rightcolval = 0

      },
      nodeTree(val) { //监听currSelected 变化，将变化后的数值传递给 getCurrSelected 事件
        console.log(val);
        if (JSON.stringify(val) != '{}') {
          if (val.entity.equipmentId) {
          if (val.equipmentId != null) {
            this.queryParamEquip.parentId = ''
            this.queryParamEquip.equipmentIds = val.entity.equipmentId
            this.queryParamEquip.equipmentId = val.equipmentId
          } else {
            this.queryParamEquip.parentId = val.entity.id
            this.queryParamEquip.equipmentIds = ''
            this.queryParamEquip.parentId = val.key
            this.queryParamEquip.equipmentId = ''
          }
          this.searchQuery()
        }
      },
      nodePeople(val){
        if (JSON.stringify(val) != '{}') {
          if (val.entity.equipmentId) {
            this.queryParamPeople.parentId = ''
            this.queryParamPeople.equipmentIds = val.entity.equipmentId
          if (val.equipmentId != null) {
            this.queryParamPeople.parentId = val.equipmentId
            this.queryParamPeople.equipmentId = ''
          } else {
            this.queryParamPeople.parentId = val.entity.id
            this.queryParamPeople.equipmentIds = ''
            this.queryParamPeople.parentId = val.key
            this.queryParamPeople.equipmentId = ''
          }
          this.searchQuery()
        }
@@ -231,6 +244,93 @@
      }
    },
    methods: {
      checkSameData(dataList){
        let cache = {};  //存储的是键是kclx 的值，值是kclx 在indeces中数组的下标
        let indices = [];  //数组中每一个值是一个数组，数组中的每一个元素是原数组中相同kclx的下标
        dataList.map((item,index)=>{
          let level1 = item.level1;
          let _index = cache[level1];
          if(_index!==undefined){
            indices[_index].push(index)
          }else{
            cache[level1] = indices.length
            indices.push([index])
          }
        })
        let result = [];
        indices.map((item)=>{
          item.map((index)=>{
            result.push(dataList[index])
          })
        })
        this.dataList = result
      },
      checkSameData1(dataList){
        let cache = {};  //存储的是键是kclx 的值，值是kclx 在indeces中数组的下标
        let indices = [];  //数组中每一个值是一个数组，数组中的每一个元素是原数组中相同kclx的下标
        dataList.map((item,index)=>{
          let level2 = item.level2;
          let _index = cache[level2];
          if(_index!==undefined){
            indices[_index].push(index)
          }else{
            cache[level2] = indices.length
            indices.push([index])
          }
        })
        let result = [];
        indices.map((item)=>{
          item.map((index)=>{
            result.push(dataList[index])
          })
        })
        this.dataList = result
      },
      checkSameData2(dataList){
        let cache = {};  //存储的是键是kclx 的值，值是kclx 在indeces中数组的下标
        let indices = [];  //数组中每一个值是一个数组，数组中的每一个元素是原数组中相同kclx的下标
        dataList.map((item,index)=>{
          let level3 = item.level3;
          let _index = cache[level3];
          if(_index!==undefined){
            indices[_index].push(index)
          }else{
            cache[level3] = indices.length
            indices.push([index])
          }
        })
        let result = [];
        indices.map((item)=>{
          item.map((index)=>{
            result.push(dataList[index])
          })
        })
        this.dataList = result
      },
      // 合并
      combineCell() {
        console.log(this.dataList)
        let list =this.dataList;
        for (let field in list[0]) {
          var k = 0;
          while (k < list.length) {
            list[k][field + 'span'] = 1;
            list[k][field + 'dis'] = false;
            for (var i = k + 1; i <= list.length - 1; i++) {
              if (list[k][field] == list[i][field] && list[k][field] != '') {
                list[k][field + 'span']++;
                list[k][field + 'dis'] = false;
                list[i][field + 'span'] = 1;
                list[i][field + 'dis'] = true;
              } else {
                break;
              }
            }
            k = i;
          }
        }
        return list;
      },
      disabledDate(current){
        //Can not slect days before today and today
        return current && current > moment().subtract('days', 1);
@@ -318,10 +418,10 @@
      searchQuery() {
        if(this.queryParam.typeTree == "1"){
          this.queryParam.parentId =  this.queryParamEquip.parentId
          this.queryParam.equipmentIds = this.queryParamEquip.equipmentIds
          this.queryParam.equipmentId = this.queryParamEquip.equipmentId
        }else{
          this.queryParam.parentId = this.queryParamPeople.parentId
          this.queryParam.equipmentIds = ""
          this.queryParam.equipmentId = ""
        }
        this.loadData()
        // this.onClearSelected()
@@ -329,21 +429,27 @@
      searchReset() {
        this.typeTree = this.queryParam.typeTree
        this.typeParent =  this.queryParam.parentId
        this.typeEquipment = this.queryParam.equipmentIds
        this.typeEquipment = this.queryParam.equipmentId
        this.queryParam = {}
        this.dates = []
        this.queryParam.typeTree = this.typeTree
        this.queryParam.parentId = this.typeParent
        this.queryParam.equipmentIds =  this.typeEquipment
        this.queryParam.equipmentId =  this.typeEquipment
        this.loadData()
        // this.onClearSelected()
      },
      loadData() {
        this.tableHeads = []
        this.dataList = []
        getAction(this.url.list, this.queryParam).then(res => {
          if (res.success) {
            this.tableHeads = res.result.dates
            this.dataList = res.result.list
            this.initDeviceType(this.dataList)
            this.dataList = res.result.mdcEfficiencyList
            this.checkSameData(this.dataList)
            this.checkSameData1(this.dataList)
            this.checkSameData2(this.dataList)
            this.combineCell();
            // this.initDeviceType(this.dataList)
          }
        })
      }
@@ -368,19 +474,35 @@
  }
  .table tbody tr .tdgu1{
    position: sticky;
    left: 100px;
    left: 150px;
    z-index: 2;
  }
  .table tbody tr .tdgu2{
    position: sticky;
    left: 250px;
    left: 300px;
    z-index: 2;
  }
  .table tbody tr .tdgu3{
    position: sticky;
    left: 350px;
    left: 450px;
    z-index: 2;
  }
  .table tbody tr .tdgu4{
    position: sticky;
    left: 550px;
    z-index: 2;
  }
  .table tbody tr .tdgu5{
    position: sticky;
    left: 700px;
    z-index: 2;
  }
  .table tbody tr .tdgu6{
    position: sticky;
    left: 800px;
    z-index: 2;
  }

  .table2 thead tr .timeth,
  .table2 thead tr  .thgu {
    position: sticky;
@@ -402,16 +524,29 @@
  }
  .table2 thead .equipname .dong2{
    z-index: 5;
    left: 100px;
    left: 150px;
  }
  .table2 thead .equipname .dong3{
    z-index: 5;
    left: 250px;
    left: 300px;
  }
  .table2 thead .equipname .dong4{
    z-index: 5;
    left: 350px;
    left: 450px;
  }
  .table2 thead .equipname .dong5{
    z-index: 5;
    left: 550px;
  }
  .table2 thead .equipname .dong6{
    z-index: 5;
    left: 700px;
  }
  .table2 thead .equipname .dong7{
    z-index: 6;
    left: 800px;
  }

  @media screen and (min-width: 1920px){
    #EfficiencyShift{
      height: 670px!important;