'修改警告区域名称'

package.json

@@ -39,7 +39,7 @@
     "electron-devtools-installer": "^3.1.0",
     "less": "^3.0.4",
     "less-loader": "^5.0.0",
-    "node-sass": "4.13.1",
+    "node-sass": "^4.14.1",
     "sass-loader": "^8.0.2",
     "vue-cli-plugin-electron-builder": "~2.1.1"
   },

src/components/warning/warningCard.vue

@@ -24,9 +24,9 @@
       </el-table-column>
 
       <el-table-column
-        prop="stationName"
+        prop="objectName"
         align="center"
-        label="场站名称"
+        label="名称"
         width="100"
       >
       </el-table-column>
@@ -161,6 +161,7 @@ export default {
               if (it.isSelected) {
                 sleected[it.id] = 0;
               }
+             
             });
             this.values = new Array();
             for (let v in val) {
@@ -177,6 +178,7 @@ export default {
               if (vl.category1 !== "GF" && vl.objectId.indexOf("GDC") < 0) {
                 this.values.push(vl);
               }
+               
             }
 
             let fjAlarArray = [];
@@ -191,6 +193,13 @@ export default {
                 }
               }
             });
+            this.values.forEach((ele) => {
+               if(item.category1 === "FJ"){
+              ele.objectName = ele.windturbineName
+            }else{
+              ele.objectName = ele.stationName
+            }
+            });
 
             if (syzAlarmItem) {
               let syzRes = syzAlarmArray.find((syzAlarmItem) => {
@@ -218,6 +227,7 @@ export default {
           }
         }
       });
+      console.log('996',this.values);
     },
     // 返回音频文件路径
     getSound(fileName) {

src/components/warning/warningRecords.vue

@@ -161,6 +161,7 @@ export default {
             }
           })
           this.recordData = res.data.records;
+          console.log('988',this.recordData);
           this.total = res.data.total
         });
     },