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

zhuzhuanzhuan

2023-12-06 ec68cffd70d2a2788f7c74af55a11563aaf611d1

1、登录页面优化首次登录会出现404字样，需要明确用户登录后显示页面是否为首页/消息页或者角色中可设置
2、驱动参数管理页面新增或修改控制系统中英文名称规则限制字符数最少6位调整为2位
3、效率段管理页面效率段颜色可自定义
4、设备利用率、设备开动率、班次利用率页面增加可按照设备类型筛选查询
5、对比分析页面增加通过选择设备来对比
6、设备日利用率和设备日利用率对比页面优化选择树节点后查询区域的设备名称字段不会更新问题

 src/components/tools/UserMenu.vue

@@ -16,7 +16,7 @@
        :filterOption="filterOption"
        :open="isMobile()?true:null"
        :getPopupContainer="(node) => node.parentNode"
        :style="isMobile()?{width: '100%',marginBottom:'50px'}:{}"
        :style="isMobile()?{width: '100%',marginBottom:'50px',color:theme=='dark'?'#fff':'#000'}:{color:theme=='dark'?'#fff':'#000'}"
        @change="searchMethods"
        @blur="hiddenClick"
      >
@@ -268,7 +268,6 @@
  /* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
  .user-wrapper .search-input {
    width: 180px;
    color: inherit;

    /deep/ .ant-select-selection {
      background-color: inherit;

 src/views/mdc/base/MdcUtilizationRateList.vue

@@ -9,11 +9,11 @@
              <a-input placeholder="请输入类别" v-model="queryParam.rateParameterCategory"></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="2" :sm="2">
          <a-col>
            <a-space>
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
          </a-col>
          <a-col :md="2" :sm="2">
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-space>
          </a-col>
        </a-row>
      </a-form>

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

@@ -54,8 +54,7 @@
      <div class="container" id="EfficiencyShift" style="margin-top: 20px;">
        <div class="table2">
          <a-table :columns="columns" :dataSource="dataSource.records" :pagination="false" bordered
                   :scroll="{ x: 1500, y: false }">

                   :scroll="{ x: 3000, y: false }">
          </a-table>
        </div>
      </div>
@@ -117,21 +116,21 @@
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            },
            }
            // fixed: 'left'
          },
          {
            title: '设备统一编号',
            align: 'center',
            dataIndex: 'equipmentId',
            width: 120,
            width: 120
            // fixed: 'left'
          },
          {
            title: '设备名称',
            align: 'center',
            width: 150,
            dataIndex: 'equipmentName',
            dataIndex: 'equipmentName'
            // fixed: 'left'
          },
          {

 src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysismain.vue

@@ -11,6 +11,13 @@
            <!--</a-form-item>-->
          <!--</a-col>-->
          <a-col :md="5" :sm="5">
              <a-form-item label="设备">
                <a-input-search :readOnly="true" v-model="queryParam.equipmentId" @search="deviceSearch"
                                placeholder='请选择设备'/>
              </a-form-item>
            </a-col>

            <a-col :md="5" :sm="5">
            <a-form-item label="驱动类型">
              <!--<j-dict-select-tag placeholder="请选择驱动类型"-->
                                 <!--:triggerChange="true" dictCode="mdc_driveType"-->
@@ -23,16 +30,16 @@
              />
            </a-form-item>
          </a-col>
          <a-col :md="9" :sm="9" :xs="4">
            <a-col :md="6" :sm="6" :xs="6">
            <a-form-item label="时间">
              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYYMMDD"/>
            </a-form-item>
          </a-col>
          <a-col :md="2" :sm="3" :xs="3">
            <a-col>
              <a-space>
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
              </a-space>
          </a-col>
        </a-row>
      </a-form>
@@ -53,6 +60,8 @@
    </div>
    <!-- table区域-end -->
    </div>

    <selectDeviceModal ref="selectDeviceModal" @selectFinished="selectOK" :title="'选择设备'"></selectDeviceModal>
  </div>
</template>

@@ -75,6 +84,8 @@
  import Tooltip from 'ant-design-vue/es/tooltip'
  import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
  import api from '@/api/mdc'
  import selectDeviceModal from '../../../../system/modules/SelectDeviceModal.vue'

  export default {
    name: 'comparativeAnalysismain',
    // mixins: [JeecgListMixin],
@@ -86,22 +97,25 @@
      JDictSelectTag,
      JInput,
      JDate,
      JEllipsis
      JEllipsis,
      selectDeviceModal
    },
    props: {  nodeTree: '', Type:'',nodePeople: '' },
    data() {
      return {
        activeKey: '1',
        typeTree:"",
        typeTree: '',
        typeParent:1,
        typeEquipment:1,
        AnalysisBarList:[],
        AnalysisGauge:[],
        AnalysisPie:[],
        dates: [],
        xianshi:"",
        xianshi: '',
        readOnly:true,
        queryParam: {},
        queryParam: {
          equipmentId: ''
        },
        queryParams:{},
        queryParamEquip:{},
        queryParamPeople:{},
@@ -115,7 +129,7 @@
    },
    watch:{
      Type(valmath){
        this.dataList = [];
        this.dataList = []
        this.queryParams.typeTree = valmath
        // console.log(this.queryParams.typeTree)
      },
@@ -123,8 +137,9 @@
        if (JSON.stringify(val) != '{}') {
          if (val.equipmentId) {
            // this.$set(this.queryParam, 'tierName', val.title)
            this.queryParamEquip.parentId =  ""
            this.queryParams.equipmentId = val.equipmentId
            this.queryParamEquip.parentId = ''
            // this.queryParams.equipmentId = val.equipmentId
            this.queryParam.equipmentId = val.equipmentId
            this.queryParamEquip.equipmentId = val.equipmentId
          } else {
            // this.$set(this.queryParam, 'tierName', val.title)
@@ -132,14 +147,13 @@
            this.queryParams.equipmentId = ''
          }
          this.searchQuery()

        }
      },
      nodePeople(val){
        if (JSON.stringify(val) != '{}') {
          if (val.equipmentId) {
            // this.$set(this.queryParam, 'tierName', val.title)
            this.queryParamEquip.parentId =  ""
            this.queryParamEquip.parentId = ''
            this.queryParams.equipmentId = val.equipmentId
            this.queryParamEquip.equipmentId = val.equipmentId
          } else {
@@ -181,7 +195,7 @@
          this.AnalysisBarList = []
          this.AnalysisGauge = []
          this.AnalysisPie = []
          if(this.queryParams.typeTree == "1"){
          if (this.queryParams.typeTree == '1') {
            this.queryParams.parentId =  this.queryParamEquip.parentId
            // this.queryParams.equipmentId =  this.queryParamEquip.equipmentId
          }else{
@@ -190,8 +204,8 @@
          }
          this.AnalysisList = []
          //获取查询条件
          this.queryParam.parentId = this.queryParams.parentId;
          this.queryParam.equipmentId = this.queryParams.equipmentId;
          this.queryParam.parentId = this.queryParams.parentId
          // this.queryParam.equipmentId = this.queryParams.equipmentId
          this.queryParam.typeTree = this.queryParams.typeTree
          getAction(this.url.comparativeAnalysis,this.queryParam).then((res) => {
            if(res.success){
@@ -204,7 +218,7 @@
              this.$notification.warning({
                message:'消息',
                description:res.message
              });
              })
            }
          }).finally(() => {
            this.loading = false
@@ -222,7 +236,7 @@
        this.AnalysisBarList = []
        this.AnalysisGauge = []
        this.AnalysisPie = []
        if(this.queryParams.typeTree == "1"){
        if (this.queryParams.typeTree == '1') {
          this.typeTree = this.queryParams.typeTree
          this.typeParent =  this.queryParams.parentId
          this.typeEquipment = this.queryParams.equipmentId
@@ -231,8 +245,8 @@
          this.dates = []
          this.queryParams.typeTree = this.typeTree
          this.queryParams.parentId = this.typeParent
          if(this.queryParams.parentId !=  ""){
            this.queryParams.equipmentId =  ""
          if (this.queryParams.parentId != '') {
            this.queryParams.equipmentId = ''
          }else{
            if(this.queryParams.equipmentId == this.queryParamEquip.equipmentId){
              this.queryParams.equipmentId =  this.typeEquipment
@@ -251,7 +265,7 @@
              this.$notification.warning({
                message:'消息',
                description:res.message
              });
              })
            }
          }).finally(() => {
            this.loading = false
@@ -265,8 +279,8 @@
          this.dates = []
          this.queryParams.typeTree = this.typeTree
          this.queryParams.parentId = this.typeParent
          if(this.queryParams.parentId !=  ""){
            this.queryParams.equipmentId =  ""
          if (this.queryParams.parentId != '') {
            this.queryParams.equipmentId = ''
          }else{
            if(this.queryParams.equipmentId == this.queryParamEquip.equipmentId){
              this.queryParams.equipmentId =  this.typeEquipment
@@ -285,7 +299,7 @@
              this.$notification.warning({
                message:'消息',
                description:res.message
              });
              })
            }
          }).finally(() => {
            this.loading = false
@@ -309,7 +323,7 @@
      filterOption(input, option) {
        return (
          option.componentOptions.children[0].text.toUpperCase().indexOf(input.toUpperCase()) >= 0
        );
        )
      },
      // onChange(value, dateString) {
      //   // console.log('Selected Time: ', value);
@@ -422,13 +436,36 @@
      //     this.loading = false
      //   })
      // },
      deviceSearch() {
        console.log('触发')
        this.$refs.selectDeviceModal.visible = true
        this.$refs.selectDeviceModal.selectedRowKeys = []
        this.$refs.selectDeviceModal.selectedRows = []
        this.$refs.selectDeviceModal.checkedKeys = this.queryParam.equipmentId.split(',')
        this.$refs.selectDeviceModal.expandAll()
      },

      /**
       * 选择已有设备后点击确定时触发
       * @param data 已选择的设备
       */
      selectOK(data) {
        // let params = {}
        // params.equipmentIdList = []
        // for (var a = 0; a < data.length; a++) {
        //   params.equipmentIdList.push(data[a])
        // }
        console.log('data=', data)
        this.queryParam.equipmentId = data.join(',')
        console.log('queryParam', this.queryParam.equipmentId)
      }
    },
    created() {
      this.dates = [moment().subtract('days', 7), moment().subtract('days', 0)]
      this.queryParam.startTime = moment(this.dates[0]).format('YYYYMMDD')
      this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
      this.queryParam.typeTree = "1";
      this.loadAnalysis();
      this.queryParam.typeTree = '1'
      this.loadAnalysis()
      this.getDriveTypeByApi()
    }
  }
