修复实时报警页面是否解除展示错误，修复预警分析页面排序错误

src/api/apiConfig.js

@@ -1,2 +1,2 @@
-// export const baseURL = "http://192.168.1.108:6015/";
+// export const baseURL = "http://192.168.1.106:6015/";
 export const baseURL = "http://10.81.3.154:6015/";

src/components/alarmPopupa/index.vue

@@ -547,7 +547,7 @@ export default {
         lvName: this.getLvName(alarmItem),
         rank: alarmItem.rank,
         class: `animate__bounceInRight lv${alarmItem.rank}`,
-        isClose: alarmItem.isClose,
+        isClose: alarmItem.closeTime ? true : alarmItem.endts ? true : false,
         isCloseName: alarmItem.isClose ? "已解除" : "未解除",
         alarmId: alarmItem.alarmId,
         alarmType: alarmItem.alarmType,
@@ -559,7 +559,15 @@ export default {
         ts: alarmItem.ts,
         tsName: new Date(alarmItem.ts).formatDate("MM-dd hh:mm:ss"),
         fullTsName: new Date(alarmItem.ts).formatDate("yyyy-MM-dd hh:mm:ss"),
-        endts: alarmItem.endts,
+        endts: alarmItem.endts
+          ? dayjs(alarmItem.endts).format("YYYY-MM-DD HH:mm:ss")
+          : alarmItem.closeTime
+          ? dayjs(alarmItem.closeTime).format("YYYY-MM-DD HH:mm:ss")
+          : null,
+        // endtsName:
+        //   alarmItem.endts > 0
+        //     ? new Date(alarmItem.endts).formatDate("yyyy-MM-dd hh:mm:ss")
+        //     : "",
         endtsName:
           alarmItem.endts > 0
             ? new Date(alarmItem.endts).formatDate("yyyy-MM-dd hh:mm:ss")

src/pages/faultDiagnosis/warning.vue

@@ -118,7 +118,7 @@
         border
         :cell-class-name="tableCell"
         :header-row-class-name="tableRowClassName"
-        @cell-click="handle"
+        @sort-change="handleSort"
         height="100%"
       >
         <el-table-column
@@ -131,14 +131,10 @@
           :label="item.label"
           v-for="(item, index) in state.tHeard"
           :key="index"
+          :prop="item"
           header-align="center"
           show-overflow-tooltip
-          sortable
-          :sort-method="
-            (a, b) => {
-              return thSort(a, b, item);
-            }
-          "
+          sortable="custom"
         >
           <template #default="{ row }">
             <div class="bar">
@@ -146,10 +142,13 @@
                 class="bar-percent"
                 :style="{
                   width:
-                    (row[`${item.code}_count`] /
-                      (row[`${item.code}_count`] + row[`${item.code}_time`])) *
-                      100 +
-                    'px',
+                    row[`${item.code}_count`] && row[`${item.code}_time`]
+                      ? (row[`${item.code}_count`] /
+                          (row[`${item.code}_count`] +
+                            row[`${item.code}_time`])) *
+                          100 +
+                        'px'
+                      : '0px',
                 }"
               ></div>
               <span class="value">{{ row[`${item.code}_count`] }} 次数</span>
@@ -159,10 +158,13 @@
                 class="bar-percent"
                 :style="{
                   width:
-                    (row[`${item.code}_time`] /
-                      (row[`${item.code}_count`] + row[`${item.code}_time`])) *
-                      100 +
-                    'px',
+                    row[`${item.code}_count`] && row[`${item.code}_time`]
+                      ? (row[`${item.code}_time`] /
+                          (row[`${item.code}_count`] +
+                            row[`${item.code}_time`])) *
+                          100 +
+                        'px'
+                      : '0px',
                 }"
               ></div>
               <span class="value">{{ row[`${item.code}_time`] }} 分钟</span>
@@ -429,9 +431,23 @@ function getTableList() {
     });
   }
 }
-
-const thSort = function (a, b, item) {
-  return a[`${item.code}_count`] - b[`${item.code}_count`];
+//列排序
+const handleSort = function (val) {
+  let item = val.prop;
+  let list = JSON.parse(JSON.stringify(state.tableData));
+  if (val.order == "ascending") {
+    state.tableData = list.sort(compare(`${item.code}_count`));
+  } else if (val.order == "descending") {
+    state.tableData = list.sort(compare(`${item.code}_count`)).reverse();
+  }
+};
+//排序函数
+const compare = function (property) {
+  return function (a, b) {
+    var value1 = a[property];
+    var value2 = b[property];
+    return value1 - value2;
+  };
 };
 
 //     // 单元格点击事件

src/pages/safe/safecomponent.vue

@@ -72,7 +72,7 @@
                 ? 'var(--el-color-success)'
                 : 'var(--el-color-danger)'
             }`"
-            >{{ scope.row.isCloseName }}</span
+            >{{ scope.row.isClose ? "已解除" : "未解除" }}</span
           >
         </template>
       </el-table-column>
@@ -142,7 +142,7 @@
             show-overflow-tooltip
           />
           <el-table-column
-            prop="endtsName"
+            prop="endts"
             label="报警解除时间"
             align="center"
             show-overflow-tooltip
@@ -180,7 +180,7 @@
                     ? 'var(--el-color-success)'
                     : 'var(--el-color-danger)'
                 }`"
-                >{{ scope.row.isCloseName }}</span
+                >{{ scope.row.isClose ? "已解除" : "未解除" }}</span
               >
             </template>
           </el-table-column>