修改bug

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

@@ -6,118 +6,73 @@
     :title="getTitle"
     @ok="handleSubmit"
   >
-    <!-- <div style="display: flex; justify-content: flex-end; padding-bottom: 10px">
-      <a-button style="margin-right: 5px" type="primary" @click="deleteAll">批量删除</a-button>
-      <a-button style="margin-right: 5px" type="primary" @click="handleImport">规则设置</a-button>
-    </div> -->
     <template #footer>
       <a-button type="primary" @click="handleSubmit">关闭</a-button>
     </template>
-    <!-- <BasicTable @register="registerTable">
-      <template #bodyCell="{ column, record }">
-        <template v-if="column.key === 'status'">
-          <Tag color="error" v-if="record.status === '0'">失败</Tag>
-        </template>
-        <template v-if="column.key === 'status'">
-          <Tag color="success" v-if="record.status === '1'">成功</Tag>
-        </template>
-        <template v-if="column.key === 'action'">
-          <TableAction
-            :actions="[
-              {
-                //配置详情
-                icon: 'clarity:note-edit-line',
-                label: '',
-                onClick: handleEdit.bind(null),
-              },
-              {
-                icon: 'ant-design:delete-outlined',
-                color: 'error',
-                label: '',
-                popConfirm: {
-                  title: '是否确认删除',
-                  placement: 'left',
-                  confirm: handleDelete.bind(null),
-                },
-              },
-              {
-                //失败日志
-                icon: 'clarity:contract-line',
-                label: '',
-                ifShow: record.status === '0',
-                onClick: handleDetail.bind(null),
-              },
-            ]"
-          />
-        </template>
-      </template>
-    </BasicTable> -->
+    <a-button
+      type="primary"
+      @click="handleQualityTaskService"
+      style="margin-bottom: 20px; margin-right: 10px; margin-left: 600px"
+      >跳转运维</a-button
+    >
+    <a-button
+      type="primary"
+      @click="handleQualityTaskRunLog"
+      style="margin-bottom: 20px; margin-right: 10px"
+      >查看报告</a-button
+    >
+    <a-button type="primary" style="margin-bottom: 20px; margin-right: 10px" @click="handleSave"
+      >保存</a-button
+    >
+    <a-button
+      type="primary"
+      @click="handleQualityTaskOnline"
+      style="margin-bottom: 20px; margin-right: 10px"
+      >上线</a-button
+    >
+    <a-button
+      type="primary"
+      @click="handleQualityTaskRunSetting"
+      style="margin-bottom: 20px; margin-right: 10px"
+      >配置运行</a-button
+    >
+    <a-button
+      type="primary"
+      style="margin-bottom: 20px; margin-right: 10px"
+      @click="handleQualityTaskRun"
+      >运行</a-button
+    >
     <BasicForm @register="registerForm" />
+    <quality-Run-setting-modal @register="registerRunSetting" />
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { ref, computed, unref, reactive, onMounted } from 'vue';
-  import { BasicModal, useModalInner } from '@/components/Modal';
+  import { ref, computed, unref, onMounted } from 'vue';
+  import { BasicModal, useModal, useModalInner } from '@/components/Modal';
   import { useMessage } from '@/hooks/web/useMessage';
-  import { BasicTable, TableAction, useTable } from '@/components/Table';
   import { BasicForm, useForm } from '@/components/Form';
   import {
-    storageManagementColumns,
-    storageManagementFormSchema,
     storageManagementData,
     storageManagementBasicFormSchema,
   } from './QualityTaskSetting.data';
-  // import { storageManagementData } from './analysisData';
-  import { Tag } from 'ant-design-vue';
+  import { Modal } from 'ant-design-vue';
+  import { useGo } from '@/hooks/web/usePage';
+  import QualityRunSettingModal from '@/views/dataQuality/dataSheet/task/QualityTaskRunSetting.vue';
 
   defineOptions({ name: 'KnowledgeModal' });
 
   const emit = defineEmits(['success', 'register']);
   const { createMessage, createConfirm } = useMessage();
   const title = ref();
+  const go = useGo();
   const isRunning = ref(false);
   const getTitle = computed(() => (!unref(isRunning) ? '配置质量文件' : '配置质量文件'));
   const tableData = ref([]);