@@ -443,30 +480,35 @@
      overflow: scroll;
    }
  }

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

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

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

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

  /*.device_list{*/
    /*display: flex;*/
  /*}*/
@@ -476,14 +518,17 @@
  /deep/ .ant-card-body{
    height: 100%!important;
  }

   .device_list .com_box{
    display: flex!important;
    height: 100%!important;
    flex-direction: column!important;
  }

  .device_list .table-page-search-wrapper{
    height: 6%!important;
  }

  .device_list #DeviceList{
   height: 90%!important;
  }

 src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue

@@ -5,19 +5,26 @@
      <div class="table-page-search-wrapper">
        <a-form layout="inline" @keyup.enter.native="searchQuery">
          <a-row :gutter="24">
            <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="6" :sm="6">
              <a-form-item label="时间">
                <a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD" v-model="dates"/>
              </a-form-item>
            </a-col>
            <a-col :lg="2" :md="3" :sm="3" :xs="3">
            <a-col :md="14" :sm="14">
              <a-space>
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
            </a-col>
            <a-col :lg="2"  :md="3" :sm="3" :xs="3">
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-col>
            <a-col :lg="2" :md="3" :sm="3" :xs="3">
              <a-button type="primary" @click="exportExcel" icon="download">导出</a-button>
              </a-space>
            </a-col>
          </a-row>
          <a-row :gutter="24">
