Commit 715e0014 authored by 罗林杰's avatar 罗林杰

修改元模型

parent 6fadeab3
...@@ -45,7 +45,7 @@ export const columns: BasicColumn[] = [ ...@@ -45,7 +45,7 @@ export const columns: BasicColumn[] = [
width: 150, width: 150,
}, },
{ {
title: '是否必填', title: '是否展示',
dataIndex: 'isShow', dataIndex: 'isShow',
editable: true, editable: true,
edit: true, edit: true,
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<ModelTree class="w-1/4 xl:w-1/5" @select="handleSelect" /> <ModelTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
<BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo"> <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo">
<template #toolbar> <template #toolbar>
<a-button type="primary" @click="handleDeleteIds">删除</a-button>
<a-button type="primary" @click="handleCreateFile">新建文件夹</a-button> <a-button type="primary" @click="handleCreateFile">新建文件夹</a-button>
<a-button type="primary" @click="handleCreateModel">新建元模型</a-button> <a-button type="primary" @click="handleCreateModel">新建元模型</a-button>
</template> </template>
...@@ -50,11 +51,11 @@ ...@@ -50,11 +51,11 @@
import { useRoute, onBeforeRouteLeave } from 'vue-router'; import { useRoute, onBeforeRouteLeave } from 'vue-router';
import { useFilterStore } from '@/store/modules/filterData'; import { useFilterStore } from '@/store/modules/filterData';
import { TreeData } from '@/views/metaModel/knowledgeModel/modelData'; import { TreeData } from '@/views/metaModel/knowledgeModel/modelData';
import {router} from "@/router"; import { router } from '@/router';
import MoveModelModal from "@/views/metaModel/knowledgeModel/moveModel.vue"; import MoveModelModal from '@/views/metaModel/knowledgeModel/moveModel.vue';
defineOptions({ name: 'AccountManagement' }); defineOptions({ name: 'AccountManagement' });
const { createMessage } = useMessage(); const { createMessage, createConfirm } = useMessage();
const filterStore = useFilterStore(); const filterStore = useFilterStore();
const route = useRoute(); const route = useRoute();
const go = useGo(); const go = useGo();
...@@ -70,11 +71,11 @@ ...@@ -70,11 +71,11 @@
api: async (params) => { api: async (params) => {
var data = []; var data = [];
//按照部门筛选 如果有进行过滤相应部门的 没有就赋值全部 //按照部门筛选 如果有进行过滤相应部门的 没有就赋值全部
if (params.modelId == undefined || params.modelId == ''){ if (params.modelId == undefined || params.modelId == '') {
data = tableData.value.filter((item) => item.businessId >= 200); data = tableData.value.filter((item) => item.businessId >= 200);
}else if (params.modelId >= 200){ } else if (params.modelId >= 200) {
data = tableData.value.filter((item) => item.businessId == params.modelId); data = tableData.value.filter((item) => item.businessId == params.modelId);
}else { } else {
data = tableData.value.filter((item) => item.parentId == params.modelId); data = tableData.value.filter((item) => item.parentId == params.modelId);
} }
const response = { const response = {
...@@ -117,7 +118,7 @@ ...@@ -117,7 +118,7 @@
function handleCreateModel() { function handleCreateModel() {
openModal(true, { openModal(true, {
isUpdate: false, isUpdate: false,
title:'新建元模型' title: '新建元模型',
}); });
} }
...@@ -125,7 +126,7 @@ ...@@ -125,7 +126,7 @@
function handleCreateFile() { function handleCreateFile() {
openModal(true, { openModal(true, {
isUpdate: false, isUpdate: false,
title:'新建文件夹' title: '新建文件夹',
}); });
} }
...@@ -188,7 +189,17 @@ ...@@ -188,7 +189,17 @@
searchInfo.modelId = modelId; searchInfo.modelId = modelId;
reload(); reload();
} }
/** 批量删除按钮*/
function handleDeleteIds() {
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '确认批量删除选中数据吗?',
onOk() {
createMessage.success('批量删除成功!');
},
});
}
function handleView(record: Recordable) { function handleView(record: Recordable) {
go('/system/account_detail/' + record.id); go('/system/account_detail/' + record.id);
} }
......
...@@ -111,50 +111,6 @@ export const modelFormSchema: any[] = [ ...@@ -111,50 +111,6 @@ export const modelFormSchema: any[] = [
}, },
], ],
}, },
{
field: 'type',
label: '数据资产类型',
component: 'Select',
colProps: { lg: 24, md: 24 },
componentProps: {
options:[
{
label: 'ArgoDB表',
value: 'ArgoDB',
},
{
label: 'DB2表',
value: 'DB2',
},
{
label: '达梦数据库表',
value: '达梦',
},
{
label: 'Hana表',
value: 'Hana',
},
{
label: 'Inceptor表',
value: 'Inceptor',
},
{
label: 'KunDB表',
value: 'KunDB',
},
{
label: 'MySQL表',
value: 'MySQL',
},
]
},
rules: [
{
required: true,
message: '请输入数据资产类型',
},
],
},
]; ];
/**移动*/ /**移动*/
......
...@@ -29,13 +29,6 @@ ...@@ -29,13 +29,6 @@
<div style="margin-top: 20px">数据资产类型:Inceptor表</div> <div style="margin-top: 20px">数据资产类型:Inceptor表</div>
</div> </div>
<div style="cursor: pointer"> <div style="cursor: pointer">
<Icon
icon="ant-design:appstore-outlined"
style="margin-right: 10px"
:size="30"
@click="handleSetButton"
:color="'#1091FE'"
/>
<Icon <Icon
icon="ant-design:edit-outlined" icon="ant-design:edit-outlined"
:size="30" :size="30"
......
...@@ -51,7 +51,7 @@ export const columns: BasicColumn[] = [ ...@@ -51,7 +51,7 @@ export const columns: BasicColumn[] = [
width: 150, width: 150,
}, },
{ {
title: '是否必填', title: '是否展示',
dataIndex: 'isShow', dataIndex: 'isShow',
editable: true, editable: true,
edit: true, edit: true,
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<ModelTree class="w-1/4 xl:w-1/5" @select="handleSelect" /> <ModelTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
<BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo"> <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo">
<template #toolbar> <template #toolbar>
<a-button type="primary" @click="handleDeleteIds">删除</a-button>
<a-button type="primary" @click="handleCreateFile">新建文件夹</a-button> <a-button type="primary" @click="handleCreateFile">新建文件夹</a-button>
<a-button type="primary" @click="handleCreateModel">新建元模型</a-button> <a-button type="primary" @click="handleCreateModel">新建元模型</a-button>
</template> </template>
...@@ -50,11 +51,11 @@ ...@@ -50,11 +51,11 @@
import { useRoute, onBeforeRouteLeave } from 'vue-router'; import { useRoute, onBeforeRouteLeave } from 'vue-router';
import { useFilterStore } from '@/store/modules/filterData'; import { useFilterStore } from '@/store/modules/filterData';
import { TreeData } from '@/views/metaModel/logicModel/modelData'; import { TreeData } from '@/views/metaModel/logicModel/modelData';
import MoveModelModal from "@/views/metaModel/logicModel/moveModel.vue"; import MoveModelModal from '@/views/metaModel/logicModel/moveModel.vue';
import {router} from "@/router"; import { router } from '@/router';
defineOptions({ name: 'AccountManagement' }); defineOptions({ name: 'AccountManagement' });
const { createMessage } = useMessage(); const { createMessage, createConfirm } = useMessage();
const filterStore = useFilterStore(); const filterStore = useFilterStore();
const route = useRoute(); const route = useRoute();
const go = useGo(); const go = useGo();
...@@ -70,11 +71,11 @@ ...@@ -70,11 +71,11 @@
api: async (params) => { api: async (params) => {
var data = []; var data = [];
//按照部门筛选 如果有进行过滤相应部门的 没有就赋值全部 //按照部门筛选 如果有进行过滤相应部门的 没有就赋值全部
if (params.modelId == undefined || params.modelId == ''){ if (params.modelId == undefined || params.modelId == '') {
data = tableData.value.filter((item) => item.businessId >= 200); data = tableData.value.filter((item) => item.businessId >= 200);
}else if (params.modelId >= 200){ } else if (params.modelId >= 200) {
data = tableData.value.filter((item) => item.businessId == params.modelId); data = tableData.value.filter((item) => item.businessId == params.modelId);
}else { } else {
data = tableData.value.filter((item) => item.parentId == params.modelId); data = tableData.value.filter((item) => item.parentId == params.modelId);
} }
const response = { const response = {
...@@ -117,7 +118,7 @@ ...@@ -117,7 +118,7 @@
function handleCreateModel() { function handleCreateModel() {
openModal(true, { openModal(true, {
isUpdate: false, isUpdate: false,
title:'新建元模型' title: '新建元模型',
}); });
} }
...@@ -125,10 +126,20 @@ ...@@ -125,10 +126,20 @@
function handleCreateFile() { function handleCreateFile() {
openModal(true, { openModal(true, {
isUpdate: false, isUpdate: false,
title:'新建文件夹' title: '新建文件夹',
});
}
/** 批量删除按钮*/
function handleDeleteIds() {
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '确认批量删除选中数据吗?',
onOk() {
createMessage.success('批量删除成功!');
},
}); });
} }
/** 移动按钮*/ /** 移动按钮*/
function handleMove(record: Recordable) { function handleMove(record: Recordable) {
openMoveModelModal(true, { openMoveModelModal(true, {
......
...@@ -68,50 +68,6 @@ export const modelFormSchema: any[] = [ ...@@ -68,50 +68,6 @@ export const modelFormSchema: any[] = [
}, },
], ],
}, },
{
field: 'type',
label: '数据资产类型',
component: 'Select',
colProps: { lg: 24, md: 24 },
componentProps: {
options:[
{
label: 'ArgoDB表',
value: 'ArgoDB',
},
{
label: 'DB2表',
value: 'DB2',
},
{
label: '达梦数据库表',
value: '达梦',
},
{
label: 'Hana表',
value: 'Hana',
},
{
label: 'Inceptor表',
value: 'Inceptor',
},
{
label: 'KunDB表',
value: 'KunDB',
},
{
label: 'MySQL表',
value: 'MySQL',
},
]
},
rules: [
{
required: true,
message: '请输入数据资产类型',
},
],
},
]; ];
/**移动*/ /**移动*/
......
...@@ -51,7 +51,7 @@ export const columns: BasicColumn[] = [ ...@@ -51,7 +51,7 @@ export const columns: BasicColumn[] = [
width: 150, width: 150,
}, },
{ {
title: '是否必填', title: '是否展示',
dataIndex: 'isShow', dataIndex: 'isShow',
editable: true, editable: true,
edit: true, edit: true,
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<ModelTree class="w-1/4 xl:w-1/5" @select="handleSelect" /> <ModelTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
<BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo"> <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo">
<template #toolbar> <template #toolbar>
<a-button type="primary" @click="handleDeleteIds">删除</a-button>
<a-button type="primary" @click="handleCreateFile">新建文件夹</a-button> <a-button type="primary" @click="handleCreateFile">新建文件夹</a-button>
<a-button type="primary" @click="handleCreateModel">新建元模型</a-button> <a-button type="primary" @click="handleCreateModel">新建元模型</a-button>
</template> </template>
...@@ -125,7 +126,17 @@ ...@@ -125,7 +126,17 @@
title:'新建文件夹' title:'新建文件夹'
}); });
} }
/** 批量删除按钮*/
function handleDeleteIds() {
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '确认批量删除选中数据吗?',
onOk() {
createMessage.success('批量删除成功!');
},
});
}
/** 移动按钮*/ /** 移动按钮*/
function handleMove(record: Recordable) { function handleMove(record: Recordable) {
......
...@@ -50,7 +50,7 @@ export const columns: BasicColumn[] = [ ...@@ -50,7 +50,7 @@ export const columns: BasicColumn[] = [
width: 150, width: 150,
}, },
{ {
title: '是否必填', title: '是否展示',
dataIndex: 'isShow', dataIndex: 'isShow',
editable: true, editable: true,
edit: true, edit: true,
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<ModelTree class="w-1/4 xl:w-1/5" @select="handleSelect" /> <ModelTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
<BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo"> <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo">
<template #toolbar> <template #toolbar>
<a-button type="primary" @click="handleDeleteIds">删除</a-button>
<a-button type="primary" @click="handleCreateFile">新建文件夹</a-button> <a-button type="primary" @click="handleCreateFile">新建文件夹</a-button>
<a-button type="primary" @click="handleCreateModel">新建元模型</a-button> <a-button type="primary" @click="handleCreateModel">新建元模型</a-button>
</template> </template>
...@@ -50,11 +51,11 @@ ...@@ -50,11 +51,11 @@
import { useRoute, onBeforeRouteLeave } from 'vue-router'; import { useRoute, onBeforeRouteLeave } from 'vue-router';
import { useFilterStore } from '@/store/modules/filterData'; import { useFilterStore } from '@/store/modules/filterData';
import { TreeData } from '@/views/metaModel/standardModel/modelData'; import { TreeData } from '@/views/metaModel/standardModel/modelData';
import MoveModelModal from "@/views/metaModel/standardModel/moveModel.vue"; import MoveModelModal from '@/views/metaModel/standardModel/moveModel.vue';
import {router} from "@/router"; import { router } from '@/router';
defineOptions({ name: 'AccountManagement' }); defineOptions({ name: 'AccountManagement' });
const { createMessage } = useMessage(); const { createMessage, createConfirm } = useMessage();
const filterStore = useFilterStore(); const filterStore = useFilterStore();
const route = useRoute(); const route = useRoute();
const go = useGo(); const go = useGo();
...@@ -70,11 +71,11 @@ ...@@ -70,11 +71,11 @@
api: async (params) => { api: async (params) => {
var data = []; var data = [];
//按照部门筛选 如果有进行过滤相应部门的 没有就赋值全部 //按照部门筛选 如果有进行过滤相应部门的 没有就赋值全部
if (params.modelId == undefined || params.modelId == ''){ if (params.modelId == undefined || params.modelId == '') {
data = tableData.value.filter((item) => item.businessId >= 200); data = tableData.value.filter((item) => item.businessId >= 200);
}else if (params.modelId >= 200){ } else if (params.modelId >= 200) {
data = tableData.value.filter((item) => item.businessId == params.modelId); data = tableData.value.filter((item) => item.businessId == params.modelId);
}else { } else {
data = tableData.value.filter((item) => item.parentId == params.modelId); data = tableData.value.filter((item) => item.parentId == params.modelId);
} }
const response = { const response = {
...@@ -117,7 +118,7 @@ ...@@ -117,7 +118,7 @@
function handleCreateModel() { function handleCreateModel() {
openModal(true, { openModal(true, {
isUpdate: false, isUpdate: false,
title:'新建元模型' title: '新建元模型',
}); });
} }
...@@ -125,10 +126,20 @@ ...@@ -125,10 +126,20 @@
function handleCreateFile() { function handleCreateFile() {
openModal(true, { openModal(true, {
isUpdate: false, isUpdate: false,
title:'新建文件夹' title: '新建文件夹',
});
}
/** 批量删除按钮*/
function handleDeleteIds() {
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '确认批量删除选中数据吗?',
onOk() {
createMessage.success('批量删除成功!');
},
}); });
} }
/** 移动按钮*/ /** 移动按钮*/
function handleMove(record: Recordable) { function handleMove(record: Recordable) {
openMoveModelModal(true, { openMoveModelModal(true, {
......
...@@ -70,45 +70,25 @@ export const modelFormSchema: any[] = [ ...@@ -70,45 +70,25 @@ export const modelFormSchema: any[] = [
}, },
{ {
field: 'type', field: 'type',
label: '数据资产类型', label: '标准类型',
component: 'Select', component: 'Select',
colProps: { lg: 24, md: 24 }, colProps: { lg: 24, md: 24 },
componentProps: { componentProps: {
options:[ options: [
{
label: 'ArgoDB表',
value: 'ArgoDB',
},
{
label: 'DB2表',
value: 'DB2',
},
{
label: '达梦数据库表',
value: '达梦',
},
{
label: 'Hana表',
value: 'Hana',
},
{
label: 'Inceptor表',
value: 'Inceptor',
},
{ {
label: 'KunDB表', label: '基础标准',
value: 'KunDB', value: '基础标准',
}, },
{ {
label: 'MySQL表', label: '指标标准',
value: 'MySQL', value: '指标标准',
}, },
] ],
}, },
rules: [ rules: [
{ {
required: true, required: true,
message: '请输入数据资产类型', message: '请输入标准类型',
}, },
], ],
}, },
...@@ -143,7 +123,7 @@ export const dataSetColumns: BasicColumn[] = [ ...@@ -143,7 +123,7 @@ export const dataSetColumns: BasicColumn[] = [
width: 150, width: 150,
editable: true, editable: true,
edit: true, edit: true,
editComponent:'Select', editComponent: 'Select',
editComponentProps: { editComponentProps: {
options: [ options: [
{ {
......
...@@ -29,13 +29,6 @@ ...@@ -29,13 +29,6 @@
<div style="margin-top: 20px">数据资产类型:Inceptor表</div> <div style="margin-top: 20px">数据资产类型:Inceptor表</div>
</div> </div>
<div style="cursor: pointer"> <div style="cursor: pointer">
<Icon
icon="ant-design:appstore-outlined"
style="margin-right: 10px"
:size="30"
@click="handleSetButton"
:color="'#1091FE'"
/>
<Icon <Icon
icon="ant-design:edit-outlined" icon="ant-design:edit-outlined"
:size="30" :size="30"
......
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