Merge remote-tracking branch 'origin/master'

zhangherong

2025-03-07 36e8795b59c7f7393758ca96e0c2438eddaee8be

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

@@ -73,16 +73,12 @@
            </a-row>

            <a-row :gutter="24" v-if="toggleSearchStatus">

              <a-col :md="5" :sm="5" :xs="5">
                <a-form-item label="重要程度">
                  <a-select
                    :value="queryParams.deviceImportanceLevel"
                    mode="multiple"
                    v-model="queryParam.deviceImportanceLevel"
                    placeholder="请选择设备重要程度"
                    allow-clear
                    :maxTagCount="1"
                    @change="selectChange($event,'deviceImportanceLevel')"
                  >
                    <a-select-option v-for="(item,index) in device_importance_level_list" :value="item.value"
                                     :key="index">
@@ -144,7 +140,7 @@
                </th>
                <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备类型
                </th>
                <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备型号
                <th class="thgu dong7 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">设备型号
                </th>
                <!--<th rowspan="2">组别</th>-->
                <template v-for="(tableHead, index) in tableHeads">
@@ -190,7 +186,7 @@
                    {{item.equipmentName}}
                  </td>
                  <td class="tdgu5 kaitou">{{item.equipmentType}}</td>
                  <td class="tdgu5 kaitou">{{item.equipmentModel}}</td>
                  <td class="tdgu6 kaitou">{{item.equipmentModel}}</td>
                </template>

                <!--合计与平均值区域-->
@@ -254,15 +250,13 @@
        equipmentTypeList: [],
        driveTypeList: [],
        device_level_list: [],
        device_category_list: [],
        device_importance_level_list: [],
        identifying: [],
        queryParam: {},
        queryParams: {
          equipmentType: [],
          driveType: [],
          deviceLevel: [],
          deviceCategory: [],
          deviceImportanceLevel: []
          deviceLevel: []
        },
        queryParamEquip: {},
        queryParamPeople: {},
@@ -546,9 +540,11 @@
          this.queryParam.equipmentId = ''
        }
        Object.keys(this.queryParams).forEach(item => {
          this.queryParam[item] = this.queryParams[item].join()
          // 此处为保证接口参数不多余，可省略
          if (this.queryParams[item].length === 0) delete this.queryParam[item]
          if (Array.isArray(this.queryParams[item])) {
            this.queryParam[item] = this.queryParams[item].join()
            // 此处为保证接口参数不多余，可省略
            if (this.queryParams[item].length === 0) delete this.queryParam[item]
          }
        })
        this.loadData()
      },
@@ -566,15 +562,9 @@
        this.queryParams = {
          equipmentType: [],
          driveType: [],
          deviceLevel: [],
          deviceCategory: []
          deviceLevel: []
        }
        // this.ipagination.current = 1
        this.loadData()
        // this.queryParam = {}
        // this.dates = []
        // this.loadData()
        // this.onClearSelected()
      },
      loadData() {
        this.tableHeads = []
@@ -698,6 +688,12 @@
    z-index: 2;
  }

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

  .table2 thead tr .timeth,
  .table2 thead tr .thgu {
    position: sticky;
@@ -745,6 +741,11 @@
    left: 412px;
  }

  .table2 thead .equipname .dong7 {
    z-index: 5;
    left: 512px;
  }

  #Efficiency {
    overflow: hidden;
  }