临时提交

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 (){

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) => {
 
       })

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({

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,
+            });
           }
 
         }

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
+          });
         });
       }
 

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(() => {