From b2b742687111443dcef2da42a849828fbe5b7f4b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Mon, 26 Aug 2024 17:59:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/src/components/StreamProxyEdit.vue    | 31 ++++++--
 web_src/src/components/StreamProxyList.vue    | 26 +++++--
 web_src/src/components/StreamPushEdit.vue     | 31 ++++++--
 .../components/common/CommonChannelEdit.vue   | 35 ++++++++--
 web_src/src/components/common/GroupTree.vue   | 30 ++++++--
 web_src/src/components/common/RegionTree.vue  | 30 ++++++--
 web_src/src/components/dialog/channelCode.vue | 46 +++++++++---
 .../src/components/dialog/devicePlayer.vue    |  7 +-
 web_src/src/components/dialog/groupEdit.vue   |  5 +-
 web_src/src/components/dialog/queryTrace.vue  |  5 +-
 web_src/src/components/dialog/regionCode.vue  | 35 ++++++++--
 .../src/components/dialog/shareChannelAdd.vue | 70 +++++++++++++++----
 web_src/src/components/group.vue              | 45 +++++++++---
 web_src/src/components/live.vue               |  5 +-
 web_src/src/components/map.vue                | 30 ++++++--
 web_src/src/components/region.vue             | 45 +++++++++---
 16 files changed, 378 insertions(+), 98 deletions(-)

diff --git a/web_src/src/components/StreamProxyEdit.vue b/web_src/src/components/StreamProxyEdit.vue
index a54bc28f..12413bfc 100644
--- a/web_src/src/components/StreamProxyEdit.vue
+++ b/web_src/src/components/StreamProxyEdit.vue
@@ -163,15 +163,23 @@ export default {
         }).then((res)=> {
           this.saveLoading = false;
           if (typeof (res.data.code) != "undefined" && res.data.code === 0) {
-            this.$message.success("保存成功");
-            console.log(res.data.data)
+            this.$message.success({
+              showClose: true,
+              message: "保存成功"
+            });
             this.streamProxy = res.data.data
           }else {
-            this.$message.error(res.data.msg);
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
           }
           this.saveLoading = false;
         }).catch((error) =>{
-          this.$message.error(error);
+          this.$message.error({
+            showClose: true,
+            message: error
+          });
           this.saveLoading = false;
         }).finally(()=>{
           console.log("finally==finally")
@@ -185,13 +193,22 @@ export default {
         }).then((res)=> {
           this.saveLoading = false;
           if (typeof (res.data.code) != "undefined" && res.data.code === 0) {
-            this.$message.success("保存成功");
+            this.$message.success({
+            showClose: true,
+            message: "保存成功"
+          });
             this.streamProxy = res.data.data
           }else {
-            this.$message.error(res.data.msg);
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
           }
         }).catch((error) =>{
-          this.$message.error(res.data.error);
+          this.$message.error({
+            showClose: true,
+            message: error
+          })
           this.saveLoading = false;
         }).finally(()=>{
           this.saveLoading = false;
diff --git a/web_src/src/components/StreamProxyList.vue b/web_src/src/components/StreamProxyList.vue
index dbdd8a83..27cad5c0 100755
--- a/web_src/src/components/StreamProxyList.vue
+++ b/web_src/src/components/StreamProxyList.vue
@@ -225,14 +225,23 @@
                   }
               })
             }else {
-              this.$message.success("未找到可用设备");
+              this.$message.success({
+                showClose: true,
+                message: "未找到可用设备"
+              });
             }
         }else {
-            this.$message.error(res.data.msg);
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
           }
 
         }).catch((error)=> {
-          this.$message.error(error.response.data.msg);
+          this.$message.error({
+            showClose: true,
+            message: error
+          })
         });
 
 			},
