From f7eeaca583d432404a99dbb8aa9242abb203c7af Mon Sep 17 00:00:00 2001
From: "si@aidatagov.com" <si@aidatagov.com>
Date: Wed, 22 Jan 2025 01:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/meta/metatask/index.vue         | 60 ++++++++++++++-----
 .../src/views/meta/metatask/logsDialog.vue    |  2 -
 2 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/vue-fastapi-frontend/src/views/meta/metatask/index.vue b/vue-fastapi-frontend/src/views/meta/metatask/index.vue
index dccf96b..ac4071e 100644
--- a/vue-fastapi-frontend/src/views/meta/metatask/index.vue
+++ b/vue-fastapi-frontend/src/views/meta/metatask/index.vue
@@ -31,6 +31,7 @@
               <template #default="{ node, data }">
               <span class="custom-tree-node">
         <i :class="getIconClass(data)"></i>
+
         <span>{{ data.name }}</span>
       </span>
     </template>
@@ -80,10 +81,10 @@
             <el-date-picker
               v-model="dateRange"
               style="width: 240px"
-              value-format="yyyy-MM-dd"
+              value-format="YYYY-MM-DD"
               type="daterange"
               range-separator="-"
-              start-placeholder="开始日期"
+              start-placeholder="开始日期" 
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
@@ -351,11 +352,12 @@
   <el-dropdown 
     link 
     @command="(command) => handleCommand(command, row)" 
-    v-hasPermi="['system:user:resetPwd', 'meta:metatask:edit']"
   >
     <el-button link type="primary" icon="d-arrow-right">
       更多
     </el-button>
+    <template #dropdown>
+
     <el-dropdown-menu>
       <el-dropdown-item 
         command="handleUp"
@@ -401,6 +403,7 @@
         日志
       </el-dropdown-item>
     </el-dropdown-menu>
+    </template>
   </el-dropdown>
 </template>
 
@@ -655,10 +658,14 @@ const chooseRows = ref([]);
 watch(dbResoursName, (val) => {
   if (val) {
     // Filter the department tree when dbResoursName changes
-    proxy.tree.filter(val);
+    proxy.$refs["tree"].filter(val);
+
+
   }
 });
-
+// watch(filterText, (val) => {
+//   treeRef.value!.filter(val)
+// })
 // On mounted
 onMounted(() => {
   getList();
@@ -674,7 +681,7 @@ const handleChangeType = (value) => {
 
 const getList = async () => {
   loading.value = true;
-  const response = await listmetatask(proxy.addDateRange(queryParams, dateRange));
+  const response = await listmetatask(proxy.addDateRange(queryParams.value, dateRange.value));
   userList.value = response.rows;
   total.value = response.total;
   loading.value = false;
@@ -707,7 +714,7 @@ const filterNode = (value, data) => {
 
 const handleNodeClick = (data) => {
   clickNode.value = data;
-  queryParams.dbRCode = data.id;
+  queryParams.value.dbRCode = data.id;
   handleQuery();
 };
 
@@ -740,18 +747,21 @@ const getIconClass = (data) => {
   let icon=""
   if (data.parentId == '0') icon= 'Monitor'; 
   if (data.parentId == '100') icon= 'Coin'; 
+  console.log(icon)
   return icon; 
 };
 
 const handleQuery = () => {
-  queryParams.pageNum = 1;
+  queryParams.value.pageNum = 1;
   getList();
 };
 
 const resetQuery = () => {
   dateRange.value = [];
-  proxy.queryForm.reset();
-  queryParams.dbRCode = clickNode.value?.id;
+
+  proxy.resetForm("queryForm");
+
+  queryParams.value.dbRCode = clickNode.value?.id;
   proxy.tree.setCurrentKey(null);
   handleQuery();
 };
@@ -776,13 +786,13 @@ const handleCommand = (command, row) => {
       handleDown(row);
       break;
     case "handleDS":
-      handleDS(row);
+      handleDSRow(row);
       break;
     case "handleRun":
-      handleRun(row);
+      handleRunRow(row);
       break;
     case "handleLog":
-      handleLog(row);
+      handleLogRow(row);
       break;
     default:
       break;
@@ -828,6 +838,7 @@ const rundialog = ref(null);
 const logdialog = ref(null);
 const handleDS = (row) => {
   if (dsdialog.value) {
+
     dsdialog.value.show(dsIds.value); // Pass ids or any required data
       }
 };
@@ -836,7 +847,7 @@ const handleRun = (row) => {
   rundialog.value.show(dsIds.value);
 };
 
-const handleLog = () => {
+const handleLog = (row) => {
   defindName.value = `${selectRowData.value.metataskName}-${selectRowData.value.dsTypes === "0" ? "表字段采集" : "存储过程采集"}`;
 
   if (logdialog.value) {
@@ -845,6 +856,27 @@ const handleLog = () => {
 
 };
 
+
+const handleDSRow  = (row) => {
+  if (dsdialog.value) {
+
+    dsdialog.value.show(row.dsIds); // Pass ids or any required data
+      }
+};
+
+const handleRunRow  = (row) => {
+  rundialog.value.show(row.dsIds);
+};
+
+const handleLogRow = (row) => {
+  defindName.value = `${row.metataskName}-${row.dsTypes === "0" ? "表字段采集" : "存储过程采集"}`;
+
+  if (logdialog.value) {
+    logdialog.value.show(defindName.value);
+      }
+
+};
+
 const submitForm = async () => {
 
     proxy.$refs["taskForm"].validate(async (valid) => {
diff --git a/vue-fastapi-frontend/src/views/meta/metatask/logsDialog.vue b/vue-fastapi-frontend/src/views/meta/metatask/logsDialog.vue
index 515ae65..4b33269 100644
--- a/vue-fastapi-frontend/src/views/meta/metatask/logsDialog.vue
+++ b/vue-fastapi-frontend/src/views/meta/metatask/logsDialog.vue
@@ -113,7 +113,6 @@ const logDetailsContent = ref(""); // 第三部分的日志内容
 defineExpose({
   show(name) {
   visible.value = true;
-  console.log(visible.value,name, "visible");
   fetchInstances(name);
   },
 });
@@ -124,7 +123,6 @@ const fetchInstances = (defindName) => {
     page_size: pageSize.value,
     searchVal: defindName,
   }).then((response) => {
-    console.log(response, "response");
     instances.value = response.rows;
     total.value = response.total;
   });