修改文件

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>
-  <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">
-        <Tabs.TabPane key="1" tab="数据库">
-          <BasicTree :treeData="treeData" :checkable="true" defaultExpandLevel="1" />
-        </Tabs.TabPane>
-        <Tabs.TabPane key="2" tab="规则组">
-          <BasicTree
-            :treeData="treeData1"
-            :checkable="true"
-            :actionList="actionList"
-            defaultExpandLevel="1"
-          />
-        </Tabs.TabPane>
-        <Tabs.TabPane key="3" tab="质量主体">
-          <BasicTree :treeData="treeData2" :checkable="true" defaultExpandLevel="1" />
-        </Tabs.TabPane>
-      </Tabs>
-    </div>
-    <container class="table-container w-3/4 xl:w-4/5">
-      <BasicTable @register="registerTable" :searchInfo="searchInfo" slots="header">
-        <template #header>
-          <div style="display: flex; justify-content: space-between">
-            <div class="title">
-              <div class="title_left">
-                <div>
-                  <Icon icon="dashicons:admin-plugins" :size="32" :color="'#7360E2'" />
-                </div>
-                <div style="padding-left: 10px">
-                  <div class="name">供电单位用电量</div>
-                  <div style="color: darkgray">API监控/市场营销</div>
+  <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">
+          <Tabs.TabPane key="1" tab="数据库">
+            <BasicTree :treeData="treeData" :checkable="true" defaultExpandLevel="1" />
+          </Tabs.TabPane>
+          <Tabs.TabPane key="2" tab="规则组">
+            <BasicTree
+              :treeData="treeData1"
+              :checkable="true"
+              :actionList="actionList"
+              defaultExpandLevel="1"
+            />
+          </Tabs.TabPane>
+          <Tabs.TabPane key="3" tab="质量主体">
+            <BasicTree :treeData="treeData2" :checkable="true" defaultExpandLevel="1" />
+          </Tabs.TabPane>
+        </Tabs>
+      </div>
+      <container class="table-container w-3/4 xl:w-4/5">
+        <BasicTable @register="registerTable" :searchInfo="searchInfo" slots="header">
+          <template #header>
+            <div style="display: flex; justify-content: space-between">
+              <div class="title">
+                <div class="title_left">
+                  <div>
+                    <Icon icon="dashicons:admin-plugins" :size="32" :color="'#7360E2'" />
+                  </div>
+                  <div style="padding-left: 10px">
+                    <div class="name">供电单位用电量</div>
+                    <div style="color: darkgray">API监控/市场营销</div>
+                  </div>
                 </div>
               </div>
+              <a-button type="primary">调用日志</a-button>
             </div>
-            <a-button type="primary">调用日志</a-button>
-          </div>
-        </template>
-        <template #toolbar> </template>
-        <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'action'"> </template>
-        </template>
-      </BasicTable>
-    </container>
+          </template>
+          <template #toolbar> </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'action'"> </template>
+          </template>
+        </BasicTable>
+      </container>
 
-    <RuleEditModel :is-add="isAdd" @register="ruleEditModal" @success="REModalSuccess" />
-    <RuleMoreUpdate @register="ruleMoreUpdateModel" />
-    <importModal @register="registerImport" @success="handleImportSuccess" />
-    <RuleGroupAddModel @register="ruleGroupAddModel" />
-    <RuleGroupEditModel @register="ruleGroupEditModel" />
-    <MoveInGroupModel @register="moveInGroupModel" />
-    <VersionManage @register="versionManage" />
-  </PageWrapper>
+      <RuleEditModel :is-add="isAdd" @register="ruleEditModal" @success="REModalSuccess" />
+      <RuleMoreUpdate @register="ruleMoreUpdateModel" />
+      <importModal @register="registerImport" @success="handleImportSuccess" />
+      <RuleGroupAddModel @register="ruleGroupAddModel" />
+      <RuleGroupEditModel @register="ruleGroupEditModel" />
+      <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) => {