@@ -302,21 +311,24 @@
         this.$router.push(`/cloudRecordDetail/${row.app}/${row.stream}`)
       },
 			deleteStreamProxy: function(row){
-				let that = this;
         this.$confirm('确定删除此代理吗？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          that.$axios({
+          this.$axios({
             method:"delete",
             url:"/api/proxy/delete",
             params:{
               id: row.id,
             }
           }).then((res)=>{
-            that.initData()
-          }).catch(function (error) {
+            this.$message.success({
+              showClose: true,
+              message: "删除成功"
+            })
+            this.initData()
+          }).catch((error) =>{
             console.log(error);
           });
         }).catch(() => {
diff --git a/web_src/src/components/StreamPushEdit.vue b/web_src/src/components/StreamPushEdit.vue
index d61a238f..1a4a3595 100644
--- a/web_src/src/components/StreamPushEdit.vue
+++ b/web_src/src/components/StreamPushEdit.vue
@@ -73,12 +73,21 @@ export default {
           data: this.streamPush
         }).then((res) => {
           if (res.data.code === 0) {
-            this.$message.success("保存成功");
+            this.$message.success({
+              showClose: true,
+              message: '保存成功',
+            });
           }else {
-            this.$message.error(res.data.msg)
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
           }
         }).catch((error) => {
-          this.$message.error(error)
+          this.$message.error({
+            showClose: true,
+            message: error
+          })
         }).finally(()=>[
           this.locading = false
         ])
@@ -89,13 +98,23 @@ export default {
           data: this.streamPush
         }).then((res) => {
           if (res.data.code === 0) {
-            this.$message.success("保存成功");
+            this.$message.success({
+              showClose: true,
+              message: '保存成功',
+            });
+
             this.streamPush = res.data.data
           }else {
-            this.$message.error(res.data.msg)
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
           }
         }).catch((error) => {
-          this.$message.error(error)
+          this.$message.error({
+            showClose: true,
+            message: error
+          })
         }).finally(()=>[
           this.locading = false
         ])
diff --git a/web_src/src/components/common/CommonChannelEdit.vue b/web_src/src/components/common/CommonChannelEdit.vue
index 6a80d4d6..38386dd0 100644
--- a/web_src/src/components/common/CommonChannelEdit.vue
+++ b/web_src/src/components/common/CommonChannelEdit.vue
@@ -245,15 +245,24 @@ export default {
           data: this.form
         }).then((res) => {
           if (res.data.code === 0) {
-            this.$message.success("保存成功");
+            this.$message.success({
+            showClose: true,
+            message: "保存成功"
+          });
             if (this.saveSuccess) {
               this.saveSuccess()
             }
           }else {
-            this.$message.error(res.data.msg);
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
           }
         }).catch((error) => {
-          this.$message.error(error);
+          this.$message.error({
+            showClose: true,
+            message: error
+          });
         }).finally(()=>[
           this.locading = false
         ])
@@ -264,16 +273,25 @@ export default {
           data: this.form
         }).then((res) => {
           if (res.data.code === 0) {
-            this.$message.success("保存成功");
+            this.$message.success({
+              showClose: true,
+              message: "保存成功"
+            });
             this.form = res.data.data
             if (this.saveSuccess) {
               this.saveSuccess()
             }
           }else {
-            this.$message.error(res.data.msg);
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
           }
         }).catch((error) => {
-          this.$message.error(error);
+          this.$message.error({
+            showClose: true,
+            message: error
+          });
         }).finally(()=>[
           this.locading = false
         ])
@@ -296,7 +314,10 @@ export default {
           }
         }).then((res) => {
           if (res.data.code === 0) {
-            this.$message.success("重置成功 已保存");
+            this.$message.success({
+              showClose: true,
+              message: "重置成功 已保存"
+            });
             this.getCommonChannel()
           }
         }).catch((error) => {
diff --git a/web_src/src/components/common/GroupTree.vue b/web_src/src/components/common/GroupTree.vue
index 102f6f45..595b7c9c 100755
--- a/web_src/src/components/common/GroupTree.vue
+++ b/web_src/src/components/common/GroupTree.vue
@@ -260,18 +260,27 @@ export default {
           }
         }).then((res)=> {
           if (res.data.code === 0) {
-            this.$message.success("保存成功")
+            this.$message.success({
+            showClose: true,
+            message: "保存成功"
+          })
             if (this.onChannelChange) {
               this.onChannelChange()
             }
             node.loaded = false
             node.expand();
           }else {
-            this.$message.error(res.data.msg)
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
           }
           this.loading = false
         }).catch((error)=> {
-          this.$message.error(error)
+          this.$message.error({
+            showClose: true,
+            message: error
+          })
           this.loading = false
         });
       })
