1、登录页面优化首次登录会出现404字样，需要明确用户登录后显示页面是否为首页/消息页或者角色中可设置 2、驱动参数管理页面新增或修改控制系统中英文名...

zhuzhuanzhuan

2023-12-06 ec68cffd70d2a2788f7c74af55a11563aaf611d1

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

@@ -1,17 +1,26 @@
<template>
  <div style="width: 100%;">
    <a-card :bordered="false">
    <div :bordered="false">
      <!-- 查询区域 -->
      <div class="seach-content">
        <div class="table-page-search-wrapper">
        <a-form layout="inline" @keyup.enter.native="searchQuery">
          <a-row :gutter="24">
            <a-col :md="9" :sm="9" :xs="9">
            <a-col :md="4" :sm="4" >
              <a-form-item label="设备类型">
                <a-select placeholder="请选择设备类型" :triggerChange="true" v-model="queryParam.equipmentType" :allowClear="true">
                  <a-select-option v-for='item in selectList' :key='item.id' :value='item.equipmentTypeName'>
                    {{item.equipmentTypeName}}
                  </a-select-option>
                </a-select>
              </a-form-item>
            </a-col>
            <a-col :md="5" :sm="5" :xs="5">
              <a-form-item label="时间">
                <a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD" v-model="dates"/>
              </a-form-item>
            </a-col>
            <a-col :md="6" :sm="6" :xs="6">
            <a-col :md="4" :sm="4" :xs="4">
              <a-form-item label="班制">
                <a-select v-model="queryParam.shiftId" placeholder="请选择班制"
                          @change="initShiftSubList" :allowClear = "allowClear">
@@ -21,7 +30,7 @@
                </a-select>
              </a-form-item>
            </a-col>
            <a-col :md="6" :sm="6" :xs="6">
            <a-col :md="4" :sm="4" :xs="4">
              <a-form-item label="班次">
                <a-select v-model="queryParam.shiftSubId" placeholder="请选择班次" @change="initShiftSubListChange"  :allowClear = "allowClearSu">
                  <a-select-option v-for="(em,index) in shiftSubList" :key="index" :value="em.value">
@@ -30,37 +39,46 @@
                </a-select>
              </a-form-item>
            </a-col>

          </a-row>
          <a-row :gutter="24">
            <a-col :md="14" :sm="14" :xs="14">
            <a-col :md="9" :sm="9" :xs="9">
              <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
                                @change="efficiencyOptionsOnChange"/>
            </a-col>
            <a-col :md="3" :sm="3" :xs="3">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
            <a-col :md="5" :sm="5">
              <a-space>
                <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
                <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
                <a-button type="primary" @click="exportExcel" icon="download">导出</a-button>
              </a-space>
            </a-col>
            <a-col :md="3" :sm="3" :xs="3">
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-col>
            <a-col :md="3" :sm="3" :xs="3">
              <a-button type="primary" @click="exportExcel" icon="download">导出</a-button>
            <a-col :md="10" :sm="10">
              <table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;">
                <tr>
                  <td v-for="(item, index) in identifying">{{item.title}}</td>
                </tr>
                <tr>
                  <td style="text-align:center;" v-for="(item, index) in identifying">
                    <div class="identifyingclass" :style="{background: item.color}"></div>
                  </td>
                </tr>
              </table>
            </a-col>
          </a-row>
        </a-form>
      </div>
        <div style="width: 400px;top: 20px; right: 0px;">
        <table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;">
          <tr>
            <td v-for="(item, index) in identifying">{{item.title}}</td>
          </tr>
          <tr>
            <td style="text-align:center;" v-for="(item, index) in identifying">
              <div class="identifyingclass" :style="{background: item.color}"></div>
            </td>
          </tr>
        </table>
      </div>
        </div>
        <!--<div style="width: 530px;position:absolute;top: 10px; right: 0;">-->
          <!--<table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;">-->
            <!--<tr>-->
              <!--<td v-for="(item, index) in identifying">{{item.title}}</td>-->
            <!--</tr>-->
            <!--<tr>-->
              <!--<td style="text-align:center;" v-for="(item, index) in identifying">-->
                <!--<div class="identifyingclass" :style="{background: item.color}"></div>-->
              <!--</td>-->
            <!--</tr>-->
          <!--</table>-->
        <!--</div>-->
      </div>
      <div class="container" id="EfficiencyShift" style="margin-top: 20px;">
        <div class="table2">
