1、全局车间层级以及部门层级树默认展开 2、车间看板页面设备详情弹窗背景透明度改为不透明 3、所有含有车间层级树页面新增弹窗中的选择设备弹窗内容由表格...

zhuzhuanzhuan

2023-12-13 a04b8970aa94f80c4c4937706c787391759aded7

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

@@ -80,87 +80,91 @@
          <!--</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 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" 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>
@@ -210,7 +214,8 @@
        },
        tableHeads: [],
        shiftList: [],
        shiftSubList: []
        shiftSubList: [],
        spinning:false
      }
    },
    props: {  nodeTree: '', Type:'',nodePeople: ''  },
@@ -262,7 +267,20 @@
        } else {
          return '0'
        }
      }
      },

      /**
       * 格式化时间
       * @param seconds 秒数
       * @returns '' 格式化后时间字符串
       */
      getFormattedTime(seconds) {
        if (seconds) {
          return parseFloat((seconds / 3600).toFixed(2)) + '小时'
        } else {
          return '0'
        }
      },
    },
    methods: {
      checkSameData(dataList){
@@ -474,6 +492,7 @@
        // this.onClearSelected()
      },
      loadData() {
        this.spinning=true
        this.tableHeads = []
        this.dataList = []
        getAction(this.url.list, this.queryParam).then(res => {
@@ -486,6 +505,8 @@
            this.combineCell();
            // this.initDeviceType(this.dataList)
          }
        }).finally(()=>{
          this.spinning=false
        })
      },
      queryGroup() {
@@ -554,12 +575,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;
  }

@@ -600,11 +621,11 @@
  }
  .table2 thead .equipname .dong6{
    z-index: 5;
    left: 400px;
    left: 412px;
  }
  .table2 thead .equipname .dong7{
    z-index: 6;
    left: 500px;
    left: 512px;
  }

  @media screen and (min-width: 1920px){