From e39f49b890815d603b544339e4008951c502b288 Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Fri, 9 Jun 2023 16:41:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E6=B5=8B=E8=AF=95bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/monitoring/electricity.vue | 4 ++--
 src/components/monitoring/wall.vue        | 4 ++--
 src/views/garden/generalizePattern.vue    | 1 +
 vue.config.js                             | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/monitoring/electricity.vue b/src/components/monitoring/electricity.vue
index 81bd959..84e14e3 100644
--- a/src/components/monitoring/electricity.vue
+++ b/src/components/monitoring/electricity.vue
@@ -73,7 +73,7 @@
               <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.warnStatus == 2" />
               <img class="icon" src="../../../public/img/monitoring/electricity/bj.png" v-else />
               <span class="message" :style="{ color: item.warnStatus == 2 ? 'white' : 'red' }"
-                v-text="item.equipName"></span>
+                v-text="item.name"></span>
             </div>
             <span class=""></span>
             <!-- <span class="data" :style="{ color: item.status == 90001 ? '#9D9D9D' : 'red' }">{{ item.status == 90001 ?
@@ -374,7 +374,6 @@ import {
   mapUpdate,
   mapViewerCamera,
   setCameraStatus,
-  recoveryWarn,//恢复告警
 } from "../../util/bfHelper";
 import * as commonValue from "../../util/commonValue";
 import echarts from "./echarts1";
@@ -393,6 +392,7 @@ import {
   getTtElectricityRight, //历史用电统计
   getElectricWarnList, //报警列表
   getCancelWarn,//关闭报警
+  recoveryWarn,//恢复告警
 } from "@/api/garden/monitoring";
 import bfHelperState from "../../store/modules/bfHelperState";
 export default {
diff --git a/src/components/monitoring/wall.vue b/src/components/monitoring/wall.vue
index 1444f74..b406283 100644
--- a/src/components/monitoring/wall.vue
+++ b/src/components/monitoring/wall.vue
@@ -987,7 +987,7 @@ export default {
               null,
               this.getWallContent(
                 row.status,
-                row.status == 9000 ? "正常" : "离线",
+                row.status == 90000 ? "正常" : "离线",
                 row.name,
                 row.location,
                 row.warnContent ? row.warnContent : row.warnMsg,
@@ -1021,7 +1021,7 @@ export default {
               null,
               this.getWallContent(
                 row.status,
-                row.status == 9000 ? "正常" : "离线",
+                row.status == 90000 ? "正常" : "离线",
                 row.name,
                 row.location,
                 row.warnContent ? row.warnContent : row.warnMsg,
diff --git a/src/views/garden/generalizePattern.vue b/src/views/garden/generalizePattern.vue
index 3022fea..dbd088a 100644
--- a/src/views/garden/generalizePattern.vue
+++ b/src/views/garden/generalizePattern.vue
@@ -1330,6 +1330,7 @@ export default {
             radius: ["40%", "55%"],
             center: ["25%", "40%"],
             label: {
+              show: false,
               formatter: "{c}",
               color: "rgba(255,255,255,0.5)",
               textBorderWidth: 0,
diff --git a/vue.config.js b/vue.config.js
index 21b45d8..6a87621 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -46,8 +46,8 @@ module.exports = {
         // target: 'http://192.168.0.105:80',
         // target: "http://192.168.43.35",
         // target: 'http://192.168.1.106',
-        // target: "http://192.168.1.3",
-        target: "http://10.90.100.204",
+        target: "http://192.168.1.3",
+        // target: "http://10.90.100.204",
         // target: "http://rsvz4t.natappfree.cc",
         //远程演示服务地址,可用于直接启动项目
         //target: 'https://saber.bladex.vip/api',