1、优化查询时若无选择日期的提示信息 2、增加部分加载时间较长的数据的加载动画

zhuzhuanzhuan

2023-09-22 12fb4b8e4fb75347b25f3ba473b930408ed2ec05

1、优化查询时若无选择日期的提示信息
2、增加部分加载时间较长的数据的加载动画

 src/mixins/JeecgListMixin.js

 src/views/jeecg/modules/JeecgDemoModal.vue

@@ -40,7 +40,6 @@
        <a-form-model-item label="个人简介"  prop="content" hasFeedback>
          <a-input  type="textarea" placeholder="请输入个人简介"  v-model="model.content"/>
        </a-form-model-item>

      </a-form-model>
    </a-spin>
  </a-modal>

 src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue

@@ -14,7 +14,7 @@
              <a-date-picker v-model="queryParams.collectTime" :disabledDate="disabledDate" format='YYYY-MM-DD' @change="dataChange"/>
            </a-form-item>
          </a-col>
          <a-col :md="3" :sm="3" :xs="3">
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
@@ -409,6 +409,7 @@
        StartupLine.setOption(statChartPieOption2);
      },
      queryStatistical(){
        if(this.queryParams.collectTime){
        getAction(this.url.dayStatisticalRate,this.queryParams).then(res =>{
          if(res.success) {
            // console.log(res);
@@ -425,16 +426,21 @@
            this.closedLong = this.getTime(res.result.closeLong);
            this.totalLong = parseInt(this.openingLong) + parseInt(this.closedLong);
            this.draw();
          }else{
            this.draw()
          }
        })
        }else{
          this.$notification.warning({
            message:'消息',
            description:'请选择时间'
          })
        }
      },
      dataChange(val) {
        this.queryParam.collectTime1 = "";
        if(val){
        this.queryParams.dateTime = val.format('YYYYMMDD')
        this.queryParams.collectTime = val.format('YYYY-MM-DD');

        }
      },
      initEquipmentNode() {
        let _this = this
@@ -474,7 +480,7 @@
        this.queryParam = {}
        this.queryParams = {}
        // this.dates = []
        this.queryStatistical()
        // this.queryStatistical()
        // this.onClearSelected()
      },
      searchQuery(){
@@ -483,26 +489,19 @@
    },
    watch: {
      equip(val) {
        // console.log(val);
        if (val && val.equipmentId) {
          this.$set(this.queryParam, 'tierName', val.title)
          this.$set(this.queryParam, 'equipmentId', val.equipmentId)
          this.queryParams.parentId = ''
          this.queryParams.equipmentId = val.equipmentId
          this.searchQuery()
        }else{
          this.queryParams.parentId = val.key
          this.queryParams.equipmentId = ''
          this.$set(this.queryParam, 'tierName', val.title)
          this.searchQuery()
        }
        this.searchQuery()
      }
      // this.searchQuery();


    }

  }
</script>


 src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue

@@ -14,7 +14,7 @@
              <a-date-picker v-model="queryParams.collectTime" :disabledDate="disabledDate" format='YYYY-MM-DD' @change="dataChange"/>
            </a-form-item>
          </a-col>
          <a-col :md="3" :sm="3" :xs="3">
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
@@ -589,9 +589,9 @@
        StartupLine.setOption(StartupLine_option);
      },
      queryStatistical(){
        if(this.queryParams.collectTime){
          getAction(this.url.dayStatisticalRate,this.queryParams).then(res =>{
            if(res.success){
              // console.log(res);
              this.StatCharOpeningRate = res.result.openRate;
              this.StatCharUsedRate = res.result.utilizationRate;
              this.UtilizationHeight = res.result.openRate;
@@ -604,16 +604,20 @@
              this.totalLong = parseInt(this.openingLong) + parseInt(this.closedLong);
              this.draw();
            }
            else{
              this.draw();
            }
          })
        }else{
          this.$notification.warning({
            message:'消息',
            description:'请选择时间'
          })
        }
      },
      dataChange(val) {
        this.queryParam.collectTime1 = "";
        if(val){
        this.queryParams.dateTime = val.format('YYYYMMDD')
        this.queryParams.collectTime = val.format('YYYY-MM-DD');

        }
      },
      initEquipmentNode(id) {
        let _this = this
@@ -652,7 +656,7 @@
        this.queryParam = {}
        this.queryParams = {}
        // this.dates = []
        this.queryStatistical()
        // this.queryStatistical()
        // this.onClearSelected()
      },
      searchQuery(){
@@ -667,18 +671,14 @@
            this.$set(this.queryParam, 'equipmentId', val.equipmentId)
            this.queryParams.parentId = ''
            this.queryParams.equipmentId = val.equipmentId
            this.searchQuery()
          }else{
            this.queryParams.parentId = val.key
            this.queryParams.equipmentId = ''
            this.$set(this.queryParam, 'tierName', val.title)
            this.searchQuery()
            }
            this.searchQuery()
          }
          // this.searchQuery();


      }

  }

 src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue

