From 48112b9a094a5c1d113c4c669cdee5946930cc4a Mon Sep 17 00:00:00 2001
From: wj <347312259@qq.com>
Date: Tue, 6 Jun 2023 10:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=97=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA--?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 psdc-ui/src/views/emonitor/db/index.vue    |  8 ++++----
 psdc-ui/src/views/emonitor/drgl/index.vue  | 14 +++++++-------
 psdc-ui/src/views/emonitor/frdl/index.vue  | 12 ++++++------
 psdc-ui/src/views/emonitor/kqyrb/index.vue | 14 +++++++-------
 psdc-ui/src/views/emonitor/wdcgq/index.vue |  5 ++++-
 psdc-ui/src/views/emonitor/xrgl/index.vue  | 14 +++++++-------
 6 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/psdc-ui/src/views/emonitor/db/index.vue b/psdc-ui/src/views/emonitor/db/index.vue
index 4b33898..e7d745d 100644
--- a/psdc-ui/src/views/emonitor/db/index.vue
+++ b/psdc-ui/src/views/emonitor/db/index.vue
@@ -63,10 +63,10 @@ export default {
   name: "db",
   setup() {
      let data = reactive({
-        totp:'',
-       totwh:'',
-       eday:'',
-       emonth:'',
+        totp:'-- ',
+       totwh:'-- ',
+       eday:'-- ',
+       emonth:'-- ',
        glData:[],
        glXz:[
          "00:00",
diff --git a/psdc-ui/src/views/emonitor/drgl/index.vue b/psdc-ui/src/views/emonitor/drgl/index.vue
index beb63f6..ea237dd 100644
--- a/psdc-ui/src/views/emonitor/drgl/index.vue
+++ b/psdc-ui/src/views/emonitor/drgl/index.vue
@@ -26,11 +26,11 @@
         <div><img src="../../../assets/images/温度.png"></div>
         <div>
         <div style="display: flex; margin-bottom: 5px">
-          <p style="color: #cccccc">进水温度:</p>
+          <p style="color: #cccccc">进水温度：</p>
           <h1>{{data.tempIn}}℃</h1>
         </div>
         <div style="display: flex">
-          <p style="color: #cccccc">出水温度:</p>
+          <p style="color: #cccccc">出水温度：</p>
           <h1>{{data.tempOut}}℃</h1>
         </div>
         </div>
@@ -81,12 +81,12 @@ export default {
   name: "drgl",
   setup() {
     let data = reactive({
-      totwh:'',
-      totp:'',
-      tempIn:'',
-      tempOut:'',
+      totwh:'-- ',
+      totp:'-- ',
+      tempIn:'-- ',
+      tempOut:'-- ',
       //1 开 2 关
-      runStatus:'',
+      runStatus:'-- ',
       glData:[],
       glXz:[
         "00:00",
diff --git a/psdc-ui/src/views/emonitor/frdl/index.vue b/psdc-ui/src/views/emonitor/frdl/index.vue
index 8e7b112..aaf6e15 100644
--- a/psdc-ui/src/views/emonitor/frdl/index.vue
+++ b/psdc-ui/src/views/emonitor/frdl/index.vue
@@ -70,13 +70,13 @@ export default {
   name: "frdl",
   setup() {
     let data = reactive({
-      totwh:'',
-      totp:'',
-      temp:'',
-      tempIn:'',
-      tempOut:'',
+      totwh:'-- ',
+      totp:'-- ',
+      temp:'-- ',
+      tempIn:'-- ',
+      tempOut:'-- ',
       //1 开 2 关
-      runStatus:'',
+      runStatus:'-- ',
       glData:[],
       glXz:[
         "00:00",
diff --git a/psdc-ui/src/views/emonitor/kqyrb/index.vue b/psdc-ui/src/views/emonitor/kqyrb/index.vue
index 1fd1918..211c47c 100644
--- a/psdc-ui/src/views/emonitor/kqyrb/index.vue
+++ b/psdc-ui/src/views/emonitor/kqyrb/index.vue
@@ -19,11 +19,11 @@
         <div><img src="../../../assets/images/温度.png"></div>
         <div>
           <div style="display: flex; margin-bottom: 5px">
-            <p style="color: #cccccc">进水温度:</p>
+            <p style="color: #cccccc">进水温度：</p>
             <h1>{{data.tempIn}}℃</h1>
           </div>
           <div style="display: flex">
-            <p style="color: #cccccc">出水温度:</p>
+            <p style="color: #cccccc">出水温度：</p>
             <h1>{{data.tempOut}}℃</h1>
           </div>
         </div>
@@ -74,12 +74,12 @@ export default {
   name: "kqyrb",
   setup() {
     let data = reactive({
-      totwh:'',
-      totp:'',
-      tempIn:'',
-      tempOut:'',
+      totwh:'-- ',
+      totp:'-- ',
+      tempIn:'-- ',
+      tempOut:'-- ',
       //1 开 2 关
-      runStatus:'',
+      runStatus:'-- ',
       glData:[],
       glXz:[
         "00:00",
diff --git a/psdc-ui/src/views/emonitor/wdcgq/index.vue b/psdc-ui/src/views/emonitor/wdcgq/index.vue
index 3ea9188..8a63c08 100644
--- a/psdc-ui/src/views/emonitor/wdcgq/index.vue
+++ b/psdc-ui/src/views/emonitor/wdcgq/index.vue
@@ -59,6 +59,9 @@ export default {
           let brr = []
           let crr = []
           for (let i in res.data) {
+            if(res.data[i].deviceTemp == null){
+              res.data[i].deviceTemp = '-- '
+            }
             arr.push({name: res.data[i].deviceName, temp: res.data[i].deviceTemp})
             brr.push({
               name: res.data[i].deviceName,
@@ -70,7 +73,7 @@ export default {
             })
             crr.push(res.data[i].times)
           }
-          console.log(crr)
+          // console.log('arr',arr)
           data.info = arr
           data.infos = brr
           data.xinfo = crr
diff --git a/psdc-ui/src/views/emonitor/xrgl/index.vue b/psdc-ui/src/views/emonitor/xrgl/index.vue
index ce8e960..a7de4c2 100644
--- a/psdc-ui/src/views/emonitor/xrgl/index.vue
+++ b/psdc-ui/src/views/emonitor/xrgl/index.vue
@@ -19,11 +19,11 @@
         <div><img src="../../../assets/images/温度.png"></div>
         <div>
           <div style="display: flex; margin-bottom: 5px">
-            <p style="color: #cccccc">进水温度:</p>
+            <p style="color: #cccccc">进水温度：</p>
             <h1>{{data.tempIn}}℃</h1>
           </div>
           <div style="display: flex">
-            <p style="color: #cccccc">出水温度:</p>
+            <p style="color: #cccccc">出水温度：</p>
             <h1>{{data.tempOut}}℃</h1>
           </div>
         </div>
@@ -74,12 +74,12 @@ export default {
   name: "xrgl",
   setup() {
     let data = reactive({
-      totwh:'',
-      totp:'',
-      tempIn:'',
-      tempOut:'',
+      totwh:'-- ',
+      totp:'-- ',
+      tempIn:'-- ',
+      tempOut:'-- ',
       //1 开 2 关
-      runStatus:'',
+      runStatus:'-- ',
       glData:[],
       glXz:[
         "00:00",