From f6c44180df57dec78cd7a7141d85045d81fda10a Mon Sep 17 00:00:00 2001
From: "si@aidatagov.com" <si@aidatagov.com>
Date: Fri, 27 Jun 2025 01:58:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AE=89=E5=85=A8=E8=B0=83?=
 =?UTF-8?q?=E5=BA=A6=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/do/metadata_config_do.py           |  2 +-
 .../service/datasec_config_service.py         |  2 +-
 .../src/views/meta/metatask/logsDialog.vue    | 70 +++++++++++++------
 .../src/views/meta/metatask/secConfig.vue     |  6 +-
 4 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/vue-fastapi-backend/module_admin/entity/do/metadata_config_do.py b/vue-fastapi-backend/module_admin/entity/do/metadata_config_do.py
index 88f5260..7e71a04 100644
--- a/vue-fastapi-backend/module_admin/entity/do/metadata_config_do.py
+++ b/vue-fastapi-backend/module_admin/entity/do/metadata_config_do.py
@@ -127,7 +127,7 @@ class DatasecConfig(Base):
     update_by = Column(String(64), nullable=True, default="", comment="更新者")
     update_time = Column(DateTime, nullable=True, comment="更新时间")
     metatask_param = Column(String(500), nullable=True, comment="参数")
-    status = Column(String(10), nullable=False, default="N", comment="状态")
+    status = Column(String(10), nullable=True, default='OFFLINE', comment='状态')
     ds_time = Column(DateTime, nullable=True, comment="调度时间")
     ds_ids = Column(String(50), nullable=True, comment="任务ID")
     schId = Column(String(50), nullable=True, comment="调度id")
\ No newline at end of file
diff --git a/vue-fastapi-backend/module_admin/service/datasec_config_service.py b/vue-fastapi-backend/module_admin/service/datasec_config_service.py
index 3909553..95703b4 100644
--- a/vue-fastapi-backend/module_admin/service/datasec_config_service.py
+++ b/vue-fastapi-backend/module_admin/service/datasec_config_service.py
@@ -441,8 +441,8 @@ class DatasecConfigService:
                   delresponsJson = json.loads(deldstext) 
                   if delresponsJson['msg'] == 'success':
                         metatask_info = await cls.get_datasec_detail_services(query_db, process.metaTaskId)
-                        metatask_info.schId=""
                         metatask_info2 = metatask_info.model_dump(exclude_unset=True)
+                        metatask_info2.schId=""
                         await DatasecConfigDao.edit(query_db,metatask_info.onum, metatask_info2)
                         await query_db.commit()   
                         return "调度删除成功！"    
diff --git a/vue-fastapi-frontend/src/views/meta/metatask/logsDialog.vue b/vue-fastapi-frontend/src/views/meta/metatask/logsDialog.vue
index 82b2d0d..a393909 100644
--- a/vue-fastapi-frontend/src/views/meta/metatask/logsDialog.vue
+++ b/vue-fastapi-frontend/src/views/meta/metatask/logsDialog.vue
@@ -1,6 +1,5 @@
 <template>
   <el-dialog v-model="visible" width="80%" top="5vh" append-to-body>
-
     <div style="display: flex; flex-direction: column; gap: 10px;">
       <!-- 第一部分：实例表格（带分页） -->
       <el-card shadow="hover">
@@ -13,6 +12,7 @@
         <el-table
           :data="instances"
           border
+          highlight-current-row
           style="width: 100%"
           @row-click="handleFirstRowClick"
           :height="350"
@@ -38,7 +38,7 @@
           :total="total"
           :page-size="pageSize"
           :current-page="currentPage"
-          @current-change="fetchInstances"
+          @current-change="handlePageChange"
           style="margin-top: 10px; text-align: right;"
         />
       </el-card>
@@ -54,6 +54,7 @@
         <el-table
           :data="taskNodesData"
           border
+          highlight-current-row
           style="width: 100%"
           @row-click="handleSecondRowClick"
           :height="300"
@@ -92,50 +93,75 @@
 </template>
 
 <script setup>