@@ -236,6 +236,7 @@
        this.queryParam.endDate = v2[1]
      },
      searchQuery() {
        if (this.dates&&this.dates.length>0){
        if (this.queryParam.typeTree == "1") {
          this.queryParam.parentId = this.queryParamEquip.parentId
          this.queryParam.equipmentId = this.queryParamEquip.equipmentId
@@ -244,6 +245,13 @@
          this.queryParam.equipmentId = ""
        }
        this.loadData1()
        } else{
          this.$notification.warning({
             message:'提示',
             description:'请选择时间'
          })
        }

        // this.onClearSelected()
      },
      // searchReset() {

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

@@ -136,7 +136,6 @@
        }
      },
      nodePeople(val){

        if (JSON.stringify(val) != '{}') {
          if (val.equipmentId) {
            // this.$set(this.queryParam, 'tierName', val.title)
@@ -177,6 +176,7 @@
        })
      },
      searchQuery(){
        if(this.dates&&this.dates.length>0){
        this.AnalysisList = []
        this.AnalysisBarList = []
        this.AnalysisGauge = []
@@ -184,13 +184,11 @@
        if(this.queryParams.typeTree == "1"){
          this.queryParams.parentId =  this.queryParamEquip.parentId
          // this.queryParams.equipmentId =  this.queryParamEquip.equipmentId

        }else{
          this.queryParams.parentId = this.queryParamEquip.parentId

          // this.queryParams.equipmentId = ""
        }
        this.AnalysisList = [];
          this.AnalysisList = []
        //获取查询条件
        this.queryParam.parentId = this.queryParams.parentId;
        this.queryParam.equipmentId = this.queryParams.equipmentId;
@@ -211,6 +209,13 @@
        }).finally(() => {
          this.loading = false
        })
        }else{
          this.$notification.warning({
            message:'提示' ,
            description:'请选择时间'
          })
        }

      },
      searchReset() {
        this.AnalysisList = []

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

@@ -329,6 +329,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')
@@ -343,6 +345,7 @@
      this.checkedList = checkedList
    },
    searchQuery() {
      if(this.dates != ''){
      if(this.queryParam.typeTree == "1"){
        this.queryParam.parentId =  this.queryParamEquip.parentId
        this.queryParam.equipmentId = this.queryParamEquip.equipmentId
@@ -351,6 +354,12 @@
        this.queryParam.equipmentId = ""
      }
      this.loadData()
      }else{
        this.$notification.warning({
          message:'消息',
          description:"请选择时间"
        });
      }
      // this.onClearSelected()
    },
    searchReset() {

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

@@ -336,6 +336,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')
@@ -374,6 +376,7 @@
    //   // this.onClearSelected()
    // },
    searchQuery() {
      if(this.dates != ''){
      if(this.queryParam.typeTree == "1"){
        this.queryParam.parentId =  this.queryParamEquip.parentId
        this.queryParam.equipmentId = this.queryParamEquip.equipmentId
@@ -382,6 +385,12 @@
        this.queryParam.equipmentId = ""
      }
      this.loadData()
      }else{
        this.$notification.warning({
          message:'消息',
          description:"请选择时间"
        });
      }
      // this.onClearSelected()
    },
    searchReset() {

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

@@ -406,6 +406,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')
@@ -431,13 +433,11 @@
          this.loadData()
        }else{
          // this.$message.warning("请选择时间")
          console.log('触发提示')
          this.$notification.warning({
            message:'消息',
            description:"请选择时间"
          });
        }

        // this.onClearSelected()
      },
      searchReset() {

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

@@ -1,4 +1,5 @@
<template>
  <a-spin :spinning="loading">
  <a-card :bordered="false" class="device_list">
    <div class="com_box">
      <!-- 查询区域 -->
@@ -38,7 +39,6 @@
      </div>
      <!-- table区域-begin -->
      <div id="DeviceList">

        <div style="padding: 5px;width: 100%;height: 100%">
          <div style="width: 100%;height: 100%" id="dayAvailBar"></div>
          <!--<div id="dayAvailLine"></div>-->
@@ -47,6 +47,7 @@
      <!-- table区域-end -->
    </div>
  </a-card>
  </a-spin>
</template>

<script>
@@ -68,6 +69,7 @@
  import Tooltip from 'ant-design-vue/es/tooltip'
  import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
  import AFormItem from 'ant-design-vue/es/form/FormItem'

  export default {
    name: 'equipmentAvailCompareMain',
    // mixins: [JeecgListMixin],
@@ -86,13 +88,13 @@
    data() {
      return {
        activeKey: '1',
        typeTree:"",
        typeTree: '',
        typeParent:1,
        typeEquipment:1,
        spaceTime:[],
        useingRates:[],
        dates: [],
        xianshi:"",
        xianshi: '',
        readOnly:true,
        queryParam: {
          // dateTime:undefined,
@@ -107,12 +109,13 @@
          getEquipmentByPid: '/mdc/mdcEquipment/getEquipmentByPid',
          getEquipmentByDepPid:'/mdc/mdcEquipment/getEquipmentByDepPid'
        },
        AnalysisList:{}
        AnalysisList: {},
        loading: false
      }
    },
    watch:{
      Type(valmath){
        this.dataList = [];
        this.dataList = []
        this.queryParams.typeTree = valmath
        // console.log(this.queryParams.typeTree)
      },
@@ -120,7 +123,7 @@
        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
            this.searchQuery()
@@ -131,14 +134,13 @@
            this.initEquipment(val.key)
          }


        }
      },
      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
            this.searchQuery()
