设备监控页面状态反馈按钮添加二次确认功能以及调整异常设备列表项字体颜色为红色显示
已修改2个文件
38 ■■■■ 文件已修改
src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
@@ -159,10 +159,10 @@
    },
    mounted() {
      this.drawWrin()
      window.addEventListener('resize',this.handleWindowResize)
      window.addEventListener('resize', this.handleWindowResize)
    },
    beforeDestroy(){
      window.removeEventListener('resize',this.handleWindowResize)
    beforeDestroy() {
      window.removeEventListener('resize', this.handleWindowResize)
    },
    watch: {
      Type(valmath) {
@@ -560,10 +560,10 @@
      handleExpandChange(expanded, record) {
        let _this = this
        // 当展开时若该行未被展开过才会请求后台数据,展开过的数据会被缓存无需重复请求
        const param = Object.assign({ alarmCode: record.alarmCode }, this.queryParam)
        this.queryParam.alarmCode = record.alarmCode
        if (expanded && !this.hasRequsetAlarmCodeList.includes(record.alarmCode)) {
          this.innerDataLoading = true
          getAction(this.url.equipmentAlarmList, param).then(res => {
          getAction(this.url.equipmentAlarmList, this.queryParam).then(res => {
            if (res.success) {
              _this.dataList.forEach(item => {
                if (item.alarmCode === record.alarmCode) {
@@ -582,9 +582,9 @@
      /**
       * 当浏览器可视窗口尺寸发生改变时触发
       */
      handleWindowResize(){
        if(this.equipmentWarningPie) this.equipmentWarningPie.resize()
        if(this.equipmentWarningLine) this.equipmentWarningLine.resize()
      handleWindowResize() {
        if (this.equipmentWarningPie) this.equipmentWarningPie.resize()
        if (this.equipmentWarningLine) this.equipmentWarningLine.resize()
      }
    }
  }
src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue
@@ -57,11 +57,25 @@
      <a-table ref="table" bordered size="middle" rowKey="equipmentId" :columns="columns" :dataSource="dataSource"
               :pagination="false" :loading="loading" :scroll="{x:'max-content',y:scrollY}">
        <template slot="equipmentId" slot-scope="text, record">
          <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
        </template>
        <template slot="equipmentName" slot-scope="text, record">
          <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
        </template>
        <template slot="oporationDict" slot-scope="text, record">
          <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
        </template>
        <template slot="equipmentStatus" slot-scope="text">
          {{text===0?'正常':'异常'}}
          <div :style="{color:text!==0?'#f00':null}">{{text===0?'正常':'异常'}}</div>
        </template>
        <template slot="collecttime" slot-scope="text, record">
          <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
        </template>
        <template slot="action" slot-scope="text, record">
          <a @click="$emit('editEquipmentStatus',record)" v-has="'deiveBaseInfo:responseStatus'">状态反馈</a>
          <a-popconfirm title="确定反馈吗?" @confirm="$emit('editEquipmentStatus',record)" v-has="'deiveBaseInfo:responseStatus'">
            <a>状态反馈</a>
          </a-popconfirm>
        </template>
      </a-table>
@@ -86,18 +100,21 @@
            title: '设备ID',
            align: "center",
            dataIndex: 'equipmentId',
            scopedSlots: {customRender: 'equipmentId'},
            width:210
          },
          {
            title: '设备名称',
            align: "center",
            dataIndex: 'equipmentName',
            scopedSlots: {customRender: 'equipmentName'},
            width:300
          },
          {
            title: '状态',
            align: "center",
            dataIndex: 'oporationDict',
            scopedSlots: {customRender: 'oporationDict'},
            width:200
          },
          {
@@ -113,6 +130,7 @@
            dataIndex: 'collecttime',
            defaultSortOrder:'descend',
            sorter: (a, b) => {return a.collecttime>b.collecttime?1:-1},
            scopedSlots: {customRender: 'collecttime'},
            width:350
          },
          {