-  //获取接口数据并放在下拉框里（这里是打开了一个弹框）
-  //初始化表单
-  const [registerTable, { reload }] = useTable({
-    api: async () => {
-      const response = {
-        pageNum: '1',
-        pageSize: '10',
-        pages: '1',
-        total: tableData.value.length,
-        code: '',
-        message: '',
-        data: [],
-      };
-      //过滤data中的数据，取出等于params.deptId的数据
-      var data = [];
-      data = tableData.value;
-      return { ...response, data: data };
-    },
-    pagination: false,
-    columns: storageManagementColumns,
-    // useSearchForm: true,
-    showTableSetting: false,
-    formConfig: {
-      labelWidth: 120,
-      schemas: storageManagementFormSchema,
-      autoSubmitOnEnter: true,
-    },
-    rowKey: 'id',
-    // rowSelection: true,
-    bordered: true,
-    showIndexColumn: false,
-    // actionColumn: {
-    //   width: 150,
-    //   title: '操作',
-    //   dataIndex: 'action',
-    // },
-  });
+
+  const [registerRunSetting, { openModal: openRunSettingModal }] = useModal();
+
   //初始化弹框
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-    await reload();
     setModalProps({ confirmLoading: false });
     title.value = data.title;
   });
@@ -133,27 +88,41 @@
   async function handleSubmit() {
     closeModal();
   }
-  function handleDetail() {
-    createMessage.success('提交成功');
+
+  /** 跳转运维 未完成 应为跳转到运维界面*/
+  function handleQualityTaskService() {
+    go('/dataQuality/dataSheet/task/taskOperation');
   }
-  function handleEdit() {
-    createMessage.success('提交成功');
+
+  /** 查看报告 正在做 应为跳转到报告页面*/
+  function handleQualityTaskRunLog() {
+    go('/dataQuality/dataSheet/task/viewTaskOperation', false);
+  }
+
+  /** 上线 未完成 应为弹窗*/
+  function handleQualityTaskOnline() {
+    go('/dataQuality/dataSheet/task');
   }
-  function handleDelete() {
-    createMessage.success('删除成功');
+
+  /** 配置运行 正在做 应为弹窗*/
+  function handleQualityTaskRunSetting() {
+    openRunSettingModal(true, {
+      isRunning: false,
+    });
   }
-  function deleteAll() {
-    createConfirm({
-      iconType: 'warning',
-      title: '确认删除',
-      content: '确认批量删除选中数据吗？',
-      onOk() {
-        createMessage.success('批量删除成功!');
+
+  /** 任务运行*/
+  function handleQualityTaskRun() {
+    Modal.confirm({
+      title: '确认运行',
+      content: '是否运行选中的任务?',
+      onOk: () => {
+        createMessage.success('运行成功!');
       },
     });
   }
-  function handleImport() {
-    createMessage.success('导出完成');
+  function handleSave() {
+    createMessage.success('保存成功!');
   }
   onMounted(() => {
     tableData.value = storageManagementData;

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

@@ -8,74 +8,97 @@
             :disabled="getRowSelection().selectedRowKeys <= 0"
             type="primary"
             @click="handleDeleteIds"
+            style="margin-right: 10px"
             >删除</a-button
           >
-          <a-button :disabled="getRowSelection().selectedRowKeys <= 0" type="primary"
+          <a-button
+            :disabled="getRowSelection().selectedRowKeys <= 0"
+            type="primary"
+            style="margin-right: 10px"
             >导出</a-button
           >
-          <a-button type="primary" @click="handleImport">导入</a-button>
-          <a-button type="primary" @click="handleAdd">新增文件夹</a-button>
-          <a-button type="primary" @click="handleAddMainBody">新增质量任务文件</a-button>
+          <a-button type="primary" @click="handleImport" style="margin-right: 10px">导入</a-button>
+          <a-button type="primary" @click="handleAdd" style="margin-right: 10px"
+            >新增文件夹</a-button
+          >
+          <a-button type="primary" @click="handleAddMainBody" style="margin-right: 10px"
+            >新增质量任务文件</a-button
+          >
 
           <a-button
             type="primary"
             @click="handleQualityTaskSetting"
             :disabled="getRowSelection().selectedRowKeys <= 0"
+            style="margin-right: 10px"
             >配置质量任务文件</a-button
           >
-          <a-button type="primary" @click="handleAddQualityRule">新增质量规则</a-button>
+          <a-button type="primary" @click="handleAddQualityRule" style="margin-right: 10px"
+            >新增质量规则</a-button
+          >
           <a-button
             type="primary"
             @click="handleAlarmSetting"
             :disabled="getRowSelection().selectedRowKeys <= 0"
+            style="margin-right: 10px"
             >配置通知告警</a-button
           >
-          <a-button
-            type="primary"
-            @click="handleQualityTaskRunSetting"
-            :disabled="getRowSelection().selectedRowKeys <= 0"
-            >配置运行</a-button
+          <!--          <a-button-->
+          <!--            type="primary"-->
+          <!--            @click="handleQualityTaskRunSetting"-->
+          <!--            :disabled="getRowSelection().selectedRowKeys <= 0"-->
+          <!--            >配置运行</a-button-->
+          <!--          >-->
+          <!--          <a-button-->
+          <!--            type="primary"-->
+          <!--            @click="handleQualityTaskRun"-->
+          <!--            :disabled="getRowSelection().selectedRowKeys <= 0"-->
+          <!--            >运行</a-button-->
+          <!--          >-->
+          <!--          <a-button-->
+          <!--            type="primary"-->
+          <!--            @click="handleQualityTaskRunLog"-->
+          <!--            :disabled="getRowSelection().selectedRowKeys <= 0"-->
+          <!--            >查看报告</a-button-->
+          <!--          >-->
+          <a-button type="primary" @click="handleAddCheckRangePlus" style="margin-right: 10px"
+            >添加检查范围-增量添加</a-button
           >
-          <a-button
-            type="primary"
-            @click="handleQualityTaskRun"
-            :disabled="getRowSelection().selectedRowKeys <= 0"
-            >运行</a-button
-          >
-          <a-button
-            type="primary"
-            @click="handleQualityTaskRunLog"
-            :disabled="getRowSelection().selectedRowKeys <= 0"
-            >查看报告</a-button
-          >
-          <a-button type="primary" @click="handleAddCheckRangePlus">添加检查范围-增量添加</a-button>
           <!-- <a-button type="primary" @click="handleAddCheckRangeAll">添加检查范围-全量添加</a-button> -->
+          <!--          <a-button-->
+          <!--            type="primary"-->
+          <!--            @click="handleQualityTaskOnline"-->
+          <!--            v-if="isOnline"-->
+          <!--            :disabled="getRowSelection().selectedRowKeys <= 0"-->
+          <!--            >上线</a-button-->
+          <!--          >-->
           <a-button
             type="primary"
             @click="handleQualityTaskOnline"
             v-if="isOnline"
             :disabled="getRowSelection().selectedRowKeys <= 0"
-            >上线</a-button
-          >
-          <a-button
-            type="primary"
-            @click="handleQualityTaskOnline"
-            v-if="isOnline"
-            :disabled="getRowSelection().selectedRowKeys <= 0"
+            style="margin-right: 10px"
             >批量上线</a-button
           >
-          <a-button type="warning" @click="handleQualityTaskOffline" v-if="isOffline"
+          <a-button
+            type="warning"
+            @click="handleQualityTaskOffline"
+            v-if="isOffline"
+            style="margin-right: 10px"
             >下线</a-button
           >
-          <a-button type="warning" @click="handleQualityTaskOffline" v-if="isOffline"
-            >批量下线</a-button
-          >
           <a-button
-            type="primary"
-            @click="handleQualityTaskService"
-            :disabled="getRowSelection().selectedRowKeys <= 0"
-            >跳转运维</a-button
+            type="warning"
+            @click="handleQualityTaskOffline"
+            v-if="isOffline"
+            style="margin-right: 10px"
+            >批量下线</a-button
           >
+          <!--          <a-button-->
+          <!--            type="primary"-->
+          <!--            @click="handleQualityTaskService"-->
+          <!--            :disabled="getRowSelection().selectedRowKeys <= 0"-->
+          <!--            >跳转运维</a-button-->
+          <!--          >-->
         </a-scrollbar>
       </template>
       <template #name="{ text, record }">
@@ -119,20 +142,18 @@
   </PageWrapper>
 </template>
 <script lang="ts" setup>
-  import { reactive, unref, onDeactivated, onMounted, ref } from 'vue';
+  import { reactive, onMounted, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
   import { PageWrapper } from '@/components/Page';
   import DeptTree from './DeptTree.vue';
   import { useMessage } from '@/hooks/web/useMessage';
   import { useModal } from '@/components/Modal';
-  import ImportModal from './importModal.vue';
+  import importModal from './importModal.vue';
   import { tableList } from './mock';
   import { columns, searchFormSchema } from './mainBody.data';
   import { useGo } from '@/hooks/web/usePage';
-  import { downloadByData } from '@/utils/file/download';
   import { useRoute, onBeforeRouteLeave } from 'vue-router';
   import { useFilterStore } from '@/store/modules/filterData';
-  import { useUserStore } from '@/store/modules/user';
   import { router } from '@/router';
   import AddFolder from '@/views/dataQuality/dataSheet/task/addFolder.vue';
   import RemoveModal from '@/views/dataQuality/dataSheet/task/removeModal.vue';

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

@@ -62,8 +62,8 @@
         </template>
       </BasicTable>
     </div>
-  </PageWrapper>
     <detail-modal @register="registerDetailModal" />
+  </PageWrapper>
 </template>
 <script lang="ts" setup>
   import { onMounted, reactive, ref } from 'vue';