Merge branch 'master' of http://git.jiayuepowertech.com:9022/liutong/xvji

xvji-ui/src/views/tasks/predict/index.vue

@@ -448,7 +448,7 @@ export default {
       return formatDateTime(new Date(row.pcreateTime))
     },
     formatPtaskStatus(row){
-      return row.ptaskStatus === 0?'失败':row.ptaskStatus === 1?'成功':'运行'
+      return row.ptaskStatus === 0?'失败':row.ptaskStatus === 1?'成功':'未运行'
     }
   }
 }

xvji-ui/src/views/tasks/training/index.vue

@@ -616,7 +616,7 @@ export default {
     // 运行信息
     viewInfo(row) {
       if(row.trunInfo !==null){
-        this.info = row.tRunInfo
+        this.info = row.trunInfo
         this.dialogInfoVisible = true
       }else{
         this.info = null
@@ -630,7 +630,7 @@ export default {
       return formatDateTime(new Date(row.tcreateTime))
     },
     formatPtaskStatus(row){
-      return row.ptaskStatus === 0?'失败':row.ptaskStatus === 1?'成功':'运行'
+      return row.ttaskStatus === 0?'失败':row.ttaskStatus === 1?'成功':'未运行'
     }
   }
 }