10-09 一些小问题

src/views/modules/snoop/home.vue

@@ -366,6 +366,7 @@ export default {
       })
     },
     jobResumeHandle (info) {
+      this.measDataListLoading = true
       MessageBox.confirm(
         `确定对[任务名=${info.jobName}]进行[恢复]操作?`,
         '提示',
@@ -398,8 +399,10 @@ export default {
       })
         .catch(() => {
         })
+      this.measDataListLoading = false
     },
     jobPauseHandle (info) {
+      this.measDataListLoading = true
       MessageBox.confirm(
         `确定对[任务名=${info.jobName}]进行[暂停]操作?`,
         '提示',
@@ -432,8 +435,10 @@ export default {
       })
         .catch(() => {
         })
+      this.measDataListLoading = false
     },
     jobDeleteHandle (info) {
+      this.measDataListLoading = true
       MessageBox.confirm(
         `确定对[任务名=${info.jobName}]进行 [删除] 操作?`,
         '提示',
@@ -467,9 +472,11 @@ export default {
       })
         .catch(() => {
         })
+      this.measDataListLoading = false
     },
     // ********** 删除
     measureDeleteHandle (info) {
+      this.measDataListLoading = true
       MessageBox.confirm(
         `确定对[${info.measureName}]进行[删除]操作? 删除后，对应job也会被删除`,
         '提示',
@@ -484,14 +491,12 @@ export default {
             url: this.$http.adornUrl('/v1/measures/') + info.measureID,
             method: 'delete'
           }).then(({data}) => {
-            this.measDataListLoading = true
             if (!data.data) {
               Message({
                 message: '操作成功',
                 type: 'success',
                 duration: 1500
               })
-              this.measDataListLoading = false
               this.getMeasureList()
               this.pageIndex = 1
             } else {
@@ -501,9 +506,11 @@ export default {
         })
         .catch(() => {
         })
+      this.measDataListLoading = false
     },
     async measureAndJobDelete () {
       var waitSecond = 1
+      this.measDataListLoading = true
       if (this.classificationtag === '度量') {
         var allMeasureName = []
         for (var index in this.dataListSelections) {
@@ -518,7 +525,6 @@ export default {
             type: 'warning'
           }
         ).then(() => {
-          this.measDataListLoading = true
           let failure = []
           for (var index = 0; index < this.dataListSelections.length; index++) {
             waitSecond = waitSecond + 0.5
@@ -531,7 +537,6 @@ export default {
               }
             })
           }
-
           if (failure.length === 0) {
             MessageBox({
               message: '操作成功',
@@ -546,7 +551,6 @@ export default {
             MessageBox.error(msg)
           }
           setTimeout(() => {
-            this.measDataListLoading = false
             this.getMeasureList()
           }, waitSecond * 1000)
         }).catch(() => {
@@ -600,6 +604,7 @@ export default {
         }).catch(() => {
 
         })
+        this.measDataListLoading = false
       }
     }
   }

src/views/modules/visi/create1.vue

@@ -316,7 +316,7 @@ export default {
       showInfo: false, // 属性数据预览
       showRiZhi: false, // 控制日志的显隐
 
-      soutRiZhiSucess: '-------------------------------info--------------------------' + '\n\n',
+      soutRiZhiInfo: '    -------------------------------info--------------------------   ' + '\n\n',
       soutRizhi: '运行过程，将会显示在这儿 。再次点击日志图标，将关闭窗口', // 输出日志内容‘
       showPreview: false, // 控制预览窗口的显隐
       showTable: false,
@@ -476,10 +476,9 @@ export default {
       var onlyStatic = true
       this.yunXingUid = new Date().getTime()
       if (this.imsql.length === 0) {
-        this.soutRizhi = '请先选择抽取的字段....'
+        this.soutRizhi = '  ' + '没有选择设备数据，跳过....' + '\n\n' + '    开始 '
       } else {
-        this.soutRizhi = '检测设备状态完毕，开始抽取数据....' + '\n\n' + '....' // 输出日志内容
-
+        this.soutRizhi = '  ' + ' 检测设备状态完毕，开始抽取数据....' + '\n' + '   ....    ' + '\n' + '    开始 ' // 输出日志内容
         for (let i = 0; i < this.imsql.length; i++) {
           if (i === 0) {
             this.imsql[i].oldFileName = this.userID + '_' + this.imsql[i].subEquipmentID + '_' + this.imsql[i].id
@@ -507,14 +506,15 @@ export default {
           }).then(subresult => {
             var context = subresult.data
 
-            this.soutRizhi = context.info + '\n\n' + this.soutRizhi
+            this.soutRizhi = '  ' + context.info + '\n\n' + this.soutRizhi
           })
           onlyStatic = false
         }
+        this.soutRizhi = '  ' + '设备数据抽取成功' + '\n\n' + this.soutRizhi
       }
 
       if (this.st_imsql.length > 0) {
-        this.soutRizhi = '\n' + '开始组合本地数据' + '\n\n' + this.soutRizhi
+        this.soutRizhi = '  开始组合本地数据' + '\n\n' + this.soutRizhi
         for (let i = 0; i < this.st_imsql.length; i++) {
           if (i === 0) {
             this.st_imsql[i].oldFileName = this.userID + '_' + this.yunXingUid
@@ -541,13 +541,13 @@ export default {
             method: 'post',
             data: this.$http.adornData(massage, false)
           }).then(subresult => {
-            this.soutRizhi = subresult.data.info + '\n\n' + this.soutRizhi
+            this.soutRizhi = '  ' + subresult.data.info + '\n\n' + this.soutRizhi
           })
         }
-        this.soutRizhi = this.soutRiZhiSucess + '静态数据测试抽取完成，点击确定制作数据集' + '\n\n' + this.soutRizhi
-      } else {
-        this.soutRizhi = this.soutRiZhiSucess + '结束'
+        this.soutRizhi = '  本地数据抽取完成，点击确定制作数据集' + '\n\n' + this.soutRizhi
       }
+
+      this.soutRizhi = this.soutRiZhiInfo + this.soutRizhi
     },
     yuLanMouseOver () {
       document.getElementById('yuLan').className = 'iconfont icon-preview1'

src/views/modules/visi/create2.vue

@@ -415,9 +415,9 @@ export default {
     async yunXingClick () {
       this.showRiZhi = true
       if (this.imsql.length === 0) {
-        this.soutRizhi = '请先选择抽取的字段....'
+        this.soutRizhi = '  ' + '请先选择抽取的字段....'
       } else {
-        this.soutRizhi = '\n 检测设备状态完毕，开始抽取数据....'  // 输出日志内容
+        this.soutRizhi = '  ' + '检测设备状态完毕，开始抽取数据....'  // 输出日志内容
         this.yunXingUid = new Date().getTime()
         for (let i = 0; i < this.imsql.length; i++) {
           if (i === 0) {
@@ -443,10 +443,10 @@ export default {
           }).then(subresult => {
             var context = subresult.data
 
-            this.soutRizhi = context.info + '\n\n' + this.soutRizhi
+            this.soutRizhi = '  ' + context.info + '\n\n' + this.soutRizhi
           })
         }
-        this.soutRizhi = this.soutRiZhiSucess + '结束！！！' + '\n\n' + this.soutRizhi
+        this.soutRizhi = this.soutRiZhiSucess + '  ' + '抽取结束，点击制作数据集' + '\n\n' + this.soutRizhi
       }
     },
     yuLanMouseOver () {
@@ -796,7 +796,7 @@ export default {
 
               if (resContent && resContent.code === 0) {
                 Message({
-                  message: '数据集' + this.dataInfo.datasetName + '创建成功',
+                  message: '数据集' + this.dataInfo.datasetName + '创建成功，点击确定制作数据集',
                   type: 'success'
                 })
                 this.$router.replace({path: '/visi-dataset', query: {'status': '2'}})

src/views/modules/visi/quartz/quickCron/quickCron.vue

@@ -17,7 +17,6 @@
       size="mini"
       border
       style="width: 100%;margin-top: 50px;"
-
     >
       <el-table-column
         prop="sVal"