Merge remote-tracking branch 'origin/master'

vue-fastapi-backend/module_admin/service/datastd_service.py

@@ -1734,7 +1734,7 @@ class DataStdService:
 
         :return: 用户导入模板excel的二进制数据
         """
-        header_list = ['标准归属', '来源系统', '标准编号', '标准中文名', '标准英文名', '标准业务定义', '标准类型', '标准来源', '数据类别', '标准业务定义', '安全等级', '代码编号', '标准目录','业务认则部门', '业务认则人员', '技术认则部门', '技术认则人员']
+        header_list = ['标准归属', '来源系统', '标准编号', '标准中文名', '标准英文名', '标准业务定义', '标准类型', '标准来源', '数据类别','安全等级', '代码编号', '标准目录','业务认则部门', '业务认则人员', '技术认则部门', '技术认则人员']
         selector_header_list = ['标准归属', '标准类型',"标准来源"]
         option_list = [{'标准归属': ['公司级', '系统级']}, {'标准类型': ['基础数据', '指标数据']}, {'标准来源': ['行业标准', '自建标准','自建标准-智能']}]
         binary_data = get_excel_template(

vue-fastapi-frontend/src/api/metadataConfig/metadataConfig.js

@@ -436,3 +436,23 @@ export function dsmetataskdelete(data) {
     data: data
   })
 }
+
+
+// 查询任务定义列表
+export function listTaskDefinitions(query) {
+  return request({
+    url: '/ds-api/dolphinscheduler/projects/15094505099232/task-definition',
+    method: 'get',
+    params: {
+      pageSize: query.pageSize || 10,
+      pageNo: query.pageNum || 1,
+      taskType: query.taskType || '',
+      searchTaskName: query.taskName || '',
+      searchWorkflowName: query.workflowName || ''
+    },
+    headers: {
+      dashUserName: query.userName,
+      dashPassword: query.password
+    }
+  })
+}

vue-fastapi-frontend/src/views/metadataConfig/log/index.vue

@@ -0,0 +1,122 @@
+<template>
+  <div class="app-container">
+    <!-- 查询条件 -->
+    <el-row :gutter="10" class="mb8">
+      <el-form :inline="true" :model="queryForm">
+        <el-form-item label="任务名称">
+          <el-input v-model="queryForm.taskName" placeholder="请输入任务名称" clearable />
+        </el-form-item>
+        <el-form-item label="任务类型">
+          <el-input v-model="queryForm.taskType" placeholder="请输入任务类型" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleSearch">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-row>
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="taskList"
+      style="width: 100%"
+      border
+      stripe
+    >
+      <el-table-column prop="taskCode" label="任务编号" width="180" />
+      <el-table-column prop="taskType" label="任务类型" width="180" />
+      <el-table-column prop="taskName" label="任务名称" width="220" />
+      <el-table-column prop="processReleaseState" label="状态" width="100">
+        <template #default="{ row }">
+          <el-tag :type="row.processReleaseState === 'ONLINE' ? 'success' : 'info'">
+            {{ row.processReleaseState === 'ONLINE' ? '上线' : '下线' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="processDefinitionName" label="工作流名称" />
+<el-table-column prop="taskVersion" label="版本" width="120">
+  <template #default="{ row }">
+    V{{ row.taskVersion }}
+  </template>
+</el-table-column>
+
+      <el-table-column prop="taskCreateTime" label="创建时间" width="180" />
+      <el-table-column prop="taskUpdateTime" label="更新时间" width="180" />
+    </el-table>
+
+    <!-- 分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryForm.pageNum"
+      v-model:limit="queryForm.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue'
+import { ElMessage } from 'element-plus'
+import { listTaskDefinitions } from '@/api/metadataConfig/metadataConfig'
+import cache from "@/plugins/cache";
+
+// 查询条件
+const queryForm = reactive({
+  taskName: '',
+  taskType: '',
+  workflowName: '',
+  pageNum: 1,
+  pageSize: 10,
+  userName:cache.local.get("username"),
+  password:cache.local.get("password")
+})
+
+// 数据
+const taskList = ref([])
+const total = ref(0)
+const loading = ref(false)
+
+// 获取列表
+async function getList() {
+  loading.value = true
+  try {
+    const res = await listTaskDefinitions(queryForm)
+    // 假设后端返回 { total, totalList }
+    taskList.value = res.data.totalList || res.data.rows || []
+    total.value = res.data.total || 0
+  } catch (error) {
+    ElMessage.error('获取任务定义失败，请重试')
+  } finally {
+    loading.value = false
+  }
+}
+
+// 搜索
+function handleSearch() {
+  queryForm.pageNum = 1
+  getList()
+}
+
+// 重置
+function resetQuery() {
+  queryForm.taskName = ''
+  queryForm.taskType = ''
+  queryForm.pageNum = 1
+  getList()
+}
+
+onMounted(() => {
+  getList()
+})
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+.mb8 {
+  margin-bottom: 8px;
+}
+</style>