@@ -120,6 +127,7 @@
      typeParent:1,
      typeEquipment:1,
      dates: [],
      selectList:[],
      queryParam: {},
      queryParamEquip:{},
      queryParamPeople:{},
@@ -136,7 +144,8 @@
      dataList: [],
      url: {
        list: '/mdc/efficiencyReport/efficiencyPOList',
        listByType: '/mdc/MdcUtilizationRate/getByType'
        listByType: '/mdc/MdcUtilizationRate/getByType',
        queryEquipmentType: '/mdc/mdcEquipmentType/queryEquipmentType'
      },
      tableHeads: []
    }
@@ -149,6 +158,7 @@
    this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
    this.queryParam.typeTree = "1"
    this.loadData()
    this.queryGroup()
  },
  watch: {
    Type(valmath){
@@ -393,6 +403,24 @@
          // 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
      })
    }
  }
}

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

@@ -6,19 +6,27 @@
        <div class="table-page-search-wrapper">
          <a-form layout="inline" @keyup.enter.native="searchQuery">
            <a-row :gutter="24">
              <a-col :md="6" :sm="6">
                <a-form-item label="时间">
                  <a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD" v-model="dates"/>
              <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 :lg="2" :md="3" :sm="3" :xs="3">
              <a-col :md="6" :sm="6">
                <a-form-item label="时间">
                  <a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD"
                                  v-model="dates"/>
                </a-form-item>
              </a-col>
              <a-col :md="14" :sm="14">
                <a-space>
                <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              </a-col>
              <a-col :lg="2" :md="3" :sm="3" :xs="3">
                <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
              </a-col>
              <a-col :lg="2" :md="3" :sm="3" :xs="3">
                <a-button type="primary" @click="exportExcel" icon="download">导出</a-button>
                </a-space>
              </a-col>
            </a-row>
            <a-row :gutter="24">