@@ -154,7 +156,7 @@
    },
    methods: {
      drawTu(){
        let dayAvailBar = this.$echarts.init(document.getElementById('dayAvailBar'), 'macarons');
        let dayAvailBar = this.$echarts.init(document.getElementById('dayAvailBar'), 'macarons')
        //dayAvailLine = echarts.init(document.getElementById('dayAvailLine'));
        let dayAvailBarOption = {
          title: {
@@ -163,12 +165,12 @@
            textStyle: {
              fontSize: 18,
              fontWeight: 'bolder',
              color: "#151414"
              color: '#151414'
            }
          },
          tooltip: {
            trigger: 'axis',
            formatter: "{a} <br/>{b} :({c}%)"
            formatter: '{a} <br/>{b} :({c}%)'
          },
          toolbox: {
            show: true,
@@ -214,8 +216,8 @@
              }
            }
          ]
        };
        dayAvailBar.setOption(dayAvailBarOption);
        }
        dayAvailBar.setOption(dayAvailBarOption)
      },
      moment,
      onChangeStart(time, timeString) {
@@ -228,10 +230,10 @@
      },
      disabledDate(current){
        //Can not slect days before today and today
        return current && current > moment().subtract('days', 1);
        return current && current > moment().subtract('days', 1)
      },
      dataChange(val) {
        this.queryParam.dateTime = val.format('YYYYMMDD')
        if (val) this.queryParam.dateTime = val.format('YYYYMMDD')
      },
      handleChange(value) {
        this.queryParam.timeType = value
@@ -247,6 +249,7 @@
        // console.log(v2[0],v2[1])
      },
      loadAnalysis(){
        this.loading = true
        getAction(this.url.dayUtilizationRateContrast,this.queryParam).then(res => {
          if (res.success) {
            this.spaceTime.push(res.result.dataList)
@@ -269,21 +272,22 @@
        }
      },
      searchQuery(){
        if (this.queryParam.startTime && this.queryParam.endTime && this.dates && this.dates.length > 0) {
          this.loading = true
        this.spaceTime = []
        this.useingRates = []
        if(this.queryParams.typeTree == "1"){
          if (this.queryParams.typeTree == '1') {
          this.queryParams.parentId =  this.queryParamEquip.parentId
          // this.queryParams.equipmentId =  this.queryParamEquip.equipmentId

        }else{
          this.queryParams.parentId = this.queryParamEquip.parentId

          // this.queryParams.equipmentId = ""
        }
        this.AnalysisList = [];
          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.dayUtilizationRateContrast,this.queryParam).then((res) => {
          if(res.success){
@@ -298,16 +302,23 @@
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
              })
          }
        }).finally(() => {
          this.loading = false
        })
        } else {
          this.$notification.warning({
            message: '消息',
            description: '请选择时间或时间段'
          })
        }
      },
      searchReset() {
        this.loading = true
        this.spaceTime = []
        this.useingRates = []
        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
@@ -315,8 +326,8 @@
          this.queryParam = {}
          this.queryParams.typeTree = this.typeTree
          this.queryParams.parentId = this.typeParent
          if(this.queryParams.parentId !=  ""){
            this.queryParams.equipmentId =  ""
          if (this.queryParams.parentId != '') {
            this.queryParams.equipmentId = ''
            this.initEquipment()
          }else{
            if(this.queryParams.equipmentId == this.queryParamEquip.equipmentId){
@@ -337,7 +348,7 @@
              this.$notification.warning({
                message:'消息',
                description:res.message
              });
              })
            }
          }).finally(() => {
            this.loading = false
@@ -351,8 +362,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 = ''
            this.initEquipment()
          }else{
            if(this.queryParams.equipmentId == this.queryParamEquip.equipmentId){
@@ -373,7 +384,7 @@
              this.$notification.warning({
                message:'消息',
                description:res.message
              });
              })
            }
          }).finally(() => {
            this.loading = false
@@ -399,14 +410,14 @@
              _this.$notification.warning({
                message:'消息',
                description:'请联系管理员，开放设备权限！'
              });
              })
            }
          }else{
            // this.$message.warning(res.message)
            _this.$notification.warning({
              message:'消息',
              description:res.message
            });
            })
          }
        })
      },
