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

qushaowei

2024-03-14 e055d2d93b516985fbc2df0f6f5a135f3230cccf

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

@@ -12,6 +12,7 @@
                    :data-source="driveTypeList"
                    placeholder="请选择驱动类型"
                    :filter-option="filterOption"
                  :allowClear="true"
                  />
                </a-form-item>
              </a-col>
@@ -23,6 +24,7 @@
                    :value="dates"
                    :mode="['month', 'month']"
                    @panelChange="dateParamChange"
                  @change="handleDateChange"
                  />
                </a-form-item>
              </a-col>
@@ -40,7 +42,8 @@
      </div>

      <div id="EfficiencyShift" style="flex:1;overflow: hidden">
        <a-table :columns="columns" rowKey="equipmentId" :dataSource="dataSource.records" :pagination="false" :scroll="{x:'max-content',y:scrollY}" bordered></a-table>
      <a-table :columns="columns" rowKey="id" :dataSource="dataSource.records" :loading="tableLoading"
               :pagination="false" :scroll="{x:'max-content',y:scrollY}" bordered></a-table>
      </div>
     <!--<div class="pagination">-->
       <!--<a-pagination-->
@@ -125,7 +128,7 @@
            align: 'center',
            width: 100,
            dataIndex: 'shift',
            ellipsis: true,
            ellipsis: true
          },
          {
            title: '每班小时',
@@ -270,6 +273,7 @@
        dataSource: [],
        driveTypeList: [],
        scrollY:465,
        tableLoading: false
      }
    },
    props: { nodeTree: '', Type: '', nodePeople: '' },
@@ -329,11 +333,19 @@
    },
    methods: {
      dateParamChange(value) {
        console.log('dateParamChangeValue', value)
        this.dates = value
        this.queryParam.startTime = moment(this.dates[0]).format('YYYY-MM')
        this.queryParam.endTime = moment(this.dates[1]).format('YYYY-MM')
      },

      handleDateChange(value) {
        console.log('handleDateChangeValue', value)
        if (!value.length) {
          delete this.queryParam.startTime
          delete this.queryParam.endTime
          this.dates = []
        }
      },
      initShiftList() {
        getAction(this.url.initShiftList).then((res) => {
          if (res.success) {
@@ -373,7 +385,6 @@
      },

      searchQuery() {
        if (this.dates != '') {
          if (this.queryParam.typeTree == '1') {
            this.queryParam.parentId = this.queryParamEquip.parentId
            this.queryParam.equipmentId = this.queryParamEquip.equipmentId
@@ -383,19 +394,11 @@
          }
          this.queryParam.pageNo = 1
          this.loadData()
        } else {
          // this.$message.warning("请选择时间")
          this.$notification.warning({
            message: '消息',
            description: '请选择时间'
          })
        }
        // this.onClearSelected()
      },

      searchReset() {
        this.queryParam = {
          pageSize: 20,
          pageSize: 10000,
          pageNo: 1
        }
        this.dates = []
@@ -412,10 +415,16 @@
      },

      loadData() {
        getAction(this.url.list, this.queryParam).then(res => {
        this.tableLoading = true
        getAction(this.url.list, this.queryParam)
          .then(res => {
          if (res.success) {
            this.dataSource = res.result
              this.tableLoading = false
          }
          })
          .finally(() => {
            this.tableLoading = false
        })
      },

@@ -479,21 +488,25 @@
      height: 811px!important;
    }
  }

  @media screen and (min-width: 1680px) and (max-width: 1920px){
    .device_list{
      height: 811px!important;
    }
  }

  @media screen and (min-width: 1400px) and (max-width: 1680px){
    .device_list{
      height: 663px!important;
    }
  }

  @media screen and (min-width: 1280px) and (max-width: 1400px){
    .device_list{
      height: 564px!important;
    }
  }

  @media screen and (max-width: 1280px){
    .device_list{
      height: 564px!important;