@@ -74,9 +82,15 @@
            </thead>
            <tbody>
            <tr class="mathData" v-for="(item, index) in dataList">
              <td  class="tdgu kaitou wenzi" :rowspan="item.level1span" :class="{hidden: item.level1dis,noExl:item.level1dis}"  v-show="!item.level1dis">{{item.level1}}</td>
              <td  class="tdgu1 kaitou wenzi" :rowspan="item.level2span" :class="{hidden: item.level2dis,noExl:item.level2dis}"  v-show="!item.level2dis">{{item.level2}}</td>
              <td  class="tdgu2 kaitou wenzi" :rowspan="item.level3span" :class="{hidden: item.level3dis,noExl:item.level3dis}"  v-show="!item.level3dis">{{item.level3}}</td>
              <td class="tdgu kaitou wenzi" :rowspan="item.level1span"
                  :class="{hidden: item.level1dis,noExl:item.level1dis}" v-show="!item.level1dis">{{item.level1}}
              </td>
              <td class="tdgu1 kaitou wenzi" :rowspan="item.level2span"
                  :class="{hidden: item.level2dis,noExl:item.level2dis}" v-show="!item.level2dis">{{item.level2}}
              </td>
              <td class="tdgu2 kaitou wenzi" :rowspan="item.level3span"
                  :class="{hidden: item.level3dis,noExl:item.level3dis}" v-show="!item.level3dis">{{item.level3}}
              </td>
              <td  class="tdgu3  kaitou">{{item.equipmentId}}</td>
              <td  class="tdgu4 kaitou">{{item.equipmentName}}</td>
              <td  class="tdgu5 kaitou">{{item.equipmentType}}</td>
@@ -113,18 +127,20 @@
import $ from 'jquery'
import '@/components/table2excel/table2excel'
import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'