@@ -428,14 +439,14 @@
              _this.$notification.warning({
                message:'消息',
                description:'请联系管理员，开放设备权限！'
              });
              })
            }
          }else{
            // this.$message.warning(res.message)
            _this.$notification.warning({
              message:'消息',
              description:res.message
            });
            })
          }
        })
      }
@@ -445,14 +456,13 @@
      this.queryParam.startDate = moment(this.dates[0]).format('YYYYMMDD')
      this.queryParam.endDate = moment(this.dates[1]).format('YYYYMMDD')
      this.queryParam.startTime = '00:00'
      this.queryParam.endTime = "08:00"
      this.queryParams.typeTree = "1";

      this.queryParam.endTime = '08:00'
      this.queryParams.typeTree = '1'

    },
    mounted() {
      this.initEquipment()
    },
    }
  }
</script>

@@ -465,30 +475,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;*/
  /*}*/
@@ -498,14 +513,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/equipmentDayAvail/equipmentDayAvailMain.vue

@@ -15,7 +15,7 @@
                <a-input placeholder="输入设备名称查询" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="5" :sm="5" :xs="5">
            <a-col :md="4" :sm="4" :xs="4">
              <a-form-item label="日期">
                <a-date-picker v-model="queryParam.dateTime" :disabledDate="disabledDate" format='YYYYMMDD' @change="dataChange"/>
              </a-form-item>
@@ -38,7 +38,7 @@
                </a-select>小时
              </a-form-item>
            </a-col>
            <a-col :md="2" :sm="3" :xs="3">
            <a-col :md="3" :sm="3" :xs="3">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
            </a-col>
            <!--<a-col :md="2" :sm="2" :xs="2">-->