+import { ref, getCurrentInstance } from "vue";
 import { listInstances, taskNodes, logDetails } from "@/api/meta/metatask";
-import { ref } from "vue";
+
 const { proxy } = getCurrentInstance();
-const { meta_instance_status} = proxy.useDict("meta_instance_status");
-// Define props
+const { meta_instance_status } = proxy.useDict("meta_instance_status");
+
+// Props
 const props = defineProps({
-  defindName: String, // Assuming defindName is a string, you can adjust based on actual type
+  defindName: String,
 });
 
-// Define reactive state
-const visible = ref(false); //弹窗显示状态
-const instances = ref([]); // 第一个表格数据
-const total = ref(0); // 数据总数，用于分页
-const pageSize = ref(10); // 每页条数
-const currentPage = ref(1); // 当前页码
-const taskNodesData = ref([]); // 第二个表格数据
-const logDetailsContent = ref(""); // 第三部分的日志内容
+// State
+const visible = ref(false);
+const instances = ref([]);
+const total = ref(0);
+const pageSize = ref(10);
+const currentPage = ref(1);
+const taskNodesData = ref([]);
+const logDetailsContent = ref("");
 
+// 对外方法
 defineExpose({
   show(name) {
-  visible.value = true;
-  fetchInstances(name);
+    visible.value = true;
+    currentPage.value = 1;
+    fetchInstances(name);
   },
 });
-// Fetch first table data
-const fetchInstances = (defindName) => {
+
+// 加载实例数据
+const fetchInstances = (name) => {
   listInstances({
     page_num: currentPage.value,
     page_size: pageSize.value,
-    searchVal: defindName,
+    searchVal: name,
   }).then((response) => {
     instances.value = response.rows;
     total.value = response.total;
+
+    // 自动点击第一行
+    if (instances.value.length > 0) {
+      handleFirstRowClick(instances.value[0]);
+    } else {
+      taskNodesData.value = [];
+      logDetailsContent.value = "";
+    }
   });
 };
 
-// Handle row click in the first table and fetch task node data
+// 分页切换
+const handlePageChange = (page) => {
+  currentPage.value = page;
+  fetchInstances(props.defindName);
+};
+
+// 选中实例，加载任务节点
 const handleFirstRowClick = (row) => {
   taskNodes(row.id).then((response) => {
     taskNodesData.value = response.rows;
+
+    if (taskNodesData.value.length > 0) {
+      handleSecondRowClick(taskNodesData.value[0]);
+    } else {
+      logDetailsContent.value = "";
+    }
   });
 };
 
-// Handle row click in the second table and fetch log details
+// 选中节点，加载日志
 const handleSecondRowClick = (row) => {
   logDetails(row.id).then((response) => {
     logDetailsContent.value = response.data;
@@ -143,9 +169,7 @@ const handleSecondRowClick = (row) => {
 };
 </script>
 
-
 <style scoped>
-/* 添加全局间距和样式优化 */
 .el-card {
   padding: 5px;
 }
diff --git a/vue-fastapi-frontend/src/views/meta/metatask/secConfig.vue b/vue-fastapi-frontend/src/views/meta/metatask/secConfig.vue
index 679d450..28a78fc 100644
--- a/vue-fastapi-frontend/src/views/meta/metatask/secConfig.vue
+++ b/vue-fastapi-frontend/src/views/meta/metatask/secConfig.vue
@@ -357,7 +357,9 @@
     </el-row>
 
     <el-dialog v-model="open" width="600px" append-to-body>
-    
+      <template #title>
+    <span style="font-weight: bold; font-size: 18px;">调度任务配置</span>
+  </template>
       <el-form ref="taskForm" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24">
@@ -666,7 +668,7 @@ const handleRunRow  = (row) => {
 };
 
 const handleLogRow = (row) => {
-  defindName.value = `${row.metataskName}-${row.dsTypes === "0" ? "表字段采集" : "存储过程采集"}`;
+  defindName.value =row.metataskName
 
   if (logdialog.value) {
     logdialog.value.show(defindName.value);