export default {
  name: 'EfficiencyList',
  components: {},
  data() {
    return {
      typeTree:"",
        typeTree: '',
      typeParent:1,
      typeEquipment:1,
      TreeIDOne:1,
      TreeIDTwo:2,
      deviceTypeDict: '',
      dates: [],
        selectList: [],
      identifying: [],
      queryParam: {},
      queryParams:{},
@@ -143,8 +159,9 @@
      url: {
        list: '/mdc/efficiencyReport/efficiencyList',
        listByType: '/mdc/MdcUtilizationRate/getByType',
          queryEquipmentType: '/mdc/mdcEquipmentType/queryEquipmentType'
      },
      tableHeads: [],
        tableHeads: []

    }
  },
@@ -154,12 +171,13 @@
    this.dates = [moment().subtract('days', 8), moment().subtract('days', 1)]
    this.queryParam.startTime = moment(this.dates[0]).format('YYYYMMDD')
    this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
    this.queryParam.typeTree = "1"
      this.queryParam.typeTree = '1'
    this.loadData()
      this.queryGroup()
  },
  watch: {
    Type(valmath){
      this.dataList = [];
        this.dataList = []
      this.queryParam.typeTree = valmath
    },
    nodeTree(val) { //监听currSelected 变化，将变化后的数值传递给 getCurrSelected 事件
@@ -198,11 +216,11 @@
  },
  methods: {
    checkSameData(dataList){
      let cache = {};  //存储的是键是kclx 的值，值是kclx 在indeces中数组的下标
      let indices = [];  //数组中每一个值是一个数组，数组中的每一个元素是原数组中相同kclx的下标
        let cache = {}  //存储的是键是kclx 的值，值是kclx 在indeces中数组的下标
        let indices = []  //数组中每一个值是一个数组，数组中的每一个元素是原数组中相同kclx的下标
      dataList.map((item,index)=>{
        let level1 = item.level1;
        let _index = cache[level1];
          let level1 = item.level1
          let _index = cache[level1]
        if(_index!==undefined){
          indices[_index].push(index)
        }else{
@@ -210,7 +228,7 @@
          indices.push([index])
        }
      })
      let result = [];
        let result = []
      indices.map((item)=>{
        item.map((index)=>{
          result.push(dataList[index])
@@ -219,11 +237,11 @@
      this.dataList = result
    },
    checkSameData1(dataList){
      let cache = {};  //存储的是键是kclx 的值，值是kclx 在indeces中数组的下标
      let indices = [];  //数组中每一个值是一个数组，数组中的每一个元素是原数组中相同kclx的下标
        let cache = {}  //存储的是键是kclx 的值，值是kclx 在indeces中数组的下标
        let indices = []  //数组中每一个值是一个数组，数组中的每一个元素是原数组中相同kclx的下标
      dataList.map((item,index)=>{
        let level2 = item.level2;
        let _index = cache[level2];
          let level2 = item.level2
          let _index = cache[level2]
        if(_index!==undefined){
          indices[_index].push(index)
        }else{
@@ -231,7 +249,7 @@
          indices.push([index])
        }
      })
      let result = [];
        let result = []
      indices.map((item)=>{
        item.map((index)=>{
          result.push(dataList[index])
@@ -240,11 +258,11 @@
      this.dataList = result
    },
    checkSameData2(dataList){
      let cache = {};  //存储的是键是kclx 的值，值是kclx 在indeces中数组的下标
      let indices = [];  //数组中每一个值是一个数组，数组中的每一个元素是原数组中相同kclx的下标
        let cache = {}  //存储的是键是kclx 的值，值是kclx 在indeces中数组的下标
        let indices = []  //数组中每一个值是一个数组，数组中的每一个元素是原数组中相同kclx的下标
      dataList.map((item,index)=>{
        let level3 = item.level3;
        let _index = cache[level3];
          let level3 = item.level3
          let _index = cache[level3]
        if(_index!==undefined){
          indices[_index].push(index)
        }else{
@@ -252,7 +270,7 @@
          indices.push([index])
        }
      })
      let result = [];
        let result = []
      indices.map((item)=>{
        item.map((index)=>{
          result.push(dataList[index])
@@ -263,30 +281,30 @@
    // 合并
    combineCell() {
      console.log(this.dataList)
      let list =this.dataList;
        let list = this.dataList
      for (let field in list[0]) {
        var k = 0;
          var k = 0
        while (k < list.length) {
          list[k][field + 'span'] = 1;
          list[k][field + 'dis'] = false;
            list[k][field + 'span'] = 1
            list[k][field + 'dis'] = false
          for (var i = k + 1; i <= list.length - 1; i++) {
            if (list[k][field] == list[i][field] && list[k][field] != '') {
              list[k][field + 'span']++;
              list[k][field + 'dis'] = false;
              list[i][field + 'span'] = 1;
              list[i][field + 'dis'] = true;
                list[k][field + 'span']++
                list[k][field + 'dis'] = false
                list[i][field + 'span'] = 1
                list[i][field + 'dis'] = true
            } else {
              break;
                break
            }
          }
          k = i;
            k = i
        }
      }
      return list;
        return list
    },
    disabledDate(current){
      //Can not slect days before today and today
      return current && current > moment().subtract('days', 1);
        return current && current > moment().subtract('days', 1)
    },
    initDeviceType(deviceList) {
      let dictCode = 'mdc_equipmentType'
@@ -316,15 +334,15 @@
      }
    },
    exportExcel() {
      $("#Efficiency").table2excel({
        exclude: ".noExl",
        name: "Excel Document Name",
        filename: "设备利用率",
        $('#Efficiency').table2excel({
          exclude: '.noExl',
          name: 'Excel Document Name',
          filename: '设备利用率',
        exclude_img: true,
        fileext: ".xls",
          fileext: '.xls',
        exclude_links: true,
        exclude_inputs: false
      });
        })
    },
    showIdentifying() {
      getAction(this.url.listByType, { type: 'lyl' }).then(res => {
@@ -345,7 +363,7 @@
        // this.$message.warn('不能取消查询开动率')
        this.$notification.warning({
          message:'消息',
          description:"不能取消查询开动率"
            description: '不能取消查询开动率'
        })

        return false
@@ -376,20 +394,21 @@
    //   // this.onClearSelected()
    // },
    searchQuery() {
        console.log('dates',this.dates)
      if(this.dates != ''){
        if(this.queryParam.typeTree == "1"){
          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.queryParam.equipmentId = ''
        }
        this.loadData()
      }else{
        this.$notification.warning({
          message:'消息',
          description:"请选择时间"
        });
            description: '请选择时间'
          })
      }
      // this.onClearSelected()
    },
@@ -403,7 +422,7 @@
      this.queryParam.parentId = this.typeParent
      this.queryParam.equipmentId =  this.typeEquipment
      // this.ipagination.current = 1
      this.loadData();
        this.loadData()
      // this.queryParam = {}
      // this.dates = []
      // this.loadData()
@@ -419,10 +438,28 @@
          this.checkSameData(this.dataList)
          this.checkSameData1(this.dataList)
          this.checkSameData2(this.dataList)
          this.combineCell();
            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
      })
    }
  }
@@ -434,12 +471,14 @@
  height: 100%;
  overflow: auto;
}

.table2 thead tr th:first-child,
.table tbody tr .tdgu{
  position: sticky;
  left: 0;
  z-index: 1;
}

.table tbody tr .wenzi{
  /*writing-mode: vertical-lr;*/
  /*text-orientation: upright;*/
@@ -447,70 +486,85 @@
  writing-mode: vertical-lr;
  letter-spacing: 2px;
}

.table tbody tr .kaitou{
  z-index: 1;
  background-color: white;
}

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

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

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

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

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

.table2 thead tr .timeth,
.table2 thead tr  .thgu {
  position: sticky;
  top:0;
  z-index: 3;
}

.table2 thead .gudingth th{
  position: sticky;
  top: 32px;
  z-index: 2;
}

.table2 thead .equipname .name{
  z-index: 3;
}

.table2 thead .equipname .dong1{
  z-index: 4;
  left: 0;
  /*border: 1px solid #000;*/
}

.table2 thead .equipname .dong2{
  z-index: 5;
  left: 50px;
}

.table2 thead .equipname .dong3{
  z-index: 5;
  left: 100px;
}

.table2 thead .equipname .dong4{
  z-index: 5;
  left: 150px;
}

.table2 thead .equipname .dong5{
  z-index: 5;
  left: 250px;
}

.table2 thead .equipname .dong6{
  z-index: 5;
  left: 400px;
@@ -522,39 +576,46 @@
    overflow: scroll;
  }
}

@media screen and (min-width: 1680px) and (max-width: 1920px){
  #Efficiency{
    height: 687px!important;
    overflow: scroll;
  }
}

@media screen and (min-width: 1400px) and (max-width: 1680px){
  #Efficiency{
    height: 540px!important;
    overflow: scroll;
  }
}

@media screen and (min-width: 1280px) and (max-width: 1400px){
  #Efficiency{
    height: 440px!important;
    overflow: scroll;
  }
}

@media screen and (max-width: 1280px){
  #Efficiency{
    height: 440px!important;
    overflow: scroll;
  }
}

#Efficiency .table_guding1{
  position: absolute;
  overflow: hidden;
  width: 500px;
}

#Efficiency .table_guding2{
  overflow-x: scroll;
  width: 500px;
}

.identifyingclass {
  width: 55px;
  height: 15px;
@@ -610,9 +671,11 @@
.dataContent .mathData .tdd {
  /*display: none;*/
}

td {
  vertical-align: middle;
}

.pink {
  background-color: #ff9bd2;
}

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

@@ -6,12 +6,21 @@
        <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,26 +39,20 @@
                </a-select>
              </a-form-item>
            </a-col>

          </a-row>
          <a-row :gutter="24">
            <a-col :md="15" :sm="15" :xs="15">
            <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-col :md="5" :sm="5">
              <a-space>
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
            </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-space>
            </a-col>
          </a-row>
        </a-form>
      </div>
        <div style="width: 530px;top: 0; right: 0px;">
            <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>
@@ -60,7 +63,22 @@
            </td>
          </tr>
        </table>
            </a-col>
          </a-row>
        </a-form>
      </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">
@@ -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){
@@ -466,6 +487,24 @@
            // 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
        })
      }
    }
  }
