1、设备TEEP/设备开动率/班次利用率页面新增异常反馈功能 2、设备TEEP页面实现滚动加载（每次滚动加载15条） 3、异常反馈页面增加手动新增反馈...

zhaowei

2025-05-28 fe470128a5432662cc3f394280c652c5ab023161

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

@@ -6,28 +6,109 @@
        <a-form layout="inline" @keyup.enter.native="searchQuery">
          <a-row :gutter="24">
            <a-col :md="6" :sm="6">
              <a-form-item label="驱动类型">
                <a-select
                  :value="queryParams.driveType"
                  mode="multiple"
                  placeholder="请选择驱动类型"
                  allow-clear
                  :maxTagCount="1"
                  @change="selectChange($event,'driveType')"
                >
                  <a-select-option v-for="(item,index) in driveTypeList" :value="item.value" :key="index">
                    {{ item.label }}
                  </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"/>
                                v-model="dates" :allowClear="false"/>
              </a-form-item>
            </a-col>
            <a-col :md="7" :sm="7" :xs="7">

            <a-col :md="9" :sm="9" :xs="9">
              <a-form-item label="时间段">
                <a-time-picker :default-value="moment('00:00', 'HH:mm')" format="HH:mm" @change="onChangeStart"/>
                至
                <a-time-picker :default-value="moment('08:00', 'HH:mm')" format="HH:mm" @change="onChangeEnd"/>
                <a-space>
                  <a-time-picker :default-value="moment('00:00', 'HH:mm')" format="HH:mm" @change="onChangeStart" :allowClear="false"/>
                  至
                  <a-time-picker :default-value="moment('08:00', 'HH:mm')" format="HH:mm" @change="onChangeEnd" :allowClear="false"/>
                  <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
                  <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
                </a-space>
              </a-form-item>
            </a-col>
            <a-col :lg="2" :md="3" :sm="3" :xs="3">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>

            <a-col :md="2" :sm="2">
              <a
                @click="toggleSearchStatus=!toggleSearchStatus"
                @selectstart="$event.preventDefault()"
                style="display: inline-block;height: 32px;line-height: 32px"
              >
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
              </a>
            </a-col>
          </a-row>

          <a-row :gutter="24" v-if="toggleSearchStatus">
            <a-col :md="6" :sm="6">
              <a-form-item label="设备类型">
                <a-select
                  :value="queryParams.equipmentType"
                  mode="multiple"
                  placeholder="请选择设备类型"
                  allow-clear
                  :maxTagCount="1"
                  @change="selectChange($event,'equipmentType')"
                >
                  <a-select-option v-for="(item,index) in equipmentTypeList" :value="item.value" :key="index">
                    {{ item.label }}
                  </a-select-option>
                </a-select>
              </a-form-item>
            </a-col>

            <a-col :md="6" :sm="6" :xs="6">
              <a-form-item label="设备级别">
                <a-select
                  :value="queryParams.deviceLevel"
                  mode="multiple"
                  placeholder="请选择设备级别"
                  allow-clear
                  :maxTagCount="1"
                  @change="selectChange($event,'deviceLevel')"
                >
                  <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
                    {{ item.label }}
                  </a-select-option>
                </a-select>
              </a-form-item>
            </a-col>

            <a-col :md="5" :sm="5" :xs="5">
              <a-form-item label="重要程度">
                <a-select
                  v-model="queryParam.deviceImportanceLevel"
                  placeholder="请选择设备重要程度"
                  allow-clear
                >
                  <a-select-option v-for="(item,index) in device_importance_level_list" :value="item.value"
                                   :key="index">
                    {{ item.label }}
                  </a-select-option>
                </a-select>
              </a-form-item>
            </a-col>
          </a-row>
        </a-form>
      </div>

      <div id="DeviceList">
        <div class="openRateTrendDg">
          <div id="Efficiency" class="container" style="margin-top: 20px;">
            <a-spin :spinning="loading">
        <a-spin :spinning="loading">
          <div id="Efficiency" class="container" style="margin-bottom: 15px;">
              <div class="table2">
                <table class="dataContent table" border="1" cellspacing="0" cellpadding="0"
                       style="white-space: nowrap;text-align: center;">
@@ -36,7 +117,7 @@
                    <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 class="thgu dong2 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">
                      设备名称
                    </th>
                    <th class="thgu dong3 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">
@@ -59,10 +140,10 @@
                  </tbody>
                </table>
              </div>
            </a-spin>
          </div>
        </div>
        <div id="openRateTrendChart" style="width: 100%;height: 60%"></div>
        </a-spin>

        <div id="openRateTrendChart"></div>
      </div>
    </div>
  </div>
