1、调整车间看板页面详情弹窗描述列表内容字段 2、报警分析页面在原有表格中为每个报警号增加子表格，内容为出现此报警号的设备ID以及报警时间等 3、报警...

zhuzhuanzhuan

2023-12-14 547aab154e85a9a89f1e320f92bd43854d10faeb

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

@@ -56,25 +56,27 @@
          <!--</table>-->
          <!--</div>-->
          <!--</div>-->
          <a-table :columns="columns" :data-source="dataList" bordered :pagination="false" :scroll="{y:168}"
          <!--<a-spin :spinning=""></a-spin>-->
          <a-table :columns="columns" :data-source="dataList" bordered :pagination="false" :scroll="{y:210}"
                   :customRow="customRow"
                   rowKey="alarmCode"
                   rowKey="alarmCode" @expand="handleExpandChange" :loading="outerDataLoading"
          >
            <span slot="timeCount" slot-scope="text">{{getFormattedTime(text)}}</span>
            <!--<a-table-->
              <!--slot="expandedRowRender"-->
              <!--slot-scope="row"-->
              <!--:columns="innerColumns"-->
              <!--:data-source="row.innerDataList"-->
              <!--:pagination="false"-->
              <!--rowKey="equipmentId"-->
            <!--&gt;-->
              <!--<span slot="duration" slot-scope="text">{{getFormattedTime(text)}}</span>-->
            <!--</a-table>-->
            <span slot="timeCount" slot-scope="text">{{text | getFormattedTime}}</span>
            <a-table
              slot="expandedRowRender"
              slot-scope="row"
              :columns="innerColumns"
              :data-source="row.innerDataList"
              :pagination="false"
              rowKey="rowIndex"
              :loading="innerDataLoading"
            >
              <span slot="duration" slot-scope="text">{{text | getFormattedTime}}</span>
            </a-table>
          </a-table>
        </div>

        <a-spin :spinning="spinning">
        <a-spin :spinning="echartLoading">
          <div style="width: 100%;height: 100%;display: flex;">
            <div id="MdcEquipmentWarningPie" style="height: 100%;width: 35%;"></div>
            <div id="MdcEquipmentWarningLine" style="height: 100%;width: 65%;"></div>
