Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into dev...

qushaowei

2023-12-13 41d50b20c975faeaa9e5277bdcff13b5acecb575

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

@@ -6,19 +6,28 @@
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
            <a-row :gutter="24">
              <a-col :md="6" :sm="6">
                <a-form-item label="时间">
                  <a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD" v-model="dates"/>
              <a-col :md="4" :sm="4">
                <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'>
                      {{item.equipmentTypeName}}
                    </a-select-option>
                  </a-select>
                </a-form-item>
              </a-col>
              <a-col :lg="2" :md="3" :sm="3" :xs="3">
              <a-col :md="6" :sm="6">
                <a-form-item label="时间">
                  <a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD"
                                  v-model="dates"/>
                </a-form-item>
              </a-col>
              <a-col :md="14" :sm="14">
                <a-space>
                <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              </a-col>
              <a-col :lg="2" :md="3" :sm="3" :xs="3">
                <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
              </a-col>
              <a-col :lg="2" :md="3" :sm="3" :xs="3">
                <a-button type="primary" @click="exportExcel" icon="download">导出</a-button>
                </a-space>
              </a-col>
            </a-row>
            <a-row :gutter="24">
@@ -45,17 +54,22 @@
        </div>
      </div>

      <a-spin :spinning="spinning">
      <div id="Efficiency" class="container" style="margin-top: 20px;">
        <div class="table2">
          <table class="dataContent table" border="1" cellspacing="0" cellpadding="0" style="white-space: nowrap">
            <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: 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 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 rowspan="2">组别</th>-->
              <template v-for="(tableHead, index) in tableHeads">
                <th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
@@ -65,44 +79,64 @@
              <template v-for="(tableHead, index) in tableHeads">
                <th>利用率(%)</th>
                <th v-if="checkedList.indexOf('kjl') > -1">开机率(%)</th>
                <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>
                  <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">
              <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>
                <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">{{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>
                </template>

                <!--合计与平均值区域-->
                <template v-else>
                  <td colspan="6" class="tdgu kaitou">{{item.level1}}</td>
                </template>

              <template v-for="(tableHead, index) in item.dataList">
                <td :style="{background:tableHead.color }">{{tableHead.utilizationRate | numFilter}}</td>
                <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjl') > -1">
                  {{tableHead.openRate | numFilter}}
                </td>
                <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjsj') > -1">
                  {{tableHead.openLong}}
                    {{tableHead.openLong | getFormattedTime}}
                </td>
                <td :style="{background:tableHead.color }"  v-if="checkedList.indexOf('jgsj') > -1">
                  {{tableHead.processLong}}
                    {{tableHead.processLong | getFormattedTime}}
                </td>
                <td :style="{background:tableHead.color }"  v-if="checkedList.indexOf('djsj') > -1">
                  {{tableHead.waitLong}}
                    {{tableHead.waitLong | getFormattedTime}}
                </td>
                <td :style="{background:tableHead.color }"  v-if="checkedList.indexOf('gjsj') > -1">
                  {{tableHead.closeLong}}
                    {{tableHead.closeLong | getFormattedTime}}
                </td>
              </template>

            </tr>

            </tbody>
          </table>

        </div>
      </div>
      </a-spin>
    </div>
  </div>
</template>
@@ -113,18 +147,20 @@
import $ from 'jquery'
import '@/components/table2excel/table2excel'
import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'

