Commit ac0db2b6 authored by 罗林杰's avatar 罗林杰

Merge remote-tracking branch 'origin/master'

parents f7c06b24 053f30b2
......@@ -219,8 +219,7 @@ export const DatasetByCreateDetailRoute: AppRouteRecordRaw = {
{
path: 'commonDataSet/index',
name: 'commonDataSet',
component: () =>
import('@/views/mallResourceDevelopment/dataSet/commonDataSet/index.vue'),
component: () => import('@/views/mallResourceDevelopment/dataSet/commonDataSet/index.vue'),
meta: {
title: '公共数据集',
icon: '',
......@@ -697,7 +696,8 @@ export const BenchmarkRoute: AppRouteRecordRaw = {
{
path: 'benchmark',
name: 'benchmark',
component: () => import('@/views/mallResourceDevelopment/benchmark/index.vue'),
component: () =>
import('@/views/mallResourceDevelopment/benchmark/benchmarkMainbody/index.vue'),
meta: {
title: '指标',
icon: '',
......
......@@ -46,7 +46,7 @@
resetFields();
isUpdate.value = data.isUpdate;
if (data.isUpdate === false) {
title.value = '新增分类分级';
title.value = '添加访问控制规则';
updateSchema([
{ field: 'sensitiveState', required: true, componentProps: { disabled: false } },
{ field: 'sensitiveType', required: true, componentProps: { disabled: false } },
......
......@@ -46,7 +46,7 @@
resetFields();
isUpdate.value = data.isUpdate;
if (data.isUpdate === false) {
title.value = '新增分类分级';
title.value = '添加访问控制规则';
updateSchema([
{ field: 'sensitiveState', required: true, componentProps: { disabled: false } },
{ field: 'sensitiveType', required: true, componentProps: { disabled: false } },
......
......@@ -46,7 +46,7 @@
resetFields();
isUpdate.value = data.isUpdate;
if (data.isUpdate === false) {
title.value = '新增分类分级';
title.value = '添加访问控制规则';
updateSchema([
{ field: 'sensitiveState', required: true, componentProps: { disabled: false } },
{ field: 'sensitiveType', required: true, componentProps: { disabled: false } },
......
......@@ -46,7 +46,7 @@
resetFields();
isUpdate.value = data.isUpdate;
if (data.isUpdate === false) {
title.value = '新增分类分级';
title.value = '添加访问控制规则';
updateSchema([
{ field: 'sensitiveState', required: true, componentProps: { disabled: false } },
{ field: 'sensitiveType', required: true, componentProps: { disabled: false } },
......
......@@ -46,7 +46,7 @@
resetFields();
isUpdate.value = data.isUpdate;
if (data.isUpdate === false) {
title.value = '新增分类分级';
title.value = '添加访问控制规则';
updateSchema([
{ field: 'sensitiveState', required: true, componentProps: { disabled: false } },
{ field: 'sensitiveType', required: true, componentProps: { disabled: false } },
......
......@@ -4,6 +4,7 @@ import { h } from 'vue';
import { Switch } from 'ant-design-vue';
import { useMessage } from '@/hooks/web/useMessage';
import { changeFlagApi } from '@/api/system/user/user';
import { defaultValueComponents } from '@/components/Form/src/helper';
// 引入开关组件
type CheckedType = boolean | string | number;
......@@ -59,9 +60,13 @@ export const formSchema: any[] = [
colProps: { span: 3 },
componentProps: {
placeholder: '规则类型',
defaultValue: '默认',
options: [
{ label: '默认', value: '默认' },
{ label: '规则类型1', value: '规则类型1' },
{ label: '域名', value: '域名' },
{ label: '特征流量', value: '特征流量' },
{ label: 'URL', value: 'URL' },
{ label: 'API', value: 'API' },
],
},
rules: [
......@@ -72,30 +77,89 @@ export const formSchema: any[] = [
],
},
{
field: 'sensitiveType',
label: '敏感类型',
field: 'ip',
label: 'IP',
component: 'Input',
componentProps: {
style: {},
},
rules: [
{
required: true,
message: '请输入IP',
},
],
},
{
field: 'fieldName',
label: '域名',
component: 'Input',
componentProps: {
placeholder: '请输入域名',
style: {},
},
ifShow: ({ values }) => values.ruleType !== undefined && values.ruleType.includes('域名'),
rules: [
{
required: true,
message: '请输入域名',
},
],
},
{
field: 'featureFlow',
label: '特征流量',
component: 'Select',
colProps: { span: 3 },
componentProps: {
placeholder: '敏感类型',
style: {},
placeholder: '特征流量',
options: [
{ label: '敏感类型', value: '敏感类型' },
{ label: 'AccessKey ID', value: 'AccessKey ID' },
{ label: '担保方式', value: '担保方式' },
{ label: '下载', value: '下载' },
{ label: '预览', value: '预览' },
],
},
ifShow: ({ values }) => values.ruleType !== undefined && values.ruleType.includes('特征流量'),
rules: [
{
required: true,
message: '请选择特征流量',
},
],
},
{
field: 'ip',
label: 'IP',
field: 'url',
label: 'URL',
component: 'Input',
componentProps: {
style: {
border: 'none',
backgroundColor: 'transparent',
style: {},
placeholder: '请输入URL',
},
ifShow: ({ values }) => values.ruleType !== undefined && values.ruleType.includes('URL'),
rules: [
{
required: true,
message: '请输入URL',
},
readOnly: true,
],
},
{
field: 'protectAction',
label: '保护动作',
component: 'Select',
componentProps: {
placeholder: '保护动作',
options: [
{ label: '放行', value: '放行' },
{ label: '拒绝', value: '拒绝' },
],
},
rules: [
{
required: true,
message: '请选择保护动作',
},
],
},
];
/** 列表筛选项tab2*/
......
......@@ -26,6 +26,10 @@
@click="handleDelete"
>删除</a-button
>
<a-button class="top-button" type="primary" :disabled="topButtonDisabled()"
>导出</a-button
>
<a-button class="top-button" type="primary">导入</a-button>
<a-button class="top-button" type="primary">新建文件夹</a-button>
<a-button class="top-button" type="primary" @click="handleAddLabel"
>新建标签主体</a-button
......@@ -104,20 +108,17 @@
EditOutlined,
PlusOutlined,
} from '@ant-design/icons-vue';
import { labelTreeData, tabTableData } from './labelData';
import { labelTreeData, tabTableData } from '../benchmarkMainbody/labelData';
import { h, ref, unref } from 'vue';
import { Divider } from 'ant-design-vue';
import type { BasicTableProps, TableActionType, TableRowSelection } from '@/components/Table';
import PageWrapper from '../../../components/Page/src/PageWrapper.vue';
import BasicTree from '../../../components/Tree/src/BasicTree.vue';
import PageWrapper from '@/components/Page/src/PageWrapper.vue';
import BasicTree from '@/components/Tree/src/BasicTree.vue';
import { BasicTable, useTable, TableAction } from '@/components/Table';
import { TreeActionItem } from '@/components/Tree';
import { tableListViewThree } from '@/views/dataQuality/agentClass/global/details/setup/mock';
import { Threecolumns } from '@/views/dataQuality/agentClass/global/details/setup/mainBody.data';
import {
tabTableColumn,
tabTableFormSchema,
} from '@/views/mallResourceDevelopment/label/label.data';
import { tabTableColumn, tabTableFormSchema } from './label.data';
import { searchFormSchema } from '@/views/auditLog/audi.data';
import { useMessage } from '@/hooks/web/useMessage';
import { useRoute, useRouter } from 'vue-router';
......
import {BasicColumn, FormSchema} from "@/components/Table";
import { BasicColumn, FormSchema } from '@/components/Table';
export const tabTableColumn: BasicColumn[] = [
{
title: '文件名称',
title: '指标主体名称',
dataIndex: 'name',
slots: { customRender: 'name' },
},
{
title: '描述',
......@@ -18,10 +16,12 @@ export const tabTableColumn: BasicColumn[] = [
{
title: '创建时间',
dataIndex: 'createdTime',
sorter: true,
},
{
title: '更新时间',
dataIndex: 'updateTime',
sorter: true,
},
{
title: '原始主体',
......
<template>
<div> 指标管理 </div>
</template>
<script></script>
<style></style>
<template>
<div> 汇总表管理 </div>
</template>
<script></script>
<style></style>
<template>
<div> 时间周期 </div>
</template>
<script></script>
<style></style>
<template >
<PageWrapper dense contentFullHeight fixedHeight contentClass="flex" >
<PageWrapper dense contentFullHeight fixedHeight contentClass="flex flex-col" class="toolbar">
<PageWrapper dense contentFullHeight fixedHeight contentClass="flex flex-col" class="mt-4 ml-3">
<div class="toolbar" style="background: white; " >
<div class="tools" >
<a-button type="primary" style="float: right; margin: 10px 15px 10px 0" >保存</a-button>
......@@ -9,6 +8,7 @@
</div>
</div>
<div>
<BasicForm
style="background: white; margin-top: -50px"
size="middle"
......@@ -22,23 +22,18 @@
</template>
</BasicForm>
<div style="background: white">
<h1 class="title-text">字段配置</h1>
</div>
<div class="mt-2">
<BasicTable
@register="registerTable"
class="w-3/4 xl:w-4/5"
style="width: 100%; height: 160px; overflow: hidden;"
>
<template #sort>
<Icon icon="material-symbols:holder" />
</template>
<template #nonEmpty>
<checkbox />
<template #nonEmpty="{ text , record }">
<Checkbox v-model:checked="record.nonEmpty">
</Checkbox>
</template>
<template #bodyCell="{ column }">
<template v-if="column.key === 'action'">
......@@ -53,9 +48,11 @@
</template>
</template>
</BasicTable>
</div>
<div>
<div style=" background: white; ">
<a-button type="primary" style="margin-left: 5px; margin-bottom: -10px; " @click="addFields">添加字段</a-button>
<a-button type="primary" style="margin-left: 5px;" @click="addFields">添加字段</a-button>
</div>
<BasicForm
......@@ -63,7 +60,7 @@
size="middle"
:bordered="false"
:column="2"
class="mt-2"
@register="partitionConfigurationTemplate"
>
......@@ -81,11 +78,10 @@
<div style=" background: white;">
<a-button type="primary" style="margin-left: 5px; margin-top: -10px; ">添加分区键</a-button>
</div>
</div>
<generateTableBuildingStatementsMode @register="registerModal" />
<addFieldsModal @register="FieldsModal" />
</PageWrapper>
<generateTableBuildingStatementsMode @register="registerModal" />
<addFieldsModal @register="FieldsModal" />
</PageWrapper>
</template>
<script lang="ts" setup>
......@@ -99,6 +95,9 @@ import Icon from "@/components/Icon/Icon.vue";
import {useModal} from "@/components/Modal";
import generateTableBuildingStatementsMode from './generateTableBuildingStatementsMode.vue';
import addFieldsModal from './addFieldsModal.vue';
import CheckReport
from "@/views/dataWarehousePlanning/physicalModel/landCheck/checkDetail/checkReport.vue";
import {Checkbox} from "ant-design-vue";
let fieldConfigurationL = ref(fieldConfigurationList);
......@@ -115,23 +114,27 @@ const [
api: async (params) => {
const response = {
pageNu: "1",
pageSize: "10",
pages: "1",
total: fieldConfigurationL.value.length,
data: [],
code:'',
message:'',
data: fieldConfigurationL.value,
};
//过滤data中的数据,取出等于params.deptId的数据
return { ...response,data: fieldConfigurationList };
return { ...response};
},
title: '字段配置',
rowKey: 'businessId',
columns: fieldConfiguration,
formConfig: {
labelWidth: 10,
autoSubmitOnEnter: false,
},
canResize:false,
useSearchForm: false,
showIndexColumn: false,
showTableSetting: false,
......@@ -251,8 +254,5 @@ const [partitionConfigurationTemplate] = useForm({
margin-left: 38px;
}
.ant-table-body{
height: 0;
}
</style>
......@@ -31,7 +31,7 @@ export const fieldConfigurationList: any[] = [
tableType: 'string',
fieldType: '',
fieldAccuracy: '',
nonEmpty:'1',
},
{
......@@ -40,9 +40,15 @@ export const fieldConfigurationList: any[] = [
tableType: 'varchar',
fieldType: '255',
fieldAccuracy: '',
nonEmpty:'1',
},
{
fieldChineseName: '手机号',
fieldEnglishName: 'phone',
tableType: 'string',
fieldType: '',
fieldAccuracy: '',
},
];
export const treeDataList = [
......
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