@@ -143,7 +161,7 @@
          </table>
        </div>
      </div>
    </a-card>
    </div>
  </div>
</template>

@@ -164,6 +182,7 @@
        allowClear:true,
        allowClearSu:true,
        dates: [],
        selectList:[],
        identifying: [],
        queryParam: {},
        queryParamEquip:{},
@@ -186,7 +205,8 @@
          list: '/mdc/efficiencyReport/efficiencyShiftList',
          listByType: '/mdc/MdcUtilizationRate/getByType',
          initShiftList: '/mdc/mdcMdcShift/initShiftList',
          initShiftSubList: '/mdc/mdcShiftSub/initShiftSubList'
          initShiftSubList: '/mdc/mdcShiftSub/initShiftSubList',
          queryEquipmentType: '/mdc/mdcEquipmentType/queryEquipmentType'
        },
        tableHeads: [],
        shiftList: [],
@@ -202,6 +222,7 @@
      this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
      this.queryParam.typeTree = "1"
      this.loadData();
      this.queryGroup()
    },
    watch: {
      Type(valmath){
@@ -370,11 +391,11 @@
        })
      },
      initShiftSubList(val) {
        this.queryParam.shiftSubId = null;
        //每次重新选择班制时班次清空且显示placeholder内容
        this.queryParam.shiftSubId = undefined;
        getAction(this.url.initShiftSubList, { shiftId: val }).then((res) => {
          if (res.success) {
            this.shiftSubList = res.result;

          }
        })
      },
@@ -406,6 +427,8 @@
      dateParamChange(v1, v2) {
        this.queryParam.startTime = v2[0]
        this.queryParam.endTime = v2[1]
        // 点击时间选择器的清空按钮时会触发此判断(点击重置按钮不会触发)，实现重置列表功能，切实改变列表显示效果
        if(!this.queryParam.startTime&&!this.queryParam.endTime)this.searchReset()
      },
      efficiencyOptionsOnChange(checkedList) {
        let index = checkedList.indexOf('lyl')
@@ -420,14 +443,22 @@
        this.checkedList = checkedList
      },
      searchQuery() {
        if(this.queryParam.typeTree == "1"){
          this.queryParam.parentId =  this.queryParamEquip.parentId
          this.queryParam.equipmentId = this.queryParamEquip.equipmentId
        if(this.dates != ''){
          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.loadData()
        }else{
          this.queryParam.parentId = this.queryParamPeople.parentId
          this.queryParam.equipmentId = ""
          // this.$message.warning("请选择时间")
          this.$notification.warning({
            message:'消息',
            description:"请选择时间"
          });
        }
        this.loadData()
        // this.onClearSelected()
      },
      searchReset() {
@@ -455,6 +486,24 @@
            this.combineCell();
            // this.initDeviceType(this.dataList)
          }
        })
      },
      queryGroup() {
        getAction(this.url.queryEquipmentType).then(res => {
          if (res.success) {
            this.selectList = res.result
            // this.selectList = res.result.map((item, index, arr) => {
            //   return { label: item.id, value: item.equipmentTypeName + '' }
            // })
          } else {
            // this.$message.warning(res.message)
            this.$notification.warning({
              message: '消息',
              description: res.message
            })
          }
        }).finally(() => {
          this.loading = false
        })
      }
    }
@@ -644,9 +693,9 @@
  .dataContent .mathData .tdd {
    /*display: none;*/
  }
  .seach-content{
    display: flex;
    justify-content: space-between;
  }
  /*.seach-content{*/
    /*display: flex;*/
    /*justify-content: space-between;*/
  /*}*/

</style>