修改了指标标准页面

src/views/dataStandards/IndicatorStandards/CopyModal.vue

@@ -47,7 +47,7 @@
 
   /**确定按钮*/
   async function handleSubmit() {
-    createMessage.success('移动成功');
+    createMessage.success('复制成功');
     closeModal()
   }
 

src/views/dataStandards/IndicatorStandards/createStandardsType.vue

@@ -27,7 +27,7 @@
   import {resetNameFormSchema} from './indicatorStandards.data';
   import { useMessage } from '@/hooks/web/useMessage';
   import {createBasicTypeFormSchema} from './indicatorStandards.data';
-  import {TreeData} from "./indicatorStandardsData";
+  import {TreeData,dataBasicTreeData} from "./indicatorStandardsData";
   import TreeTwo from './TreeTwo.vue'
   defineOptions({ name: 'AccountModal' });
 
@@ -65,6 +65,7 @@
       ...formData,
     });
     const treeList =  handleTree(TreeData, 'businessId',undefined,undefined,undefined)
+    const treeList1 =  handleTree(dataBasicTreeData, 'businessId',undefined,undefined,undefined)
     updateSchema([
       {
         field: 'standardsTree',
@@ -75,7 +76,7 @@
       {
         field: 'ModelTree',
         componentProps: {
-          treeData: treeList
+          treeData: treeList1
         },
       },
     ]);

src/views/dataStandards/IndicatorStandards/detailStandard.vue

@@ -14,7 +14,7 @@
       </div>
       <div>
         <a-button type="primary" @click="contrastButton">版本对比</a-button>
-        <a-button type="primary" style="margin-left: 10px"  @click="resetButton">回滚</a-button>
+        <a-button type="primary" style="margin-left: 10px"  @click="returnButton">回滚</a-button>
         <a-button type="primary" style="margin-left: 10px"  @click="exitButton">退出查看</a-button>
       </div>
     </div>
@@ -138,8 +138,15 @@ function handleChange(value) {
 }
 
 /**回滚*/
-function resetButton(value) {
-  createMessage.success('回滚成功!')
+function returnButton(value) {
+  createConfirm({
+      iconType: 'warning',
+      title: '确认回滚',
+      content: '是否确认进行回滚？',
+      onOk() {
+        createMessage.success('回滚成功!');
+      },
+  });
 }
 
 

src/views/dataStandards/IndicatorStandards/editDetailStandard.vue

@@ -13,9 +13,9 @@
     </div>
     <Divider />
     <BasicForm @register="registerForm1" />
-    <div style="margin-left: 10px">
-      命名字典映射<a-button style="margin-left: 10px;border-color: #4aabfe"  @click="chooseButton">选择</a-button>
-    </div>
+<!--    <div style="margin-left: 10px">-->
+<!--      命名字典映射<a-button style="margin-left: 10px;border-color: #4aabfe"  @click="chooseButton">选择</a-button>-->
+<!--    </div>-->
     <Divider />
     <BasicForm @register="registerForm2" />
     <Divider />
@@ -23,7 +23,7 @@
     <Divider />
 
 <!--    选择命名字典 弹窗-->
-    <ChooseNamingDictionaryModal @register="registerChooseNamingDictionaryModal" @success="handleSuccess" />
+<!--    <ChooseNamingDictionaryModal @register="registerChooseNamingDictionaryModal" @success="handleSuccess" />-->
   </div>
 </template>
 <script lang="ts" setup>

src/views/dataStandards/IndicatorStandards/index.vue

@@ -6,6 +6,7 @@
         <a-button type="primary" @click="copyButton">复制到</a-button>
         <a-button type="primary" @click="deleteBatchButton">删除</a-button>
         <a-button type="primary" @click="MoveButton">移动</a-button>
+        <a-button type="primary" @click="ImportDataStandardsButton">导入数据标准</a-button>
         <a-button type="primary" @click="ExportRelativeButton">导出关联关系</a-button>
         <a-button type="primary" @click="ExportDataStandardsButton">导出数据标准</a-button>
         <a-button type="primary" @click="batchPublishButton">批量发布</a-button>
@@ -61,6 +62,8 @@
         </span>
       </template>
     </BasicTable>
+<!--    导入数据标准 弹窗-->
+    <ImportDataStandardsModal @register="registerDataStandardsModal" @success="handleSuccess" />
 <!--    新建基础标准 弹窗-->
     <CreateIndicatorStandards @register="registerCreateIndicatorStandardsModal" @success="handleSuccess" />
 <!--    新建标准分类 弹窗-->
@@ -92,11 +95,12 @@
   import { router } from '@/router';
   import {exportUserList} from "@/api/system/user/user";
   import {downloadByData} from "@/utils/file/download";
-
+  import ImportDataStandardsModal from './ImportDataStandardsModal.vue';
   defineOptions({ name: 'AccountManagement' });
   const { createMessage, createConfirm } = useMessage();
   const route = useRoute();
   const go = useGo();
+  const [registerDataStandardsModal, { openModal: openDataStandardsModal }] = useModal();
   const [registerCreateIndicatorStandardsModal, { openModal: openCreateIndicatorStandardsModal }] = useModal();
   const [registerCreateStandardsTypeModal, { openModal: openCreateStandardsTypeModal }] = useModal();
   const [registerMoveModal, { openModal: openMoveModal }] = useModal();
@@ -243,6 +247,13 @@
     downloadByData(data, '数据标准信息' + '.xlsx');
   }
 
+   /**导入数据标准*/
+  async function ImportDataStandardsButton() {
+    openDataStandardsModal(true, {
+
+    });
+  }
+
   function handleSuccess({ isUpdate, values }) {
 
   }

src/views/dataStandards/IndicatorStandards/indicatorStandards.data.ts

@@ -161,7 +161,7 @@ export const createBasicTypeFormSchema: FormSchema[] = [
     colProps: { lg: 24, md: 24 },
     componentProps: {
       fieldNames: {
-        label: 'standardChineseName',
+        label: 'modelName',
         value: 'businessId',
       },
       getPopupContainer: () => document.body,
@@ -2083,15 +2083,33 @@ export const relatedBasicStandardsSchema: any[] = [
   {
     field: 'relatedRelationship',
     label: '关联关系',
-    component: 'Input',
+    component: 'Select',
     rules: [
       {
         required: true,
-        message: '请输入关联关系',
+        message: '请选择关联关系',
       },
     ],
     componentProps: {
-      placeholder: '请输入关联关系',
+      options:[
+        {
+          label: '引用',
+          value: '引用'
+        },
+        {
+          label: '同义词',
+          value: '同义词'
+        },
+        {
+          label: '依赖',
+          value: '依赖'
+        },
+        {
+          label: '从属',
+          value: '从属'
+        }
+      ],
+      placeholder: '请选择关联关系',
     },
     colProps: { lg: 24, md: 24 },
   },
@@ -2130,15 +2148,33 @@ export const relatedIndicatorStandardsSchema: any[] = [
   {
     field: 'relatedRelationship',
     label: '关联关系',
-    component: 'Input',
+    component: 'Select',
     rules: [
       {
         required: true,
-        message: '请输入关联关系',
+        message: '请选择关联关系',
       },
     ],
     componentProps: {
-      placeholder: '请输入关联关系',
+      options:[
+        {
+          label: '引用',
+          value: '引用'
+        },
+        {
+          label: '同义词',
+          value: '同义词'
+        },
+        {
+          label: '依赖',
+          value: '依赖'
+        },
+        {
+          label: '从属',
+          value: '从属'
+        }
+      ],
+      placeholder: '请选择关联关系',
     },
     colProps: { lg: 24, md: 24 },
   },

src/views/dataStandards/IndicatorStandards/indicatorStandardsContrast.vue

@@ -42,11 +42,11 @@
           <div style="font-size: 15px;padding-left: 10px;padding-left: 50px">
             <div>
               版本<Select
-              v-model:value="optionValue"
+              v-model:value="optionValue1"
               show-search
               placeholder="请选择版本"
               style="width: 200px;margin-left: 10px"
-              :options="options"
+              :options="options1"
               @change="handleChange"
             ></Select>
             </div>
@@ -85,6 +85,13 @@
     { value: 'V2', label: 'V2' },
     { value: 'V3', label: 'V3' },
   ]);
+  const options1 = ref<any>([
+    { value: 'V1', label: 'V1' },
+    { value: 'V2', label: 'V2' },
+    { value: 'V3', label: 'V3' },
+  ]);
+  const optionValue = ref('')
+  const optionValue1 = ref('')
   const { createMessage } = useMessage();
   const [registerLeftForm,{setFieldsValue:setLeftFieldsValue}] = useForm({
     labelWidth: 100,
@@ -107,9 +114,17 @@
   function endContrast() {
     createMessage.info('结束对比');
     startContrastFlag.value = false
+    router.push({
+      path: '/dataStandards/indicatorStandards/detailStandard',
+      query: {
+        businessId:route.query.businessId,
+      },
+    });
   }
 
   onMounted(() => {
+    optionValue.value = 'V3'
+    optionValue1.value = 'V1'
     setLeftFieldsValue({
       ...leftContrastData[0],
     })

src/views/dataStandards/IndicatorStandards/indicatorStandardsData.ts

@@ -390,6 +390,153 @@ export const TreeData: any[] = [
     "collaborativeDepartment": "人力资源部, 技术部"
   }
 ];
+/**首页 新增基础分类 基础元模型树*/
+export const dataBasicTreeData: any[] = [
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 100,
+    modelName: '数据标准模型',
+    parentId: 0,
+    code: '001',
+    ancestors: '0',
+    orderNum: 0,
+    holder: 'admin',
+    createDate: '2024-10-24 10:04:04',
+    updateDate: '2024-10-24 10:04:04',
+    selectType: null,
+    type: 'MySQL',
+    icon: 'ion:settings-outline',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 101,
+    modelName: '数据标准模型文件夹1',
+    parentId: 100,
+    code: '002',
+    ancestors: '0,100',
+    orderNum: 1,
+    selectType: null,
+    holder: 'admin',
+    createDate: '2024-10-24 10:04:04',
+    updateDate: '2024-10-24 10:04:04',
+    type: 'MySQL',
+    icon: 'ant-design:folder-open-outlined',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 102,
+    modelName: '数据标准模型文件夹2',
+    parentId: 100,
+    code: '002',
+    ancestors: '0,100',
+    orderNum: 1,
+    selectType: null,
+    holder: 'admin',
+    createDate: '2024-10-24 10:04:04',
+    updateDate: '2024-10-24 10:04:04',
+    type: 'MySQL',
+    icon: 'ant-design:folder-open-outlined',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 103,
+    modelName: '数据标准模型文件夹3',
+    parentId: 100,
+    code: '002',
+    ancestors: '0,100',
+    orderNum: 1,
+    selectType: null,
+    holder: 'admin',
+    createDate: '2024-10-24 10:04:04',
+    updateDate: '2024-10-24 10:04:04',
+    type: 'MySQL',
+    icon: 'ant-design:folder-open-outlined',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 201,
+    modelName: 'argodb元模型',
+    parentId: 101,
+    'code:': '002',
+    ancestors: '0,100，101',
+    orderNum: 1,
+    selectType: null,
+    holder: 'admin',
+    createDate: '2024-10-24 10:04:04',
+    updateDate: '2024-10-24 10:04:04',
+    type: 'MySQL',
+    icon: 'ant-design:codepen-outlined',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 202,
+    modelName: 'inceptor元模型',
+    parentId: 101,
+    'code:': '002',
+    ancestors: '0,100，101',
+    orderNum: 1,
+    selectType: null,
+    holder: 'admin',
+    createDate: '2024-10-24 10:04:04',
+    updateDate: '2024-10-24 10:04:04',
+    type: 'MySQL',
+    icon: 'ant-design:codepen-outlined',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 203,
+    modelName: 'acc元模型',
+    parentId: 102,
+    'code:': '002',
+    ancestors: '0,100，102',
+    orderNum: 1,
+    selectType: null,
+    holder: 'admin',
+    createDate: '2024-10-24 10:04:04',
+    updateDate: '2024-10-24 10:04:04',
+    type: 'MySQL',
+    icon: 'ant-design:codepen-outlined',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 204,
+    modelName: 'ctor元模型',
+    parentId: 102,
+    'code:': '002',
+    ancestors: '0,100，102',
+    orderNum: 1,
+    selectType: null,
+    holder: 'admin',
+    createDate: '2024-10-24 10:04:04',
+    updateDate: '2024-10-24 10:04:04',
+    type: 'MySQL',
+    icon: 'ant-design:codepen-outlined',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 205,
+    modelName: 'octp元模型',
+    parentId: 103,
+    'code:': '002',
+    ancestors: '0,100，103',
+    orderNum: 1,
+    selectType: null,
+    holder: 'admin',
+    createDate: '2024-10-24 10:04:04',
+    updateDate: '2024-10-24 10:04:04',
+    type: 'MySQL',
+    icon: 'ant-design:codepen-outlined',
+  },
+];
 
 export const fileData: any[] = [
     {
@@ -838,7 +985,6 @@ export const meteDataTreeData: any[] = [
     businessId: 100,
     workSpaceName: '数据库对象资源',
     parentId: 0,
-    'code:': '001',
     ancestors: '0',
     orderNum: 0,
     children: [],
@@ -852,7 +998,6 @@ export const meteDataTreeData: any[] = [
     businessId: 101,
     workSpaceName: 'admin-个人工作区',
     parentId: 100,
-    'code:': '002',
     ancestors: '0,100',
     orderNum: 1,
     children: [],
@@ -863,10 +1008,9 @@ export const meteDataTreeData: any[] = [
   {
     delFlag: '0',
     flag: '1',
-    businessId: 107,
+    businessId: 102,
     workSpaceName: '共享工作区',
     parentId: 100,
-    'code:': '003',
     ancestors: '0,100',
     orderNum: 2,
     children: [],
@@ -877,17 +1021,81 @@ export const meteDataTreeData: any[] = [
   {
     delFlag: '0',
     flag: '0',
-    businessId: 203,
+    businessId: 103,
     workSpaceName: '高级工作区',
     parentId: 100,
-    'code:': '010',
-    ancestors: '0,100,107',
+    ancestors: '0,100',
     orderNum: 2,
     children: [],
     selectType: null,
     createTime: '2024-10-24 10:04:04',
     createBy: 'admin',
   },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 201,
+    workSpaceName: 'mysql',
+    parentId: 101,
+    ancestors: '0,100,101',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 301,
+    workSpaceName: 'gxx',
+    parentId: 201,
+    ancestors: '0,100,101,201',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 401,
+    workSpaceName: 'batch3_prc',
+    parentId: 301,
+    ancestors: '0,100,101,201,301',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 202,
+    workSpaceName: 'oracle',
+    parentId: 102,
+    ancestors: '0,100,102',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
+  {
+    delFlag: '0',
+    flag: '1',
+    businessId: 203,
+    workSpaceName: 'localhost',
+    parentId: 103,
+    ancestors: '0,100,103',
+    orderNum: 1,
+    children: [],
+    selectType: null,
+    createTime: '2024-10-24 10:04:04',
+    createBy: 'admin',
+  },
 ]
 /**关联关系-指标标准-树 数据*/
 export const indicatorTreeData: any[] = [

src/views/dataStandards/IndicatorStandards/relatedQualityModal.vue

@@ -65,7 +65,7 @@
         data: [],
       };
       //过滤data中的数据，取出等于params.deptId的数据
-      return { ...response,data: relatedQualityData };
+      return { ...response,data: [] };
     },
     columns:relatedQualityColumns,
     useSearchForm: false,

src/views/dataStandards/IndicatorStandards/relatedRelationships.vue

 <template>
   <PageWrapper :title="title" class="content-padding" contentBackground  @back="goBack">
-<!--    <div class="relatedRelationships_module">-->
       <BasicTable @register="registerTable1">
         <template #toolbar>
           <a-button type="primary" @click="createQualityButton">创建质量规则</a-button>
@@ -12,8 +11,9 @@
             <TableAction
               :actions="[
               {
+                //解绑
                 icon: 'ant-design:link-outlined',
-                onClick: Button.bind(null, record),
+                onClick: unbindButton.bind(null, record),
               },
             ]"
             />
@@ -37,8 +37,9 @@
             <TableAction
               :actions="[
               {
+                //解绑
                 icon: 'ant-design:link-outlined',
-                onClick: Button.bind(null, record),
+                onClick: unbindButton.bind(null, record),
               },
             ]"
             />
@@ -57,8 +58,9 @@
            <TableAction
               :actions="[
               {
+                //解绑
                 icon: 'ant-design:link-outlined',
-                onClick: Button.bind(null, record),
+                onClick: unbindButton.bind(null, record),
               },
             ]"
             />
@@ -77,8 +79,9 @@
             <TableAction
               :actions="[
               {
+                //解绑
                 icon: 'ant-design:link-outlined',
-                onClick: Button.bind(null, record),
+                onClick: unbindButton.bind(null, record),
               },
             ]"
             />
@@ -88,7 +91,6 @@
           <a @click="showDetails(record)"> {{ text }}</a>
         </template>
       </BasicTable>
-<!--    </div>-->
 <!--    引用模版 弹窗-->
     <RelatedQualityModal @register="registerRelatedQualityModal" @success="handleSuccess" />
 <!--    引用基础标准 弹窗-->
@@ -279,6 +281,18 @@ function referenceTemplateButton(record) {
   })
 }
 
+/**解绑 按钮*/
+function unbindButton(record) {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认解绑',
+    content: '确认解绑选中的数据吗？',
+    onOk() {
+      createMessage.success('解绑成功!');
+    },
+  });
+}
+
 /**按钮*/
 function Button(record) {
   router.push({

src/views/dataStandards/basicStandards/basicStandards.data.ts

@@ -2605,15 +2605,33 @@ export const relatedBasicStandardsSchema: any[] = [
   {
     field: 'relatedRelationship',
     label: '关联关系',
-    component: 'Input',
+    component: 'Select',
     rules: [
       {
         required: true,
-        message: '请输入关联关系',
+        message: '请选择关联关系',
       },
     ],
     componentProps: {
-      placeholder: '请输入关联关系',
+      options:[
+        {
+          label: '引用',
+          value: '引用'
+        },
+        {
+          label: '同义词',
+          value: '同义词'
+        },
+        {
+          label: '依赖',
+          value: '依赖'
+        },
+        {
+          label: '从属',
+          value: '从属'
+        }
+      ],
+      placeholder: '请选择关联关系',
     },
     colProps: { lg: 24, md: 24 },
   },
@@ -2652,15 +2670,33 @@ export const relatedIndicatorStandardsSchema: any[] = [
   {
     field: 'relatedRelationship',
     label: '关联关系',
-    component: 'Input',
+    component: 'Select',
     rules: [
       {
         required: true,
-        message: '请输入关联关系',
+        message: '请选择关联关系',
       },
     ],
     componentProps: {
-      placeholder: '请输入关联关系',
+      options:[
+        {
+          label: '引用',
+          value: '引用'
+        },
+        {
+          label: '同义词',
+          value: '同义词'
+        },
+        {
+          label: '依赖',
+          value: '依赖'
+        },
+        {
+          label: '从属',
+          value: '从属'
+        }
+      ],
+      placeholder: '请选择关联关系',
     },
     colProps: { lg: 24, md: 24 },
   },
@@ -2699,15 +2735,33 @@ export const relatedPublicCodeSchema: any[] = [
   {
     field: 'relatedRelationship',
     label: '关联关系',
-    component: 'Input',
+    component: 'Select',
     rules: [
       {
         required: true,
-        message: '请输入关联关系',
+        message: '请选择关联关系',
       },
     ],
     componentProps: {
-      placeholder: '请输入关联关系',
+      options:[
+        {
+          label: '引用',
+          value: '引用'
+        },
+        {
+          label: '同义词',
+          value: '同义词'
+        },
+        {
+          label: '依赖',
+          value: '依赖'
+        },
+        {
+          label: '从属',
+          value: '从属'
+        }
+      ],
+      placeholder: '请选择关联关系',
     },
     colProps: { lg: 24, md: 24 },
   },

src/views/dataStandards/basicStandards/recommendedMetadataModal.vue

@@ -5,7 +5,7 @@
     <template #footer>
       <a-button type="primary" @click="handleCancel">取消</a-button>
       <a-button type="primary" @click="handleSubmit">确定</a-button>
-      <a-button type="primary" @click="handleSubmit">确认并创建质量规则</a-button>
+<!--      <a-button type="primary" @click="handleSubmit">确认并创建质量规则</a-button>-->
     </template>
 <!--    提示弹窗-->
     <RecommendedMetadataTipModal @register="registerTipsModal" @success="handleSuccess" />

src/views/dataStandards/basicStandards/relatedRelationships.vue

@@ -38,8 +38,9 @@
             <TableAction
               :actions="[
               {
+                //解绑
                 icon: 'ant-design:link-outlined',
-                onClick: Button.bind(null, record),
+                onClick: unbindButton.bind(null, record),
               },
             ]"
             />
@@ -58,8 +59,9 @@
             <TableAction
               :actions="[
               {
+                //解绑
                 icon: 'ant-design:link-outlined',
-                onClick: Button.bind(null, record),
+                onClick: unbindButton.bind(null, record),
               },
             ]"
             />
@@ -78,8 +80,9 @@
             <TableAction
               :actions="[
               {
+                //解绑
                 icon: 'ant-design:link-outlined',
-                onClick: Button.bind(null, record),
+                onClick: unbindButton.bind(null, record),
               },
             ]"
             />
@@ -98,8 +101,9 @@
             <TableAction
               :actions="[
               {
+                //解绑
                 icon: 'ant-design:link-outlined',
-                onClick: Button.bind(null, record),
+                onClick: unbindButton.bind(null, record),
               },
             ]"
             />
@@ -119,8 +123,9 @@
             <TableAction
               :actions="[
               {
+                //解绑
                 icon: 'ant-design:link-outlined',
-                onClick: Button.bind(null, record),
+                onClick: unbindButton.bind(null, record),
               },
             ]"
             />