@@ -654,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>

 src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue

@@ -125,6 +125,7 @@
            // this.$set(this.queryParam, 'tierName', val.title)
            this.queryParamEquip.parentId = ''
            this.queryParams.equipmentId = val.equipmentId
            this.queryParams.equipmentName = val.equipmentName
            this.queryParamEquip.equipmentId = val.equipmentId
            this.searchQuery()
          } else {

 src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue

@@ -138,6 +138,8 @@
            // this.$set(this.queryParam, 'tierName', val.title)
            this.queryParamEquip.parentId = ''
            this.queryParams.equipmentId = val.equipmentId
            this.queryParams.equipmentName = val.equipmentName
            console.log('XXXval=', val)
            this.queryParamEquip.equipmentId = val.equipmentId
            this.searchQuery()
          } else {

 src/views/mdc/base/modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigForm.vue

@@ -139,7 +139,7 @@
        ],
        englishName: [
          { required: true, message: '请输入英文名称!' },
          { pattern: /^.{6,18}$/, message: '请输入6到18位任意字符!' },
          { pattern: /^.{2,18}$/, message: '请输入2到18位任意字符!' ,trigger:'blur'},
        ],
        showFlag: [
          { required: true, message: '请输入显示标志!' },

 src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue

@@ -32,6 +32,13 @@
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item label="颜色" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input type="color" v-decorator="['rateParameterColor',validatorRules.rateParameterColor]"></a-input>
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </a-spin>
  </a-modal>
@@ -95,7 +102,7 @@
        this.model = Object.assign({}, record)
        this.visible = true
        this.$nextTick(() => {
          this.form.setFieldsValue(pick(this.model, 'rateParameterCategory', 'rateParameterLevel', 'minimumRange', 'maximumRange'))
          this.form.setFieldsValue(pick(this.model, 'rateParameterCategory', 'rateParameterLevel', 'minimumRange', 'maximumRange', 'rateParameterColor'))
        })
      },
      close() {
@@ -117,15 +124,15 @@
                // that.$message.success("保存成功")
                that.$notification.success({
                  message:'消息',
                  description:"保存成功"
                });
                  description: '保存成功'
                })
                that.$emit('ok', res.result)
              } else {
                // that.$message.warning(res.message)
                that.$notification.warning({
                  message:'消息',
                  description:res.message
                });
                })
              }
            }).finally(() => {
              that.confirmLoading = false

 src/views/system/WorkshopSignageManagement.vue

@@ -7,15 +7,17 @@
          <!-- 搜索区域 -->
          <a-form layout="inline" @keyup.enter.native="searchQuery">
            <a-row :gutter="24">
              <a-col :md="12" :sm="8">
                <a-form-item label="车间名称" :labelCol="{ span: 5 }" :wrapperCol="{ span: 18, offset: 1 }">
              <a-col :md="6" :sm="6">
                <a-form-item label="车间名称" :labelCol="{ span: 5 }" :wrapperCol="{ span: 19}">
                  <a-input placeholder="" v-model="queryParam.workshopName"></a-input>
                </a-form-item>
              </a-col>
              <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">
                  <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">查询</a-button>
                  <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
                <a-col>
                  <a-space>
                    <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
                    <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
                  </a-space>
                </a-col>
              </span>
            </a-row>
@@ -148,7 +150,7 @@
    <!-- 表单区域 -->
    <workshop-modal ref="modalForm" @ok="modalFormOk"></workshop-modal>
    <!--新增车间-->
    <select-device-modal ref="selectUserModal" @selectFinished="selectOK"></select-device-modal>
    <select-device-modal ref="selectDeviceModal" @selectFinished="selectOK" :title="'添加已有设备'"></select-device-modal>
    <!--已有设备-->
  </a-row>
</template>
@@ -355,6 +357,8 @@
        if (res.success) {
          this.dataSource2 = res.result.records
          this.ipagination2.total = res.result.total
        }else{
          this.dataSource2=[]
        }
        this.loading2 = false
      })
