From b94da8f63e4e614d62d88fedad79db4b3952db20 Mon Sep 17 00:00:00 2001
From: sd <shidong@jhsoft.cc>
Date: 星期四, 31 七月 2025 10:03:31 +0800
Subject: [PATCH] 检测内容、预警规则整合进系统设置里边； 预警规则增加图标； 摄像机配置样式调整、预警规则更名为任务描述并调整数据结构； 实时监控右侧样式调整，预警数据按所有任务进行筛选。

---
 src/pages/analysisPower/index/App.vue |   43 ++++++++++++++++++++++++++++++++++---------
 1 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/pages/analysisPower/index/App.vue b/src/pages/analysisPower/index/App.vue
index 3eca26a..aa2642f 100644
--- a/src/pages/analysisPower/index/App.vue
+++ b/src/pages/analysisPower/index/App.vue
@@ -116,16 +116,36 @@
             </template>
           </el-table-column>
           <el-table-column
-            label="鐫ｆ煡浠诲姟"
+            label="AI浠诲姟"
             align="center"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
               <span v-if="scope.row.run_type === -1">-</span>
-              <span v-else-if="scope.row.TaskNames != null">{{(scope.row.TaskNames || []).map(r => r.taskName).join('/') || ''}}</span>
+              <span v-else-if="scope.row.allTasks != null">{{
+                scope.row.allTasks | allTaskList
+              }}</span>
               <span v-else>-</span>
             </template>
           </el-table-column>
+          
+          <!-- <el-table-column
+            label="浠诲姟鎻忚堪"
+            align="center"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+            </template>
+          </el-table-column>
+          
+          <el-table-column
+            label="浜嬩欢绛夌骇"
+            align="center"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+            </template>
+          </el-table-column> -->
           <el-table-column
             label="杩愯璁惧"
             align="center"
@@ -134,7 +154,7 @@
           >
             <template slot-scope="scope">
               <span v-if="scope.row.run_type === -1">-</span>
-              <span v-else>{{ scope.row.run_server_name }}</span>
+              <span v-else>{{ scope.row.runServerName }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -158,9 +178,7 @@
           >
             <template slot-scope="scope">
               <span v-if="scope.row.run_type === -1">-</span>
-              <span v-else-if="scope.row.run_type === 1">{{ "杞" }}</span>
-              <span v-else>{{ "瀹炴椂" }}</span>
-              <!-- <toggle-button
+              <toggle-button
                 v-else
                 :value="scope.row.run_type === 1"
                 :width="60"
@@ -172,7 +190,7 @@
                 }"
                 :sync="true"
                 @change="pollSwitch(scope.row)"
-              /> -->
+              />
             </template>
           </el-table-column>
         </el-table>
@@ -276,7 +294,7 @@
     cameraType(type) {
       return type === -1 ? "鐩戞帶鎽勫儚鏈�" : "AI鎽勫儚鏈�";
     },
-    taskList(tasks) {
+    taskList(tasks) {//鎵ц绠楁硶
       return tasks
         .filter((task) => {
           return task.hasRule;
@@ -285,6 +303,13 @@
           return task.taskname;
         })
         .join(",");
+    },
+    allTaskList(allTasks) {
+      return allTasks
+        .map((allTasks) => {
+          return allTasks.taskName;
+        })
+        .join(" / ");
     },
     switchText(type) {
       return type ? "宸插紑鍚�" : "鏈紑鍚�";
@@ -435,7 +460,7 @@
         _this.statistic();
       }, 10 * 1000);
     },
-    pollSwitch(row) {
+    pollSwitch(row) {//杞鍔熻兘 鏆傛湭瀹炵幇
       // changeRunType({ camera_ids: [row.id], run_type: row.run_type ^ 1 }).then(
       //   (rsp) => {
       //     if (rsp && rsp.success) {

--
Gitblit v1.8.0