Merge branch 'develop' into dev_20241202_xukangle

@@ -24,7 +24,8 @@ const props = defineProps({
 
 const emits = defineEmits(["expand"]);
 
-const isExpanded = ref(true);
+// const isExpanded = ref(true);
+const isExpanded = ref(props.isExpand);
 
 watch(
   () => props.isExpand,
@@ -46,14 +47,10 @@ const expandSwicthHandler = () => {
 </script>
 
 <template>
-  <ElCard
-    class="v-content-wrap"
-    shadow="never"
-    :body-style="{
+  <ElCard class="v-content-wrap" shadow="never" :body-style="{
     padding: `0px`,
     height: `${isExpanded ? contentHeight + 28 : 0}px`,
-    }"
-  >
+  }">
     <template v-if="title" #header>
       <div class="card-title" @click="expandSwicthHandler">
         <span v-if="expandSwicth" style="padding-right: 5px; cursor: pointer">

@@ -15,7 +15,7 @@ const { required, orderNum } = useValidator();
 const { proxy } = getCurrentInstance() as any;
 const router = useRouter();
 const route = useRoute();
-const fullPath = route.query.fullPath;
+const fullPath = route.fullPath;
 const userStore = useUserStore();
 
 const fullscreenLoading = ref(false);
@@ -501,6 +501,7 @@ const saveUpdate = async () => {
     });
     saveLoading.value = false;
   } else {
+    saveLoading.value = false;
     proxy.$ElMessage.error(res.msg);
   }
 }