@@ -456,11 +460,11 @@
      if (this.currentWorkshopId == '') {
        this.$message.error('请选择一个车间!')
      } else {
        this.$refs.selectUserModal.visible = true
        this.$refs.selectUserModal.selectedRowKeys = []
        this.$refs.selectUserModal.selectedRows = []
        this.$refs.selectUserModal.checkedKeys = []
        this.$refs.selectUserModal.expandAll()
        this.$refs.selectDeviceModal.visible = true
        this.$refs.selectDeviceModal.selectedRowKeys = []
        this.$refs.selectDeviceModal.selectedRows = []
        this.$refs.selectDeviceModal.checkedKeys = []
        this.$refs.selectDeviceModal.expandAll()
      }
    },

@@ -508,7 +512,7 @@
}
  .close-circle{
    position: absolute;
    z-index: 9999;
    z-index: 1;
    right: 15px;
    top: 15px;
    cursor: pointer;

 src/views/system/modules/SelectDeviceModal.vue

@@ -112,11 +112,13 @@
        default() {
          return true
        }
      },
      title: {
        type: String
      }
    },
    data() {
      return {
        title: '添加已有设备',
        cardLoading: false,
        loading: false,
        treeDataSource: [],
@@ -264,19 +266,21 @@
      refreshTree() {
        this.queryTreeData()
      },
      onCheck(value) {
      onCheck(value, obj) {
        this.checkedKeys = value
        console.log('obj,', obj)
        this.deviceNodes = obj.checkedNodes.filter(item => item.data.props.equipmentId).map(item => item.data.props.equipmentId)
        console.log(this.deviceNodes)
      },
      handleCancel() {
        this.visible = false
      },
      handleOk() {
        if (this.checkedKeys.length > 0) {
          this.$emit('selectFinished', this.checkedKeys)
          this.$emit('selectFinished', this.deviceNodes)
        }
        this.visible = false
      }


      // add() {
      //   this.visible = true

 src/views/user/Login.vue

@@ -144,7 +144,10 @@
    },
    // 登录后台成功
    requestSuccess(loginResult) {
      this.$router.push({ path: "/isps/userAnnouncement" }).catch(() => {
      // this.$router.push({ path: "/isps/userAnnouncement" }).catch(() => {
      //   console.log('登录跳转首页出错,这个错误从哪里来的')
      // })
      this.$router.push({ path: "/dashboard/analysis" }).catch(() => {
        console.log('登录跳转首页出错,这个错误从哪里来的')
      })
      this.$notification.success({