Merge remote-tracking branch 'origin/master'

zhangherong

2025-03-07 36e8795b59c7f7393758ca96e0c2438eddaee8be

 src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue

@@ -114,12 +114,9 @@
            <a-col :md="6" :sm="6" :xs="6">
              <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">
@@ -174,28 +171,15 @@
        <!--</template>-->
      </a-table>
    </div>
    <!--<div class="pagination">-->
    <!--<a-pagination-->
    <!--:total=dataSource.total-->
    <!--:show-total="(total, range) => `${range[0]}-${range[1]} 共 ${total} 条`"-->
    <!--:page-size="+queryParam.pageSize"-->
    <!--:default-current="1"-->
    <!--:current=+queryParam.pageNo-->
    <!--show-size-changer-->
    <!--:pageSizeOptions="['20','30','40','50']"-->
    <!--@change="handlePageNoChange"-->
    <!--@showSizeChange="handlePageSizeChange"-->
    <!--/>-->
    <!--</div>-->
  </div>
</template>

<script>
  import moment from 'moment'
  import { putAction, getAction } from '@/api/manage'
import { getAction } from '@/api/manage'
  import $ from 'jquery'
  import '@/components/table2excel/table2excel'
  import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
  import api from '@api/mdc'

  // import EditableCell from './EditableCell.vue'
@@ -214,8 +198,6 @@
          equipmentType: [],
          driveType: [],
          deviceLevel: [],
          deviceCategory: [],
          deviceImportanceLevel: [],
          percentageLevel: []
        },
        queryParamEquip: {},
@@ -416,7 +398,7 @@
        driveTypeList: [],
        equipmentTypeList: [],
        device_level_list: [],
        device_category_list: [],
      device_importance_level_list: [],
        percentage_level_list: [],
        scrollY: 465,
        tableLoading: false,
@@ -541,7 +523,6 @@
            // 此处为保证接口参数不多余，可省略
            this.queryParam[item] = this.queryParams[item].join()
            if (this.queryParams[item].length === 0) delete this.queryParam[item]
            console.log('this.queryParam', this.queryParam)
          }
        })
        this.loadData()
@@ -556,8 +537,7 @@
        this.queryParams = {
          equipmentType: [],
          driveType: [],
          deviceLevel: [],
          deviceCategory: []
        deviceLevel: []
        }
        this.dates = []
        this.loadData()
@@ -603,30 +583,6 @@
            this.tableLoading = false
            this.handleWindowResize()
          })
      },

      /**
       * 分页器页数发生改变时触发
       * @param page 改变后页数
       * @param pageSize 改变后每页展示数据条数
       */
      handlePageNoChange(page, pageSize) {
        this.queryParam.pageNo = page
        this.loadData()
      },

      /**
       * 分页器每页展示数据条数发生改变时触发
       * @param current 改变后页数
       * @param size 改变后每页展示数据条数
       */
      handlePageSizeChange(current, size) {
        this.queryParam.pageSize = size
        this.loadData()
      },

      onCellChange(key, dataIndex, value) {
        console.log('触发onCellChange', key, dataIndex, value)
      },

      /**