@@ -276,6 +276,7 @@
        }
      },
      searchQuery(){
        if(this.queryParam.dateTime){
        this.spaceTime = []
        this.useingRates = []
        if(this.queryParams.typeTree == "1"){
@@ -309,6 +310,13 @@
        }).finally(() => {
          this.loading = false
        })
        }else{
          this.$notification.warning({
            message:'消息',
            description:'请选择时间'
          });
        }

      },
      searchReset() {
        this.spaceTime = []

 src/views/mdc/base/modules/openRateFractionAnalysis/openRateFractionAnalysisMain.vue

@@ -7,7 +7,8 @@
          <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-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD"
                                v-model="dates"/>
              </a-form-item>
            </a-col>
            <a-col :md="7" :sm="7" :xs="7">
@@ -26,13 +27,21 @@
      <div id="DeviceList">
        <div class="openRateTrendDg">
          <div id="Efficiency" class="container" style="margin-top: 20px;">
            <a-spin :spinning="loading">
            <div class="table2">
              <table class="dataContent table" border="1" cellspacing="0" cellpadding="0" style="white-space: nowrap;text-align: center;">
                <table class="dataContent table" border="1" cellspacing="0" cellpadding="0"
                       style="white-space: nowrap;text-align: center;">
                <thead>
                <tr class="thead fixed equipname">
                  <th class="thgu dong1 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">设备编号</th>
                  <th class="thgu dong2 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">设备名称</th>
                  <th class="thgu dong3 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备类型</th>
                    <th class="thgu dong1 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">
                      设备编号
                    </th>
                    <th class="thgu dong2 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">
                      设备名称
                    </th>
                    <th class="thgu dong3 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">
                      设备类型
                    </th>
                  <template v-for="(tableHead, index) in tableHeads">
                    <th class="timeth">{{tableHead}}</th>
                  </template>
@@ -50,6 +59,7 @@
                </tbody>
              </table>
            </div>
            </a-spin>
          </div>
        </div>
        <div id="openRateTrendChart" style="width: 100%;height: 60%"></div>
@@ -67,6 +77,7 @@
  import {
    JeecgListMixin
  } from '@/mixins/JeecgListMixin'

  export default {
    // mixins: [JeecgListMixin],
    name: 'openRateFractionAnalysisMain',
@@ -76,7 +87,7 @@
        dataSource: [],
        /* table加载状态 */
        loading: false,
        typeTree: "",
        typeTree: '',
        typeParent: 1,
        typeEquipment: 1,
        TreeIDOne: 1,
@@ -104,7 +115,7 @@
        },
        tableHeads: [],
        XData:[0],
        YData:[0],
        YData: [0]
      }
    },
    props: { nodeTree: '', Type: '', nodePeople: '' },
