Skip to content

B
bigDataSystem
Commit 9379b45f authored by 罗林杰's avatar 罗林杰
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/router/routes/index.ts
parents 943e8b48 3e42f1f2
Hide whitespace changes
Inline Side-by-side
Showing with 256 additions and 235 deletions
src/router/routes/index.ts
View file @ 9379b45f
......@@ -129,28 +129,28 @@ export const UserRoute: AppRouteRecordRaw = {
};
/**通用文件*/
export const CommonFileRoute: AppRouteRecordRaw = {
path: '/commonFile',
name: 'commonFile',
component: LAYOUT,
meta: {
title: '通用文件操作',
icon: '',
hidden: true,
currentActiveMenu: '/commonFile',
},
children: [
{
path: 'fileDetail',
name: 'fileDetail',
component: () => import('@/views/commonFile/fileDetail.vue'),
meta: {
title: '文件详情',
icon: '',
},
},
],
};
// export const CommonFileRoute: AppRouteRecordRaw = {
// path: '/commonFile',
// name: 'commonFile',
// component: LAYOUT,
// meta: {
// title: '通用文件操作',
// icon: '',
// hidden: true,
// currentActiveMenu: '/commonFile',
// },
// children: [
// {
// path: 'fileDetail',
// name: 'fileDetail',
// component: () => import('@/views/commonFile/fileDetail.vue'),
// meta: {
// title: '文件详情',
// icon: '',
// },
// },
// ],
// };
export const DataWarehousePlanningRoute: AppRouteRecordRaw = {
path: '/dataWarehousePlanning',
......@@ -534,7 +534,7 @@ export const kinshipParseRoute: AppRouteRecordRaw = {
],
};
// /**服务开发*/
/**服务开发*/
// export const serviceDevelopmentRoute: AppRouteRecordRaw = {
// path: '/serviceDevelopment',
// name: 'serviceDevelopment',
......@@ -547,8 +547,8 @@ export const kinshipParseRoute: AppRouteRecordRaw = {
// },
// children: [
// {
// path: 'fileDetail',
// name: 'fileDetail',
// path: 'fileDetails',
// name: 'fileDetails',
// component: () => import('@/views/serviceDevelopment/index.vue'),
// meta: {
// title: '模块描述',
......@@ -574,7 +574,7 @@ export const basicRoutes = [
mainBodyRoute,
UserRoute,
WorkSpaceRoute,
CommonFileRoute,
// CommonFileRoute,
ModelRoute,
DataSourceRoute,
DataStandardRoute,
......
src/views/dataStandards/namingDictionary/details.vue
View file @ 9379b45f
......@@ -25,8 +25,8 @@
<Icon icon="ant-design:file-done-outlined" :size="30" :color="'#42C465'" />
</div>
<div>
<div style="font-weight: bold;font-size: 25px;">标准文件A</div>
<div>引用文档管理/admin-个人工作区/国家标准/标准文件A</div>
<div style="font-weight: bold;font-size: 25px;">企业号</div>
<div>命名字典/admin-个人工作区/企业/企业号</div>
</div>
</div>
<div style="margin-top: 10px;display: flex" v-if="!isShow">
......@@ -39,42 +39,17 @@
<div>
<Icon icon="ant-design:file-done-outlined" :size="25" :color="'#42C465'" />
</div>
<div>标准文件A</div>
<div>企业号</div>
<div style="font-size: 15px;padding-top: 15px;padding-left: 10px">
版本:{{optionValue}}
</div>
</div>
<BasicForm @register="registerForm1" />
<Divider />
<div style="display: flex;align-items: center;justify-content: space-between;padding-bottom: 20px">
<div>引用文档</div>
<a-button type="primary" @click="handleImport">导入文档</a-button>
<BasicForm @register="registerForm2" />
<div style="background-color: #FAFBFC;padding: 20px">
<BasicForm @register="registerForm3" />
</div>
<BasicTable @register="registerTable">
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
<TableAction
:actions="[
{
icon: 'ant-design:download-outlined',
label: '下载',
},
{
icon: 'ant-design:delete-outlined',
color: 'error',
label: '删除',
popConfirm: {
title: '是否确认删除',
placement: 'left',
confirm: handleDelete.bind(null, record),
},
},
]"
/>
</template>
</template>
</BasicTable>
<ImportModal @register="registerImport"/>
<!-- 版本管理 弹窗-->
......@@ -90,7 +65,7 @@ import { Divider } from 'ant-design-vue';
import {router} from "@/router";
import { BasicTable, useTable, TableAction } from '@/components/Table';
import { BasicForm, useForm } from '@/components/Form';
import {detailSchema1,} from './referenceDocument.data.ts';
import {detailSchema1,detailSchema3,detailSchema4} from './referenceDocument.data.ts';
import {tableListTwo} from "./mock";
import {onMounted, ref} from "vue";
import {useRoute} from "vue-router";
......@@ -117,6 +92,24 @@ const [registerForm1, { setFieldsValue: setFieldsValue1 }] = useForm({
span: 23,
},
});
const [registerForm2, { setFieldsValue: setFieldsValue2 }] = useForm({
labelWidth: 100,
baseColProps: { lg: 12, md: 24 },
schemas: detailSchema3,
showActionButtonGroup: false,
actionColOptions: {
span: 23,
},
});
const [registerForm3, { setFieldsValue: setFieldsValue3 }] = useForm({
labelWidth: 100,
baseColProps: { lg: 12, md: 24 },
schemas: detailSchema4,
showActionButtonGroup: false,
actionColOptions: {
span: 23,
},
});
const [registerTable, { reload, updateTableDataRecord, getSearchInfo, getForm,getRowSelection }] = useTable({
api: async (params) => {
......
src/views/dataStandards/namingDictionary/edit.vue
View file @ 9379b45f
......@@ -6,13 +6,15 @@
<Icon icon="ant-design:file-done-outlined" :size="30" :color="'#42C465'" />
</div>
<div>
<div style="font-weight: bold;font-size: 25px;">标准文件A</div>
<div>引用文档管理/admin-个人工作区/国家标准/标准文件A</div>
<div style="font-weight: bold;font-size: 25px;">企业号</div>
<div>命名字典/admin-个人工作区/企业/企业号</div>
</div>
</div>
<div style="margin-top: 10px;display: flex" v-if="!isShow">
<a-button type="primary" @click="editButton">保存修改</a-button>
<a-button type="primary" >发布</a-button>
<a-button type="primary" style="margin-left: 10px" @click="editButton">保存修改</a-button>
<a-button type="primary" style="margin-left: 10px" @click="editButton">退出编辑</a-button>
<a-button type="primary" disabled style="margin-left: 10px">版本管理</a-button>
</div>
</div>
<Divider />
......@@ -20,43 +22,17 @@
<div>
<Icon icon="ant-design:file-done-outlined" :size="25" :color="'#42C465'" />
</div>
<div>标准文件A</div>
<div>企业号</div>
<div style="font-size: 15px;padding-top: 15px;padding-left: 10px">
版本:{{optionValue}}
</div>
</div>
<BasicForm @register="registerForm1" />
<Divider />
<div style="display: flex;align-items: center;justify-content: space-between;padding-bottom: 20px">
<div>引用文档</div>
<a-button type="primary">导入文档</a-button>
<BasicForm @register="registerForm2" />
<div style="background-color: #FAFBFC;padding: 20px">
<BasicForm @register="registerForm3" />
</div>
<BasicTable @register="registerTable">
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
<TableAction
:actions="[
{
icon: 'ant-design:download-outlined',
label: '下载',
},
{
icon: 'ant-design:delete-outlined',
color: 'error',
label: '删除',
popConfirm: {
title: '是否确认删除',
placement: 'left',
confirm: handleDelete.bind(null, record),
},
},
]"
/>
</template>
</template>
</BasicTable>
<!-- 版本管理 弹窗-->
<VersionModal @register="registerModal" @success="handleSuccess" />
......@@ -71,8 +47,8 @@ import { Divider } from 'ant-design-vue';
import {router} from "@/router";
import { BasicTable, useTable, TableAction } from '@/components/Table';
import { BasicForm, useForm } from '@/components/Form';
import {detailSchema2,} from './referenceDocument.data.ts';
import {tableListTwo} from "./mock"
import {detailSchema2, detailSchema5, detailSchema4,} from './referenceDocument.data.ts';
import {tableListTwo, treeDataList2} from "./mock"
import {onMounted, ref} from "vue";
import {useRoute} from "vue-router";
import VersionModal from '@/views/dataStandards/basicStandards/VersionModal.vue'
......@@ -96,6 +72,24 @@ const [registerForm1, { setFieldsValue: setFieldsValue1 }] = useForm({
span: 23,
},
});
const [registerForm2, { setFieldsValue: setFieldsValue2,updateSchema:updateSchema2 }] = useForm({
labelWidth: 100,
baseColProps: { lg: 12, md: 24 },
schemas: detailSchema5,
showActionButtonGroup: false,
actionColOptions: {
span: 23,
},
});
const [registerForm3, { setFieldsValue: setFieldsValue3 }] = useForm({
labelWidth: 100,
baseColProps: { lg: 12, md: 24 },
schemas: detailSchema4,
showActionButtonGroup: false,
actionColOptions: {
span: 23,
},
});
const [registerTable, { reload, updateTableDataRecord, getSearchInfo, getForm,getRowSelection }] = useTable({
api: async (params) => {
......@@ -168,10 +162,16 @@ function handleSuccess(record) {
/**初始化*/
onMounted(() => {
setFieldsValue1({
})
updateSchema2([
{
field: 'valueOne',
componentProps: { options:treeDataList2 },
},
]
);
setFieldsValue2({
valueOne: [1,2,3]
});
});
</script>
......
src/views/dataStandards/namingDictionary/manageModal.vue
View file @ 9379b45f
......@@ -57,7 +57,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
});
const getTitle = computed(() => (!unref(isUpdate) ? '新建文档管理' : '编辑文档管理'));
const getTitle = computed(() => ('新建名词'));
......
src/views/dataStandards/namingDictionary/mock.ts
View file @ 9379b45f
......@@ -66,6 +66,28 @@ export const treeDataList = [
],
},
]
export const treeDataList2 = [
{
label: '域',
value: 1,
icon: 'home|svg',
children: [
{
label: '共享工作区',
value: 2,
icon: 'home|svg',
children: [
{ label: '日期类',
value: 3,
icon: 'home|svg',
children: [
],
},
],
},
],
},
]
export const treeDataListPath = [
{
label: '主体管理',
......
src/views/dataStandards/namingDictionary/referenceDocument.data.ts
View file @ 9379b45f
......@@ -188,48 +188,37 @@ export const formSchemaManage: FormSchema[] = [
},
}
},
]
/**详情表单1*/
export const detailSchema1: FormSchema[] = [
{
field: 'modal',
label: '目录权属模式',
component: 'Input',
defaultValue:'本级定义',
componentProps: {
readonly: true,
disabled: true,
style: {
border: 'none',
backgroundColor: 'transparent',
},
}
},
{
field: 'group',
label: '权属工作组',
component: 'Input',
defaultValue:'-',
field: '',
label: '属性',
component: 'BasicTitle',
componentProps: {
readonly: true,
disabled: true,
style: {
border: 'none',
backgroundColor: 'transparent',
marginLeft: '15px',
fontWeight: 'bold',
},
}
},
colProps: { lg: 24, md: 24 },
},
]
/**详情表单1*/
export const detailSchema1: FormSchema[] = [
{
field: 'valueOne',
label: '所属主题',
label: '名词中文名称',
component: 'Input',
colProps: { lg: 12, md: 8 },
defaultValue:'标准文件管理',
defaultValue:'企业号',
rules: [
{
required: true,
message: '请输入所属主题',
message: '请输入名词中文名称',
},
],
componentProps: {
......@@ -238,19 +227,19 @@ export const detailSchema1: FormSchema[] = [
backgroundColor: 'transparent',
},
readonly: true,
placeholder: '请输入所属主题',
placeholder: '请输入名词中文名称',
},
},
{
field: 'valueTwo',
label: '标准编号',
label: '名词英文全称',
component: 'Input',
defaultValue: 'REF000023',
colProps: { lg: 12, md: 8 },
rules: [
{
required: true,
message: '请输入标准编号',
message: '请输入名词英文全称',
},
],
componentProps: {
......@@ -259,19 +248,19 @@ export const detailSchema1: FormSchema[] = [
backgroundColor: 'transparent',
},
readonly: true,
placeholder: '请输入标准编号',
placeholder: '请输入名词英文全称',
},
},
{
field: 'valueThree',
label: '标准中文名称',
label: '名词英文简称',
component: 'Input',
defaultValue:'标准文件A',
colProps: { lg: 12, md: 8 },
rules: [
{
required: true,
message: '请输入标准中文名称',
message: '请输入名词英文简称',
},
],
componentProps: {
......@@ -280,201 +269,218 @@ export const detailSchema1: FormSchema[] = [
backgroundColor: 'transparent',
},
readonly: true,
placeholder: '请输入标准中文名称',
placeholder: '请输入名词英文简称',
},
},
];
export const detailSchema2: FormSchema[] = [
{
field: 'valueFour',
label: '来源定义',
field: 'valueOne',
label: '名词中文名称',
component: 'Input',
colProps: { lg: 12, md: 8 },
defaultValue: '-',
rules: [
{
required: true,
message: '请输入来源定义',
},
],
defaultValue:'企业号',
componentProps: {
style: {
border: 'none',
backgroundColor: 'transparent',
},
readonly: true,
placeholder: '请输入来源定义',
placeholder: '请输入名词中文名称',
},
},
{
field: 'valueFive',
label: '发文机构',
field: 'valueTwo',
label: '名词英文全称',
component: 'Input',
defaultValue: '某部队',
defaultValue: 'company_no',
colProps: { lg: 12, md: 8 },
rules: [
{
required: true,
message: '请输入发文机构',
},
],
componentProps: {
style: {
border: 'none',
backgroundColor: 'transparent',
},
readonly: true,
placeholder: '请输入发文机构',
placeholder: '请输入名词英文全称',
},
},
{
field: 'valueSix',
label: '发文日期',
field: 'valueThree',
label: '名词英文简称',
component: 'Input',
defaultValue: '202304',
defaultValue:'company_no',
colProps: { lg: 12, md: 8 },
rules: [
{
required: true,
message: '请输入发文日期',
},
],
componentProps: {
style: {
border: 'none',
backgroundColor: 'transparent',
},
readonly: true,
placeholder: '请输入发文机构',
placeholder: '请输入名词英文简称',
},
},
];
export const detailSchema3: FormSchema[] = [
{
field: 'valueSeven',
label: '发布文号',
component: 'Input',
defaultValue: '2023001',
colProps: { lg: 12, md: 8 },
rules: [
{
required: true,
message: '请输入发布文号',
},
],
field: '',
label: '域属性',
component: 'BasicTitle',
componentProps: {
readonly: true,
style: {
border: 'none',
backgroundColor: 'transparent',
marginLeft: '15px',
fontWeight: 'bold',
},
readonly: true,
placeholder: '请输入发布文号',
},
colProps: { lg: 24, md: 24 },
},
{
field: 'valueEight',
label: '重点摘录',
field: 'valueOne',
label: '关联域',
component: 'Input',
defaultValue: '-',
colProps: { lg: 12, md: 8 },
rules: [
{
required: true,
message: '请输入重点摘录',
},
],
defaultValue:'日期类',
componentProps: {
style: {
border: 'none',
backgroundColor: 'transparent',
},
readonly: true,
placeholder: '请输入重点摘录',
placeholder: '请输入名词中文名称',
},
},
];
export const detailSchema2: FormSchema[] = [
];
export const detailSchema4: FormSchema[] = [
{
field: 'valueOne',
label: '所属主题',
label: '域名称',
component: 'Input',
colProps: { lg: 12, md: 8 },
defaultValue:'标准文件管理',
defaultValue:'日期类',
componentProps: {
placeholder: '请输入所属主题',
style: {
border: 'none',
backgroundColor: 'transparent',
},
disabled: true,
readonly: true,
placeholder: '请输入名词中文名称',
},
},
{
field: 'valueTwo',
label: '标准编号',
label: '父域',
component: 'Input',
defaultValue: 'REF000023',
colProps: { lg: 12, md: 8 },
defaultValue:'日期时间型',
componentProps: {
placeholder: '请输入标准编号',
style: {
border: 'none',
backgroundColor: 'transparent',
},
readonly: true,
disabled: true,
},
},
{
field: 'valueThree',
label: '标准中文名称',
label: '字段示例',
component: 'Input',
defaultValue:'标准文件A',
colProps: { lg: 12, md: 8 },
rules: [
{
required: true,
message: '请输入标准中文名称',
},
],
defaultValue:'成交日期',
componentProps: {
placeholder: '请输入标准中文名称',
style: {
border: 'none',
backgroundColor: 'transparent',
},
readonly: true,
disabled: true,
},
},
{
field: 'valueFour',
label: '来源定义',
label: '数据类型',
component: 'Input',
colProps: { lg: 12, md: 8 },
defaultValue: '-',
defaultValue:'date',
componentProps: {
placeholder: '请输入来源定义',
style: {
border: 'none',
backgroundColor: 'transparent',
},
readonly: true,
disabled: true,
},
},
{
field: 'valueFive',
label: '发文机构',
label: '传统数据库类型',
component: 'Input',
defaultValue: '某部队',
colProps: { lg: 12, md: 8 },
defaultValue:'date',
componentProps: {
placeholder: '请输入发文机构',
style: {
border: 'none',
backgroundColor: 'transparent',
},
readonly: true,
disabled: true,
},
},
{
field: 'valueSix',
label: '发文日期',
label: '长度',
component: 'Input',
defaultValue: '202304',
colProps: { lg: 12, md: 8 },
defaultValue:'123',
componentProps: {
placeholder: '请输入发文机构',
style: {
border: 'none',
backgroundColor: 'transparent',
},
readonly: true,
disabled: true,
},
},
{
field: 'valueSeven',
label: '发布文号',
label: '精度',
component: 'Input',
defaultValue: '2023001',
colProps: { lg: 12, md: 8 },
defaultValue:'-',
componentProps: {
placeholder: '请输入发布文号',
style: {
border: 'none',
backgroundColor: 'transparent',
},
readonly: true,
disabled: true,
},
},
];
export const detailSchema5: FormSchema[] = [
{
field: 'valueEight',
label: '重点摘录',
component: 'Input',
defaultValue: '-',
colProps: { lg: 12, md: 8 },
field: '',
label: '域属性',
component: 'BasicTitle',
componentProps: {
placeholder: '请输入重点摘录',
readonly: true,
style: {
border: 'none',
backgroundColor: 'transparent',
marginLeft: '15px',
fontWeight: 'bold',
},
},
colProps: { lg: 24, md: 24 },
},
{
field: 'valueOne',
component: 'Cascader',
label: '关联域',
componentProps: {
// dataField: 'data',
labelField: 'label',
valueField: 'value',
initFetchParams: {
parentCode: '',
},
isLeaf: (record) => {
return !(record.levelType < 3);
},
onChange: (e, ...v) => {
console.log('ApiCascader====>:', e, v);
},
},
},
];
......
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