From ab5867c4fd94f07e03a23ee09f7ddc42bf887302 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Wed, 24 Apr 2024 17:05:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                       | 3 ++-
 src/views/databoard/components/ISRAChart.vue   | 2 +-
 src/views/databoard/deepProcessing/EqAlarm.vue | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.env.dev b/.env.dev
index 2d9cb29e..dd91d53e 100644
--- a/.env.dev
+++ b/.env.dev
@@ -13,7 +13,8 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# VUE_APP_BASE_API = 'http://192.168.4.176:48082'
+# VUE_APP_BASE_API = 'http://xcac.mes.picaiba.com/'
+# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://192.168.1.101:48082'
 
diff --git a/src/views/databoard/components/ISRAChart.vue b/src/views/databoard/components/ISRAChart.vue
index 0e1ee1ea..76347619 100644
--- a/src/views/databoard/components/ISRAChart.vue
+++ b/src/views/databoard/components/ISRAChart.vue
@@ -85,7 +85,7 @@ export default {
 				color: this.colors,
 				title: {
 					text: num,
-					subtext: '总数',
+					subtext: '总数/个',
 					top: '32%',
 					left: '49%',
 					textAlign: 'center',
diff --git a/src/views/databoard/deepProcessing/EqAlarm.vue b/src/views/databoard/deepProcessing/EqAlarm.vue
index 65c107f3..805da998 100644
--- a/src/views/databoard/deepProcessing/EqAlarm.vue
+++ b/src/views/databoard/deepProcessing/EqAlarm.vue
@@ -66,8 +66,10 @@ export default {
 					`<span title=${item.name || ''}>${item.name || ''}</span>`,
 					`<span title=${item.code || ''}>${item.code || ''}</span>`,
 					`<span><div style="${
-						item.status == '正常'
+						item.status == '运行'
 							? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 '
+							: item.status == '故障'
+							? 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0 '
 							: 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:13px 10px 0 0 '
 					}"></div>  ${item.status || ''}</span>`,
 					`<span"><div style="${
-- 
2.24.3