From 8cf3ccb145e0f31da1477a9d331b9ed155d1282c Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 8 Jun 2023 14:49:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/carouselChart.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index 1373718..edc7c0b 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -133,7 +133,13 @@
                 <span> {{ $moment(item.recvTime).format("HH:mm:ss") }}</span>
               </el-tooltip>
               )
-              <span>--{{ item.channelName }}</span>
+              <span
+                >--{{
+                  item.alias !== null && item.alias !== ""
+                    ? item.alias
+                    : item.channelName
+                }}</span
+              >
             </p>
           </div>
           <div class="smallnoPic" v-else>

From 83c32677711f48fd45e367fb167a7c0b96eb8112 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 8 Jun 2023 17:08:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=A8=E5=B1=80=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/api/index.js                 |  8 ++++++++
 src/views/system/globalTools/index.vue | 20 +++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index fc8bd13..d206baf 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -107,6 +107,14 @@ export function readAlarm(data) {
     data,
   });
 }
+//设置告警可信度
+export function updateAlarmTypeList(data) {
+  return request({
+    url: "/api/updateAlarmTypeList",
+    method: "post",
+    data,
+  });
+}
 
 //历史图片
 //获取电压-线路-杆塔等信息
diff --git a/src/views/system/globalTools/index.vue b/src/views/system/globalTools/index.vue
index 5e5b624..358a34f 100644
--- a/src/views/system/globalTools/index.vue
+++ b/src/views/system/globalTools/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="globalBox">
     <div class="setBox">
-      <el-card class="box-card globalDrawLine">
+      <!-- <el-card class="box-card globalDrawLine">
         <div slot="header" class="clearfix">
           <span>线缆开启关闭</span>
         </div>
@@ -14,7 +14,7 @@
           >
           </el-switch>
         </div>
-      </el-card>
+      </el-card> -->
       <el-card class="box-card globalprob">
         <div slot="header" class="clearfix">
           <span>设置告警可信度</span>
@@ -37,7 +37,7 @@
   </div>
 </template>
 <script>
-import { getAlarmTypeList } from "@/utils/api/index";
+import { getAlarmTypeList, updateAlarmTypeList } from "@/utils/api/index";
 
 export default {
   components: {},
@@ -59,6 +59,20 @@ export default {
     },
     setProb() {
       console.log(this.probList);
+      updateAlarmTypeList({ list: this.probList })
+        .then((res) => {
+          console.log(res);
+          if (res.code === 200) {
+            this.$message({
+              showClose: true,
+              message: "告警可信度设置成功",
+              type: "success",
+            });
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     },
   },
 };