From c76a15ef052fb7ff0a53b85cf9527f4f16a17bcb Mon Sep 17 00:00:00 2001
From: zhanghan11 <zhanghan11@inspur.com>
Date: Mon, 8 Jul 2024 16:57:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=8F=96=E6=95=B0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9+=E5=89=8D=E5=8F=B0=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tzipc-ui/src/views/ipc/bigscreen/index.vue   | 36 ++++++++++----------
 tzipc-ui/src/views/ipc/rulesConfig/index.vue |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/tzipc-ui/src/views/ipc/bigscreen/index.vue b/tzipc-ui/src/views/ipc/bigscreen/index.vue
index 1d20866..91e9848 100644
--- a/tzipc-ui/src/views/ipc/bigscreen/index.vue
+++ b/tzipc-ui/src/views/ipc/bigscreen/index.vue
@@ -185,13 +185,13 @@
                 >
                   <div
                     class="extra-bar-item"
-                    :style="`height: ${parseInt(l1 )}%;background-color:#6581f0;`"
+                    :style="`height: ${parseInt(l1  || 0)}%;background-color:#6581f0;`"
                   ></div>
                   <div
                     class="extra-bar-text"
-                    :style="`height: calc(100% - ${parseInt(l1)}%);`"
+                    :style="`height: calc(100% - ${parseInt(l1 || 0)}%);`"
                   >
-                    {{ parseFloat(l1 ).toFixed(2) }}
+                    {{ parseFloat(l1 || 0).toFixed(2) }}
                   </div>
                 </div>
                 <div
@@ -206,13 +206,13 @@
                 >
                   <div
                     class="extra-bar-item"
-                    :style="`height: ${parseInt(l2)}%;background-color:#19ca88;`"
+                    :style="`height: ${parseInt(l2 || 0)}%;background-color:#19ca88;`"
                   ></div>
                   <div
                     class="extra-bar-text"
-                    :style="`height: calc(100% - ${parseInt(l2)}%);`"
+                    :style="`height: calc(100% - ${parseInt(l2 || 0)}%);`"
                   >
-                    {{ parseFloat(l2).toFixed(2) }}
+                    {{ parseFloat(l2 || 0).toFixed(2) }}
                   </div>
                 </div>
                 <div
@@ -249,13 +249,13 @@
                 >
                   <div
                     class="extra-bar-item"
-                    :style="`height: ${parseInt(r1)}%;background-color:#19ca88;`"
+                    :style="`height: ${parseInt(r1 || 0)}%;background-color:#19ca88;`"
                   ></div>
                   <div
                     class="extra-bar-text"
-                    :style="`height: calc(100% - ${parseInt(r1)}%);`"
+                    :style="`height: calc(100% - ${parseInt(r1 || 0)}%);`"
                   >
-                    {{ parseFloat(r1).toFixed(2) }}
+                    {{ parseFloat(r1 || 0).toFixed(2) }}
                   </div>
                 </div>
                 <div
@@ -270,13 +270,13 @@
                 >
                   <div
                     class="extra-bar-item"
-                    :style="`height: ${parseInt(r2)}%;background-color:#6581f0;`"
+                    :style="`height: ${parseInt(r2 || 0)}%;background-color:#6581f0;`"
                   ></div>
                   <div
                     class="extra-bar-text"
-                    :style="`height: calc(100% - ${parseInt(r2)}%);`"
+                    :style="`height: calc(100% - ${parseInt(r2 || 0)}%);`"
                   >
-                    {{ parseFloat(r2).toFixed(2) }}
+                    {{ parseFloat(r2 || 0).toFixed(2) }}
                   </div>
                 </div>
                 <div
@@ -798,9 +798,9 @@ export default {
           const { pzAlarmStr, otherAlarmStr, ssat, rot, oip, ov, owc } =
             operation;
 
-          this.initBottomR1(parseFloat(oip).toFixed(2));
-          this.initBottomR2(parseFloat(ov).toFixed(2));
-          this.initBottomR3(parseFloat(owc).toFixed(2));
+          this.initBottomR1(parseFloat(oip || 0).toFixed(2));
+          this.initBottomR2(parseFloat(ov || 0).toFixed(2));
+          this.initBottomR3(parseFloat(owc || 0).toFixed(2));
 
           this.r1 = ssat;
           this.r2 = rot;
@@ -814,9 +814,9 @@ export default {
           this.initChart3(xPlcData, pz4, pz6, pz14, pz21);
 
           const { pzAlarmStr, otherAlarmStr, owc, ov, oip, rot, ssat } = drive;
-          this.initBottomL1(parseFloat(owc).toFixed(2));
-          this.initBottomL2(parseFloat(ov).toFixed(2));
-          this.initBottomL3(parseFloat(oip).toFixed(2));
+          this.initBottomL1(parseFloat(owc || 0).toFixed(2));
+          this.initBottomL2(parseFloat(ov || 0).toFixed(2));
+          this.initBottomL3(parseFloat(oip || 0).toFixed(2));
 
           this.l1 = rot;
           this.l2 = ssat;
diff --git a/tzipc-ui/src/views/ipc/rulesConfig/index.vue b/tzipc-ui/src/views/ipc/rulesConfig/index.vue
index e27bae3..3e0c832 100644
--- a/tzipc-ui/src/views/ipc/rulesConfig/index.vue
+++ b/tzipc-ui/src/views/ipc/rulesConfig/index.vue
@@ -203,7 +203,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['ipc:config:edit']"
+            v-hasPermi="['ipc:rulesConfig:edit']"
           >修改</el-button>
         </template>
       </el-table-column>