@@ -97,21 +99,32 @@

  const columns = [
    { title: '报警号', dataIndex: 'alarmCode', key: 'alarmCode', align: 'center' },
    { title: '出现次数', dataIndex: 'count', key: 'count', align: 'center' },
    { title: '出现次数', dataIndex: 'count', key: 'count', align: 'center', sorter: (a, b) => b.count - a.count },
    {
      title: '合计持续时间',
      dataIndex: 'timeCount',
      key: 'timeCount',
      scopedSlots: { customRender: 'timeCount' },
      align: 'center'
      align: 'center',
      sorter: (a, b) => b.timeCount - a.timeCount
    },
    { title: '报警信息', dataIndex: 'alarmContent', key: 'alarmContent', align: 'center' }
    { title: '报警信息', dataIndex: 'alarmContent', key: 'alarmContent', align: 'center', ellipsis: true }
  ]

  const innerColumns = [
    {
      title: '',
      dataIndex: 'rowIndex',
      key: 'rowIndex',
      width: 60,
      align: 'center',
      customRender: function(t, r, index) {
        return parseInt(index) + 1
      }
    },
    { title: '设备编号', dataIndex: 'equipmentId', key: 'equipmentId', align: 'center' },
    { title: '设备名称', dataIndex: 'equipmentName', key: 'equipmentName', align: 'center' },
    { title: '报警时间', dataIndex: 'alarmTime', key: 'alarmTime', align: 'center' },
    { title: '报警时间', dataIndex: 'startTime', key: 'startTime', align: 'center' },
    { title: '结束时间', dataIndex: 'endTime', key: 'endTime', align: 'center' },
    {
      title: '持续时间',
@@ -130,8 +143,9 @@
      return {
        dataSource: [],
        /* table加载状态 */
        loading: false,
        spinning:false,
        outerDataLoading: false,
        innerDataLoading: false,
        echartLoading: false,
        typeTree: '',
        typeParent: 1,
        typeEquipment: 1,
@@ -157,14 +171,16 @@
        url: {
          efficiencyList: '/mdc/alarmAnalyze/alarmList',
          listByType: '/mdc/MdcUtilizationRate/getByType',
          alarmTrend: '/mdc/alarmAnalyze/alarmTrend'
          alarmTrend: '/mdc/alarmAnalyze/alarmTrend',
          equipmentAlarmList: '/mdc/alarmAnalyze/equipmentAlarmList'
        },
        tableHeads: [],
        pieDate: [0],
        XData: [0],
        YData: [0],
        columns,
        innerColumns
        innerColumns,
        hasRequsetAlarmCodeList: []
      }
    },
    props: { nodeTree: '', Type: '', nodePeople: '' },
@@ -220,6 +236,35 @@
        } else {
          return '0'
        }
      },

      /**
       * 格式化时间
       * @param seconds 秒数
       * @returns '' 格式化后时间字符串
       */
      getFormattedTime(seconds) {
        var hours = Math.floor(seconds / 3600)
        var minutes = Math.floor((seconds % 3600) / 60)
        var secs = seconds % 60

        if (hours === 0) {
          if (minutes === 0) {
            return secs === 0 ? 0 : `${secs}秒`
          } else {
            if (secs === 0) {
              return `${minutes}分`
            }
            return `${minutes}分 ${secs}秒`
          }
        } else {
          if (minutes === 0 && secs === 0) {
            return `${hours}小时`
          } else if (minutes !== 0 && secs === 0) {
            return `${hours}小时 ${minutes}分`
          }
        }
        return `${hours}小时 ${minutes}分 ${secs}秒`
      }
    },
    methods: {
@@ -232,34 +277,34 @@
      },
      TableDraw(key, val) {
        let that = this
        that.spinning=true
        that.echartLoading = true
        that.queryParam.alarmCode = val.alarmCode
        console.log(this.queryParam)
        getAction(that.url.alarmTrend, that.queryParam)
          .then(res => {
          if (res.success) {
            that.pieDate=res.result.equipmentCountList.map(item=>{
              return {
                name:item.key,
                value:item.count
              }
            })
            that.XData=res.result.dateCountList.map(item=>item.key)
            that.YData=res.result.dateCountList.map(item=>item.count)
            if (res.success) {
              that.pieDate = res.result.equipmentCountList.map(item => {
                return {
                  name: item.key,
                  value: item.count
                }
              })
              that.XData = res.result.dateCountList.map(item => item.key)
              that.YData = res.result.dateCountList.map(item => item.count)

            // this.tableHeads = res.result.dates
            // this.dataList = res.result
            // this.draw()
            // this.checkSameData(this.dataList)
            // this.checkSameData1(this.dataList)
            // this.checkSameData2(this.dataList)
            // this.combineCell();
            // this.initDeviceType(this.dataList)
            that.drawWrin()
          }
        })
          .finally(()=>{
            that.spinning=false
              // this.tableHeads = res.result.dates
              // this.dataList = res.result
              // this.draw()
              // this.checkSameData(this.dataList)
              // this.checkSameData1(this.dataList)
              // this.checkSameData2(this.dataList)
              // this.combineCell();
              // this.initDeviceType(this.dataList)
              that.drawWrin()
            }
          })
          .finally(() => {
            that.echartLoading = false
          })
        console.log(this.YData)

@@ -388,37 +433,14 @@
      //     }
      //   }
      loadData1() {
        this.outerDataLoading = true
        this.tableHeads = []
        this.dataList = []
        getAction(this.url.efficiencyList, this.queryParam).then(res => {
          if (res.success) {
            // this.tableHeads = res.result.dates
            this.dataList = res.result
            this.dataList[0].innerDataList=[
              {
                equipmentId: '11234',
                equipmentName: '立体机床',
                alarmTime: 20,
                endTime: 20,
                duration: 123
              },
              {
                equipmentId: '4213',
                equipmentName: '卧室机床',
                alarmTime: 312,
                endTime: 31,
                duration: 421
              }
            ]
            this.dataList[1].innerDataList=[
              {
                equipmentId: '4213',
                equipmentName: '卧室机床',
                alarmTime: 312,
                endTime: 31,
                duration: 421
              }
            ]
            this.hasRequsetAlarmCodeList = []
            // this.draw()
            // this.checkSameData(this.dataList)
            // this.checkSameData1(this.dataList)
@@ -427,6 +449,8 @@
            // this.initDeviceType(this.dataList)

          }
        }).finally(() => {
          this.outerDataLoading = false
        })
      },
      drawWrin() {
@@ -542,35 +566,6 @@
      },

      /**
       * 格式化时间
       * @param seconds 秒数
       * @returns '' 格式化后时间字符串
       */
      getFormattedTime(seconds) {
        var hours = Math.floor(seconds / 3600)
        var minutes = Math.floor((seconds % 3600) / 60)
        var secs = seconds % 60

        if (hours === 0) {
          if (minutes === 0 ) {
            return secs === 0 ? 0 : `${secs}秒`
          } else {
            if(secs=== 0 ){
              return `${minutes}分`
            }
            return `${minutes}分 ${secs}秒`
          }
        } else {
          if (minutes === 0 && secs === 0) {
            return `${hours}小时`
          } else if (minutes !== 0 && secs === 0) {
            return `${hours}小时 ${minutes}分`
          }
        }
        return `${hours}小时 ${minutes}分 ${secs}秒`
      },

      /**
       * 自定义表格行触发
       * @param record 当前行信息
       * @param index 当前行下标
@@ -581,10 +576,10 @@
          on: {
            click: (event) => {
              // 如果点击的不是展开图标区域则渲染图表，相反则相当于点击展开图标
              if(event.target.className !== 'ant-table-row-expand-icon-cell'){
              if (event.target.className !== 'ant-table-row-expand-icon-cell') {
                this.TableDraw(index, record)
              }else{
                if(event.target.children && event.target.children.length>0) event.target.children[0].click()
              } else {
                if (event.target.children && event.target.children.length > 0) event.target.children[0].click()
              }
            }
          }
@@ -592,24 +587,29 @@
      },

      /**
       * 自定义展开表格图标
       * @param props 图标属性
       * @returns {null} 若主表数据下无数据则不显示图标
       * 自定义表格行触发
       * @param expanded 当前行是否为展开状态
       * @param record 当前行信息
       */
      expandIcon(props){
        console.log('props',props)
        if (props.record.innerDataList&&props.record.innerDataList.length>0){
          if (props.expanded) {
            return <a style="margin-right:0px;color:#999" onClick={e=> {
              props.onExpand(props.record, e);
            }}><a-icon type="minus" /></a>
          } else{
            return <a style="margin-right:0px;color:#999" onClick={e => {
              props.onExpand(props.record, e);
            }}><a-icon type="plus"/></a>
          }
        }else{
          return null
      handleExpandChange(expanded, record) {
        let _this = this
        // 当展开时若该行未被展开过才会请求后台数据，展开过的数据会被缓存无需重复请求
        const param = Object.assign({ alarmCode: record.alarmCode }, this.queryParam)
        if (expanded && !this.hasRequsetAlarmCodeList.includes(record.alarmCode)) {
          this.innerDataLoading = true
          getAction(this.url.equipmentAlarmList, param).then(res => {
            if (res.success) {
              _this.dataList.forEach(item => {
                if (item.alarmCode === record.alarmCode) {
                  item.innerDataList = res.result
                }
              })
              _this.hasRequsetAlarmCodeList.push(record.alarmCode)
            }
          })
            .finally(() => {
              _this.innerDataLoading = false
            })
        }
      }
    }
@@ -832,15 +832,25 @@
  /deep/ .ant-table-body .ant-table-row td {
    padding-top: 10px;
    padding-bottom: 10px;
  }

  /deep/ .ant-table-scroll > .ant-table-body > table > .ant-table-tbody > .ant-table-row td {
    cursor: pointer;
  }

  /deep/ .ant-spin-nested-loading{
  /deep/ .ant-spin-nested-loading {
    height: 55%;
  }

  /deep/ .ant-spin-container{
  /deep/ .ant-spin-container {
    height: 100%;
  }

  /deep/ .ant-table.ant-table-bordered {
    height: 265px;
  }

  /deep/ .ant-table-scroll > .ant-table-placeholder {
    height: 210px;
  }
</style>