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

xvji-ui/src/utils/dateUtil.js

@@ -0,0 +1,21 @@
+
+/**
+ * 时间格式化函数
+ * @param {Date|string|number} date - 可接受Date对象/时间戳/ISO字符串
+ * @returns {string} 格式为"yyyy-mm-dd hh:mm:ss"的时间字符串
+ */
+export function formatDateTime(date) {
+  const d = date instanceof Date ? date : new Date(date);
+
+  const pad = n => n.toString().padStart(2, '0');
+
+  return [
+    d.getFullYear(),
+    pad(d.getMonth() + 1),
+    pad(d.getDate())
+  ].join('-') + ' ' + [
+    pad(d.getHours()),
+    pad(d.getMinutes()),
+    pad(d.getSeconds())
+  ].join(':');
+}

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

@@ -19,8 +19,8 @@
         style="width: 100%">
         <el-table-column align="center" prop="ptaskId" label="任务id"></el-table-column>
         <el-table-column align="center" prop="ptaskName" label="名称"></el-table-column>
-        <el-table-column align="center" prop="ptaskStatus" label="状态"></el-table-column>
-        <el-table-column align="center" prop="pcreateTime" label="创建时间"></el-table-column>
+        <el-table-column align="center" prop="ptaskStatus" label="状态" :formatter="formatPtaskStatus"></el-table-column>
+        <el-table-column align="center" prop="pcreateTime" label="创建时间" :formatter="formatCreateTime"></el-table-column>
         <el-table-column align="center" prop="pcronExpression" label="定时任务"></el-table-column>
         <el-table-column align="center" prop="prunInfo" label="运行信息" width="100">
           <template slot-scope="{row}">
@@ -187,9 +187,9 @@
     <el-dialog
       title="运行信息"
       :visible.sync="dialogInfoVisible"
-      width="30%"
+      width="50%"
     >
-      <div>
+      <div class="runInfoBox">
         {{ info }}
       </div>
       <span slot="footer" class="dialog-footer">
@@ -203,6 +203,7 @@ import dataCleanForm from './dataCleanForm.vue'
 import modelForm from './modelForm.vue'
 import processingForm from './processingForm.vue'
 import {addTask, deleteId, queryTasks,updateTask} from "@/api/xvji/predict";
+import {formatDateTime} from "@/utils/dateUtil";
 
 export default {
   components: {modelForm, dataCleanForm, processingForm},
@@ -402,8 +403,17 @@ export default {
 
     // 运行信息
     viewInfo(row) {
-      this.info = row.tRunInfo
-      this.dialogInfoVisible = true
+      if(row.prunInfo !==null){
+        this.info = row.prunInfo
+        this.dialogInfoVisible = true
+      }else{
+        this.info = null
+        this.$message({
+          type: 'warning',
+          message: '暂无运行信息'
+        });
+      }
+
     },
     //删除
     handleDeleteClick(row){
@@ -434,6 +444,12 @@ export default {
         });
       });
     },
+    formatCreateTime(row){
+      return formatDateTime(new Date(row.pcreateTime))
+    },
+    formatPtaskStatus(row){
+      return row.ptaskStatus === 0?'失败':row.ptaskStatus === 1?'成功':'运行'
+    }
   }
 }
 </script>
@@ -503,5 +519,8 @@ export default {
 
   }
 }
-
+.runInfoBox{
+  line-height: 25px;
+  white-space: pre-wrap;
+}
 </style>

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

@@ -19,8 +19,8 @@
         style="width: 100%">
         <el-table-column align="center" prop="ttaskId" label="任务id"></el-table-column>
         <el-table-column align="center" prop="ttaskName" label="名称"></el-table-column>
-        <el-table-column align="center" prop="ttaskStatus" label="状态"></el-table-column>
-        <el-table-column align="center" prop="tcreateTime" label="创建时间"></el-table-column>
+        <el-table-column align="center" prop="ttaskStatus" label="状态" :formatter="formatPtaskStatus"></el-table-column>
+        <el-table-column align="center" prop="tcreateTime" label="创建时间" :formatter="formatCreateTime"></el-table-column>
         <el-table-column align="center" prop="tcronExpression" label="定时任务"></el-table-column>
         <el-table-column align="center" prop="tanalysisReport" label="报告分析" width="100">
           <template slot-scope="{row}">
@@ -250,9 +250,9 @@
     <el-dialog
       title="运行信息"
       :visible.sync="dialogInfoVisible"
-      width="30%"
+      width="50%"
     >
-      <div>
+      <div class="runInfoBox">
         {{ info }}
       </div>
       <span slot="footer" class="dialog-footer">
@@ -269,6 +269,7 @@ import modelTestForm from './modelTestForm.vue'
 import processingForm from './processingForm.vue'
 import reportForm from './reportForm.vue'
 import {addTask, deleteId, queryTasks, updateTask} from "@/api/xvji/training";
+import {formatDateTime} from "@/utils/dateUtil";
 
 export default {
   components: {modelForm, modelTestForm, dataCleanForm, powerRationingForm, processingForm, reportForm},
@@ -601,13 +602,35 @@ export default {
       this.dialogVisible = false
     },
     // 预览报告文件
-    viewReport() {
-
+    viewReport(row) {
+      if(row.tanalysisReport !==null){
+        window.open(row.tanalysisReport)
+        // window.open('http://192.168.1.29:11111/J00001_1758852448094_3865.html')
+      }else{
+        this.$message({
+          type: 'warning',
+          message: '暂无报告文件'
+        });
+      }
     },
     // 运行信息
     viewInfo(row) {
-      this.info = row.tRunInfo
-      this.dialogInfoVisible = true
+      if(row.trunInfo !==null){
+        this.info = row.tRunInfo
+        this.dialogInfoVisible = true
+      }else{
+        this.info = null
+        this.$message({
+          type: 'warning',
+          message: '暂无运行信息'
+        });
+      }
+    },
+    formatCreateTime(row){
+      return formatDateTime(new Date(row.tcreateTime))
+    },
+    formatPtaskStatus(row){
+      return row.ptaskStatus === 0?'失败':row.ptaskStatus === 1?'成功':'运行'
     }
   }
 }
@@ -679,5 +702,7 @@ export default {
 
   }
 }
-
+.runInfoBox{
+  line-height: 25px;
+}
 </style>