Merge remote-tracking branch 'origin/master'

zhangherong

2025-03-07 36e8795b59c7f7393758ca96e0c2438eddaee8be

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

@@ -77,22 +77,22 @@
            </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.deviceCategory"-->
<!--                    mode="multiple"-->
<!--                    placeholder="请选择设备种类"-->
<!--                    allow-clear-->
<!--                    :maxTagCount="1"-->
<!--                    @change="selectChange($event,'deviceCategory')"-->
<!--                  >-->
<!--                    <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">-->
<!--                      {{item.label}}-->
<!--                    </a-select-option>-->
<!--                  </a-select>-->
<!--                </a-form-item>-->
<!--              </a-col>-->
              <!--              <a-col :md="5" :sm="5" :xs="5">-->
              <!--                <a-form-item label="设备种类">-->
              <!--                  <a-select-->
              <!--                    :value="queryParams.deviceCategory"-->
              <!--                    mode="multiple"-->
              <!--                    placeholder="请选择设备种类"-->
              <!--                    allow-clear-->
              <!--                    :maxTagCount="1"-->
              <!--                    @change="selectChange($event,'deviceCategory')"-->
              <!--                  >-->
              <!--                    <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">-->
              <!--                      {{item.label}}-->
              <!--                    </a-select-option>-->
              <!--                  </a-select>-->
              <!--                </a-form-item>-->
              <!--              </a-col>-->
              <a-col :md="5" :sm="5" :xs="5">
                <a-form-item label="设备级别">
                  <a-select
@@ -112,12 +112,9 @@
              <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">
@@ -177,9 +174,9 @@
                </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: 120px; max-width: 120px;width: 120px;">设备型号
                </th>
                <th class="thgu dong7 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">班次</th>
                <th class="thgu dong8 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>
@@ -221,12 +218,12 @@
                    {{item.equipmentName}}
                  </td>
                  <td class="tdgu5  kaitou">{{item.equipmentType}}</td>
                  <td class="tdgu5 kaitou">{{item.equipmentModel}}</td>
                  <td class="tdgu6  kaitou">{{item.shiftSubName}}</td>
                  <td class="tdgu6 kaitou">{{item.equipmentModel}}</td>
                  <td class="tdgu7  kaitou">{{item.shiftSubName}}</td>
                </template>

                <template v-else>
                  <td colspan="7" class="tdgu kaitou">{{item.level1}}</td>
                  <td colspan="8" class="tdgu kaitou">{{item.level1}}</td>
                </template>
                <!--<td>{{item.tierType}}</td>-->
                <template v-for="(tableHead, index) in item.dataList">
@@ -278,16 +275,13 @@
        equipmentTypeList: [],
        driveTypeList: [],
        device_level_list: [],
        device_category_list: [],
        device_importance_level_list: [],
        identifying: [],
        queryParam: {},
        queryParams: {
          equipmentType: [],
          driveType: [],
          deviceLevel: [],
          deviceCategory: [],
          deviceImportanceLevel: []
          deviceLevel: []
        },
        queryParamEquip: {},
        queryParamPeople: {},
@@ -616,8 +610,7 @@
        this.queryParams = {
          equipmentType: [],
          driveType: [],
          deviceLevel: [],
          deviceCategory: []
          deviceLevel: []
        }
        this.loadData()
        // this.onClearSelected()
@@ -748,6 +741,12 @@
    z-index: 2;
  }

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

  .table2 thead tr .timeth,
  .table2 thead tr .thgu {
    position: sticky;
@@ -800,6 +799,11 @@
    left: 512px;
  }

  .table2 thead .equipname .dong8 {
    z-index: 6;
    left: 632px;
  }

  #EfficiencyShift {
    overflow: hidden;
  }