任务调度

src/views/dataIntegration/dataLoading/dataEntryLake/ViewLogModal.vue

@@ -16,10 +16,11 @@
   import { useMessage } from '@/hooks/web/useMessage';
   import { exportRoleList } from '@/api/system/role/role';
   import { downloadByData } from '@/utils/file/download';
+  import { ModalProps } from 'ant-design-vue';
 
   const emit = defineEmits(['success', 'register']);
   const { createMessage } = useMessage();
-  const getTitle = computed(() => '查看日志');
+  const getTitle = '查看日志1111';
   const textAreaData = ref(
     '\n' +
       '2023-07-05 15: 38: 11.224 [ForkJoinPool-2-worker-25] INFO i.t.t.web.schedule.SolutionWatcher - change sub job status to RUNNING, sub job id is 13ad3131-d07b-4f53-92b9-4f06447fe400\n' +
@@ -39,7 +40,11 @@
 
   //初始化弹框
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-    setModalProps({ confirmLoading: false, showOkBtn: false, cancelText: '关闭' });
+    setModalProps({
+      confirmLoading: false,
+      showOkBtn: false,
+      cancelText: '关闭',
+    } as ModalProps);
   });
 
   /**确定按钮*/

src/views/taskScheduling/taskFlow/index.vue

@@ -3,53 +3,53 @@
     <template #extra>
       <div style="display: flex">
         <div>
-          <a-button type="link">
-            <Icon icon="ant-design:caret-right-outlined"  size="24" />
+          <a-button type="link" :disabled="checkDisabled()">
+            <Icon icon="ant-design:caret-right-outlined" size="24" />
             <p style="color: black">运行</p>
           </a-button>
         </div>
         <div>
-          <a-button type="link">
-            <Icon icon="ant-design:send-outlined"  size="24" />
+          <a-button type="link" :disabled="checkDisabled()">
+            <Icon icon="ant-design:send-outlined" size="24" />
             <p style="color: black">发布</p>
           </a-button>
         </div>
         <div>
-          <a-button
-            @click="batchOffline"
-            :disabled="checkDisabled()"
-            type="link"
-          >
+          <a-button @click="batchOffline" :disabled="checkDisabled()" type="link">
             <Icon icon="ant-design:cloud-download-outlined" size="24" />
             <p style="color: black">下线</p>
           </a-button>
         </div>
         <div>
-          <a-button type="link">
-            <Icon icon="ant-design:tag-outlined"  size="24" />
+          <a-button type="link" :disabled="checkDisabled()">
+            <Icon icon="ant-design:tag-outlined" size="24" />
             <p style="color: black">设置业务标签</p>
           </a-button>
         </div>
         <div>
-          <a-button type="link">
+          <a-button type="link" :disabled="checkDisabled()">
             <Icon icon="ant-design:reconciliation-outlined" size="24" />
             <p style="color: black">复制到</p>
           </a-button>
         </div>
         <div>
-          <a-button type="link">
-            <Icon icon="ant-design:delete-outlined" style="color: red" size="24" />
+          <a-button type="link" :disabled="checkDisabled()">
+            <Icon
+              icon="ant-design:delete-outlined"
+              :style="{ color: checkDisabled() ? null : 'red' }"
+              size="24"
+            />
             <p style="color: black">删除</p>
           </a-button>
         </div>
         <div>
-          <a-button type="link">
+          <a-button type="link" :disabled="checkDisabled()">
             <Icon icon="ant-design:folder-open-outlined" size="24" />
             <p style="color: black">移动</p>
           </a-button>
         </div>
         <div>
-          <a-button type="link">
+          <a-button type="link" :disabled="checkDisabled()">
             <Icon icon="ant-design:arrow-up-outlined" size="24" />
             <p style="color: black">导出</p>
           </a-button>
@@ -193,40 +193,41 @@
   const searchInfo = reactive<Recordable>({});
   const [copyModal, { openModal: openCopyModal }] = useModal();
   const [checkModal, { openModal: openCheckModal }] = useModal();