@@ -70,18 +151,14 @@

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

  export default {
    // mixins: [JeecgListMixin],
    name: 'openRateFractionAnalysisMain',
    components: {},
    data() {
      return {
        dataSource: [],
@@ -94,9 +171,17 @@
        TreeIDTwo: 2,
        deviceTypeDict: '',
        dates: [],
        equipmentTypeList: [],
        driveTypeList: [],
        device_level_list: [],
        device_importance_level_list: [],
        identifying: [],
        queryParam: {},
        queryParams: {},
        queryParams: {
          equipmentType: [],
          driveType: [],
          deviceLevel: []
        },
        queryParamEquip: {},
        queryParamPeople: {},
        efficiencyOptions: [
@@ -111,14 +196,16 @@
        dataList: [],
        url: {
          efficiencyList: '/mdc/efficiencyReport/utilizationRateSectionAnalyze',
          listByType: '/mdc/MdcUtilizationRate/getByType'
          listByType: '/mdc/MdcUtilizationRate/getByType',
          queryEquipmentType: '/mdc/mdcEquipmentType/queryEquipmentType'
        },
        tableHeads: [],
        XData: [0],
        YData: [0],
        isLazyRequest: '',// 是否开启懒加载
        requestAlldataSize: 8,// 总共请求的列表项数目
        everyRequestDataSize: 15// 每次请求的列表项数目
        requestAllDataSize: 8,// 总共请求的列表项数目
        everyRequestDataSize: 15,// 每次请求的列表项数目
        toggleSearchStatus:false
      }
    },
    props: { nodeTree: '', Type: '', nodePeople: '' },
@@ -126,20 +213,19 @@
     * 生命周期 挂载前
     * */
    created() {
      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.startTime = '00:00'
      this.queryParam.endTime = '08:00'
      this.queryParam.typeTree = '1'
      this.loadData1()

      this.queryGroup()
      this.getDriveTypeByApi()
      this.initDictData('device_level')
      this.initDictData('device_importance_level')
    },
    mounted() {
      this.tableScroll = document.querySelector('.table2')
      this.searchReset()
      window.addEventListener('resize',this.handleWindowResize)
    },
    beforeDestroy() {
      this.tableScroll.removeEventListener('scroll', this.tableScrollX)
      window.removeEventListener('resize',this.handleWindowResize)
    },
    watch: {
      Type(valmath) {
@@ -182,22 +268,69 @@
      }
    },
    methods: {
      moment,
      onChangeStart(time, timeString) {
        this.queryParam.startTime = timeString
        // console.log(time, timeString);
      queryGroup() {
        getAction(this.url.queryEquipmentType).then(res => {
          if (res.success) {
            this.equipmentTypeList = res.result.map(item => {
              return {
                label: item.equipmentTypeName,
                value: item.equipmentTypeName
              }
            })
          } else {
            this.$notification.warning({
              message: '消息',
              description: res.message
            })
          }
        })
      },
      onChangeEnd(time, timeString) {
        this.queryParam.endTime = timeString
        // console.log(time, timeString);

      // 调用接口获取控制系统类型
      getDriveTypeByApi() {
        api.getDriveTypeApi().then((res) => {
          if (res.success) this.driveTypeList = res.result
        })
      },
      numBerTwo(value) {
        if (value) {
          return parseFloat((value * 100).toFixed(2))
        } else {
          return '0'

      initDictData(dictCode) {
        // //优先从缓存中读取字典配置
        if (getDictItemsFromCache(dictCode)) {
          this[dictCode + '_list'] = getDictItemsFromCache(dictCode)
          return
        }
        //根据字典Code, 初始化字典数组
        ajaxGetDictItems(dictCode, null).then((res) => {
          if (res.success) {
            this[dictCode + '_list'] = res.result
            return
          }
        })
      },

      loadData() {
        this.loading = true
        this.tableHeads = []
        this.dataList = []
        // 若日期选择器设置的查询请求数量超过15条则开启懒加载
        if (this.requestAllDataSize > 15) {
          // 开启懒加载后将结束日期设置为开始日期之后的14天，即先查询15天内的数据
          this.queryParam.endDate = moment(this.queryParam.startDate).add(this.everyRequestDataSize - 1, 'days').format('YYYYMMDD')
          this.isLazyRequest = true
          this.tableScroll.removeEventListener('scroll', this.tableScrollX) // 为避免滚动条有滚动距离后后点击查询按钮触发滚动事件，因此在触发事件前移除事件
        }
        getAction(this.url.efficiencyList, this.queryParam).then(res => {
          if (res.success) {
            this.tableHeads = res.result.dates
            this.dataList = res.result.mdcEfficiencyList
            this.draw()
            this.tableScroll.addEventListener('scroll', this.tableScrollX)
          }
        }).finally(() => {
          this.loading = false
        })
      },

      TableDraw(key, val) {
        this.XData = [0]
        this.YData[0]
@@ -209,141 +342,12 @@
        }
        this.XData = Xarr
        this.YData = Yarr
        // if(this.openRateTrendAnalysisChart !=null && this.openRateTrendAnalysisChart != '' && this.openRateTrendAnalysisChart != undefined){
        //     this.openRateTrendAnalysisChart.dispose()
        // }

        this.draw()
      },
      //Can not slect days before today and today
      disabledDate(current) {
        return current && current > moment().subtract('days', 1)
      },
      dateParamChange(v1, v2) {
        this.queryParam.startDate = v2[0]
        this.queryParam.endDate = v2[1]
        this.dates = [v1[0], v1[1]]
      },
      searchQuery() {
        this.queryParam.startDate = moment(this.dates[0]).format('YYYYMMDD')
        this.queryParam.endDate = moment(this.dates[1]).format('YYYYMMDD')
        if (this.queryParam.startTime && this.queryParam.endTime && this.dates[0] && this.dates[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.requestAlldataSize = moment.duration(moment(this.queryParam.endDate) - moment(this.queryParam.startDate), 'millisecond').asDays() + 1
          this.loadData1()
        } else {
          this.$notification.warning({
            message: '提示',
            description: '请选择时间或时间段'
          })
        }

        // this.onClearSelected()
      },
      // searchReset() {
      //   this.typeTree = this.queryParam.typeTree
      //   this.typeParent =  this.queryParam.parentId
      //   this.typeEquipment = this.queryParam.equipmentId
      //   this.queryParam = {}
      //   this.dates = []
      //   this.queryParam.typeTree = this.typeTree
      //   this.queryParam.parentId = this.typeParent
      //   this.queryParam.equipmentId =  this.typeEquipment
      //   // this.ipagination.current = 1
      //   this.loadData1();
      //   // this.queryParam = {}
      //   // this.dates = []
      //   // this.loadData()
      //   // this.onClearSelected()
      // },
      // loadData1() {
      //   let that = this
      //   that.columns=[
      //     {
      //       title: '设备编号',
      //       align: 'center',
      //       dataIndex: 'equipmentId',
      //       width:'150px'
      //     },
      //     {
      //       title: '设备名称',
      //       align: 'center',
      //       dataIndex: 'equipmentName',
      //       width:'150px'
      //     },
      //   ]
      //   that.tableHeads = []
      //   that.dataList = []
      //   getAction(this.url.efficiencyList, that.queryParam).then(res => {
      //     var tmp = {}
      //     console.log(res)
      //     if (res.success)
      //
      //       that.dataSource = res.result.mdcEfficiencyList
      //       for(var k = 0;k<that.dataSource[0].dataList.length;k++){
      //         that.columns.push(
      //           {
      //             title:that.dataSource[0].dataList.theDate,
      //             align: 'center',
      //             width:'120px',
      //             // dataIndex:'utilizationRate',
      //           }
      //         )
      //       }
      //       for(var i = 0;i<that.dataSource.length;i++){
      //         for (var j = 0; j < that.dataSource[i].dataList.length;j++){
      //           // that.columns.push(
      //           //   {
      //           //     title:that.dataSource[0].dataList[j].theDate,
      //           //     align: 'center',
      //           //     width:'120px',
      //           //     dataIndex:'utilizationRate',
      //           //   }
      //           // )
      //         }
      //
      //       }
      //       console.log(that.columns)
      //       console.log(that.dataSource)
      //       // this.initDeviceType(this.dataList)
      //       this.draw()
      //     }
      //   }
      loadData1() {
        this.loading = true
        this.tableHeads = []
        this.dataList = []
        // 若日期选择器设置的查询请求数量超过15条则开启懒加载
        if (this.requestAlldataSize > 15) {
          // 开启懒加载后将结束日期设置为开始日期之后的14天，即先查询15天内的数据
          this.queryParam.endDate = moment(this.queryParam.startDate).add(this.everyRequestDataSize - 1, 'days').format('YYYYMMDD')
          this.isLazyRequest = true
          this.tableScroll.removeEventListener('scroll', this.tableScrollX) // 为避免滚动条有滚动距离后后点击查询按钮触发滚动事件，因此在触发事件前移除事件
        }
        getAction(this.url.efficiencyList, this.queryParam).then(res => {
          if (res.success) {
            this.tableHeads = res.result.dates
            this.dataList = res.result.mdcEfficiencyList
            this.draw()
            // this.checkSameData(this.dataList)
            // this.checkSameData1(this.dataList)
            // this.checkSameData2(this.dataList)
            // this.combineCell();
            // this.initDeviceType(this.dataList)
            this.tableScroll.addEventListener('scroll', this.tableScrollX)
          }
        }).finally(() => {
          this.loading = false
        })
      },
      draw() {
        let openRateTrendAnalysisChart = this.$echarts.init(document.getElementById('openRateTrendChart'), 'macarons')
        this.openRateTrendAnalysisChart = this.$echarts.init(document.getElementById('openRateTrendChart'), 'macarons')
        let openRateTrendChartOptions = {
          title: {
            text: '利用率分段分析',
@@ -398,8 +402,83 @@
            }
          ]
        }
        openRateTrendAnalysisChart.setOption(openRateTrendChartOptions, true)
        this.openRateTrendAnalysisChart.setOption(openRateTrendChartOptions, true)
      },

      searchQuery() {
        // 因触底刷新会修改参数时间值，故在此用时间选择器的时间值对参数时间值再次赋值，若不这样做则参数时间值则会与时间选择器上的时间值不一致
        this.queryParam.startDate = moment(this.dates[0]).format('YYYYMMDD')
        this.queryParam.endDate = moment(this.dates[1]).format('YYYYMMDD')

        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.requestAllDataSize = moment.duration(moment(this.queryParam.endDate) - moment(this.queryParam.startDate), 'millisecond').asDays() + 1

        Object.keys(this.queryParams).forEach(item => {
          if (Array.isArray(this.queryParams[item])) {
            if (this.queryParams[item].length !== 0) this.queryParam[item] = this.queryParams[item].join()
            else delete this.queryParam[item]
          }
        })
        this.loadData()
      },

      searchReset() {
        this.queryParams = {
          equipmentType: [],
          driveType: [],
          deviceLevel: []
        }
        this.queryParam = {}
        this.dates = [moment().subtract('days', 8), moment().subtract('days', 1)]
        this.requestAllDataSize = this.dates[1].diff(this.dates[0],'days') + 1
        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.loadData()
      },

      selectChange(value, key) {
        this.queryParams[key] = value
      },

      onChangeStart(time, timeString) {
        this.queryParam.startTime = timeString
        // console.log(time, timeString);
      },

      onChangeEnd(time, timeString) {
        this.queryParam.endTime = timeString
        // console.log(time, timeString);
      },

      numBerTwo(value) {
        if (value) {
          return parseFloat((value * 100).toFixed(2))
        } else {
          return '0'
        }
      },

      //Can not slect days before today and today
      disabledDate(current) {
        return current && current > moment().subtract('days', 1)
      },

      dateParamChange(v1, v2) {
        this.queryParam.startDate = v2[0]
        this.queryParam.endDate = v2[1]
        this.dates = [v1[0], v1[1]]
      },

      moment,

      /**
       * 滚动条触底刷新表格数据
@@ -434,6 +513,13 @@
            this.loading = false
          })
        }
      },

      /**
       * 当浏览器可视窗口尺寸发生改变时触发
       */
      handleWindowResize(){
        if(this.openRateTrendAnalysisChart) this.openRateTrendAnalysisChart.resize()
      }
    }
  }
@@ -455,19 +541,11 @@
    text-align: center;
  }

  /*.dataContent .fixed th {*/
  /*width: 50px;*/
  /*}*/

  .dataContent .thead th {
    background-color: #fafafa;
    text-align: center;
    height: 30px;
    padding: 5px;
  }

  .dataContent .notfixed th {
    /*width: auto;*/
  }

  .dataContent tr td {
@@ -476,22 +554,11 @@

  .dataContent .mathData td {
    padding: 10px;
    /*display: none;*/
    cursor: pointer;
  }

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

  .dataContent .mathData .td {
    /*background-color: #ff9bd2;*/
    display: inline-block;
    padding: 10px;
  }

  .dataContent .mathData .tdd {
    /*display: none;*/
  }

  .table2 {
@@ -500,12 +567,6 @@
    overflow: auto;
  }

  /*tr th {*/
  /*height: 50px!important;*/
  /*}*/
  /*tr td{*/
  /*height: 50px!important;*/
  /*}*/
  .table2 thead tr th:first-child,
  .table tbody tr .tdgu {
    position: sticky;
@@ -526,25 +587,7 @@

  .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;
    left: 312px;
    z-index: 2;
  }

@@ -568,7 +611,6 @@
  .table2 thead .equipname .dong1 {
    z-index: 4;
    left: 0;
    /*border: 1px solid #000;*/
  }

  .table2 thead .equipname .dong2 {
@@ -578,79 +620,49 @@

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

  .table2 thead .equipname .dong4 {
    z-index: 5;
    left: 450px;
  .efficiency_list #DeviceList {
    height: 90% !important;
  }

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

  .table2 thead .equipname .dong6 {
    z-index: 5;
    left: 700px;
  #openRateTrendChart{
    width: 100%;
    height: 60%
  }

  @media screen and (min-width: 1920px) {
    #Efficiency {
      height: 337px !important;
      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;
      height: 337px !important;
    }
  }

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

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

  #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;
  }
</style>