@@ -290,18 +299,27 @@ export default {
           }
         }).then((res)=> {
           if (res.data.code === 0) {
-            this.$message.success("保存成功")
+            this.$message.success({
+            showClose: true,
+            message: "保存成功"
+          })
             if (this.onChannelChange) {
               this.onChannelChange()
             }
             node.loaded = false
             node.expand();
           }else {
-            this.$message.error(res.data.msg)
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
           }
           this.loading = false
         }).catch((error)=> {
-          this.$message.error(error)
+          this.$message.error({
+            showClose: true,
+            message: error
+          })
           this.loading = false
         });
       })
diff --git a/web_src/src/components/common/RegionTree.vue b/web_src/src/components/common/RegionTree.vue
index 605ec215..46125a1f 100755
--- a/web_src/src/components/common/RegionTree.vue
+++ b/web_src/src/components/common/RegionTree.vue
@@ -258,18 +258,27 @@ export default {
           }
         }).then((res)=> {
           if (res.data.code === 0) {
-            this.$message.success("保存成功")
+            this.$message.success({
+            showClose: true,
+            message: "保存成功"
+          })
             if (this.onChannelChange) {
               this.onChannelChange()
             }
             node.loaded = false
             node.expand();
           }else {
-            this.$message.error(res.data.msg)
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
           }
           this.loading = false
         }).catch((error)=> {
-          this.$message.error(error)
+          this.$message.error({
+            showClose: true,
+            message: error
+          })
           this.loading = false
         });
       })
@@ -288,18 +297,27 @@ export default {
           }
         }).then((res)=> {
           if (res.data.code === 0) {
-            this.$message.success("保存成功")
+            this.$message.success({
+              showClose: true,
+              message: "保存成功"
+            })
             if (this.onChannelChange) {
               this.onChannelChange()
             }
             node.loaded = false
             node.expand();
           }else {
-            this.$message.error(res.data.msg)
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
           }
           this.loading = false
         }).catch((error)=> {
-          this.$message.error(error)
+          this.$message.error({
+            showClose: true,
+            message: error
+          })
           this.loading = false
         });
       })
