修改文件

src/views/dataQuality/dataSheet/task/QualityTaskSetting.vue

@@ -68,6 +68,7 @@
     </PageWrapper>
     <quality-Run-setting-modal @register="registerRunSetting" />
     <quality-check-range-plus-modal @register="registerCheckRangePlusModal" />
+    <new-rule-modal @register="registerNewRule" />
   </BasicModal>
 </template>
 <script lang="ts" setup>
@@ -83,7 +84,7 @@
   import { Modal } from 'ant-design-vue';
   import { useGo } from '@/hooks/web/usePage';
   import QualityCheckRangePlusModal from '@/views/dataQuality/dataSheet/task/checkRange/index.vue';
-
+  import NewRuleModal from '@/views/dataQuality/dataSheet/task/rule/index.vue';
   import QualityRunSettingModal from '@/views/dataQuality/dataSheet/task/QualityTaskRunSetting.vue';
   import { BasicTable, useTable } from '@/components/Table';
   import { PageWrapper } from '@/components/Page';
@@ -107,6 +108,7 @@
   //准备获取表单项checkType的值
   const checkType = ref('1');
   const searchInfo = reactive<Recordable>({});
+  const [registerNewRule, { openModal: openNewRuleModal }] = useModal();
   const [registerRunSetting, { openModal: openRunSettingModal }] = useModal();
   const [registerCheckRangePlusModal, { openModal: openCheckRangePlusModal }] = useModal();
   //初始化弹框
@@ -236,9 +238,7 @@
   }
   /** 新增质量规则*/
   function handleAddQualityRule() {
-    router.push({
-      path: '/dataQuality/ruleAdd',
-    });
+    openNewRuleModal(true, {});
     reload();
   }
   /** 添加检查范围*/

src/views/dataQuality/dataSheet/task/index.vue

@@ -182,6 +182,7 @@
   import NewRuleModal from './QualityTaskNewRule.vue';
   import AlarmSettingModal from './QualityTaskAlarmSetting.vue';
   import QualityCheckRangePlusModal from '@/views/dataQuality/dataSheet/task/checkRange/index.vue';
