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 @@
+
{{ data.name }}
@@ -80,10 +81,10 @@
@@ -351,11 +352,12 @@
handleCommand(command, row)"
- v-hasPermi="['system:user:resetPwd', 'meta:metatask:edit']"
>
更多
+
+
+
@@ -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;
});