-  const [registerTable, { getRowSelection, getSelectRows, setTableData,setSelectedRows, }] = useTable({
-    /*  title: '任务流',*/
-    api: async (params) => {
-      const response = {
-        pageNu: '1',
-        pageSize: '10',
-        pages: '1',
-        total: tableData.value.length,
-        code: '',
-        message: '',
-        data: [],
-      };
-      //按照部门筛选 如果有进行过滤相应部门的  没有就赋值全部
-      let data = [];
-      data = tableData.value.filter((item) => item.type === 'theme');
-      return { ...response, data: data };
-    },
-    rowKey: 'businessId',
-    rowSelection: true,
-    showIndexColumn: false,
-    columns,
-    showTableSetting: false,
-    bordered: true,
-    striped: false,
-    handleSearchInfoFn(info) {
-      console.log('handleSearchInfoFn', info);
-      return info;
-    },
-    actionColumn: {
-      width: 220,
-      title: '操作',
-      dataIndex: 'action',
-    },
-  });
+  const [registerTable, { getRowSelection, getSelectRows, setTableData, setSelectedRows }] =
+    useTable({
+      /*  title: '任务流',*/
+      api: async (params) => {
+        const response = {
+          pageNu: '1',
+          pageSize: '10',
+          pages: '1',
+          total: tableData.value.length,
+          code: '',
+          message: '',
+          data: [],
+        };
+        //按照部门筛选 如果有进行过滤相应部门的  没有就赋值全部
+        let data = [];
+        data = tableData.value.filter((item) => item.type === 'theme');
+        return { ...response, data: data };
+      },
+      rowKey: 'businessId',
+      rowSelection: true,
+      showIndexColumn: false,
+      columns,
+      showTableSetting: false,
+      bordered: true,
+      striped: false,
+      handleSearchInfoFn(info) {
+        console.log('handleSearchInfoFn', info);
+        return info;
+      },
+      actionColumn: {
+        width: 220,
+        title: '操作',
+        dataIndex: 'action',
+      },
+    });
   /**右上*/
   const [registerForm] = useTable({
     schemas: searchFormSchema,

src/views/taskScheduling/taskFlowDesign/addTaskFlushModel.vue

@@ -6,7 +6,7 @@
     :title="getTitle"
     @ok="handleSubmit"
   >
-    <BasicTree checkable :search="true" :treeData="taskFlushTreeData" />
+    <BasicTree checkable :search="true" :treeData="taskFlushTreeData" :defaultExpandAll="true" />
   </BasicModal>
 </template>
 <script lang="ts" setup>
@@ -14,7 +14,7 @@
   import { taskFlushTreeData } from './designData';
   import { BasicTree } from '@/components/Tree';
 
- /* const getTitle = '选择上游任务流';*/
+  /* const getTitle = '选择上游任务流';*/
   const getTitle = '添加上游任务流';
   //初始化弹框
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
@@ -22,7 +22,6 @@
   });
   /**确定按钮*/
   async function handleSubmit() {
-
     closeModal();
   }
 </script>

src/views/taskScheduling/taskFlowDesign/addTaskModel.vue

@@ -9,7 +9,7 @@
     <div style="display: flex">
       <BasicTree
         class="w-1/2"
-        defaultExpandLevel="1"
+        :defaultExpandAll="true"
         @select="handleSelect"
         :search="true"
         :treeData="taskLeftTreeData"

src/views/taskScheduling/taskFlowDesign/design.data.ts

@@ -2,6 +2,9 @@ import { FormSchema } from '@/components/Form';
 import { BasicColumn } from '@/components/Table';
 import { InputProps, TableColumn } from 'ant-design-vue';
 import { TreeItem } from '@/components/Tree';
