分类分级任务bug修改

@@ -6,11 +6,13 @@
 import { ref, onMounted } from "vue";
 import { ref, onMounted } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { useRouter, useRoute } from "vue-router";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { ElMessage, ElMessageBox } from "element-plus";
+import useDataAssetStore from "@/store/modules/dataAsset";
 import { filterVal, getCgTaskPageList, cgTaskDelete, runExecTask } from "@/api/modules/dataInventory";
 import { filterVal, getCgTaskPageList, cgTaskDelete, runExecTask } from "@/api/modules/dataInventory";
 import { TableColumnWidth } from '@/utils/enum';
 import { TableColumnWidth } from '@/utils/enum';
 
 
 const { proxy } = getCurrentInstance() as any;
 const { proxy } = getCurrentInstance() as any;
 const router = useRouter();
 const router = useRouter();
+const assetStore = useDataAssetStore();
 
 
 const loading = ref(false);
 const loading = ref(false);
 const page = ref({
 const page = ref({
@@ -196,10 +198,10 @@ const open = (msg, type, isBatch = false) => {
 };
 };
 
 
 onActivated(() => {
 onActivated(() => {
-  // if (assetStore.isRefresh) {//如果是首次加载，则不需要调用
-  //   getFirstPageData();
-  //   assetStore.set(false);
-  // }
+  if (assetStore.isRefresh) {//如果是首次加载，则不需要调用
+    getTableData()
+    assetStore.set(false);
+  }
 })
 })
 
 
 onBeforeMount(() => {
 onBeforeMount(() => {

@@ -8,6 +8,8 @@ import { useRouter, useRoute } from "vue-router";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { Search, Warning, ArrowUp } from "@element-plus/icons-vue";
 import { Search, Warning, ArrowUp } from "@element-plus/icons-vue";
 import { tagMethod, tagType, changeNum } from "@/utils/common";
 import { tagMethod, tagType, changeNum } from "@/utils/common";
+import useUserStore from "@/store/modules/user";
+import useDataAssetStore from "@/store/modules/dataAsset";
 import TableTools from '@/components/Tools/table_tools.vue';
 import TableTools from '@/components/Tools/table_tools.vue';
 import {
 import {
   getCgTaskDetail,
   getCgTaskDetail,
@@ -25,6 +27,9 @@ import {
 const { proxy } = getCurrentInstance() as any;
 const { proxy } = getCurrentInstance() as any;
 const router = useRouter();
 const router = useRouter();
 const route = useRoute();
 const route = useRoute();
+const userStore = useUserStore();
+const fullPath = route.fullPath;
+const assetStore = useDataAssetStore();
 
 
 const loading = ref(false);
 const loading = ref(false);
 const gradeList = ref([]);
 const gradeList = ref([]);
@@ -659,6 +664,8 @@ const saveTask = () => {
     loading.value = false;
     loading.value = false;
     if (res.code == proxy.$passCode) {
     if (res.code == proxy.$passCode) {
       ElMessage.success('变更成功');
       ElMessage.success('变更成功');
+      userStore.setTabbar(userStore.tabbar.filter((tab: any) => tab.fullPath !== fullPath));
+      assetStore.set(true);
       router.push({
       router.push({
         name: "taskConfig",
         name: "taskConfig",
       });
       });

@@ -7,14 +7,20 @@ import { ref, onMounted } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { useRouter, useRoute } from "vue-router";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { Search } from "@element-plus/icons-vue";
 import { Search } from "@element-plus/icons-vue";
+import useUserStore from "@/store/modules/user";
+import useDataAssetStore from "@/store/modules/dataAsset";
 import { getCgTaskDetail, getClassifyGradList, getClassifyTreeList, getCgLabelPageList, getMetaTableCollectList, cgTaskSave, cgTaskUpdate } from "@/api/modules/dataInventory";
 import { getCgTaskDetail, getClassifyGradList, getClassifyTreeList, getCgLabelPageList, getMetaTableCollectList, cgTaskSave, cgTaskUpdate } from "@/api/modules/dataInventory";
 
 
 const { proxy } = getCurrentInstance() as any;
 const { proxy } = getCurrentInstance() as any;
 const router = useRouter();
 const router = useRouter();
 const route = useRoute();
 const route = useRoute();
+const userStore = useUserStore();
+const fullPath = route.fullPath;
+const assetStore = useDataAssetStore();
 
 
+const loading = ref(false);
 const step = ref(0);
 const step = ref(0);
-const selectIndex = ref(0);
+const selectIndex = ref('');
 const taskDetail = ref({});
 const taskDetail = ref({});
 const asideSearchInput = ref("");
 const asideSearchInput = ref("");
 const permissionList: any = ref([])
 const permissionList: any = ref([])
@@ -56,6 +62,7 @@ const taskFormItems: any = ref([
     field: 'taskName',
     field: 'taskName',
     default: '',
     default: '',
     maxlength: 50,
     maxlength: 50,
+    clearable: true,
     required: true
     required: true
   },
   },
   {
   {
@@ -65,6 +72,7 @@ const taskFormItems: any = ref([
     field: 'cgDirName',
     field: 'cgDirName',
     default: '',
     default: '',
     maxlength: 50,
     maxlength: 50,
+    clearable: true,
     required: true
     required: true
   },
   },
 ])
 ])
@@ -190,9 +198,10 @@ const getTableData = () => {
 };
 };
 
 
 const toPath = () => {
 const toPath = () => {
+  userStore.setTabbar(userStore.tabbar.filter((tab: any) => tab.fullPath !== fullPath));
+  assetStore.set(true);
   router.push({
   router.push({
     name: "taskConfig",
     name: "taskConfig",
-    query: {},
   });
   });
 }
 }
 
 
@@ -222,7 +231,7 @@ const getMetaTableData = () => {
       if (route.query.type === 'edit') {
       if (route.query.type === 'edit') {
         nextTick(() => {
         nextTick(() => {
           data.map((row) => {
           data.map((row) => {
-            taskDetail.value.metaGuids.indexOf(row.guid) > -1 && metadataTableRef.value.tableRef.toggleRowSelection(row, true);
+            taskDetail.value.metaGuids.indexOf(row.databaseGuid) > -1 && metadataTableRef.value.tableRef.toggleRowSelection(row, true);
           });
           });
         })
         })
       }
       }
@@ -258,7 +267,9 @@ const btnClick = async (btn, bType = null) => {
     const subForm = { ...form };
     const subForm = { ...form };
     submitForm(formEl, subForm);
     submitForm(formEl, subForm);
   } else {
   } else {
-    toPath()
+    router.push({
+      name: "taskConfig",
+    });
   }
   }
 };
 };
 
 
@@ -266,6 +277,7 @@ const submitForm = (formEl, info) => {
   if (!formEl) return;
   if (!formEl) return;
   formEl.validate((valid, fields) => {
   formEl.validate((valid, fields) => {
     if (valid) {
     if (valid) {
+      loading.value = true;
       const params = {
       const params = {
         classifyGuid: templateInfo.value.guid,
         classifyGuid: templateInfo.value.guid,
         metaGuids: selectRowData.value,
         metaGuids: selectRowData.value,
@@ -275,6 +287,7 @@ const submitForm = (formEl, info) => {
         params.guid = taskDetail.value.guid;
         params.guid = taskDetail.value.guid;
         params.execGuid = taskDetail.value.execGuid;
         params.execGuid = taskDetail.value.execGuid;
         cgTaskUpdate(params).then((res: any) => {
         cgTaskUpdate(params).then((res: any) => {
+          loading.value = false;
           if (res.code == proxy.$passCode) {
           if (res.code == proxy.$passCode) {
             toPath()
             toPath()
           } else {
           } else {
@@ -288,9 +301,11 @@ const submitForm = (formEl, info) => {
             type: "error",
             type: "error",
             message: '请求失败',
             message: '请求失败',
           });
           });
+          loading.value = false;
         })
         })
       } else {
       } else {
         cgTaskSave(params).then((res: any) => {
         cgTaskSave(params).then((res: any) => {
+          loading.value = false;
           if (res.code == proxy.$passCode) {
           if (res.code == proxy.$passCode) {
             toPath()
             toPath()
           } else {
           } else {
@@ -304,6 +319,7 @@ const submitForm = (formEl, info) => {
             type: "error",
             type: "error",
             message: '请求失败',
             message: '请求失败',
           });
           });
+          loading.value = false;
         })
         })
       }
       }
     } else {
     } else {
@@ -322,6 +338,7 @@ const handleScroll = () => {
 
 
 // 点击分类列表
 // 点击分类列表
 const listClick = (row) => {
 const listClick = (row) => {
+  selectIndex.value = row.guid;
   templateInfo.value = row;
   templateInfo.value = row;
   getClassifyTree();
   getClassifyTree();
   searchItemValue.value.classifyGuid = row.guid;
   searchItemValue.value.classifyGuid = row.guid;
@@ -409,7 +426,7 @@ onMounted(() => {
 </script>
 </script>
 
 
 <template>
 <template>
-  <div class="container_wrap full flex">
+  <div class="container_wrap full flex" v-loading="loading">
     <div class="aside_wrap" v-show="step == 0">
     <div class="aside_wrap" v-show="step == 0">
       <div class="aside_title">选择分类</div>
       <div class="aside_title">选择分类</div>
       <!-- <div class="aside_search">
       <!-- <div class="aside_search">
@@ -417,8 +434,8 @@ onMounted(() => {
           @change="querySearch" />
           @change="querySearch" />
       </div> -->
       </div> -->
       <div class="aside_list" v-loading="listLoading" v-infinite-scroll="handleScroll">
       <div class="aside_list" v-loading="listLoading" v-infinite-scroll="handleScroll">
-        <div class="list_item" v-for="(item, i) in currpermissionList" :class="{ active: selectIndex == i }"
-          @click="selectIndex = i; listClick(item);" v-preReClick>{{ item.name }}</div>
+        <div class="list_item" v-for="(item, i) in currpermissionList" :class="{ active: selectIndex == item.guid }"
+          @click="listClick(item);" v-preReClick>{{ item.name }}</div>
       </div>
       </div>
     </div>
     </div>
     <div class="main_wrap" :class="{ full: step == 1 }">
     <div class="main_wrap" :class="{ full: step == 1 }">

@@ -131,11 +131,11 @@ const getFirstPageData = () => {
 }
 }
 
 
 onActivated(() => {
 onActivated(() => {
-  getFirstPageData()
+  // getFirstPageData()
 })
 })
 
 
 onBeforeMount(() => {
 onBeforeMount(() => {
-
+  getFirstPageData()
 })
 })
 
 
 </script>
 </script>
@@ -170,7 +170,7 @@ onBeforeMount(() => {
 .table_panel_wrap {
 .table_panel_wrap {
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
-  padding: 0px 8px 0;
+  padding: 12px 8px 0;
 }
 }
 
 
 .card-noData {
 .card-noData {