diff --git a/web_src/src/components/dialog/channelCode.vue b/web_src/src/components/dialog/channelCode.vue
index 7d3805eb..d6a3d2ee 100644
--- a/web_src/src/components/dialog/channelCode.vue
+++ b/web_src/src/components/dialog/channelCode.vue
@@ -229,7 +229,11 @@ export default {
           parent = this.allVal[0].val + this.allVal[1].val
         }
         if (this.activeKey !== '0' && parent === '') {
-          this.$message.error('请先选择上级行政区划');
+          this.$message.error({
+            showClose: true,
+            message: '请先选择上级行政区划'
+          })
+
         }
         this.queryChildList(parent);
       } else if (this.activeKey === '4') {
@@ -253,10 +257,16 @@ export default {
         if (res.data.code === 0) {
           this.regionList = res.data.data
         } else {
-          this.$message.error(res.data.msg);
+          this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
         }
       }).catch((error) => {
-        this.$message.error(error);
+        this.$message.error({
+            showClose: true,
+            message: error
+          });
       });
     },
     queryIndustryCodeList: function(){
@@ -268,10 +278,16 @@ export default {
         if (res.data.code === 0) {
           this.industryCodeTypeList = res.data.data
         } else {
-          this.$message.error(res.data.msg);
+          this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
         }
       }).catch((error) => {
-        this.$message.error(error);
+        this.$message.error({
+            showClose: true,
+            message: error
+          });
       });
     },
     queryDeviceTypeList: function(){
@@ -283,10 +299,16 @@ export default {
         if (res.data.code === 0) {
           this.deviceTypeList = res.data.data
         } else {
-          this.$message.error(res.data.msg);
+          this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
         }
       }).catch((error) => {
-        this.$message.error(error);
+        this.$message.error({
+            showClose: true,
+            message: error
+          });
       });
     },
     queryNetworkIdentificationTypeList: function(){
@@ -298,10 +320,16 @@ export default {
         if (res.data.code === 0) {
           this.networkIdentificationTypeList = res.data.data
         } else {
-          this.$message.error(res.data.msg);
+          this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
         }
       }).catch((error) => {
-        this.$message.error(error);
+        this.$message.error({
+            showClose: true,
+            message: error
+          });
       });
     },
     closeModel: function (){
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index e0a1d01d..0eaec92f 100755
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -7,7 +7,7 @@
                  v-if="Object.keys(this.player).length > 1">
           <el-tab-pane label="Jessibuca" name="jessibuca">
             <jessibucaPlayer v-if="activePlayer === 'jessibuca'" ref="jessibuca" :visible.sync="showVideoDialog"
-                             :videoUrl="videoUrl" :error="videoError" :message="videoError" 
+                             :videoUrl="videoUrl" :error="videoError" :message="videoError"
                              :hasAudio="hasAudio" fluent autoplay live></jessibucaPlayer>
           </el-tab-pane>
           <el-tab-pane label="WebRTC" name="webRTC">
@@ -636,7 +636,10 @@ export default {
     copyUrl: function (dropdownItem) {
       console.log(dropdownItem)
       this.$copyText(dropdownItem).then((e) => {
-        this.$message.success("成功拷贝到粘贴板");
+        this.$message.success({
+          showClose: true,
+          message: "成功拷贝到粘贴板"
+        })
       }, (e) => {
 
       })
diff --git a/web_src/src/components/dialog/groupEdit.vue b/web_src/src/components/dialog/groupEdit.vue
index b202a082..b0954f17 100755
--- a/web_src/src/components/dialog/groupEdit.vue
+++ b/web_src/src/components/dialog/groupEdit.vue
@@ -78,7 +78,10 @@ export default {
         data: this.group
       }).then((res)=> {
         if (res.data.code === 0) {
-          this.$message.success("保存成功")
+          this.$message.success({
+            showClose: true,
+            message: "保存成功"
+          })
           if (this.submitCallback)this.submitCallback(this.group)
         }else {
           this.$message({
diff --git a/web_src/src/components/dialog/queryTrace.vue b/web_src/src/components/dialog/queryTrace.vue
index 5063ad4e..253f076e 100755
--- a/web_src/src/components/dialog/queryTrace.vue
+++ b/web_src/src/components/dialog/queryTrace.vue
@@ -84,7 +84,10 @@ export default {
             this.callback(res.data.data)
             this.close()
           }else {
-            this.$message.error(res.data.msg);
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg,
+            });
           }
 
         }
diff --git a/web_src/src/components/dialog/regionCode.vue b/web_src/src/components/dialog/regionCode.vue
index c8d900ca..780a824f 100644
--- a/web_src/src/components/dialog/regionCode.vue
+++ b/web_src/src/components/dialog/regionCode.vue
@@ -218,7 +218,10 @@ export default {
           }
         }
         if (this.activeKey !== '0' && parent === '') {
-          this.$message.error('请先选择上级行政区划');
+          this.$message.error({
+            showClose: true,
+            message: "请先选择上级行政区划"
+          })
         }
         if (parent !== "") {
           this.queryChildList(parent);
@@ -241,10 +244,16 @@ export default {
         if (res.data.code === 0) {
           this.regionList = res.data.data
         } else {
-          this.$message.error(res.data.msg);
+          this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
         }
       }).catch((error) => {
-        this.$message.error(error);
+        this.$message.error({
+            showClose: true,
+            message: error
+          });
       });
     },
     closeModel: function (){
@@ -286,10 +295,16 @@ export default {
             }
             this.showVideoDialog = false
           } else {
-            this.$message.error(res.data.msg);
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
           }
         }).catch((error) => {
-          this.$message.error(error);
+          this.$message.error({
+            showClose: true,
+            message: error
+          });
         });
       }else {
         this.$axios({
@@ -303,10 +318,16 @@ export default {
             }
             this.showVideoDialog = false
           } else {
-            this.$message.error(res.data.msg);
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
           }
         }).catch((error) => {
-          this.$message.error(error);
+          this.$message.error({
+            showClose: true,
+            message: error
+          });
         });
       }
 
