Commit 4d9a1be7 authored by 罗林杰's avatar 罗林杰

Merge remote-tracking branch 'origin/master'

parents 901f30c2 c52a756c
......@@ -5,7 +5,7 @@
<BasicTable @register="registerTable" :searchInfo="searchInfo">
<template #toolbar>
<a-button type="primary" @click="updateData">更新</a-button>
<a-button type="primary" @click="handleAdd">新增</a-button>
<a-button type="primary" @click="handleAdd">新增编目</a-button>
<a-button
type="primary"
@click="handleMoveBatch"
......
import { getAllRoleList } from '@/api/system/role/role';
import { BasicColumn, FormSchema } from '@/components/Table';
import { h } from 'vue';
import { Tag } from 'ant-design-vue';
import { Switch } from 'ant-design-vue';
import { Tag, Switch } from 'ant-design-vue';
import { useMessage } from '@/hooks/web/useMessage';
import { changeFlagApi } from '@/api/system/user/user'; // 引入开关组件
import { changeFlagApi } from '@/api/system/user/user';
// 引入开关组件
type CheckedType = boolean | string | number;
export const columns: BasicColumn[] = [
......@@ -255,13 +255,13 @@ export const fileData: any[] = [
export const infoData: any[] = [
{
tableName: 'st',
columnsName: 'user_id',
CNname: '用户ID',
type: 'INT',
columnsName: 'id',
CNname: '主键',
type: 'bigint unsigned',
length: 11,
precision: null,
isNull: 'NO',
remark: '用户的唯一标识符',
remark: '主键',
primaryKey: 'YES',
foreignKey: 'NO',
dataType: '整数型',
......@@ -271,13 +271,13 @@ export const infoData: any[] = [
},
{
tableName: 'st',
columnsName: 'username',
CNname: '用户名',
type: 'VARCHAR',
length: 50,
columnsName: 'uuid',
CNname: '编目用UUID',
type: 'varchar(32)',
length: 32,
precision: null,
isNull: 'NO',
remark: '用户的登录名称',
remark: '编目用UUID',
primaryKey: 'NO',
foreignKey: 'NO',
dataType: '字符串型',
......@@ -287,96 +287,112 @@ export const infoData: any[] = [
},
{
tableName: 'st',
columnsName: 'password',
CNname: '密码',
type: 'VARCHAR',
length: 100,
columnsName: 'assetsName',
CNname: '资产名称',
type: 'varchar(255)',
length: 255,
precision: null,
isNull: 'NO',
remark: '用户登录密码(加密存储)',
remark: '资产名称',
primaryKey: 'NO',
foreignKey: 'NO',
dataType: '字符串型',
safeLevel: '极高',
sensitiveStatus: '非敏感',
safeLevel: '',
sensitiveStatus: '非敏感',
isFixation: 'true',
},
{
tableName: 'st',
columnsName: 'email',
CNname: '邮箱地址',
type: 'VARCHAR',
length: 100,
columnsName: 'directoryUuid',
CNname: '资产编目uuid',
type: 'varchar(32)',
length: 32,
precision: null,
isNull: 'YES',
remark: '用户注册邮箱地址',
isNull: 'NO',
remark: '资产编目uuid',
primaryKey: 'NO',
foreignKey: 'NO',
dataType: '字符串型',
safeLevel: '中',
sensitiveStatus: '敏感',
sensitiveStatus: '敏感',
isFixation: 'true',
},
{
tableName: 'st',
columnsName: 'created_at',
CNname: '创建时间',
type: 'DATETIME',
length: null,
columnsName: 'businessCode',
CNname: '业务编码',
type: 'varchar(32)',
length: 32,
precision: null,
isNull: 'NO',
remark: '账户创建的时间戳',
remark: '业务编码',
primaryKey: 'NO',
foreignKey: 'NO',
dataType: '日期时间型',
safeLevel: '',
dataType: '字符串型',
safeLevel: '',
sensitiveStatus: '非敏感',
isFixation: 'false',
isFixation: 'true',
},
{
tableName: 'st',
columnsName: 'updated_at',
CNname: '最后更新时间',
type: 'DATETIME',
length: null,
columnsName: 'category',
CNname: '类别',
type: 'varchar(32)',
length: 32,
precision: null,
isNull: 'YES',
remark: '账户信息最后更新的时间戳',
isNull: 'NO',
remark: '类别',
primaryKey: 'NO',
foreignKey: 'NO',
dataType: '日期时间型',
safeLevel: '',
dataType: '字符串型',
safeLevel: '',
sensitiveStatus: '非敏感',
isFixation: 'true',
},
{
tableName: 'st',
columnsName: 'is_active',
CNname: '账户状态',
type: 'TINYINT',
length: 1,
columnsName: 'source',
CNname: '资产来源',
type: 'varchar(32)',
length: 32,
precision: null,
isNull: 'NO',
remark: '账户是否处于激活状态(0-未激活,1-已激活)',
remark: '资产来源',
primaryKey: 'NO',
foreignKey: 'NO',
dataType: '布尔型',
dataType: '字符串型',
safeLevel: '中',
sensitiveStatus: '非敏感',
isFixation: 'true',
},
{
tableName: 'st',
columnsName: 'is_deleted',
CNname: '删除标记',
type: 'TINYINT',
length: 1,
columnsName: 'assetsType',
CNname: '资产类型',
type: 'varchar(32)',
length: 32,
precision: null,
isNull: 'NO',
remark: '账户是否被标记为删除(0-未删除,1-已删除)',
remark: '资产类型',
primaryKey: 'NO',
foreignKey: 'NO',
dataType: '布尔型',
dataType: '字符串型',
safeLevel: '中',
sensitiveStatus: '非敏感',
isFixation: 'true',
},
{
tableName: 'st',
columnsName: 'assetsStatus',
CNname: '资产状态',
type: 'varchar(32)',
length: 32,
precision: null,
isNull: 'NO',
remark: '资产状态',
primaryKey: 'NO',
foreignKey: 'NO',
dataType: '字符串型',
safeLevel: '中',
sensitiveStatus: '非敏感',
isFixation: 'true',
......@@ -395,84 +411,83 @@ export const samplingInfoData: any[] = [
assetsStatus: '9',
},
{
id: '1',
uuid: '1',
assetsName: 'TEST1',
id: '2',
uuid: '2',
assetsName: 'SAMPLE2',
directoryUuid: '-',
businessCode: '03000001',
category: 'ASSET',
source: 'CATELOG',
assetsType: 'DATASET',
assetsStatus: '9',
businessCode: '03000002',
category: 'DATA',
source: 'DATABASE',
assetsType: 'TABLE',
assetsStatus: '8',
},
{
id: '1',
uuid: '1',
assetsName: 'TEST1',
id: '3',
uuid: '3',
assetsName: 'EXAMPLE3',
directoryUuid: '-',
businessCode: '03000001',
category: 'ASSET',
source: 'CATELOG',
assetsType: 'DATASET',
assetsStatus: '9',
businessCode: '03000003',
category: 'FILE',
source: 'FILESYSTEM',
assetsType: 'DOCUMENT',
assetsStatus: '7',
},
{
id: '1',
uuid: '1',
assetsName: 'TEST1',
id: '4',
uuid: '4',
assetsName: 'DEMO4',
directoryUuid: '-',
businessCode: '03000001',
category: 'ASSET',
source: 'CATELOG',
assetsType: 'DATASET',
assetsStatus: '9',
businessCode: '03000004',
category: 'IMAGE',
source: 'IMAGESTORE',
assetsType: 'PICTURE',
assetsStatus: '6',
},
{
id: '1',
uuid: '1',
assetsName: 'TEST1',
id: '5',
uuid: '5',
assetsName: 'TEST5',
directoryUuid: '-',
businessCode: '03000001',
category: 'ASSET',
source: 'CATELOG',
assetsType: 'DATASET',
assetsStatus: '9',
businessCode: '03000005',
category: 'VIDEO',
source: 'VIDEOSTORE',
assetsType: 'MOVIE',
assetsStatus: '5',
},
{
id: '1',
uuid: '1',
assetsName: 'TEST1',
id: '6',
uuid: '6',
assetsName: 'SAMPLE6',
directoryUuid: '-',
businessCode: '03000001',
category: 'ASSET',
source: 'CATELOG',
assetsType: 'DATASET',
assetsStatus: '9',
businessCode: '03000006',
category: 'AUDIO',
source: 'AUDIOSTORE',
assetsType: 'MUSIC',
assetsStatus: '4',
},
{
id: '1',
uuid: '1',
assetsName: 'TEST1',
id: '7',
uuid: '7',
assetsName: 'EXAMPLE7',
directoryUuid: '-',
businessCode: '03000001',
category: 'ASSET',
source: 'CATELOG',
assetsType: 'DATASET',
assetsStatus: '9',
businessCode: '03000007',
category: 'TEXT',
source: 'TEXTSTORE',
assetsType: 'DOCUMENT',
assetsStatus: '3',
},
{
id: '1',
uuid: '1',
assetsName: 'TEST1',
id: '8',
uuid: '8',
assetsName: 'DEMO8',
directoryUuid: '-',
businessCode: '03000001',
category: 'ASSET',
source: 'CATELOG',
assetsType: 'DATASET',
assetsStatus: '9',
businessCode: '03000008',
category: 'CODE',
source: 'CODESTORE',
assetsType: 'SCRIPT',
assetsStatus: '2',
},
];
export const associationRulesData: any[] = [
{
applicant: 'admin',
......@@ -564,7 +579,7 @@ export const reviewData: any[] = [
infoTime: '2024-11-29 13:41:11',
operationType: '推送',
target: 'https://127.0.0.2',
status: '成功',
status: '失败',
},
{
operator: 'admin',
......
<template>
<PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
<PageWrapper dense contentClass="flex">
<template #headerContent>
<div style="display: flex; justify-content: space-between">
<div class="title">
......@@ -15,16 +15,16 @@
</div>
</div>
</template>
<Row :gutter="16">
<Col :span="24">
<BasicForm @register="registerForm">
</PageWrapper>
<PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
<template #headerContent
><BasicForm @register="registerForm">
<template #toolbar>
<a-button type="primary">导入</a-button>
</template>
</BasicForm>
</Col>
</Row>
</BasicForm></template
>
<BasicTable @register="registerTable" :searchInfo="searchInfo">
<template #toolbar> </template>
<template #bodyCell="{ column, record }">
......@@ -42,11 +42,10 @@
</template>
</template>
</BasicTable>
</PageWrapper>
<AccountModal @register="registerModal" @success="handleSuccess" />
<MoveUser @register="registerMoveUser" @success="handleMoveSuccess" />
<AddUserModal @register="registerAddUserModal" @success="handleAddSuccess" />
</PageWrapper>
</template>
<script lang="ts" setup>
import { reactive, unref, onDeactivated, onMounted, ref } from 'vue';
......
......@@ -5,6 +5,8 @@ import { Tag, Switch } from 'ant-design-vue';
import { useMessage } from '@/hooks/web/useMessage';
import { changeFlagApi } from '@/api/system/user/user';
import { DescItem } from '@/components/Description';
import { c } from 'node_modules/vite/dist/node/types.d-aGj9QkWt';
import { t } from '@/hooks/web/useI18n';
// 引入开关组件
type CheckedType = boolean | string | number;
......@@ -26,7 +28,7 @@ export const ManagePropertySchema: DescItem[] = [
export const permissionsInfo: DescItem[] = [
{
field: 'permissions',
label: '权限',
label: '开放权限',
},
];
export const BasicInfoSchema: DescItem[] = [
......@@ -237,14 +239,40 @@ export const EditFormSchema: any[] = [
{
field: 'name',
label: '资源编目',
component: 'Select',
component: 'TreeSelect',
colProps: { lg: 24, md: 24 },
componentProps: {
options: [
{ label: 'test1', value: 'test1' },
{ label: 'test2', value: 'test2' },
{ label: 'test3', value: 'test3' },
{ label: 'test4', value: 'test4' },
treeData: [
{
label: '资源编目管理',
value: 'server',
children: [
{
label: '一级编目',
value: 'vm',
},
{
label: '公共安全',
value: 'physical',
},
{
label: '卫生健康',
value: 'health',
},
{
label: '文化休闲',
value: 'leisure',
},
{
label: '经济建设',
value: 'economic',
},
{
label: '科技教育',
value: 'technology',
},
],
},
],
},
rules: [
......@@ -256,8 +284,16 @@ export const EditFormSchema: any[] = [
{
field: 'label',
label: 'Label',
component: 'Input',
component: 'Select',
colProps: { lg: 24, md: 24 },
componentProps: {
options: [
{ label: 'Server', value: 'server' },
{ label: 'Network Device', value: 'network_device' },
{ label: 'Storage Device', value: 'storage_device' },
{ label: 'Firewall', value: 'firewall' },
],
},
rules: [
{
message: '请输入Label',
......
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