Commit 755912ad by 周海峰

Merge branch 'master' of https://code.palacesun.com/wuchao/nse-ui

parents c71137e9 0a79756d
import request from '@/utils/request'
/**
* 资产库 - 查询用户列表
* @param {*} query
* @returns
*/
export function queryUser(query) {
return request({
url: '/console/user/queryAll',
method: 'get',
params: query
})
}
/**
* 资产库 - 查询列表
* @param {*} query
* @returns
*/
export function queryAll(query) {
return request({
url: '/core/datasystem/queryAll',
method: 'get',
params: query
})
}
/**
* 资产库 - 数据源明细
* @param {*} query
* @returns
*/
export function initEdit(query) {
return request({
url: '/core/datasystem/initEdit',
method: 'get',
params: query
})
}
/**
* 资产库 - 查询数据库版本
* @param {*} query
* @returns
*/
export function queryDatadis(query) {
return request({
url: '/core/datadis/queryAll',
method: 'get',
params: query
})
}
/**
* 资产库 - 数据库版本检测
* @param {*} data
* @returns
*/
export function checkVersion(data) {
return request({
url: '/core/datasystem/checkVersion',
method: 'post',
data: data
})
}
/**
* 资产库 - 测试数据源名称是否重复
* @param {*} data
* @returns
*/
export function checkRepeatName(data) {
return request({
url: '/core/datasystem/checkRepeatName',
method: 'post',
data: data
})
}
/**
* 资产库 - 测试连接
* @param {*} data
* @returns
*/
export function testConnect(data) {
return request({
url: '/core/datasystem/testConnect',
method: 'post',
data: data
})
}
/**
* 资产库 - 新增修改接口
* @param {*} data
* @returns
*/
export function add(data) {
return request({
url: '/core/datasystem/add',
method: 'post',
data: data
})
}
/**
* 资产库 - 关联检测
* @param {*} data
* @returns
*/
export function checkDatasystemUsed(data) {
return request({
url: '/core/datasystem/checkDatasystemUsed',
method: 'post',
data: data
})
}
/**
* 资产库 - 删除数据源
* @param {*} data
* @returns
*/
export function del(data) {
return request({
url: '/core/datasystem/del',
method: 'post',
data: data
})
}
/**
* 资产库 - 查询字符编码
* @param {*} query
* @returns
*/
export function queryCharset(query) {
return request({
url: '/core/datasystem/queryCharset',
method: 'get',
params: query
})
}
\ No newline at end of file
import request from '@/utils/request'
/**
* 项目列表
* @param {*} query
* @returns
*/
export function selectDataProject(data) {
return request({
url: '/core/tdataproject/selectDataProject',
method: 'post',
data: data
})
}
import request from '@/utils/request'
/**
* 知识库 - 查询字典类型
* @param {*} query
* @returns
*/
export function dictinaryTypes(query) {
return request({
url: '/core/dictionary/getDictinaryTypes',
method: 'get',
params: query
})
}
/**
* 知识库 - 查询table数据
* @param {*} data
* @returns
*/
export function query(data) {
return request({
url: '/core/dictionary/query',
method: 'post',
data: data
})
}
/**
* 知识库 - 检测分类名称是否存在
* @param {*} query
* @returns
*/
export function checkNameExitType(query) {
return request({
url: '/core/dictionary/checkNameExitType',
method: 'get',
params: query
})
}
/**
* 知识库 - 添加修改分类
* @param {*} data
* @returns
*/
export function addDictionaryType(data) {
return request({
url: '/core/dictionary/addDictionaryType',
method: 'post',
data: data
})
}
/**
* 知识库 - 查询分类详情
* @param {*} data
* @returns
*/
export function initEditType(data) {
return request({
url: '/core/dictionary/initEditType',
method: 'post',
data: data
})
}
/**
* 知识库 - 删除分类
* @param {*} data
* @returns
*/
export function delDictionaryType(data) {
return request({
url: '/core/dictionary/delDictionaryType',
method: 'post',
data: data
})
}
/**
* 知识库 - 添加修改值
* @param {*} data
* @returns
*/
export function add(data) {
return request({
url: '/core/dictionary/add',
method: 'post',
data: data
})
}
/**
* 知识库 - 删除值
* @param {*} data
* @returns
*/
export function delValue(data) {
return request({
url: '/core/dictionary/del',
method: 'post',
data: data
})
}
......@@ -34,8 +34,8 @@ function onSearch() {
// 重置
function onReset(formRef: FormInstance) {
queryForm.value.projectName = ''
queryForm.value.remark = ''
queryForm.value.proName = ''
queryForm.value.note = ''
emit('reset', formRef)
}
......@@ -49,16 +49,16 @@ function onReset(formRef: FormInstance) {
:model="queryForm"
@search="onSearch"
@reset="onReset">
<el-form-item label="项目名称" prop="projectName">
<el-form-item label="项目名称" prop="proName">
<el-input
v-model="queryForm.projectName"
v-model="queryForm.proName"
placeholder="请输入项目名称"
clearable
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-form-item label="备注" prop="note">
<el-input
v-model="queryForm.remark"
v-model="queryForm.note"
placeholder="请输入备注"
clearable
/>
......
<script setup name="ProjectManageList">
import { getCurrentInstance, reactive, ref, toRefs } from 'vue'
import { getCurrentInstance, reactive, ref, toRefs,onMounted } from 'vue'
import { ElMessage } from 'element-plus'
import QueryForm from './QueryForm.vue'
import ProjectEditDialog from './ProjectEditDialog.vue'
......@@ -7,10 +7,29 @@ import DownloadPluginDialog from './DownloadPluginDialog.vue'
import ExportDialog from './ExportDialog.vue'
import { useRouter } from 'vue-router'
import {changeRoute} from '@/utils/switchRoute'
import {
selectDataProject
} from '@/api/project'
import useAppStore from '@/store/modules/app'
const appStore = useAppStore()
const projectAttr = ['数据源', '数据域', '发现规则'];
const router = useRouter()
const emit = defineEmits(['page'])
const { proxy } = getCurrentInstance()
const loginUser = {
tsysUser: {
id: appStore.userInfo.user.id,
username: appStore.userInfo.user.username
}
}
function onReset(formQuery) {
console.log('onReset')
formQuery.resetFields()
......@@ -21,44 +40,49 @@ function onQuery() {
}
// 搜索按钮操作
function handleQuery() {
queryParams.value.pageNum = 1
queryParams.value.page = 1
getList()
}
const data = reactive({
queryParams: {
pageNum: 1,
pageSize: 8,
projectName: '',
remark: ''
page: 1,
everypage: 8,
proName: '',
note: ''
}
})
// 表格数据
const { queryParams } = toRefs(data)
const tableList = ref([
{
id: '1',
projectName: '若依配测系统1',
datasource: 'MySQL',
domain: '电商',
findRule: '自动发现'
},
{
id: '2',
projectName: '若依配测系统2',
datasource: 'Oracle',
domain: '金融',
findRule: '手动配置'
},
{
id: '3',
projectName: '若依配测系统3',
datasource: 'SQL Server',
domain: '医疗',
findRule: '规则匹配'
}
// {
// id: '1',
// proName: '若依配测系统1',
// datasource: 'MySQL',
// domain: '电商',
// findRule: '自动发现'
// },
// {
// id: '2',
// proName: '若依配测系统2',
// datasource: 'Oracle',
// domain: '金融',
// findRule: '手动配置'
// },
// {
// id: '3',
// proName: '若依配测系统3',
// datasource: 'SQL Server',
// domain: '医疗',
// findRule: '规则匹配'
// }
])
const total = ref(3)
......@@ -68,9 +92,45 @@ function getList() {
loading.value = true
setTimeout(() => {
loading.value = false
}, 3000);
selectDataProject({
loginUser:loginUser,
everypage:queryParams.value.everypage,
note:queryParams.value.note,
page:queryParams.value.page,
proName:queryParams.value.proName,
}).then(res=>{
tableList.value = res.data.map(item => {
let arrs = []
projectAttr.forEach((name, index) => {
if (index === 0) {
arrs.push({
label: name,
value: item.list[0].s
})
} else if (index === 1){
arrs.push({
label: name,
value: item.list[3].s
})
} else if (index === 2) {
arrs.push({
label: name,
value: item.list[6] && item.list[6].s ? item.list[6].s : 0
})
}
})
item.list = arrs
return item;
});
total.value = res.totalCount;
loading.value = false
console.log('tableList.value',tableList.value)
})
// setTimeout(() => {
// loading.value = false
// }, 3000);
}
......@@ -140,12 +200,12 @@ const handleImportProject = (project) => {
}
// 导出项目
const handleExportProject = (project) => {
// ElMessage.success(`开始导出项目 "${project.projectName}"`)
// ElMessage.success(`开始导出项目 "${project.proName}"`)
openExportDialog(project)
}
// 下载插件
const handleDownloadPlugin = (project) => {
// ElMessage.success(`开始下载 "${project.projectName}" 的插件`)
// ElMessage.success(`开始下载 "${project.proName}" 的插件`)
currentProjectId.value = project.id // 假设项目对象中有id字段
downloadDialogVisible.value = true
console.log(123)
......@@ -161,7 +221,7 @@ const handleSubmit = (formData) => {
// 模拟新增
const newProject = {
id: tableList.value.length + 1,
projectName: formData.projectName,
proName: formData.proName,
datasource: '待配置',
domain: '待配置',
findRule: '待配置'
......@@ -173,7 +233,7 @@ const handleSubmit = (formData) => {
// 模拟编辑
const index = tableList.value.findIndex(p => p.id === currentProject.value.id)
if (index !== -1) {
tableList.value[index].projectName = formData.projectName
tableList.value[index].proName = formData.proName
ElMessage.success('编辑项目成功')
}
}
......@@ -207,7 +267,9 @@ const handleBackup = (projectId) => {
console.log('备份项目:', projectId)
}
onMounted(()=>{
handleQuery()
})
</script>
<template>
......@@ -239,7 +301,7 @@ const handleBackup = (projectId) => {
<el-card shadow="always">
<template #header>
<div class="flex-container justify-between align-center">
{{ item.projectName }}
{{ item.project }}
<el-dropdown placement="bottom-end" @command="(command) => handleCommandProject(command, item)">
<el-button type="primary" icon="Operation">
操作
......@@ -258,18 +320,11 @@ const handleBackup = (projectId) => {
</div>
</template>
<div class="item-content flex-container align-center">
<div class="label">数据源:</div>
<div class="value flex1">{{ item.datasource }}</div>
</div>
<div class="item-content flex-container align-center">
<div class="label">数据域:</div>
<div class="value flex1">{{ item.domain }}</div>
</div>
<div class="item-content flex-container align-center">
<div class="label">发现规则:</div>
<div class="value flex1">{{ item.findRule }}</div>
<div class="item-content flex-container align-center" v-for="(x,y) in item.list">
<div class="label">{{x.label}}:</div>
<div class="value flex1">{{x.value}}</div>
</div>
</el-card>
</el-col>
</el-row>
......@@ -277,8 +332,8 @@ const handleBackup = (projectId) => {
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.page"
v-model:limit="queryParams.everypage"
@pagination="getList"
/>
</div>
......
......@@ -89,16 +89,18 @@ const collapseAdd = (item) => {
// 删除事件
const collapseDelete = (item) => {
console.log('删除事件', item)
const { name } = item
delData.value = item
modalData.show = true
modalData.icon = 'error'
modalData.text = '确认删除[' + item.name + ']?'
modalData.text = '确认删除[' + name + ']?'
}
// 删除回调
const modalConfirm = () => {
const { id } = delData.value
const data = {
relationid: delData.value.id
relationid: id
}
del(data).then(res => {
const { flag } = res
......@@ -133,9 +135,10 @@ const getQueryenc = () => {
queryenc({}).then((res) => {
const { data } = res;
encryptionList.value = data.map((item) => {
const { encryption_name, id } = item;
return {
value: item.id,
label: item.encryption_name,
value: id,
label: encryption_name,
};
});
});
......
......@@ -108,9 +108,10 @@ const getQuerysec = () => {
querysec({ encryption_id: form.value.encryption_id }).then((res) => {
const { data } = res;
secretkeyList.value = data.map((item) => {
const { id, secret_key_name } = item;
return {
value: item.id,
label: item.secret_key_name,
value: id,
label: secret_key_name,
};
});
});
......
<script setup lang="ts" name="AddClass">
import { onMounted, reactive, ref, toRefs, watch } from "vue";
import type { FormInstance } from "element-plus";
import { ElMessage } from "element-plus";
import { checkNameExitType, addDictionaryType, initEditType } from '@/api/ruleConfig/dictionary'
const props = defineProps<{
modelValue: boolean;
itemData: boolean;
type: string;
}>();
const emit = defineEmits(["update:modelValue", 'cancel','confirm']);
const emit = defineEmits(["cancel", "confirm"]);
const data = reactive({
rules: {},
form: <any>{
id: "",
remark: "",
typename: "",
},
rules: {
typename: [
{
required: true,
message: "请输入字典分类名称",
trigger: ["blur"],
},
],
},
});
const { rules } = toRefs(data);
const { form, rules } = toRefs(data);
const formRef = ref<FormInstance>();
// 重置
const reset = () => {
form.value = {
id: "",
remark: "",
typename: "",
};
};
// 取消
const cancel = () => {
if (props.type === 'edit') {
}else if (props.type === 'add') {
}
emit('cancel')
}
const cancel = () => {
emit("cancel");
};
const confirm = () => {
if (props.type === 'edit') {
formRef.value?.validate((valid) => {
if (valid) {
getcheckNameExitType()
} else {
}
});
};
// 检验数据域名称
const getcheckNameExitType = () => {
const data = {
typename: form.value.typename
}
emit('confirm')
checkNameExitType(data).then(res => {
const { flag, data } = res
if (flag) {
addDictionaryTypeFun()
}
})
}
// 添加数据域
const addDictionaryTypeFun = () => {
addDictionaryType({dictionaryType: form.value}).then(res => {
const { flag } = res
if (flag) {
ElMessage.success(props.type === "add" ? "新增成功" : "修改成功");
emit("confirm");
reset()
}
})
}
const getInitEditType = (id) => {
initEditType({ typeId: id }).then(res => {
const { flag, data } = res
const { tConsoleDictionarytype } = data
const { id, remark, typename } = tConsoleDictionarytype
if (flag) {
form.value.id = id
form.value.remark = remark
form.value.typename = typename
}
})
}
watch(
() => props.itemData,
(newVal) => {
if (props.type === "edit" && props.itemData) {
const { id } = JSON.parse(JSON.stringify(props.itemData));
getInitEditType(id)
}
},
{ deep: true, immediate: true }
);
</script>
<template>
<div>
<el-form ref="formRef" :model="modelValue" label-width="100px">
<el-form-item label="字典分类" required>
<el-input v-model="modelValue.name" placeholder="请输入字典分类"></el-input>
<el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="字典分类" prop="typename" required>
<el-input v-model="form.typename" placeholder="请输入字典分类"></el-input>
</el-form-item>
<el-form-item label="备注">
<el-input type="textarea" v-model="modelValue.name" placeholder="请输入备注" rows="2" maxlength="200" show-word-limit></el-input>
<el-input type="textarea" v-model="form.remark" placeholder="请输入备注" rows="2" maxlength="200"
show-word-limit></el-input>
</el-form-item>
</el-form>
<div class="btn">
......@@ -57,4 +129,9 @@ const confirm = () => {
display: flex;
justify-content: center;
}
:deep(.el-form-item__error) {
left: auto;
right: 30px;
top: 24%;
}
</style>
\ No newline at end of file
<script setup lang="ts" name="AddValue">
import { onMounted, reactive, ref, toRefs, watch } from "vue";
import type { FormInstance } from "element-plus";
import { ElMessage } from "element-plus";
import { add } from "@/api/ruleConfig/dictionary";
const props = defineProps<{
modelValue: boolean;
itemData: boolean;
type: string;
classDict: any;
}>();
const emit = defineEmits(["update:modelValue", 'cancel', 'confirm']);
const emit = defineEmits(["cancel", "confirm"]);
const data = reactive({
rules: {},
form: <any>{
id: null,
name: "",
parentid: "",
parentvalue: "",
typecode: "",
typename: "",
value: "",
},
rules: {
value: [
{
required: true,
message: "请输入值",
trigger: ["blur"],
},
],
},
});
const { rules } = toRefs(data);
const { form, rules } = toRefs(data);
const formRef = ref<FormInstance>();
const classDictList = ref<any[]>([]);
// 重置
const reset = () => {
form.value = {
id: null,
name: "",
parentid: "",
parentvalue: "",
typecode: "",
typename: "",
value: "",
};
};
// 取消
const cancel = () => {
if (props.type === 'edit') {
} else if (props.type === 'add') {
}
emit('cancel')
}
emit("cancel");
};
const confirm = () => {
if (props.type === 'edit') {
} else if (props.type === 'add') {
formRef.value?.validate((valid) => {
if (valid) {
addFunc();
} else {
}
});
};
}
emit('confirm')
}
// 添加数据域
const addFunc = () => {
add({ dictionary: form.value }).then((res) => {
const { flag } = res;
if (flag) {
ElMessage.success(props.type === "add" ? "新增成功" : "修改成功");
emit("confirm");
reset();
}
});
};
watch(
() => props.itemData,
(newVal) => {
if (props.itemData) {
const data = JSON.parse(JSON.stringify(props.itemData))
form.value = {...form.value, ...data}
}
},
{ deep: true, immediate: true }
);
watch(
() => props.classDict,
(newVal) => {
classDictList.value = props.classDict;
},
{ deep: true, immediate: true }
);
</script>
<template>
<div>
<el-form ref="formRef" :model="modelValue" label-width="70px" :disabled="readOnly">
<el-form ref="formRef" :model="form" :rules="rules" label-width="70px">
<el-form-item label="字典分类">
<el-select v-model="modelValue.name" v-if="!readOnly" placeholder="请选择字典分类">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
<el-select v-model="form.typecode" placeholder="请选择字典分类">
<el-option v-for="item in classDictList" :key="item.value" :label="item.text" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="值" required>
<el-input v-model="modelValue.name" placeholder="请输入值"></el-input>
<el-form-item label="值" prop="value" required>
<el-input v-model="form.value" placeholder="请输入值"></el-input>
</el-form-item>
<el-form-item label="名称" required>
<el-input v-model="modelValue.name" placeholder="请输入名称"></el-input>
<el-form-item label="名称">
<el-input v-model="form.name" placeholder="请输入名称"></el-input>
</el-form-item>
<el-form-item label="父值" required>
<el-input v-model="modelValue.name" placeholder="请输入父值"></el-input>
<el-form-item label="父值">
<el-input v-model="form.parentvalue" placeholder="请输入父值"></el-input>
</el-form-item>
</el-form>
<div class="btn">
......@@ -68,4 +129,9 @@ const confirm = () => {
display: flex;
justify-content: center;
}
:deep(.el-form-item__error) {
left: auto;
right: 30px;
top: 24%;
}
</style>
\ No newline at end of file
......@@ -99,33 +99,33 @@ const collapseAdd = (item) => {
// 删除发现规则
const collapseDelete = (item) => {
console.log('删除发现规则', item)
const { name } = item
delData.value = item
modalData.type = 'rules'
modalData.cancel = true
modalData.icon = 'error'
modalData.text = '删除后无法恢复,是否确认删除[' + item.name + ']?'
modalData.text = '删除后无法恢复,是否确认删除[' + name + ']?'
modalData.show = true
}
// 删除数据域
const collapseMainDeletion = (item) => {
console.log('删除数据域事件', item)
const { dataarea } = item
delData.value = item
modalData.type = 'domain'
modalData.cancel = false
modalData.icon = 'error'
modalData.text = '删除后无法恢复,是否确认删除[' + item.dataarea + ']?'
modalData.text = '删除后无法恢复,是否确认删除[' + dataarea + ']?'
modalData.show = true
}
// 提示回调
const modalConfirm = () => {
if (modalData.type === 'domain') {
console.log('删除数据域确认')
const { id, dataarea } = delData.value
const data = {
areaid: delData.value.id,
areaname: delData.value.dataarea
areaid: id,
areaname: dataarea
}
delDataArea(data).then(res => {
const { flag } = res
......@@ -137,11 +137,11 @@ const modalConfirm = () => {
}
})
} else if (modalData.type === 'rules') {
console.log('删除发现规则确认')
const { ruleid, name, tid } = delData.value
const data = {
ruleid: delData.value.ruleid,
rulename: delData.value.name,
tid: delData.value.tid
ruleid: ruleid,
rulename: name,
tid: tid
}
delRule(data).then(res => {
const { flag } = res
......@@ -153,10 +153,10 @@ const modalConfirm = () => {
}
})
} else if (modalData.type === 'default') {
console.log('设置默认项')
const { ruleid, name } = delData.value
const data = {
ruleid: delData.value.ruleid,
rulename: delData.value.name,
ruleid: ruleid,
rulename: name,
}
setdefault(data).then(res => {
const { flag } = res
......@@ -192,21 +192,20 @@ const collapseChange = (item) => {
// 发现规则设置默认项
const collapseDefault = (item) => {
const { name } = item
delData.value = item
modalData.type = 'default'
modalData.cancel = false
modalData.icon = 'error'
modalData.text = '确定设置[' + item.name + ']为默认规则?'
modalData.text = '确定设置[' + name + ']为默认规则?'
modalData.show = true
}
// 新增确认
const AddFormConfirm = (item) => {
if (modalPopData.type === 'domain') {
console.log('新增数据域确认', item)
getCollapse()
} else if (modalPopData.type === 'rules') {
console.log('新增发现规则确认', item)
getCollapse()
}
modalPopData.show = false
......
......@@ -31,9 +31,16 @@ const readOnly = ref(true);
const formRef = ref<FormInstance>();
watch(
() => [props.type, props.itemData],
() => props.type,
(newVal) => {
readOnly.value = props.type === 'edit' ? true : false;
},
{ deep: true, immediate: true }
);
watch(
() => props.itemData,
(newVal) => {
if (props.type === 'edit' && props.itemData) {
form.value = JSON.parse(JSON.stringify(props.itemData))
}
......@@ -127,4 +134,9 @@ const addDataAreaFun = () => {
display: flex;
justify-content: center;
}
:deep(.el-form-item__error) {
left: auto;
right: 30px;
top: 24%;
}
</style>
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论