1、mdc菜单下除特殊要求外，页面表格最少条数由10条调整为30条，每页最多条数区间由[10,20,30]调整为[30,50,100] 2、OEE基础...

zhuzhuanzhuan

2024-03-18 51b9e548b0e533e8a415ce141808f2bb747b381e

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

@@ -6,16 +6,17 @@
        <div class="table-page-search-wrapper">
        <a-form layout="inline" @keyup.enter.native="searchQuery">
          <a-row :gutter="24">
            <a-col :md="5" :sm="5" >
              <a-col :md="4" :sm="4">
              <a-form-item label="设备类型">
                <a-select placeholder="请选择设备类型" :triggerChange="true" v-model="queryParam.equipmentType" :allowClear="true">
                  <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'>
                    {{item.equipmentTypeName}}
                  </a-select-option>
                </a-select>
              </a-form-item>
            </a-col>
            <a-col :md="5" :sm="5">
              <a-col :md="4" :sm="4">
              <a-form-item label="驱动类型">
                <a-auto-complete
                  v-model="queryParam.driveType"
@@ -25,9 +26,10 @@
                />
              </a-form-item>
            </a-col>
            <a-col :md="5" :sm="5" :xs="5">
              <a-col :md="6" :sm="6" :xs="6">
              <a-form-item label="时间">
                <a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD" v-model="dates" :allowClear="false"/>
                  <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">
@@ -42,28 +44,52 @@
            </a-col>
            <a-col :md="4" :sm="4" :xs="4">
              <a-form-item label="班次">
                <a-select v-model="queryParam.shiftSubId" placeholder="请选择班次" @change="initShiftSubListChange"  :allowClear = "allowClearSu">
                  <a-select v-model="queryParam.shiftSubId" placeholder="请选择班次" @change="initShiftSubListChange"
                            :allowClear="allowClearSu">
                  <a-select-option v-for="(em,index) in shiftSubList" :key="index" :value="em.value">
                    {{ em.label }}
                  </a-select-option>
                </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-col :md="2" :sm="2">
                <a
                  @click="toggleSearchStatus=!toggleSearchStatus"
                  style="display:block;height: 32px;display: flex;align-items: center"
                >
                  {{ toggleSearchStatus ? '收起' : '展开' }}
                  <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
                </a>
              </a-col>
          </a-row>

            <a-row :gutter="24" v-if="toggleSearchStatus">
              <a-col :md="4" :sm="4" :xs="4">
                <a-form-item label="设备级别">
                  <j-dict-select-tag placeholder="请选择设备级别" dictCode="device_level" v-model="queryParam.deviceLevel"
                                     allow-clear/>
                </a-form-item>
              </a-col>
              <a-col :md="4" :sm="4" :xs="4">
                <a-form-item label="设备种类">
                  <j-dict-select-tag placeholder="请选择设备种类" dictCode="device_category"
                                     v-model="queryParam.deviceCategory"
                                     allow-clear/>
                </a-form-item>
              </a-col>
            </a-row>

          <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">
              <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-button type="primary" icon="printer" v-print="'#EfficiencyShift'"
                              v-has="'efficiencyShiftReport:print'">打印
                    </a-button>
                </a-space>
                <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
                                  @change="efficiencyOptionsOnChange"/>
@@ -98,15 +124,19 @@
      <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">
            <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 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>
@@ -133,22 +163,28 @@
              <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">
                  <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>
                  </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">
                  <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="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>
@@ -208,7 +244,7 @@
    components: {},
    data() {
      return {
        typeTree:"",
        typeTree: '',
        typeParent:1,
        typeEquipment:1,
        allowClear:true,
@@ -244,7 +280,8 @@
        tableHeads: [],
        shiftList: [],
        shiftSubList: [],
        spinning:false
        spinning: false,
        toggleSearchStatus: false
      }
    },
    props: {  nodeTree: '', Type:'',nodePeople: ''  },
