Merge branch 'master' into dev/录制计划

web_src/src/components/DeviceList.vue

@@ -246,6 +246,15 @@ export default {
             type: 'error'
           });
         } else {
+          if (res.data.data && res.data.data.errorMsg) {
+            that.$message({
+              showClose: true,
+              message: res.data.data.errorMsg,
+              type: 'error'
+            });
+            return;
+          }
+
           this.$refs.syncChannelProgress.openDialog(itemData.deviceId, ()=>{
             console.log(32322)
             this.initData()

web_src/src/components/dialog/SyncChannelProgress.vue

@@ -66,7 +66,7 @@ export default {
 
           if (res.data.data != null) {
             if (res.data.data.syncIng) {
-              if (res.data.data.total == 0) {
+              if (res.data.data.total === 0) {
                 this.msg = `等待同步中`;
                 this.timmer = setTimeout(this.getProgress, 300)
               }else {
@@ -89,6 +89,9 @@ export default {
                 }, 3000)
               }
             }
+          }else {
+            this.msg = `同步尚未开始`;
+            this.timmer = setTimeout(this.getProgress, 300)
           }
         }else {
           if (this.syncFlag) {