From 06bbc7c77687bbfe2c921c319e5854dbbbcd3e1c Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 29 Aug 2024 12:52:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A1=E7=AE=97=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/fac_cal/mpointstat.vue |  7 ++++---
 src/views/fac_cal/taskresult.vue | 19 +++++++++++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue
index c3d8a9f8..6f658343 100644
--- a/src/views/fac_cal/mpointstat.vue
+++ b/src/views/fac_cal/mpointstat.vue
@@ -56,11 +56,12 @@
 				</el-table-column>
                 <el-table-column label="所属集合" prop="mgroup_name">
 				</el-table-column>
-				<el-table-column label="年" prop="year_s" width="80"> </el-table-column>
+				<el-table-column label="类型" prop="type" width="80"> </el-table-column>
+				<el-table-column label="年" prop="year" width="80"> </el-table-column>
                 <el-table-column label="班年" prop="year_s" width="80"> </el-table-column>
-				<el-table-column label="月" prop="month_s" width="50"> </el-table-column>
+				<el-table-column label="月" prop="month" width="50"> </el-table-column>
                 <el-table-column label="班月" prop="month_s" width="50"> </el-table-column>
-				<el-table-column label="日" prop="day_s" width="50"> </el-table-column>
+				<el-table-column label="日" prop="day" width="50"> </el-table-column>
                 <el-table-column label="班日" prop="day_s" width="50"> </el-table-column>
                 <el-table-column label="时" prop="hour" width="50"> </el-table-column>
 				<el-table-column label="当前值" prop="val"></el-table-column>
diff --git a/src/views/fac_cal/taskresult.vue b/src/views/fac_cal/taskresult.vue
index e02bee2c..d63d2f62 100644
--- a/src/views/fac_cal/taskresult.vue
+++ b/src/views/fac_cal/taskresult.vue
@@ -11,7 +11,7 @@
             </div>
         </el-header>
         <el-main>
-            <scTable ref="table" :apiObj="apiObj" :params="params">
+            <scTable ref="table" :apiObj="apiObj" :params="params" @row-click="itemDetail">
                 <el-table-column label="执行ID" prop="task_id" width="280" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="名称" prop="periodic_task_name" width="240" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="执行方法" prop="task_name" width="260" :show-overflow-tooltip="true"></el-table-column>
@@ -22,6 +22,15 @@
                 <el-table-column label="错误信息" prop="traceback" min-width="80" :show-overflow-tooltip="true"></el-table-column>
             </scTable>
         </el-main>
+        <el-dialog v-model="dVisible" title="详情">
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="开始执行" width="80">{{ current_tr.date_created }}</el-descriptions-item>
+                <el-descriptions-item label="结束执行">{{ current_tr.date_created }}</el-descriptions-item>
+                <el-descriptions-item label="执行状态">{{ current_tr.status }}</el-descriptions-item>
+                <el-descriptions-item label="返回结果">{{ current_tr.result }}</el-descriptions-item>
+                <el-descriptions-item label="错误信息">{{ current_tr.traceback }}</el-descriptions-item>
+            </el-descriptions>
+        </el-dialog>
     </el-container>
 </template>
 <script>
@@ -40,10 +49,16 @@ export default {
                 {label: 'REVOKED', value: 'REVOKED'},
                 {label: 'PENDING', value: 'PENDING'},
                 {label: 'RETRY', value: 'RETRY'},
-            ]
+            ],
+            dVisible: false,
+            current_tr: {}
         }
     },
     methods: {
+        itemDetail(row){
+            this.dVisible = true;
+            this.current_tr = row;
+        },
         handleQuery(){
             if(this.timeRange){
                 this.query.date_created__gte = this.timeRange[0]