@@ -254,18 +291,18 @@
      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 = "1"
      this.loadData();
      this.queryParam.typeTree = '1'
      this.loadData()
      this.queryGroup()
      this.getDriveTypeByApi()
    },
    watch: {
      Type(valmath){
        this.dataList = [];
        this.dataList = []
        this.queryParam.typeTree = valmath
      },
      nodeTree(val) { //监听currSelected 变化，将变化后的数值传递给 getCurrSelected 事件
        console.log(val);
        console.log(val)
        if (JSON.stringify(val) != '{}') {
          if (val.equipmentId != null) {
            this.queryParamEquip.parentId = ''
@@ -310,15 +347,15 @@
        } else {
          return '0'
        }
      },
      }
    },
    methods: {
      checkSameData(dataList){
        let cache = {};  //存储的是键是kclx 的值，值是kclx 在indeces中数组的下标
        let indices = [];  //数组中每一个值是一个数组，数组中的每一个元素是原数组中相同kclx的下标
        let cache = {}  //存储的是键是kclx 的值，值是kclx 在indeces中数组的下标
        let indices = []  //数组中每一个值是一个数组，数组中的每一个元素是原数组中相同kclx的下标
        dataList.map((item,index)=>{
          let level1 = item.level1;
          let _index = cache[level1];
          let level1 = item.level1
          let _index = cache[level1]
          if(_index!==undefined){
            indices[_index].push(index)
          }else{
@@ -326,7 +363,7 @@
            indices.push([index])
          }
        })
        let result = [];
        let result = []
        indices.map((item)=>{
          item.map((index)=>{
            result.push(dataList[index])
@@ -335,11 +372,11 @@
        this.dataList = result
      },
      checkSameData1(dataList){
        let cache = {};  //存储的是键是kclx 的值，值是kclx 在indeces中数组的下标
        let indices = [];  //数组中每一个值是一个数组，数组中的每一个元素是原数组中相同kclx的下标
        let cache = {}  //存储的是键是kclx 的值，值是kclx 在indeces中数组的下标
        let indices = []  //数组中每一个值是一个数组，数组中的每一个元素是原数组中相同kclx的下标
        dataList.map((item,index)=>{
          let level2 = item.level2;
          let _index = cache[level2];
          let level2 = item.level2
          let _index = cache[level2]
          if(_index!==undefined){
            indices[_index].push(index)
          }else{
@@ -347,7 +384,7 @@
            indices.push([index])
          }
        })
        let result = [];
        let result = []
        indices.map((item)=>{
          item.map((index)=>{
            result.push(dataList[index])
@@ -356,11 +393,11 @@
        this.dataList = result
      },
      checkSameData2(dataList){
        let cache = {};  //存储的是键是kclx 的值，值是kclx 在indeces中数组的下标
        let indices = [];  //数组中每一个值是一个数组，数组中的每一个元素是原数组中相同kclx的下标
        let cache = {}  //存储的是键是kclx 的值，值是kclx 在indeces中数组的下标
        let indices = []  //数组中每一个值是一个数组，数组中的每一个元素是原数组中相同kclx的下标
        dataList.map((item,index)=>{
          let level3 = item.level3;
          let _index = cache[level3];
          let level3 = item.level3
          let _index = cache[level3]
          if(_index!==undefined){
            indices[_index].push(index)
          }else{
@@ -368,7 +405,7 @@
            indices.push([index])
          }
        })
        let result = [];
        let result = []
        indices.map((item)=>{
          item.map((index)=>{
            result.push(dataList[index])
@@ -379,30 +416,30 @@
      // 合并
      combineCell() {
        console.log(this.dataList)
        let list =this.dataList;
        let list = this.dataList
        for (let field in list[0]) {
          var k = 0;
          var k = 0
          while (k < list.length) {
            list[k][field + 'span'] = 1;
            list[k][field + 'dis'] = false;
            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;
                list[k][field + 'span']++
                list[k][field + 'dis'] = false
                list[i][field + 'span'] = 1
                list[i][field + 'dis'] = true
              } else {
                break;
                break
              }
            }
            k = i;
            k = i
          }
        }
        return list;
        return list
      },
      disabledDate(current){
        //Can not slect days before today and today
        return current && current > moment().subtract('days', 1);
        return current && current > moment().subtract('days', 1)
      },
      initDeviceType(deviceList) {
        let dictCode = 'mdc_equipmentType'
@@ -440,17 +477,17 @@
      },
      initShiftSubList(val) {
        //每次重新选择班制时班次清空且显示placeholder内容
        this.queryParam.shiftSubId = undefined;
        this.queryParam.shiftSubId = undefined
        getAction(this.url.initShiftSubList, { shiftId: val }).then((res) => {
          if (res.success) {
            this.shiftSubList = res.result;
            this.shiftSubList = res.result
          }
        })
      },
      initShiftSubListChange() {
        getAction(this.url.initShiftSubList, { shiftId: this.queryParam.shiftId }).then((res) => {
          if (res.success) {
            this.shiftSubList = res.result;
            this.shiftSubList = res.result
          }
        })
      },
@@ -484,19 +521,19 @@
          // this.$message.warn('不能取消查询利用率')
          this.$notification.warning({
            message:'消息',
            description:"不能取消查询班次利用率"
            description: '不能取消查询班次利用率'
          })
          return false
        }
        this.checkedList = checkedList
      },
      searchQuery() {
        if(this.queryParam.typeTree == "1"){
        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.queryParam.equipmentId = ''
        }
        this.loadData()
        // this.onClearSelected()
@@ -532,7 +569,7 @@
            this.checkSameData(this.dataList)
            this.checkSameData1(this.dataList)
            this.checkSameData2(this.dataList)
            this.combineCell();
            this.combineCell()
            // this.initDeviceType(this.dataList)
          }
        }).finally(()=>{
@@ -576,8 +613,8 @@
      filterOption(input, option) {
        return (
          option.componentOptions.children[0].text.toUpperCase().indexOf(input.toUpperCase()) >= 0
        );
      },
        )
      }
    }
  }
</script>
@@ -587,12 +624,14 @@
    height: 100%;
    overflow: auto;
  }

  .table2 thead tr th:first-child,
  .table tbody tr .tdgu{
    position: sticky;
    left: 0;
    z-index: 1;
  }

  .table tbody tr .wenzi{
    /*writing-mode: vertical-lr;*/
    /*text-orientation: upright;*/
@@ -600,35 +639,42 @@
    writing-mode: vertical-lr;
    letter-spacing: 2px;
  }

  .table tbody tr .kaitou{
    z-index: 1;
    background-color: white;
  }

  .table tbody tr .tdgu1{
    position: sticky;
    left: 50px;
    z-index: 2;
  }

  .table tbody tr .tdgu2{
    position: sticky;
    left: 100px;
    z-index: 2;
  }

  .table tbody tr .tdgu3{
    position: sticky;
    left: 150px;
    z-index: 2;
  }

  .table tbody tr .tdgu4{
    position: sticky;
    left: 250px;
    z-index: 2;
  }

  .table tbody tr .tdgu5{
    position: sticky;
    left: 412px;
    z-index: 2;
  }

  .table tbody tr .tdgu6{
    position: sticky;
    left: 512px;
@@ -671,6 +717,7 @@
    z-index: 5;
    left: 150px;
  }

  .table2 thead .equipname .dong5{
    z-index: 5;
    left: 250px;