+  // src\views\dataQuality\dataSheet\task\rule\index.vue
   import { Modal } from 'ant-design-vue';
   import {
     storageManagementData,

src/views/dataQuality/dataSheet/task/rule/index.vue

 <template>
+  <BasicModal
+    width="60%"
+    v-bind="$attrs"
+    @register="registerModal"
+    :title="getTitle"
+    @ok="handleSubmit"
+  >
     <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
       <div class="w-1/4 xl:w-1/5" style="padding: 0 0 0 16px">
         <Tabs default-active-key="1">
@@ -51,9 +58,11 @@
       <MoveInGroupModel @register="moveInGroupModel" />
       <VersionManage @register="versionManage" />
     </PageWrapper>
+  </BasicModal>
 </template>
 <script lang="ts" setup>
   import { BasicTable, useTable, TableAction } from '@/components/Table';
+  import { BasicModal, useModal, useModalInner } from '@/components/Modal';
   import { PageWrapper } from '@/components/Page';
   import { BasicTree, TreeActionItem } from '@/components/Tree';
   import { ruleFormSchema, ruleTable } from '@/views/dataQuality/dataSheet/task/rule/rule.data';
@@ -65,7 +74,6 @@
   import RuleGroupEditModel from './ruleGroupEditModel.vue';
   import MoveInGroupModel from './moveInGroupModel.vue';
   import VersionManage from './versionManage.vue';
-  import { useModal } from '@/components/Modal';
   import { useRouter } from 'vue-router';
   import { useMessage } from '@/hooks/web/useMessage';
   import { h, ref } from 'vue';
@@ -83,6 +91,10 @@
   const [ruleGroupEditModel, { openModal: openRuleGroupEditModel }] = useModal();
   const [moveInGroupModel, { openModal: openMoveInGroupModel }] = useModal();
   const [versionManage, { openModal: openVersionManage }] = useModal();
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ confirmLoading: false });
+  });
   const actionList: TreeActionItem[] = [
     {
       render: (node) => {

src/views/taskScheduling/schedulingExecution/executorManagement/index.vue

 <template>
   <PageWrapper contentBackground dense contentClass="flex">
     <template #headerContent>
-      <div style="border-bottom: 2px solid #EBEFF6;">
-        <p style="margin: -20px 0 10px 0;color: #DCDCDC; ">调度/执行器管理/</p>
-        <div style="display: flex;align-items: center;margin-bottom:10px;">
+      <div style="border-bottom: 2px solid #ebeff6">
+        <div style="display: flex; align-items: center; margin-bottom: 10px">
           <div>
-            <Icon icon="ant-design:apartment-outlined" :size="25" style="color:#5689E5;"/>
+            <Icon icon="ant-design:apartment-outlined" :size="25" style="color: #5689e5" />
           </div>
           <span style="font-size: 20px">执行器编辑器</span>
         </div>
+        <p style="margin-top: 10px; margin-bottom: 10px; margin-left: 30px; color: #dcdcdc"
+          >调度/执行器管理/</p
+        >
         <div type="primary" class="save-button" @click="resourceReplacement">
-          <a-button type="text" style="color: #169aff;border-color:#169aff;">执行器资源替换
+          <a-button type="text" style="border-color: #169aff; color: #169aff"
+            >执行器资源替换
           </a-button>
         </div>
         <div type="primary" class="save-button1" @click="downloadAndInstallPackage">
-          <a-button type="text" style="color: #169aff;border-color:#169aff;">下载执行器rpm安装包
+          <a-button type="text" style="border-color: #169aff; color: #169aff"
+            >下载执行器rpm安装包
           </a-button>
         </div>
       </div>
     </template>
-    <div style="display:flex;">
-      <div style="width: 20%;border-right: 2px solid #EBEFF6;">
+    <div style="display: flex">
+      <div style="width: 20%; border-right: 2px solid #ebeff6">
         <div>
           <BasicTable @register="registerGroupTable" :searchInfo="searchInfo">
             <template #tableTitle>
-              <div style="display: flex;align-items: center">
-                <div class="container ">
+              <div style="display: flex; align-items: center">
+                <div class="container">
                   <span class="executor-text">组别</span>
                 </div>
               </div>
             </template>
             <template #toolbar>
-              <Icon icon="ant-design:plus-outlined"
-                    :size="20" @click="Delete"/>
-              <Icon icon="ant-design:delete-outlined"
-
-                    :size="20" @click="Delete"/>
+              <Icon icon="ant-design:plus-outlined" :size="20" @click="addGroup" />
+              <Icon icon="ant-design:delete-outlined" :size="20" @click="Delete" />
             </template>
           </BasicTable>
         </div>
         <div>
           <BasicTable @register="registerPathTable" :searchInfo="searchInfo">
             <template #tableTitle>
-              <div style="display: flex;align-items: center">
+              <div style="display: flex; align-items: center">
                 <div class="container1">
                   <span class="executor-text">运行环境路径</span>
                 </div>
               </div>
             </template>
             <template #toolbar>
-              <Icon icon="ant-design:plus-outlined"
-                    :size="20" @click="Delete"/>
-              <Icon icon="ant-design:delete-outlined"
-
-                    :size="20" @click="Delete"/>
+              <Icon icon="ant-design:plus-outlined" :size="20" @click="addEnvironmentPath" />
+              <Icon icon="ant-design:delete-outlined" :size="20" @click="Delete" />
             </template>
           </BasicTable>
         </div>
@@ -61,25 +59,32 @@
       <div style="width: 80%">
         <BasicTable @register="registerTable" :searchInfo="searchInfo">
           <template #tableTitle>
-            <div style="display: flex;align-items: center">
-              <div class="container ">
+            <div style="display: flex; align-items: center">
+              <div class="container">
                 <span class="executor-text">执行器</span>
               </div>
-              <BasicForm @register="registerForm" style="margin-bottom: -20px"/>
+              <BasicForm @register="registerForm" style="margin-bottom: -20px" />
             </div>
           </template>
           <template #toolbar>
-            <a-button :disabled="getRowSelection().selectedRowKeys <=0"
-                      type="primary" @click="addEnvironmentPath">
-              <Icon icon="ant-design:plus-outlined" :size="15"/>
+            <a-button
+              :disabled="getRowSelection().selectedRowKeys <= 0"
+              type="primary"
+              @click="addEnvironmentPath"
+            >
               添加运行环境路径
             </a-button>
-            <a-button :disabled="getRowSelection().selectedRowKeys <=0"
-                      type="primary" @click="addGroup">添加到组别
+            <a-button
+              :disabled="getRowSelection().selectedRowKeys <= 0"
+              type="primary"
+              @click="addGroup"
+              >添加到组别
             </a-button>
-            <a-button :disabled="getRowSelection().selectedRowKeys <=0"
-                      type="primary" @click="Delete">
-              <Icon icon="ant-design:delete-outlined"></Icon>
+            <a-button
+              :disabled="getRowSelection().selectedRowKeys <= 0"
+              type="primary"
+              @click="Delete"
+              >删除
             </a-button>
           </template>
           <template #bodyCell="{ column, record }">
@@ -91,9 +96,9 @@
                     onClick: addGroup.bind(null, record),
                   },
                   {
-                icon:'ant-design:delete-outlined',
+                    icon: 'ant-design:delete-outlined',
                     /*label: '删除',*/
-                 type:'text',
+                    type: 'text',
                     onClick: Delete.bind(null, record),
                   },
                 ]"
@@ -102,11 +107,11 @@
           </template>
           <template #flag="{ text }">
             <span v-if="text === '正常'">
-          <Icon icon="ant-design:check-circle-filled" :size="15" style="color:#82BD9D;"/>
+              <Icon icon="ant-design:check-circle-filled" :size="15" style="color: #82bd9d" />
               正常
             </span>
             <span v-else-if="text === '不正常'">
-          <Icon icon="ant-design:close-circle-filled" :size="15" style="color:#C02C20;"/>
+              <Icon icon="ant-design:close-circle-filled" :size="15" style="color: #c02c20" />
               不正常
             </span>
           </template>
@@ -116,41 +121,40 @@
   </PageWrapper>
 </template>
 <script lang="ts" setup>
-import {PageWrapper} from "@/components/Page";
-import Icon from "@/components/Icon/Icon.vue";
-import {groupTable, pathTable, tableList} from './mock';
-import {columns, groupSchema, pathSchema, searchFormSchema} from './executorManagement.data';
-import {BasicTable, useTable, TableAction} from '@/components/Table';
-import {reactive} from "vue";
-import {Divider} from "ant-design-vue";
-import BasicForm from "@/components/Form/src/BasicForm.vue";
+  import { PageWrapper } from '@/components/Page';
+  import Icon from '@/components/Icon/Icon.vue';
+  import { groupTable, pathTable, tableList } from './mock';
+  import { columns, groupSchema, pathSchema, searchFormSchema } from './executorManagement.data';
+  import { BasicTable, useTable, TableAction } from '@/components/Table';
+  import { reactive } from 'vue';
+  import { Divider, Modal } from 'ant-design-vue';
+  import BasicForm from '@/components/Form/src/BasicForm.vue';
+  import { useMessage } from '@/hooks/web/useMessage';
 
-const searchInfo = reactive<Recordable>({});
-const [registerTable, {
-  reload,
-  updateTableDataRecord,
-  getSearchInfo,
-  getForm,
-  getRowSelection
-}] = useTable({
+  const { createMessage } = useMessage();
+  const searchInfo = reactive<Recordable>({});
+  const [
+    registerTable,
+    { reload, updateTableDataRecord, getSearchInfo, getForm, getRowSelection },
+  ] = useTable({
     /* title: '执行器',*/
     api: async (params) => {
       const response = {
-      pageNu: "1",
-      pageSize: "10",
-      pages: "1",
+        pageNu: '1',
+        pageSize: '10',
+        pages: '1',
         total: tableList.length,
         code: '',
         message: '',
         data: tableList,
       };
-    return {...response};
+      return { ...response };
     },
     rowKey: 'businessId',
     rowSelection: true,
     showIndexColumn: false,
     columns,
-/*  formConfig: {
+    /*  formConfig: {
     schemas: searchFormSchema,
     //在 input 中输入时按回车自动提交
     autoSubmitOnEnter: true,
@@ -174,9 +178,9 @@ const [registerTable, {
       dataIndex: 'action',
       // slots: { customRender: 'action' },
     },
-});
-/**右上*/
-const [registerForm] = useTable({
+  });
+  /**右上*/
+  const [registerForm] = useTable({
     schemas: searchFormSchema,
     //在 input 中输入时按回车自动提交
     autoSubmitOnEnter: true,
@@ -185,11 +189,11 @@ const [registerForm] = useTable({
     rowSelection: true,
     pagination: false,
     showIndexColumn: false,
-  scroll: {y: 300},
+    scroll: { y: 300 },
     showSummary: true,
-});
-/**左上*/
-const [registerGroupTable, {}] = useTable({
+  });
+  /**左上*/
+  const [registerGroupTable, {}] = useTable({
     rowKey: 'pathId',
     title: '组别',
     dataSource: groupTable,
@@ -197,11 +201,11 @@ const [registerGroupTable, {}] = useTable({
     rowSelection: true,
     pagination: false,
     showIndexColumn: false,
-  scroll: {y: 300},
+    scroll: { y: 300 },
     showSummary: true,
-});
-/**左下*/
-const [registerPathTable] = useTable({
+  });
+  /**左下*/
+  const [registerPathTable] = useTable({
     title: '运行环境路径',
     rowKey: 'groupId',
     dataSource: pathTable,
@@ -209,78 +213,117 @@ const [registerPathTable] = useTable({
     rowSelection: true,
     pagination: false,
     showIndexColumn: false,
-  scroll: {y: 300},
+    scroll: { y: 300 },
     showSummary: true,
-});
-
-/**执行器资源替换*/
-function resourceReplacement() {
-
-}
-/**搜索*/
-function search() {
-
-}
-/**下载执行器rpm安装包*/
-function downloadAndInstallPackage() {
-
-}
-
-/**添加运行环境路径*/
-function addEnvironmentPath() {
-
-}
+  });
 
-/**添加到组别*/
-function addGroup() {
+  /**执行器资源替换*/
+  function resourceReplacement() {}
+  /**搜索*/
+  function search() {}
+  /**下载执行器rpm安装包*/
+  function downloadAndInstallPackage() {}
 
-}
+  /**添加运行环境路径*/
+  function addEnvironmentPath() {
+    Modal.confirm({
+      title: '确认添加',
+      content: '是否将选中执行器添加到运行环境路径?',
+      onOk: () => {
+        // const rowSelection = getRowSelection().selectedRowKeys;
+        // for (let i = 0; i < rowSelection.length; i++) {
+        //   tableList.value.splice(
+        //     tableList.value.findIndex((item) => item.businessId === rowSelection[i]),
+        //     1,
+        //   );
+        // }
+        createMessage.success('添加成功!');
+        // rowSelection.length = 0;
+        reload();
+      },
+    });
+  }
 
-/**删除Delete*/
-function Delete() {
-  console.log('打印加号按钮')
-}
+  /**添加到组别*/
+  function addGroup() {
+    Modal.confirm({
+      title: '确认添加',
+      content: '是否添加执行器?',
+      onOk: () => {
+        // const rowSelection = getRowSelection().selectedRowKeys;
+        // for (let i = 0; i < rowSelection.length; i++) {
+        //   tableList.value.splice(
+        //     tableList.value.findIndex((item) => item.businessId === rowSelection[i]),
+        //     1,
+        //   );
+        // }
+        createMessage.success('添加成功!');
+        // rowSelection.length = 0;
+        reload();
+      },
+    });
+  }
 
+  /**删除Delete*/
+  function Delete() {
+    Modal.confirm({
+      title: '确认删除',
+      content: '是否删除选中的执行器?',
+      onOk: () => {
+        // const rowSelection = getRowSelection().selectedRowKeys;
+        // for (let i = 0; i < rowSelection.length; i++) {
+        //   tableList.value.splice(
+        //     tableList.value.findIndex((item) => item.businessId === rowSelection[i]),
+        //     1,
+        //   );
+        // }
+        createMessage.success('删除成功!');
+        // rowSelection.length = 0;
+        reload();
+      },
+    });
+  }
 </script>
 <style lang="scss" scoped>
-.save-button {
+  .save-button {
     position: absolute; /* 绝对定位 */
     top: 15px;
     right: 10px;
     margin: 25px 200px 10px 10px;
-}
+  }
 
-.save-button1 {
+  .save-button1 {
     position: absolute;
     top: 15px;
     right: 10px;
-  margin: 25px 10px 10px 10px;
-}
-
+    margin: 25px 10px 10px;
+  }
 
-.container {
-  width: 70px;
+  .container {
     display: flex;
-  justify-content: center;
     align-items: center; /* 让内容垂直居中 */
-}
-.container1 {
-  width: 120px;
-  display: flex;
     justify-content: center;
+    width: 70px;
+  }
+
+  .container1 {
+    display: flex;
     align-items: center; /* 让内容垂直居中 */
-}
-.executor-text {
+    justify-content: center;
+    width: 120px;
+  }
+
+  .executor-text {
     display: inline-flex; /* 保持内联样式 */
     align-items: center; /* 确保文本垂直居中 */
-}
+  }
 
-.executor-text::before {
+  .executor-text::before {
     content: ''; /* 伪元素的内容为空 */
     display: inline-block;
     width: 4px; /* 伪元素的宽度 */
     height: 20px; /* 伪元素的高度 */
-  background-color:#5689E5;  /* 蓝色 */
     margin-right: 5px; /* 与文字的间距 */
-}
+    background-color: #5689e5; /* 蓝色 */
+  }
 </style>