diff --git a/web_src/src/components/dialog/shareChannelAdd.vue b/web_src/src/components/dialog/shareChannelAdd.vue
index b470b36c..a9fb3d06 100755
--- a/web_src/src/components/dialog/shareChannelAdd.vue
+++ b/web_src/src/components/dialog/shareChannelAdd.vue
@@ -178,7 +178,10 @@ export default {
         channels.push(this.multipleSelection[i].gbId)
       }
       if (channels.length === 0) {
-        this.$message.info("请选择右侧通道")
+        this.$message.info({
+          showClose: true,
+          message: "请选择右侧通道"
+        })
         return;
       }
       this.loading = true
@@ -192,14 +195,23 @@ export default {
         }
       }).then((res)=> {
         if (res.data.code === 0) {
-          this.$message.success("保存成功")
+          this.$message.success({
+            showClose: true,
+            message: "保存成功"
+          })
           this.getChannelList()
         }else {
-          this.$message.error(res.data.msg)
+          this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
         }
         this.loading = false
       }).catch((error)=> {
-        this.$message.error(error)
+        this.$message.error({
+            showClose: true,
+            message: error
+          })
         this.loading = false
       });
     },
@@ -221,14 +233,23 @@ export default {
           }
         }).then((res)=> {
           if (res.data.code === 0) {
-            this.$message.success("保存成功")
+            this.$message.success({
+            showClose: true,
+            message: "保存成功"
+          })
             this.getChannelList()
           }else {
-            this.$message.error(res.data.msg)
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
           }
           this.loading = false
         }).catch((error)=> {
-          this.$message.error(error)
+          this.$message.error({
+            showClose: true,
+            message: error
+          })
           this.loading = false
         });
       }).catch(() => {
@@ -245,7 +266,10 @@ export default {
         channels.push(this.multipleSelection[i].gbId)
       }
       if (channels.length === 0) {
-        this.$message.info("请选择右侧通道")
+        this.$message.info({
+          showClose: true,
+          message: "请选择右侧通道"
+        })
         return;
       }
       this.loading = true
@@ -259,14 +283,23 @@ export default {
         }
       }).then((res)=> {
         if (res.data.code === 0) {
-          this.$message.success("保存成功")
+          this.$message.success({
+            showClose: true,
+            message: "保存成功"
+          })
           this.getChannelList()
         }else {
-          this.$message.error(res.data.msg)
+          this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
         }
         this.loading = false
       }).catch((error)=> {
-        this.$message.error(error)
+        this.$message.error({
+            showClose: true,
+            message: error
+          })
         this.loading = false
       });
     },
