From 1d45ea75308850ad0ef575ca28ba3f93552f097c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 24 一月 2024 16:01:58 +0800
Subject: [PATCH] 设备监控页面状态反馈按钮添加二次确认功能以及调整异常设备列表项字体颜色为红色显示

---
 src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue    |   22 ++++++++++++++++++++--
 src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue |   16 ++++++++--------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue b/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
index 12d210a..da98855 100644
--- a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
+++ b/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()
       }
     }
   }
diff --git a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue
index 6f83625..07795c1 100644
--- a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue
+++ b/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
           },
           {

--
Gitblit v1.9.3