From 822732742d1e12d0b14f56ef393325d176162385 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Wed, 6 Mar 2024 10:14:35 +0800
Subject: [PATCH] update alert list screen

---
 src/AlertListScreen.vue                  | 58 ++++++++++++++++--------
 src/components/mainscreen/SumYield.vue   |  9 ++--
 src/components/mainscreen/TodayYield.vue |  8 ++--
 3 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/src/AlertListScreen.vue b/src/AlertListScreen.vue
index 0a2da25..da40e8f 100644
--- a/src/AlertListScreen.vue
+++ b/src/AlertListScreen.vue
@@ -21,7 +21,7 @@ const store = useWsStore();
 connect0(store);
 
 const alarmList = ref(
-  (store.data1.alarmArrList || []).map((item, index) => ({
+  (store.mainDataAlarm.alarmArrList || []).map((item, index) => ({
     id: item.id,
     eqName: item.equipmentName,
     eqIndex: index + 1,
@@ -30,16 +30,16 @@ const alarmList = ref(
     position: `${item.productLine} - ${item.segment}`,
   }))
 );
-// store.$subscribe((mutation, state) => {
-//   alarmList.value = state.data1.alarmArrList.map((item, index) => ({
-//     id: item.id,
-//     eqName: item.equipmentName,
-//     eqIndex: index + 1,
-//     alarmGrade: item.alarmLevel,
-//     alarmDetail: item.alarmDetails,
-//     position: `${item.productLine} - ${item.segment}`,
-//   }));
-// });
+store.$subscribe((mutation, state) => {
+  alarmList.value = state.mainDataAlarm.alarmArrList.map((item, index) => ({
+    id: item.id,
+    eqName: item.equipmentName,
+    eqIndex: index + 1,
+    alarmGrade: item.alarmLevel,
+    alarmDetail: item.alarmDetails,
+    position: `${item.productLine} - ${item.segment}`,
+  }));
+});
 
 // function handleIgnore() {
 //   alarmList.value.splice(0)
@@ -65,14 +65,13 @@ function handleResolutionChange(width, height) {
           <el-table
             class="dark-table"
             :data="alarmList"
-            :show-overflow-tooltip="true"
             row-class-name="dark-row"
             header-row-class-name="dark-header"
           >
             <el-table-column
               prop="eqName"
               label="设备名"
-              width="80"
+              width="90"
             ></el-table-column>
             <el-table-column
               prop="eqIndex"
@@ -81,15 +80,34 @@ function handleResolutionChange(width, height) {
             ></el-table-column>
             <el-table-column
               prop="alarmGrade"
-              label="报警等级"
-              width="100"
+              label="等级"
+              width="60"
             ></el-table-column>
+            <el-table-column prop="alarmDetail" label="报警细节">
+              <template v-slot="{ row }">
+                <el-tooltip
+                  class="box-item"
+                  effect="dark"
+                  :content="row.alarmDetail || '---'"
+                  placement="top-start"
+                >
+                  <span
+                    style="
+                      overflow: hidden;
+                      white-space: nowrap;
+                      text-overflow: ellipsis;
+                      word-break: break-all;
+                    "
+                    >{{ row.alarmDetail || "---" }}</span
+                  >
+                </el-tooltip>
+              </template>
+            </el-table-column>
             <el-table-column
-              prop="alarmDetail"
-              label="报警细节"
-              width="144"
+              prop="position"
+              width="128"
+              label="定位"
             ></el-table-column>
-            <el-table-column prop="position" label="定位"></el-table-column>
           </el-table>
         </div>
         <!-- <button @click="handleIgnore" class="alert-btn">忽略</button> -->
@@ -182,7 +200,7 @@ function handleResolutionChange(width, height) {
 
 .alert-list {
   height: calc(100% - 56px);
-  width: 520px;
+  width: 640px;
 
   position: absolute;
   top: 15px;
diff --git a/src/components/mainscreen/SumYield.vue b/src/components/mainscreen/SumYield.vue
index 0fc2311..f98cb6d 100644
--- a/src/components/mainscreen/SumYield.vue
+++ b/src/components/mainscreen/SumYield.vue
@@ -4,7 +4,6 @@ import * as echarts from "echarts";
 import Container from "../Base/Container.vue";
 import { useWsStore } from "../../store";
 
-
 const setupFn = (chart, datalist = [0.0, 0.0, 0.0, 0.0]) => {
   console.log("datalist", datalist);
   const option = {
@@ -79,14 +78,14 @@ function loadData(yieldArray) {
   if (yieldArray == undefined || yieldArray?.length == 0) return null;
   for (let i = 0; i < yieldArray.length; ++i) {
     if (yieldArray[i].name == "钢1线") {
-      result[0] = parseInt(yieldArray[i].data);
+      result[0] = parseFloat(yieldArray[i].data) || 0;
     } else if (yieldArray[i].name == "钢2线") {
-      result[1] = parseInt(yieldArray[i].data);
+      result[1] = parseFloat(yieldArray[i].data) || 0;
     } else if (yieldArray[i].name == "钢3线") {
-      result[2] = parseInt(yieldArray[i].data);
+      result[2] = parseFloat(yieldArray[i].data) || 0;
     } else {
       // 合计
-      result[3] = parseInt(yieldArray[i].data);
+      result[3] = parseFloat(yieldArray[i].data) || 0;
     }
   }
   return result;
diff --git a/src/components/mainscreen/TodayYield.vue b/src/components/mainscreen/TodayYield.vue
index c9b0d3e..73a6301 100644
--- a/src/components/mainscreen/TodayYield.vue
+++ b/src/components/mainscreen/TodayYield.vue
@@ -79,14 +79,14 @@ function loadData(yieldArray) {
   if (yieldArray == undefined || yieldArray?.length == 0) return null;
   for (let i = 0; i < yieldArray.length; ++i) {
     if (yieldArray[i].name == "钢1线") {
-      result[0] = parseInt(yieldArray[i].data);
+      result[0] = parseFloat(yieldArray[i].data) || 0;
     } else if (yieldArray[i].name == "钢2线") {
-      result[1] = parseInt(yieldArray[i].data);
+      result[1] = parseFloat(yieldArray[i].data) || 0;
     } else if (yieldArray[i].name == "钢3线") {
-      result[2] = parseInt(yieldArray[i].data);
+      result[2] = parseFloat(yieldArray[i].data) || 0;
     } else {
       // 合计
-      result[3] = parseInt(yieldArray[i].data);
+      result[3] = parseFloat(yieldArray[i].data) || 0;
     }
   }
   return result;