export default {
  name: 'EfficiencyList',
  components: {},
  data() {
    return {
      typeTree:"",
        typeTree: '',
      typeParent:1,
      typeEquipment:1,
      TreeIDOne:1,
      TreeIDTwo:2,
      deviceTypeDict: '',
      dates: [],
        selectList: [],
      identifying: [],
      queryParam: {},
      queryParams:{},
@@ -143,9 +179,17 @@
      url: {
        list: '/mdc/efficiencyReport/efficiencyList',
        listByType: '/mdc/MdcUtilizationRate/getByType',
          queryEquipmentType: '/mdc/mdcEquipmentType/queryEquipmentType'
      },
      tableHeads: [],

        distinguishColorList: [],
        utilizationRateRowAverage: '',
        openRateRowAverage: '',
        openLongRowAverage: '',
        processLongRowAverage: '',
        waitLongRowAverage: '',
        closeLongRowAverage: '',
        spinning: false
    }
  },
  props: { nodeTree: '',Type:'',nodePeople:'' },
@@ -154,12 +198,13 @@
    this.dates = [moment().subtract('days', 8), 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.queryParam.typeTree = '1'
    this.loadData()
      this.queryGroup()
  },
  watch: {
    Type(valmath){
      this.dataList = [];
        this.dataList = []
      this.queryParam.typeTree = valmath
    },
    nodeTree(val) { //监听currSelected 变化，将变化后的数值传递给 getCurrSelected 事件
@@ -194,15 +239,29 @@
      } else {
        return '0'
      }
      },

      /**
       * 格式化时间
       * @param seconds 秒数
       * @returns '' 格式化后时间字符串
       */
      getFormattedTime(seconds) {
        if (seconds) {
          return parseFloat((seconds / 3600).toFixed(2)) + '小时'
        } else {
          return '0'
        }
    }
  },
    computed: {},
  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{
@@ -210,7 +269,7 @@
          indices.push([index])
        }
      })
      let result = [];
        let result = []
      indices.map((item)=>{
        item.map((index)=>{
          result.push(dataList[index])
@@ -219,11 +278,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{
@@ -231,7 +290,7 @@
          indices.push([index])
        }
      })
      let result = [];
        let result = []
      indices.map((item)=>{
        item.map((index)=>{
          result.push(dataList[index])
@@ -240,11 +299,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{
@@ -252,7 +311,7 @@
          indices.push([index])
        }
      })
      let result = [];
        let result = []
      indices.map((item)=>{
        item.map((index)=>{
          result.push(dataList[index])
@@ -263,30 +322,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'
@@ -316,15 +375,15 @@
      }
    },
    exportExcel() {
      $("#Efficiency").table2excel({
        exclude: ".noExl",
        name: "Excel Document Name",
        filename: "设备利用率",
        $('#Efficiency').table2excel({
          exclude: '.noExl',
          name: 'Excel Document Name',
          filename: '设备利用率',
        exclude_img: true,
        fileext: ".xls",
          fileext: '.xls',
        exclude_links: true,
        exclude_inputs: false
      });
        })
    },
    showIdentifying() {
      getAction(this.url.listByType, { type: 'lyl' }).then(res => {
@@ -345,7 +404,7 @@
        // this.$message.warn('不能取消查询开动率')
        this.$notification.warning({
          message:'消息',
          description:"不能取消查询开动率"
            description: '不能取消查询开动率'
        })

        return false
@@ -376,20 +435,21 @@
    //   // this.onClearSelected()
    // },
    searchQuery() {
        console.log('dates', this.dates)
      if(this.dates != ''){
        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()
      }else{
        this.$notification.warning({
          message:'消息',
          description:"请选择时间"
        });
            description: '请选择时间'
          })
      }
      // this.onClearSelected()
    },
@@ -403,7 +463,7 @@
      this.queryParam.parentId = this.typeParent
      this.queryParam.equipmentId =  this.typeEquipment
      // this.ipagination.current = 1
      this.loadData();
        this.loadData()
      // this.queryParam = {}
      // this.dates = []
      // this.loadData()
@@ -412,19 +472,41 @@
    loadData() {
      this.tableHeads = []
      this.dataList = []
        this.spinning = true
      getAction(this.url.list, this.queryParam).then(res => {
        if (res.success) {
          this.tableHeads = res.result.dates
          this.dataList = res.result.mdcEfficiencyList
            this.distinguishColorList = res.result.utilizationRateList
          this.checkSameData(this.dataList)
          this.checkSameData1(this.dataList)
          this.checkSameData2(this.dataList)
          this.combineCell();
            this.combineCell()
            // this.columns.push(...dataColumns)
          // this.initDeviceType(this.dataList)

        }
        }).finally(() => {
          this.spinning = false
        })
      },
      queryGroup() {
        getAction(this.url.queryEquipmentType).then(res => {
          if (res.success) {
            this.selectList = res.result
            // this.selectList = res.result.map((item, index, arr) => {
            //   return { label: item.id, value: item.equipmentTypeName + '' }
            // })
          } else {
            // this.$message.warning(res.message)
            this.$notification.warning({
              message: '消息',
              description: res.message
      })
    }
        }).finally(() => {
          this.loading = false
        })
      },
  }
}
</script>
@@ -434,12 +516,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;*/
@@ -447,73 +531,88 @@
  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: 400px;
    left: 412px;
  z-index: 2;
}

.table2 thead tr .timeth,
.table2 thead tr  .thgu {
  position: sticky;
  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;
}

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

.table2 thead .equipname .dong6{
  z-index: 5;
  left: 400px;
    left: 412px;
}

@media screen and (min-width: 1920px){
@@ -522,39 +621,46 @@
    overflow: scroll;
  }
}

@media screen and (min-width: 1680px) and (max-width: 1920px){
  #Efficiency{
    height: 687px!important;
    overflow: scroll;
  }
}

@media screen and (min-width: 1400px) and (max-width: 1680px){
  #Efficiency{
    height: 540px!important;
    overflow: scroll;
  }
}

@media screen and (min-width: 1280px) and (max-width: 1400px){
  #Efficiency{
    height: 440px!important;
    overflow: scroll;
  }
}

@media screen and (max-width: 1280px){
  #Efficiency{
    height: 440px!important;
    overflow: scroll;
  }
}

#Efficiency .table_guding1{
  position: absolute;
  overflow: hidden;
  width: 500px;
}

#Efficiency .table_guding2{
  overflow-x: scroll;
  width: 500px;
}

.identifyingclass {
  width: 55px;
  height: 15px;
@@ -607,12 +713,10 @@
  padding: 10px;
}

.dataContent .mathData .tdd {
  /*display: none;*/
}
td {
  vertical-align: middle;
}

.pink {
  background-color: #ff9bd2;
}
@@ -624,4 +728,27 @@
.green {
  background-color: #99ff4e;
}

  .vertical-text {
    writing-mode: vertical-rl;
  }

  /*/deep/ .ant-table-body .ant-table-row td {*/
  /*padding-top: 10px;*/
  /*padding-bottom: 10px;*/
  /*}*/

  /deep/ .ant-table-body .ant-table-row td.data {
    min-width: 150px;
    max-width: 150px;
  }

  /deep/ .ant-table-tbody > tr.ant-table-row:hover > td {
    background: none !important;
  }

  /deep/ .ant-table-thead th {
    text-align: center;
  }

</style>