+import { TreeProps } from 'ant-design-vue/es/tree/Tree';
+import { pathOptionsData } from '@/views/dataStandards/labelDropInspection/labelData';
+import {taskTreeData} from "@/views/taskScheduling/taskFlowDesign/designData";
 
 export const designFormSchema: FormSchema[] = [
   {
@@ -757,8 +760,10 @@ export const checkFormSchema: FormSchema[] = [
   {
     label: '落标检查',
     field: 'path',
-    required: true,
-    slot: 'path',
+    component: 'TreeSelect',
+    componentProps: {
+      treeData: pathOptionsData,
+    } as TreeProps,
   },
   {
     label: '检查结果',
@@ -1265,7 +1270,8 @@ export const defineEvent: FormSchema[] = [
     field: 'sql',
     component: 'InputTextArea',
     componentProps: {
-      placeholder: '事件满足取决于当前sql返回结果是否为空，' +
+      placeholder:
+        '事件满足取决于当前sql返回结果是否为空，' +
         '若无返回结果则判断事件条件未达成:\n' +
         '此处支持引用任务流参数、工作区参数、全局参数',
       rows: 8,
@@ -1369,6 +1375,10 @@ export const copyFormSchema: FormSchema[] = [
   {
     label: '路径',
     field: 'path',
-    slot: 'path',
+    component: 'TreeSelect',
+    componentProps: {
+      fieldNames: { value: 'key', title: 'title' },
+      treeData: taskTreeData,
+    } as TreeProps,
   },
 ];

src/views/taskScheduling/taskFlowDesign/index.vue

@@ -17,10 +17,7 @@
         <CloseOutlined />
         退出
       </a-button>
-      <a-button v-if="!versionFlag" style="border-color: transparent">
-        <Icon icon="ant-design:dashboard-outlined" style="color: blue" size="24" />
-        <p>跳转运维</p></a-button
-      >
+      <a-button v-if="!versionFlag" type="primary">跳转运维</a-button>
       <a-button v-if="!versionFlag" :disabled="debugFlag" type="primary">
         <!--        <Icon icon="ant-design:caret-right-outlined" style="color: blue" size="24"/>
                 <p>运行</p>-->

src/views/taskScheduling/taskFlowDesign/taskConfigModel.vue

@@ -8,167 +8,165 @@
   >
     <BasicForm @register="registerForm">
       <template #cycle="{ field, model }">
-        <Select v-model:value="model[field]" :options="cycleOptions" placeholder="请选择"/>
+        <Select v-model:value="model[field]" :options="cycleOptions" placeholder="请选择" />
         <a-button
           type="link"
           v-if="model[field] === '事件触发器'"
           @click="handleCycle"
           style="margin-left: -15px"
-        >批量调整直接下游配置
+          >批量调整直接下游配置
         </a-button>
       </template>
       <template #scheduleTime="{ field, model }">
         <div style="display: flex">
-        <Input v-model:value="model[field]" style="width: 45%"/>时
-        <Input v-model:value="model['scheduleTime']" style="width: 45%"/>分
+          <Input v-model:value="model[field]" style="width: 45%" />时
+          <Input v-model:value="model['scheduleTime']" style="width: 45%" />分
         </div>
       </template>
       <template #eventTrigger="{ field, model }">
-        <div style="display: flex;">
-          <a-button @click="handleSetConfig"
-                    style="color: red;border-color: red;">定义事件
+        <div style="display: flex">
+          <a-button @click="handleSetConfig" style="color: red; border-color: red"
+            >定义事件
           </a-button>
           <a-button @click="viewLogs" style="margin-left: 20px">查看日志</a-button>
         </div>
-        <a-button type="link" style="color: red;margin-left: -10px">
-          <Icon icon="ant-design:exclamation-circle-outlined"/>
+        <a-button type="link" style="color: red; margin-left: -10px">
+          <Icon icon="ant-design:exclamation-circle-outlined" />
           请定义触发事件详情
         </a-button>
       </template>
       <template #overTime="{ field, model }">
-        <CheckboxGroup :options="overTimeOptions" v-model:value="model[field]"/>
+        <CheckboxGroup :options="overTimeOptions" v-model:value="model[field]" />
         <div v-if="model[field]" style="display: flex; width: 30%">
-          <InputNumber v-model:value="model.timeNum" :min="0" :step="1"/>
-          <Select v-model:value="model.timeType" :options="timeTypeOptions"/>
+          <InputNumber v-model:value="model.timeNum" :min="0" :step="1" />
+          <Select v-model:value="model.timeType" :options="timeTypeOptions" />
         </div>
       </template>
       <template #group="{ field, model }">
-        <Select v-model:value="model[field]" :options="groupOptions"/>
+        <Select v-model:value="model[field]" :options="groupOptions" />
       </template>
     </BasicForm>
-    <EditDownStreamModel @register="editModal"/>
-    <DefineEvent @register="defineEvent"/>
+    <EditDownStreamModel @register="editModal" />
+    <DefineEvent @register="defineEvent" />
     <ViewLogModal @register="registerViewLogsModal" />
   </BasicModal>
 </template>
 <script lang="ts" setup>
-import Icon from '@/components/Icon/Icon.vue';
-import {Input, CheckboxGroup, Select, InputNumber, FormItemRest} from 'ant-design-vue';
-import {BasicModal, useModal, useModalInner} from '@/components/Modal';
-import {BasicForm, useForm} from '@/components/Form';
-import {
-  taskOverallConfig,
-} from '@/views/taskScheduling/taskFlowDesign/design.data';
-import EditDownStreamModel from './editDownStreamModel.vue';
-import DefineEvent from "./defineEvent.vue";
-import {routeList} from "@/views/dataService/serviceManage/onlineManage/mock";
-import ViewLogModal from "@/views/dataIntegration/dataLoading/dataEntryLake/ViewLogModal.vue";
+  import Icon from '@/components/Icon/Icon.vue';
+  import { Input, CheckboxGroup, Select, InputNumber, FormItemRest } from 'ant-design-vue';
+  import { BasicModal, useModal, useModalInner } from '@/components/Modal';
+  import { BasicForm, useForm } from '@/components/Form';
+  import { taskOverallConfig } from '@/views/taskScheduling/taskFlowDesign/design.data';
+  import EditDownStreamModel from './editDownStreamModel.vue';
+  import DefineEvent from './defineEvent.vue';
+  import { routeList } from '@/views/dataService/serviceManage/onlineManage/mock';
+  import ViewLogModal from '@/views/dataIntegration/dataLoading/dataEntryLake/ViewLogModal.vue';
 
-const getTitle = '任务流全局配置';
-const [registerViewLogsModal, { openModal: openViewLogsModal }] = useModal();
-const [editModal, {openModal: openEditModel}] = useModal();
-const [defineEvent, {openModal: openDefineEvent}] = useModal();
+  const getTitle = '任务流全局配置';
+  const [registerViewLogsModal, { openModal: openViewLogsModal }] = useModal();
+  const [editModal, { openModal: openEditModel }] = useModal();
+  const [defineEvent, { openModal: openDefineEvent }] = useModal();
 
-function handleCycle() {
-  openEditModel(true, {
-    isUpdate: false,
-  });
-}
+  function handleCycle() {
+    openEditModel(true, {
+      isUpdate: false,
+    });
+  }
 
-/**定义事件*/
-function handleSetConfig() {
-  openDefineEvent(true, {
-    isUpdate: false,
-  });
-}
+  /**定义事件*/
+  function handleSetConfig() {
+    openDefineEvent(true, {
+      isUpdate: false,
+    });
+  }
 
-/**查看日志*/
-function viewLogs() {
-  openViewLogsModal(true);
-}
+  /**查看日志*/
+  function viewLogs() {
+    openViewLogsModal(true, {});
+  }
 
-//初始化弹框
-const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
-  setModalProps({confirmLoading: false});
-});
-/**调度周期*/
-const cycleOptions = [
-  {
-    label: '每天一次',
-    value: '每天一次',
-  },
-  {
-    label: 'Cron表达式',
-    value: 'Cron表达式',
-  },
-  {
-    label: '事件触发器',
-    value: '事件触发器',
-  },
-  {
-    label: '无周期',
-    value: '无周期',
-  },
-];
-const overTimeOptions = [
-  {
-    label: '超时失败',
-    value: '超时失败',
-  },
-];
-const groupOptions = [
-  {
-    label: '全部执行器',
-    value: '全部执行器',
-  },
-  {
-    label: 'Java执行器',
-    value: 'Java执行器',
-  },
-  {
-    label: 'Scala执行器',
-    value: 'Scala执行器',
-  },
-  {
-    label: 'default group',
-    value: 'default group',
-  },
-];
-const timeTypeOptions = [
-  {
-    label: '分',
-    value: '分',
-  },
-  {
-    label: '小时',
-    value: '小时',
-  },
-  {
-    label: '天',
-    value: '天',
-  },
-  {
-    label: '周',
-    value: '周',
-  },
-  {
-    label: '月',
-    value: '月',
-  },
-];
-const [registerForm, {setFieldsValue, updateSchema, resetFields, validate}] = useForm({
-  labelWidth: 100,
-  labelAlign: 'left',
-  baseColProps: {lg: 12, md: 24},
-  schemas: taskOverallConfig,
-  showActionButtonGroup: false,
-  actionColOptions: {
-    span: 23,
-  },
-});
+  //初始化弹框
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ confirmLoading: false });
+  });
+  /**调度周期*/
+  const cycleOptions = [
+    {
+      label: '每天一次',
+      value: '每天一次',
+    },
+    {
+      label: 'Cron表达式',
+      value: 'Cron表达式',
+    },
+    {
+      label: '事件触发器',
+      value: '事件触发器',
+    },
+    {
+      label: '无周期',
+      value: '无周期',
+    },
+  ];
+  const overTimeOptions = [
+    {
+      label: '超时失败',
+      value: '超时失败',
+    },
+  ];
+  const groupOptions = [
+    {
+      label: '全部执行器',
+      value: '全部执行器',
+    },
+    {
+      label: 'Java执行器',
+      value: 'Java执行器',
+    },
+    {
+      label: 'Scala执行器',
+      value: 'Scala执行器',
+    },
+    {
+      label: 'default group',
+      value: 'default group',
+    },
+  ];
+  const timeTypeOptions = [
+    {
+      label: '分',
+      value: '分',
+    },
+    {
+      label: '小时',
+      value: '小时',
+    },
+    {
+      label: '天',
+      value: '天',
+    },
+    {
+      label: '周',
+      value: '周',
+    },
+    {
+      label: '月',
+      value: '月',
+    },
+  ];
+  const [registerForm, { setFieldsValue, updateSchema, resetFields, validate }] = useForm({
+    labelWidth: 100,
+    labelAlign: 'left',
+    baseColProps: { lg: 12, md: 24 },
+    schemas: taskOverallConfig,
+    showActionButtonGroup: false,
+    actionColOptions: {
+      span: 23,
+    },
+  });
 
-/**确定按钮*/
-async function handleSubmit() {
-  closeModal();
-}
+  /**确定按钮*/
+  async function handleSubmit() {
+    closeModal();
+  }
 </script>

src/views/taskScheduling/taskFlowDesign/taskModel.vue

@@ -226,17 +226,7 @@
         </BasicForm>
       </TabPane>
       <TabPane v-if="type === '13'" key="13" tab="落标检查任务">
-        <BasicForm @register="checkForm">
-          <template #path="{ field, model }">
-            <div style="display: flex">
-              <InputSearch
-                v-model:value="model[field]"
-                enter-button="选择"
-                @search="onCheckSearch"
-              />
-            </div>
-          </template>
-        </BasicForm>
+        <BasicForm @register="checkForm" />
       </TabPane>
       <TabPane v-if="type !== '7' && type !== '8' && type !== '10'" key="100" tab="任务参数">
         <!--嵌套任务流任务区别部分-->