@@ -116,14 +127,14 @@
      this.queryParam.startDate = moment(this.dates[0]).format('YYYYMMDD')
      this.queryParam.endDate = moment(this.dates[1]).format('YYYYMMDD')
      this.queryParam.startTime = '00:00'
      this.queryParam.endTime = "08:00"
      this.queryParam.typeTree = "1"
      this.queryParam.endTime = '08:00'
      this.queryParam.typeTree = '1'
      this.loadData1()

    },
    watch: {
      Type(valmath) {
        this.dataList = [];
        this.dataList = []
        this.queryParam.typeTree = valmath
      },
      nodeTree(val) { //监听currSelected 变化，将变化后的数值传递给 getCurrSelected 事件
@@ -197,21 +208,29 @@
      },
      //Can not slect days before today and today
      disabledDate(current) {
        return current && current > moment().subtract('days', 1);
        return current && current > moment().subtract('days', 1)
      },
      dateParamChange(v1, v2) {
        this.queryParam.startDate = v2[0]
        this.queryParam.endDate = v2[1]
      },
      searchQuery() {
        if (this.queryParam.typeTree == "1") {
        if (this.queryParam.startTime && this.queryParam.endTime && this.dates && this.dates.length > 0) {
          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.loadData1()
        } else {
          this.$notification.warning({
            message: '提示',
            description: '请选择时间或时间段'
          })
        }

        // this.onClearSelected()
      },
      // searchReset() {
@@ -284,6 +303,7 @@
      //     }
      //   }
      loadData1() {
        this.loading=true
        this.tableHeads = []
        this.dataList = []
        getAction(this.url.efficiencyList, this.queryParam).then(res => {
@@ -298,10 +318,12 @@
            // this.initDeviceType(this.dataList)

          }
        }).finally(()=>{
          this.loading=false
        })
      },
      draw(){
        let openRateTrendAnalysisChart = this.$echarts.init(document.getElementById('openRateTrendChart'), 'macarons');
        let openRateTrendAnalysisChart = this.$echarts.init(document.getElementById('openRateTrendChart'), 'macarons')
        let openRateTrendChartOptions = {
          title: {
            text: '利用率走势分析',
@@ -309,7 +331,7 @@
            textStyle: {
              fontSize: 18,
              fontWeight: 'bolder',
              color: "#151414"
              color: '#151414'
            }
          },
          tooltip: {
@@ -355,8 +377,8 @@
              }
            }
          ]
        };
        openRateTrendAnalysisChart.setOption(openRateTrendChartOptions,true);
        }
        openRateTrendAnalysisChart.setOption(openRateTrendChartOptions, true)
      }
    }
  }
@@ -401,9 +423,11 @@
    padding: 10px;
    /*display: none;*/
  }

  .dataContent .mathData:hover td{
    background-color: #e6f7ff;
  }

  .dataContent .mathData .td {
    /*background-color: #ff9bd2;*/
    display: inline-block;
@@ -413,11 +437,13 @@
  .dataContent .mathData .tdd {
    /*display: none;*/
  }

  .table2{
  width: 100%;
  height: 100%;
  overflow: auto;
  }

  /*tr th {*/
    /*height: 50px!important;*/
  /*}*/
@@ -430,70 +456,85 @@
    left: 0;
    z-index: 1;
  }

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

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

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

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

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

  .table tbody tr .tdgu5{
    position: sticky;
    left: 700px;
    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: 6!important;
  }

  .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: 150px;
  }

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

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

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

  .table2 thead .equipname .dong6{
    z-index: 5;
    left: 700px;
@@ -505,45 +546,54 @@
  overflow: scroll;
  }
  }

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

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

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

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

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

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

  /deep/ .ant-card{
    height: 100%!important;
  }

  /deep/ .ant-card .ant-card-body{
    height: 100%!important;
  }

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

 src/views/mdc/base/modules/openRateTrendAnalysis/openRateTrendAnalysisMain.vue

@@ -7,7 +7,8 @@
            <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-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">
@@ -19,13 +20,21 @@
        <div id="DeviceList">
          <div class="openRateTrendDg">
            <div id="Efficiency" class="container" style="margin-top: 20px;">
            <a-spin :spinning="loading">
              <div class="table2">
                <table class="dataContent table" border="1" cellspacing="0" cellpadding="0" style="white-space: nowrap;text-align: center;">
                <table class="dataContent table" border="1" cellspacing="0" cellpadding="0"
                       style="white-space: nowrap;text-align: center;">
                  <thead>
                  <tr class="thead fixed equipname">
                    <th class="thgu dong1 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">设备编号</th>
                    <th class="thgu dong2 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">设备名称</th>
                    <th class="thgu dong3 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备类型</th>
                    <th class="thgu dong1 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">
                      设备编号
                    </th>
                    <th class="thgu dong2 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">
                      设备名称
                    </th>
                    <th class="thgu dong3 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>
@@ -43,6 +52,7 @@
                  </tbody>
                </table>
              </div>
            </a-spin>
            </div>
          </div>
          <div id="openRateTrendChart" style="width: 100%;height: 60%"></div>