@@ -288,14 +321,23 @@ export default {
           }
         }).then((res)=> {
           if (res.data.code === 0) {
-            this.$message.success("保存成功")
+            this.$message.success({
+            showClose: true,
+            message: "保存成功"
+          })
             this.getChannelList()
           }else {
-            this.$message.error(res.data.msg)
+            this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
           }
           this.loading = false
         }).catch((error)=> {
-          this.$message.error(error)
+          this.$message.error({
+            showClose: true,
+            message: error
+          })
           this.loading = false
         });
       }).catch(() => {
diff --git a/web_src/src/components/group.vue b/web_src/src/components/group.vue
index abd0f34e..37271132 100755
--- a/web_src/src/components/group.vue
+++ b/web_src/src/components/group.vue
@@ -181,7 +181,10 @@ export default {
     },
     add: function (row) {
       if (!this.groupId) {
-        this.$message.info("请选择左侧行政区划节点")
+        this.$message.info({
+          showClose: true,
+          message: "请选择左侧行政区划节点"
+        })
         return;
       }
       let channels = []
@@ -189,7 +192,10 @@ export default {
         channels.push(this.multipleSelection[i].gbId)
       }
       if (channels.length === 0) {
-        this.$message.info("请选择右侧通道")
+        this.$message.info({
+          showClose: true,
+          message: "请选择右侧通道"
+        })
         return;
       }
       this.loading = true
@@ -204,16 +210,25 @@ export default {
         }
       }).then((res)=> {
         if (res.data.code === 0) {
-          this.$message.success("保存成功")
+          this.$message.success({
+            showClose: true,
+            message: "保存成功"
+          })
           this.getChannelList()
           // 刷新树节点
           this.$refs.groupTree.refresh(this.groupId)
         }else {
-          this.$message.error(res.data.msg)
+          this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
         }
         this.loading = false
       }).catch((error)=> {
-        this.$message.error(error)
+        this.$message.error({
+            showClose: true,
+            message: error
+          })
         this.loading = false
       });
     },
@@ -224,7 +239,10 @@ export default {
         channels.push(this.multipleSelection[i].gbId)
       }
       if (channels.length === 0) {
-        this.$message.info("请选择右侧通道")
+        this.$message.info({
+          showClose: true,
+          message: "请选择右侧通道"
+        })
         return;
       }
       this.loading = true
@@ -237,16 +255,25 @@ export default {
         }
       }).then((res)=> {
         if (res.data.code === 0) {
-          this.$message.success("保存成功")
+          this.$message.success({
+            showClose: true,
+            message: "保存成功"
+          })
           this.getChannelList()
           // 刷新树节点
           this.$refs.groupTree.refresh(this.groupId)
         }else {
-          this.$message.error(res.data.msg)
+          this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
         }
         this.loading = false
       }).catch((error)=> {
-        this.$message.error(error)
+        this.$message.error({
+            showClose: true,
+            message: error
+          })
         this.loading = false
       });
     },