@@ -517,6 +518,8 @@ const changeShowMethod = () => {
 }
 
 const cancel = () => {
+  console.log(userStore.tabbar);
+  console.log(fullPath);
   proxy.$openMessageBox("当前页面尚未保存，确定放弃修改吗？", () => {
     userStore.setTabbar(userStore.tabbar.filter((tab: any) => tab.fullPath !== fullPath));
     router.push({
@@ -673,7 +676,7 @@ const initGraph = () => {
       },
       getHGap: function getHGap() {
         return 80;
-      }
+      },
     }
   });
   graph.data(shapeTreeListData.value[0]);
@@ -799,12 +802,16 @@ onMounted(() => {
   // });
 })
 
+const isExpand = ref<boolean>(router.currentRoute.value.query.isExpand == 'true');
+
+
 </script>
 
 <template>
   <div class="container_wrap" v-loading="fullscreenLoading">
     <div class="content_main">
-      <ContentWrap id="id-baseInfo" title="基础信息" description="" style="margin-top: 8px;">
+      <ContentWrap id="id-baseInfo" title="基础信息" description="" style="margin-top: 8px;" :expandSwicth="true"
+        :isExpand="isExpand">
         <Form ref="formRef" :itemList="classStandardFormItems" formId="main-model-edit" col="col3" />
       </ContentWrap>
       <ContentWrap id="id-classStandard" class="detail-content" title="分类标准" description=""
@@ -852,6 +859,7 @@ onMounted(() => {
 .content_main {
   height: calc(100% - 44px);
   padding: 10px 16px;
+  overflow: auto;
 }
 
 .bottom_tool_wrap {
@@ -870,6 +878,7 @@ onMounted(() => {
 
     .card-body-content {
       height: 100%;
+      overflow: auto;
     }
   }
 }
@@ -885,11 +894,11 @@ onMounted(() => {
 }
 
 .shape-main {
-  height: calc(100% - 160px);
+  height: calc(100% - 44px);
 }
 
 .table_panel {
-  height: calc(100% - 160px) !important;
+  height: calc(100% - 44px) !important;
 }
 
 .node-details-popup {

@@ -10,7 +10,7 @@ import { saveGrade, getGradeList, deleteGrade, getLargeCategoryList, updateGrade
 import useUserStore from "@/store/modules/user";
 const userStore = useUserStore();
 const route = useRoute();
-const fullPath = route.query.fullPath;
+const fullPath = route.fullPath;
 onBeforeMount(() => {
   getGradeListData();
   getDataGrade();
@@ -114,7 +114,7 @@ const tableInfo = ref({
   multiple: true,
   fields: [
     { label: "序号", type: 'index', width: 56, align: "center" },
-    { label: "排序", field: 'orderNum', width: 56, align: "center" },
+    // { label: "排序", field: 'orderNum', width: 56, align: "center" },
     {
       label: "数据级别", field: "dataGrade", width: 120, getName: (scope) => {
         let dataGrade = scope.row.dataGrade;
@@ -140,7 +140,7 @@ const tableInfo = ref({
           console.log(scope);
           filterDataGradeEdit(scope.row.dataGrade);
           newCreateGradeStandardDialogInfo.value.visible = true;
-          newCreateGradeStandardDialogInfo.value.title = '编辑分类';
+          newCreateGradeStandardDialogInfo.value.title = '编辑标准';
           newCreateGradeFormItems.value.forEach(item => {
             item.default = scope.row[item.field];
           })
@@ -231,7 +231,7 @@ const newCreateGradeFormItems = ref([{
   visible: true,
 },
 {
-  label: '序号',
+  label: '排序号',
   type: 'input',
   maxlength: 19,
   placeholder: '请输入',
@@ -268,7 +268,7 @@ const newCreateGradeFormRules = ref({
 const newCreateGradeStandardDialogInfo = ref({
   visible: false,
   size: 860,
-  title: "添加分类",
+  title: "新增标准",
   type: "",
   formInfo: {
     id: "grade-form",
@@ -281,9 +281,8 @@ const newCreateGradeStandardDialogInfo = ref({
       newCreateGradeStandardDialogInfo.value.visible = false;
     },
     submit: async (btn, info) => {
-      console.log(info, guid);
       newCreateGradeStandardDialogInfo.value.submitBtnLoading = true;
-      if (newCreateGradeStandardDialogInfo.value.title === '编辑分类') {
+      if (newCreateGradeStandardDialogInfo.value.title === '编辑标准') {
         const params = {
           ...info,
           guid: editClassifyGradeGuid.value,
@@ -294,7 +293,7 @@ const newCreateGradeStandardDialogInfo = ref({
         if (res.code == proxy.$passCode) {
           proxy.$ElMessage({
             type: 'success',
-            message: '修改分类成功'
+            message: '编辑标准成功'
           })
           getGradeListData();
           newCreateGradeStandardDialogInfo.value.submitBtnLoading = false;
@@ -312,7 +311,7 @@ const newCreateGradeStandardDialogInfo = ref({
         if (res.code == proxy.$passCode) {
           proxy.$ElMessage({
             type: 'success',
-            message: '新增分类成功'
+            message: '新增标准成功'
           })
           getGradeListData();
           newCreateGradeStandardDialogInfo.value.submitBtnLoading = false;
@@ -369,6 +368,7 @@ const saveUpdate = async () => {
     });
     saveLoading.value = false;
   } else {
+    saveLoading.value = false;
     proxy.$ElMessage.error(res.msg);
   }
 }
@@ -417,6 +417,7 @@ const cancel = () => {
 .content_main {
   height: calc(100% - 44px);
   padding: 10px 16px;
+  overflow: auto;
 
   .table-top-btns {
     margin-bottom: 12px;

@@ -5,18 +5,12 @@
 <script lang="ts" setup name="taskConfig">
 import { ref, onMounted } from "vue";
 import { useRouter, useRoute } from "vue-router";
-import useUserStore from "@/store/modules/user";
 import { ElMessage, ElMessageBox } from "element-plus";
-
-import useDataAssetStore from "@/store/modules/dataAsset";
 import { filterVal, getCgTaskPageList, cgTaskDelete, runExecTask } from "@/api/modules/dataInventory";
 import { TableColumnWidth } from '@/utils/enum';
 
 const { proxy } = getCurrentInstance() as any;
 const router = useRouter();
-const userStore = useUserStore();
-const userData = JSON.parse(userStore.userData);
-const assetStore = useDataAssetStore();
 
 const loading = ref(false);
 const page = ref({
@@ -159,7 +153,7 @@ const toPath = (type) => {
       query: {
         guid: currTableData.value.guid,
         name: currTableData.value.taskName,
-        detail: JSON.stringify(currTableData.value),
+        execGuid: currTableData.value.execGuid,
         type
       },
     });

@@ -5,18 +5,13 @@
 <script lang="ts" setup name="taskEdit">
 import { ref, onMounted } from "vue";
 import { useRouter, useRoute } from "vue-router";
-import useUserStore from "@/store/modules/user";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { Search } from "@element-plus/icons-vue";
-import useDataAssetStore from "@/store/modules/dataAsset";
 import { getCgTaskDetail, getClassifyGradList, getClassifyTreeList, getCgLabelPageList, getMetaTableCollectList, cgTaskSave, cgTaskUpdate } from "@/api/modules/dataInventory";
 
 const { proxy } = getCurrentInstance() as any;
 const router = useRouter();
 const route = useRoute();
-const userStore = useUserStore();
-const userData = JSON.parse(userStore.userData);
-const assetStore = useDataAssetStore();
 
 const step = ref(0);
 const selectIndex = ref(0);

@@ -5,20 +5,13 @@
 <script lang="ts" setup name="taskLog">
 import { ref, onMounted } from "vue";
 import { useRouter, useRoute } from "vue-router";
-import useUserStore from "@/store/modules/user";
 import { ElMessage, ElMessageBox } from "element-plus";
-
-import useDataAssetStore from "@/store/modules/dataAsset";
 import { getTaskExecPageList, filterVal } from "@/api/modules/dataInventory";
 import { TableColumnWidth } from '@/utils/enum';
 
 const { proxy } = getCurrentInstance() as any;
 const router = useRouter();
 const route = useRoute();
-const userStore = useUserStore();
-const userData = JSON.parse(userStore.userData);
-const assetStore = useDataAssetStore();
-
 const loading = ref(false);
 const page = ref({
   limit: 50,
@@ -71,12 +64,11 @@ const tableInfo = ref({
   actionInfo: {
     label: "操作",
     type: "btn",
-    width: 100,
+    width: 90,
     btns: (scope) => {
-      let row = scope.row, btnArr: any = [
-        { label: "查看结果", value: "path" },
+      return [
+        { label: "查看结果", value: "log" },
       ];
-      return btnArr;
     },
   },
 });
@@ -107,7 +99,7 @@ const tableBtnClick = (scope, btn) => {
   const type = btn.value;
   const row = scope.row;
   currTableData.value = row;
-  if (type == "path") {
+  if (type == "log") {
     toPath(type);
   }
 };
@@ -116,8 +108,9 @@ const toPath = (type) => {
   router.push({
     name: "taskDetail",
     query: {
-      guid: currTableData.value.guid,
-      name: currTableData.value.damName,
+      guid: currTableData.value.taskGuid,
+      name: currTableData.value.taskName,
+      execGuid: currTableData.value.guid,
       type
     },
   });

@@ -158,7 +158,8 @@ const handleClassDataClick = (item, des = '') => {
       type: des === '' ? '配置' : des,
       classStandardName: item.name,
       refGradeGuid: item.refGradeGuid,
-      description: item.description
+      description: item.description,
+      isExpand: item.isExpand || false
     }
   });
 }
@@ -276,7 +277,8 @@ const newCreateClassStandardDialogInfo = ref({
                 name: item.name,
                 guid: item.guid,
                 refGradeGuid: item.refGradeGuid,
-                description: item.description
+                description: item.description,
+                isExpand: true
               }
               handleClassDataClick(params, '');
             }
@@ -312,6 +314,7 @@ const newCreateClassStandardDialogInfo = ref({
 })
 
 const newCreateClass = () => {
+  newCreateClassStandardDialogInfo.value.submitBtnLoading = false;
   newCreateClassStandardDialogInfo.value.visible = true;
   classStandardFormItems.value.forEach(item => item.default = '');
 }