@@ -60,6 +70,7 @@
  import {
    JeecgListMixin
  } from '@/mixins/JeecgListMixin'

  export default {
    // mixins: [JeecgListMixin],
    name: 'openRateTrendAnalysisMain',
@@ -69,7 +80,7 @@
        dataSource: [],
        /* table加载状态 */
        loading: false,
        typeTree: "",
        typeTree: '',
        typeParent: 1,
        typeEquipment: 1,
        TreeIDOne: 1,
@@ -97,7 +108,7 @@
        },
        tableHeads: [],
        XData:[0],
        YData:[0],
        YData: [0]
      }
    },
    props: { nodeTree: '', Type: '', nodePeople: '' },
@@ -108,12 +119,12 @@
      this.dates = [moment().subtract('days', 8), moment().subtract('days', 1)]
      this.queryParam.startDate = moment(this.dates[0]).format('YYYYMMDD')
      this.queryParam.endDate = moment(this.dates[1]).format('YYYYMMDD')
      this.queryParam.typeTree = "1"
      this.queryParam.typeTree = '1'
      this.loadData1()
    },
    watch: {
      Type(valmath) {
        this.dataList = [];
        this.dataList = []
        this.queryParam.typeTree = valmath
      },
      nodeTree(val) { //监听currSelected 变化，将变化后的数值传递给 getCurrSelected 事件
@@ -178,7 +189,7 @@
      },
      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'
@@ -212,14 +223,21 @@
        this.queryParam.endDate = v2[1]
      },
      searchQuery() {
        if (this.queryParam.typeTree == "1") {
        if (this.dates && this.dates.length > 0) {
          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.loadData1()
        } else {
          this.$notification.warning({
            message: '提示',
            description: '请选择时间'
          })
        }
        // this.onClearSelected()
      },
      // searchReset() {
@@ -292,6 +310,7 @@
      //     }
      //   }
      loadData1() {
        this.loading = true
        this.tableHeads = []
        this.dataList = []
        getAction(this.url.efficiencyList, this.queryParam).then(res => {
@@ -304,12 +323,13 @@
            // this.checkSameData2(this.dataList)
            // this.combineCell();
            // this.initDeviceType(this.dataList)

          }
        }).finally(() => {
          this.loading = false
        })
      },
      draw(){
        let openRateTrendAnalysisChart = this.$echarts.init(document.getElementById('openRateTrendChart'), 'macarons');
        let openRateTrendAnalysisChart = this.$echarts.init(document.getElementById('openRateTrendChart'), 'macarons')
        let openRateTrendChartOptions = {
          title: {
            text: '利用率走势分析',
@@ -317,7 +337,7 @@
            textStyle: {
              fontSize: 18,
              fontWeight: 'bolder',
              color: "#151414"
              color: '#151414'
            }
          },
          tooltip: {
@@ -363,8 +383,8 @@
              }
            }
          ]
        };
        openRateTrendAnalysisChart.setOption(openRateTrendChartOptions,true);
        }
        openRateTrendAnalysisChart.setOption(openRateTrendChartOptions, true)
      }
    }
  }
@@ -409,9 +429,11 @@
    padding: 10px;
    /*display: none;*/
  }

  .dataContent .mathData:hover td{
    background-color: #e6f7ff;
  }

  .dataContent .mathData .td {
    /*background-color: #ff9bd2;*/
    display: inline-block;
@@ -421,11 +443,13 @@
  .dataContent .mathData .tdd {
    /*display: none;*/
  }

  .table2{
    width: 100%;
    height: 100%;
    overflow: auto;
  }

  /*tr th {*/
  /*height: 50px!important;*/
  /*}*/
@@ -438,70 +462,85 @@
    left: 0;
    z-index: 1;
  }

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

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

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

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

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

  .table tbody tr .tdgu5{
    position: sticky;
    left: 700px;
    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: 6!important;
  }

  .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: 150px;
  }

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

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

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

  .table2 thead .equipname .dong6{
    z-index: 5;
    left: 700px;
@@ -513,45 +552,54 @@
      overflow: scroll;
    }
  }

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

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

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

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

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

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

  /deep/ .ant-card{
    height: 100%!important;
  }

  /deep/ .ant-card .ant-card-body{
    height: 100%!important;
  }

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