diff --git a/web_src/src/components/live.vue b/web_src/src/components/live.vue
index 4a7af491..e264b1aa 100755
--- a/web_src/src/components/live.vue
+++ b/web_src/src/components/live.vue
@@ -110,7 +110,10 @@ export default {
     clickEvent: function (device, data, isCatalog) {
       if (data.channelId && !isCatalog) {
         if (device.online === 0) {
-          this.$message.error('设备离线!不允许点播');
+          this.$message.error({
+            showClose: true,
+            message: "设备离线!不允许点播"
+          })
         }else {
           this.sendDevicePush(data)
         }
diff --git a/web_src/src/components/map.vue b/web_src/src/components/map.vue
index 64ae0e2d..e46ebcbe 100755
--- a/web_src/src/components/map.vue
+++ b/web_src/src/components/map.vue
@@ -103,7 +103,10 @@ export default {
       if (data.channelId && !isCatalog) {
         // 点击通道
         if (data[this.longitudeStr] * data[this.latitudeStr] === 0) {
-          this.$message.error('未获取到位置信息');
+          this.$message.error({
+            showClose: true,
+            message: "未获取到位置信息"
+          })
         } else {
           if (this.layer != null) {
             this.$refs.map.removeLayer(this.layer);
@@ -235,10 +238,16 @@ export default {
         } else if (params.length > 1) {
           this.$refs.map.fit(this.layer)
         } else {
-          this.$message.error('未获取到位置信息');
+          this.$message.error({
+            showClose: true,
+            message: "未获取到位置信息"
+          })
         }
       } else {
-        this.$message.error('未获取到位置信息');
+        this.$message.error({
+          showClose: true,
+          message: "未获取到位置信息"
+        })
       }
     },
     getImageByChannel: function (channel) {
@@ -314,7 +323,10 @@ export default {
       });
     },
     edit: function (data) {
-      this.$message.warning('暂不支持');
+      this.$message.warning({
+        showClose: true,
+        message: "暂不支持"
+      })
     },
     getTrace: function (data) {
       // this.$message.warning('暂不支持');
@@ -323,7 +335,10 @@ export default {
         console.log("getTrace")
         console.log(channelPositions)
         if (channelPositions.length === 0) {
-          this.$message.success('未查询到轨迹信息');
+          this.$message.info({
+            showClose: true,
+            message: "未查询到轨迹信息"
+          })
         } else {
           let positions = [];
           for (let i = 0; i < channelPositions.length; i++) {
@@ -333,7 +348,10 @@ export default {
 
           }
           if (positions.length === 0) {
-            this.$message.success('未查询到轨迹信息');
+            this.$message.info({
+              showClose: true,
+              message: "未查询到轨迹信息"
+            })
             return;
           }
           this.lineLayer = this.$refs.map.addLineLayer(positions)
diff --git a/web_src/src/components/region.vue b/web_src/src/components/region.vue
index 8029e2a2..d1838829 100755
--- a/web_src/src/components/region.vue
+++ b/web_src/src/components/region.vue
@@ -181,7 +181,10 @@ export default {
     },
     add: function (row) {
       if (!this.regionId) {
-        this.$message.info("请选择左侧行政区划节点")
+        this.$message.info({
+          showClose: true,
+          message: "请选择左侧行政区划节点"
+        })
         return;
       }
       let channels = []
@@ -189,7 +192,10 @@ export default {
         channels.push(this.multipleSelection[i].gbId)
       }
       if (channels.length === 0) {
-        this.$message.info("请选择右侧通道")
+        this.$message.info({
+          showClose: true,
+          message: "请选择右侧通道"
+        })
         return;
       }
       this.loading = true
@@ -203,16 +209,25 @@ export default {
         }
       }).then((res)=> {
         if (res.data.code === 0) {
-          this.$message.success("保存成功")
+          this.$message.success({
+            showClose: true,
+            message: "保存成功"
+          })
           this.getChannelList()
           // 刷新树节点
           this.$refs.regionTree.refresh(this.regionId)
         }else {
-          this.$message.error(res.data.msg)
+          this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
         }
         this.loading = false
       }).catch((error)=> {
-        this.$message.error(error)
+        this.$message.error({
+            showClose: true,
+            message: error
+          })
         this.loading = false
       });
     },
@@ -222,7 +237,10 @@ export default {
         channels.push(this.multipleSelection[i].gbId)
       }
       if (channels.length === 0) {
-        this.$message.info("请选择右侧通道")
+        this.$message.info({
+          showClose: true,
+          message: "请选择右侧通道"
+        })
         return;
       }
       this.loading = true
@@ -235,16 +253,25 @@ export default {
         }
       }).then((res)=> {
         if (res.data.code === 0) {
-          this.$message.success("保存成功")
+          this.$message.success({
+            showClose: true,
+            message: "保存成功"
+          })
           this.getChannelList()
           // 刷新树节点
           this.$refs.regionTree.refresh(this.regionId)
         }else {
-          this.$message.error(res.data.msg)
+          this.$message.error({
+              showClose: true,
+              message: res.data.msg
+            })
         }
         this.loading = false
       }).catch((error)=> {
-        this.$message.error(error)
+        this.$message.error({
+            showClose: true,
+            message: error
+          })
         this.loading = false
       });
     },