Commit d65866c2 authored by liwei's avatar liwei

修改了基础标准页面

parent 1fbdfe5e
......@@ -47,7 +47,7 @@
/**确定按钮*/
async function handleSubmit() {
createMessage.success('移动成功');
createMessage.success('复制成功');
closeModal()
}
......
......@@ -232,7 +232,7 @@ export const createBasicTypeFormSchema: FormSchema[] = [
colProps: { lg: 24, md: 24 },
componentProps: {
fieldNames: {
label: 'standardChineseName',
label: 'modelName',
value: 'businessId',
},
getPopupContainer: () => document.body,
......@@ -2746,15 +2746,33 @@ export const relatedDocumentSchema: 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 },
},
......
......@@ -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,18 @@
function endContrast() {
createMessage.info('结束对比');
startContrastFlag.value = false
router.push({
path: '/dataStandards/basicStandards/detailStandard',
query: {
businessId:route.query.businessId,
},
});
}
onMounted(() => {
optionValue.value = 'V3'
optionValue1.value = 'V1'
setLeftFieldsValue({
...leftContrastData[0],
})
......
......@@ -466,7 +466,153 @@ export const treeDataListTwo = [
],
},
]
/**首页 新增基础分类 基础元模型树*/
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 chooseDictoryTreeData = [
......@@ -901,7 +1047,6 @@ export const meteDataTreeData: any[] = [
businessId: 100,
workSpaceName: '数据库对象资源',
parentId: 0,
'code:': '001',
ancestors: '0',
orderNum: 0,
children: [],
......@@ -915,7 +1060,6 @@ export const meteDataTreeData: any[] = [
businessId: 101,
workSpaceName: 'admin-个人工作区',
parentId: 100,
'code:': '002',
ancestors: '0,100',
orderNum: 1,
children: [],
......@@ -926,10 +1070,9 @@ export const meteDataTreeData: any[] = [
{
delFlag: '0',
flag: '1',
businessId: 107,
businessId: 102,
workSpaceName: '共享工作区',
parentId: 100,
'code:': '003',
ancestors: '0,100',
orderNum: 2,
children: [],
......@@ -940,17 +1083,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[] = [
......@@ -1065,6 +1272,7 @@ export const publicCodeTreeData: any[] = [
/**关联关系-智能推荐元数据 数据*/
export const recommendedMetadataData = [
{
businessId:'1',
fieldName: 'current_school',
fieldComment: '数值类',
fieldType: 'string',
......@@ -1072,20 +1280,23 @@ export const recommendedMetadataData = [
mappingDescription:''
},
{
businessId:'2',
fieldName: 'current_school',
fieldComment: '数值类',
fieldType: 'string',
recommendationLevel:'98%',
mappingDescription:''
},{
},
{
businessId:'3',
fieldName: 'current_school',
fieldComment: '数值类',
fieldType: 'string',
recommendationLevel:'99%',
mappingDescription:''
},
{
businessId:'4',
fieldName: 'current_school',
fieldComment: '数值类',
fieldType: 'string',
......@@ -1093,6 +1304,7 @@ export const recommendedMetadataData = [
mappingDescription:''
},
{
businessId:'5',
fieldName: 'current_school',
fieldComment: '数值类',
fieldType: 'string',
......
......@@ -32,7 +32,7 @@
import { getDeptList } from '@/api/system/dept/dept';
import { addUserApi, UserDetailApi, UserUpdataApi } from '@/api/system/user/user';
import { useMessage } from '@/hooks/web/useMessage';
import { TreeData } from '@/views/dataStandards/basicStandards/basicStandardsData';
import { TreeData,dataBasicTreeData } from '@/views/dataStandards/basicStandards/basicStandardsData';
import TreeTwo from '@/views/dataStandards/basicStandards/TreeTwo.vue';
defineOptions({ name: 'AccountModal' });
......@@ -71,6 +71,7 @@
...formData,
});
const treeList = handleTree(TreeData, 'businessId', undefined, undefined, undefined);
const treeList1 = handleTree(dataBasicTreeData, 'businessId', undefined, undefined, undefined);
updateSchema([
{
field: 'standardsTree',
......@@ -81,7 +82,7 @@
{
field: 'ModelTree',
componentProps: {
treeData: treeList,
treeData: treeList1,
},
},
]);
......
......@@ -139,7 +139,14 @@ function handleChange(value) {
/**回滚*/
function resetButton(value) {
createMessage.success('回滚成功!')
createConfirm({
iconType: 'warning',
title: '确认回滚',
content: '是否确认进行回滚?',
onOk() {
createMessage.success('回滚成功!');
},
});
}
......
......@@ -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 />
......
......@@ -59,13 +59,13 @@
pageNu: "1",
pageSize: "10",
pages: "1",
total: relatedQualityData.length,
total: 0,
code:'',
message:'',
data: [],
};
//过滤data中的数据,取出等于params.deptId的数据
return { ...response,data: relatedQualityData };
return { ...response,data: [] };
},
columns:relatedQualityColumns,
useSearchForm: false,
......
......@@ -12,8 +12,9 @@
<TableAction
:actions="[
{
//解绑
icon: 'ant-design:link-outlined',
onClick: Button.bind(null, record),
onClick: unbindButton.bind(null, record),
},
]"
/>
......@@ -363,6 +364,18 @@ const [registerTable6] = useTable({
});
/**解绑 按钮*/
function unbindButton(record) {
createConfirm({
iconType: 'warning',
title: '确认解绑',
content: '确认解绑选中的数据吗?',
onOk() {
createMessage.success('解绑成功!');
},
});
}
/**引用指标标准 按钮*/
function referenceIndicatorStandardsButton(record) {
openIndicatorStandardsModal(true,{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment