1、mdc设备多选输入框优化新增点击输入框同样触发查询按钮弹出抽屉或弹窗 2、解决进入过产品结构树页面后再进入设备日志页面后设备状态分布图样式变形问题...

zhaowei

9 天以前 c3a4f841d5499b74e9153fce421cebd1fb4ac72d

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

@@ -39,7 +39,8 @@
            </a-col>
            <a-col :md="4" :sm="4">
              <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="5" :sm="5" :xs="5">
@@ -107,15 +108,21 @@
      <a-spin :spinning="spinning">
        <div class="container" id="EfficiencyPO" 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;height: 66px">公司</th>
                <th class="thgu dong1 name" rowspan="2"
                    style="min-width: 50px; max-width: 50px;width: 50px;height: 66px">公司
                </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 rowspan="2">组别</th>-->
                <template v-for="(tableHead, index) in tableHeads">
                  <th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
@@ -135,23 +142,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">
                  <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 style="min-width: 162px; max-width: 162px;width: 162px;"  class="tdgu4 kaitou">{{item.equipmentName}}</td>
                  <td style="min-width: 162px; max-width: 162px;width: 162px;" class="tdgu4 kaitou">
                    {{item.equipmentName}}
                  </td>
                  <td  class="tdgu5 kaitou">{{item.equipmentType}}</td>
                </template>

@@ -159,20 +171,22 @@
                  <td colspan="6" class="tdgu kaitou">{{item.level1}}</td>
                </template>
                <template v-for="(tableHead, index) in item.dataList">
                  <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('lyl') > -1">{{tableHead.startRate | numFilter}}</td>
                  <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjl') > -1">
                  <td :style="{background:tableHead.color,minWidth:'100px' }" v-if="checkedList.indexOf('lyl') > -1">
                    {{tableHead.startRate | numFilter}}
                  </td>
                  <td :style="{background:tableHead.color,minWidth:'100px' }" v-if="checkedList.indexOf('kjl') > -1">
                    {{tableHead.openRate | numFilter}}
                  </td>
                  <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjsj') > -1">
                  <td :style="{background:tableHead.color,minWidth:'110px' }" v-if="checkedList.indexOf('kjsj') > -1">
                    {{tableHead.openLong | getFormattedTime}}
                  </td>
                  <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('jgsj') > -1">
                  <td :style="{background:tableHead.color ,minWidth:'110px'}" v-if="checkedList.indexOf('jgsj') > -1">
                    {{tableHead.processLong | getFormattedTime}}
                  </td>
                  <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('djsj') > -1">
                  <td :style="{background:tableHead.color,minWidth:'110px' }" v-if="checkedList.indexOf('djsj') > -1">
                    {{tableHead.waitLong | getFormattedTime}}
                  </td>
                  <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('gjsj') > -1">
                  <td :style="{background:tableHead.color,minWidth:'110px' }" v-if="checkedList.indexOf('gjsj') > -1">
                    {{tableHead.closeLong | getFormattedTime}}
                  </td>
                </template>
@@ -199,7 +213,7 @@
  components: {},
  data() {
    return {
      typeTree:"",
        typeTree: '',
      typeParent:1,
      typeEquipment:1,
      dates: [],
@@ -242,7 +256,7 @@
    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()
    this.getDriveTypeByApi()
@@ -255,7 +269,7 @@
  },
  watch: {
    Type(valmath){
      this.dataList = [];
        this.dataList = []
      this.queryParam.typeTree = valmath
    },
    nodeTree(val) { //监听currSelected 变化，将变化后的数值传递给 getCurrSelected 事件
@@ -303,7 +317,7 @@
      } else {
        return '0'
      }
    },
      }
  },
  methods: {
    initDictData(dictCode) {
@@ -324,11 +338,11 @@
      this.queryParams[key] = value
    },
    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{
@@ -336,7 +350,7 @@
          indices.push([index])
        }
      })
      let result = [];
        let result = []
      indices.map((item)=>{
        item.map((index)=>{
          result.push(dataList[index])
@@ -345,11 +359,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{
@@ -357,7 +371,7 @@
          indices.push([index])
        }
      })
      let result = [];
        let result = []
      indices.map((item)=>{
        item.map((index)=>{
          result.push(dataList[index])
@@ -366,11 +380,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{
@@ -378,7 +392,7 @@
          indices.push([index])
        }
      })
      let result = [];
        let result = []
      indices.map((item)=>{
        item.map((index)=>{
          result.push(dataList[index])
@@ -389,30 +403,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'
@@ -442,15 +456,15 @@
      }
    },
    exportExcel() {
      $("#EfficiencyPO").table2excel({
        exclude: ".noExl",
        name: "Excel Document Name",
        filename: "设备开动率",
        $('#EfficiencyPO').table2excel({
          exclude: '.noExl',
          name: 'Excel Document Name',
          filename: '设备开动率',
        exclude_img: true,
        fileext: ".xls",
          fileext: '.xls',
        exclude_links: true,
        exclude_inputs: true
      });
        })
    },
    showIdentifying() {
      getAction(this.url.listByType, { type: 'kdl' }).then(res => {
@@ -478,12 +492,12 @@
      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 = ''
      }
      Object.keys(this.queryParams).forEach(item => {
        this.queryParam[item] = this.queryParams[item].join()
@@ -510,7 +524,7 @@
        deviceLevel: [],
        deviceCategory: []
      }
      this.loadData();
        this.loadData()
    },
    loadData() {
      this.spinning=true
@@ -530,7 +544,7 @@
          this.checkSameData(this.dataList)
          this.checkSameData1(this.dataList)
          this.checkSameData2(this.dataList)
          this.combineCell();
            this.combineCell()
          // this.initDeviceType(this.dataList)
        }
      }).finally(()=>{
@@ -663,7 +677,6 @@
  z-index: 5;
  left: 50px;
}


.table2 thead .equipname .dong3{
  z-index: 5;