yangjun
/
hldy_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整数据源配置、机构管理、服务指令同步机构获取相关逻辑

This commit is contained in:
1378012178@qq.com 2025-04-21 17:07:58 +08:00
parent d3bed9c000
commit d61a805aad
7 changed files with 238 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/views/monitor/datasource/DataSourceDrawer.vue
View File

@ -1,13 +1,6 @@
<template> <template>
<BasicDrawer <BasicDrawer v-bind="$attrs" @register="registerDrawer" :title="getTitle" :width="adaptiveWidth" @ok="handleSubmit"
v-bind="$attrs" :showFooter="showFooter" destroyOnClose>
@register="registerDrawer"
:title="getTitle"
:width="adaptiveWidth"
@ok="handleSubmit"
:showFooter="showFooter"
destroyOnClose
>
<BasicForm @register="registerForm"> <BasicForm @register="registerForm">
<template #pwd="{ model, field }"> <template #pwd="{ model, field }">
<a-row :gutter="8"> <a-row :gutter="8">
@ -19,11 +12,12 @@
</a-col> </a-col>
</a-row> </a-row>
</template> </template>
<template #departSelect ="{model,field}"> <template #departSelect="{ model, field }">
<a-select v-model:value="model[field]" :disabled="model['id']!=null" @change="(value,option) => handleChange(value,model)"> <a-select v-model:value="model[field]" :disabled="model['id'] != null"
@change="(value, option) => handleChange(value, model)" :allowClear="true">
<template v-for="item in departOptions" :key="`${item.code}`"> <template v-for="item in departOptions" :key="`${item.code}`">
<a-select-option :value="item.code" :label="item.departName"> <a-select-option :value="item.code" :label="item.departName">
{{item.departName}} {{ item.departName }}
</a-select-option> </a-select-option>
</template> </template>
</a-select> </a-select>
@ -33,37 +27,37 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { defineComponent, ref, computed, unref, useAttrs } from 'vue'; import { defineComponent, ref, computed, unref, useAttrs } from 'vue';
import { BasicForm, useForm } from '/@/components/Form/index'; import { BasicForm, useForm } from '/@/components/Form/index';
import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'; import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth'; import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth';
import { formSchema } from './datasource.data'; import { formSchema } from './datasource.data';
import { saveOrUpdateDataSource, getDataSourceById, testConnection, queryDeparts } from './datasource.api'; import { saveOrUpdateDataSource, getDataSourceById, testConnection, queryDeparts } from './datasource.api';
import {useMessage} from "@/hooks/web/useMessage"; import { useMessage } from "@/hooks/web/useMessage";
const { createMessage } = useMessage(); const { createMessage } = useMessage();
// 声明Emits // 声明Emits
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
const attrs = useAttrs(); const attrs = useAttrs();
const isUpdate = ref(true); const isUpdate = ref(true);
const rowId = ref(''); const rowId = ref('');
let isFormDepartUser = false; let isFormDepartUser = false;
//表单配置 //表单配置
const [registerForm, { setProps, resetFields, validateFields, getFieldsValue, setFieldsValue, validate, updateSchema }] = useForm({ const [registerForm, { setProps, resetFields, validateFields, getFieldsValue, setFieldsValue, validate, updateSchema }] = useForm({
labelWidth: 90, labelWidth: 90,
schemas: formSchema, schemas: formSchema,
showActionButtonGroup: false, showActionButtonGroup: false,
}); });
const showFooter = ref(true); const showFooter = ref(true);
const departOptions = ref<any[]>([]); const departOptions = ref<any[]>([]);
//表单赋值 //表单赋值
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
await resetFields(); await resetFields();
showFooter.value = data?.showFooter ?? true; showFooter.value = data?.showFooter ?? true;
setDrawerProps({ confirmLoading: false, showFooter: showFooter.value }); setDrawerProps({ confirmLoading: false, showFooter: showFooter.value });
isUpdate.value = !!data?.isUpdate; isUpdate.value = !!data?.isUpdate;
if (unref(isUpdate)){ if (unref(isUpdate)) {
await getDepartOptions(''); await getDepartOptions('');
}else{ } else {
await getDepartOptions('1'); await getDepartOptions('1');
} }
@ -78,32 +72,32 @@
} }
// 隐藏底部时禁用整个表单 // 隐藏底部时禁用整个表单
setProps({ disabled: !showFooter.value }); setProps({ disabled: !showFooter.value });
}); });
//获取标题 //获取标题
const getTitle = computed(() => { const getTitle = computed(() => {
if (!unref(isUpdate)) { if (!unref(isUpdate)) {
return '新增数据源'; return '新增数据源';
} else { } else {
return unref(showFooter) ? '编辑数据源' : '数据源详情'; return unref(showFooter) ? '编辑数据源' : '数据源详情';
} }
}); });
const { adaptiveWidth } = useDrawerAdaptiveWidth(); const { adaptiveWidth } = useDrawerAdaptiveWidth();
async function getDepartOptions(addFLag){ async function getDepartOptions(addFLag) {
departOptions.value = []; departOptions.value = [];
const data = await queryDeparts({ addFLag : addFLag }); const data = await queryDeparts({ addFLag: addFLag });
Object.assign(departOptions.value, data); Object.assign(departOptions.value, data);
} }
async function handleChange(value,formData){ async function handleChange(value, formData) {
if(value == null){ if (value == null) {
formData["code"] = ""; formData["code"] = "";
}else{ } else {
formData["code"] = value; formData["code"] = value;
} }
} }
async function handleTest() { async function handleTest() {
let keys = ['dbType', 'dbDriver', 'dbUrl', 'dbName', 'dbUsername', 'dbPassword']; let keys = ['dbType', 'dbDriver', 'dbUrl', 'dbName', 'dbUsername', 'dbPassword'];
// 获取以上字段的值，并清除校验状态 // 获取以上字段的值，并清除校验状态
let fieldsValues = getFieldsValue(keys); let fieldsValues = getFieldsValue(keys);
@ -117,13 +111,13 @@
createMessage.success('连接成功'); createMessage.success('连接成功');
} }
}) })
.catch((error) => {}) .catch((error) => { })
.finally(() => loading()); .finally(() => loading());
}); });
} }
//提交事件 //提交事件
async function handleSubmit() { async function handleSubmit() {
try { try {
let values = await validate(); let values = await validate();
setDrawerProps({ confirmLoading: true }); setDrawerProps({ confirmLoading: true });
@ -135,10 +129,8 @@
} finally { } finally {
setDrawerProps({ confirmLoading: false }); setDrawerProps({ confirmLoading: false });
} }
} }
</script> </script>
<style scoped> <style scoped></style>
</style>

75
src/views/monitor/datasource/DataSourceModal.vue
View File

@ -11,11 +11,12 @@
</a-col> </a-col>
</a-row> </a-row>
</template> </template>
<template #departSelect ="{model,field}"> <template #departSelect="{ model, field }">
<a-select v-model:value="model[field]" :disabled="model['id']!=null" @change="(value,option) => handleChange(value,model)"> <a-select v-model:value="model[field]" :disabled="model['id'] != null"
@change="(value, option) => handleChange(value, model)" :allowClear="true">
<template v-for="item in departOptions" :key="`${item.code}`"> <template v-for="item in departOptions" :key="`${item.code}`">
<a-select-option :value="item.code" :label="item.departName"> <a-select-option :value="item.code" :label="item.departName">
{{item.departName}} {{ item.departName }}
</a-select-option> </a-select-option>
</template> </template>
</a-select> </a-select>
@ -24,34 +25,34 @@
</BasicModal> </BasicModal>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, computed, unref } from 'vue'; import { ref, computed, unref } from 'vue';
import { BasicModal, useModalInner } from '/@/components/Modal'; import { BasicModal, useModalInner } from '/@/components/Modal';
import { BasicForm, useForm } from '/@/components/Form/index'; import { BasicForm, useForm } from '/@/components/Form/index';
import { formSchema } from './datasource.data'; import { formSchema } from './datasource.data';
import { saveOrUpdateDataSource, getDataSourceById, testConnection, queryDeparts } from './datasource.api'; import { saveOrUpdateDataSource, getDataSourceById, testConnection, queryDeparts } from './datasource.api';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
const { createMessage } = useMessage(); const { createMessage } = useMessage();
// Emits声明 // Emits声明
const emit = defineEmits(['register', 'success']); const emit = defineEmits(['register', 'success']);
const isUpdate = ref(true); const isUpdate = ref(true);
const departOptions = ref<any[]>([]); const departOptions = ref<any[]>([]);
//表单配置 //表单配置
const [registerForm, { getFieldsValue, resetFields, validateFields, setFieldsValue, validate }] = useForm({ const [registerForm, { getFieldsValue, resetFields, validateFields, setFieldsValue, validate }] = useForm({
// labelWidth: 150, // labelWidth: 150,
schemas: formSchema, schemas: formSchema,
showActionButtonGroup: false, showActionButtonGroup: false,
}); });
//表单赋值 //表单赋值
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
//重置表单 //重置表单
await resetFields(); await resetFields();
setModalProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
isUpdate.value = !!data?.isUpdate; isUpdate.value = !!data?.isUpdate;
if (unref(isUpdate)){ if (unref(isUpdate)) {
await getDepartOptions(''); await getDepartOptions('');
}else{ } else {
await getDepartOptions('1'); await getDepartOptions('1');
} }
if (unref(isUpdate)) { if (unref(isUpdate)) {
@ -62,26 +63,26 @@
...data.record, ...data.record,
}); });
} }
}); });
//设置标题 //设置标题
const title = computed(() => (!unref(isUpdate) ? '新增数据源' : '编辑数据源')); const title = computed(() => (!unref(isUpdate) ? '新增数据源' : '编辑数据源'));
async function getDepartOptions(addFLag){ async function getDepartOptions(addFLag) {
departOptions.value = []; departOptions.value = [];
const data = await queryDeparts({ addFLag : addFLag }); const data = await queryDeparts({ addFLag: addFLag });
console.log(data); console.log(data);
Object.assign(departOptions.value, data); Object.assign(departOptions.value, data);
} }
async function handleChange(value,formData){ async function handleChange(value, formData) {
if(value == null){ if (value == null) {
formData["code"] = ""; formData["code"] = "";
}else{ } else {
formData["code"] = value; formData["code"] = value;
} }
} }
async function handleTest() { async function handleTest() {
let keys = ['dbType', 'dbDriver', 'dbUrl', 'dbName', 'dbUsername', 'dbPassword']; let keys = ['dbType', 'dbDriver', 'dbUrl', 'dbName', 'dbUsername', 'dbPassword'];
// 获取以上字段的值，并清除校验状态 // 获取以上字段的值，并清除校验状态
let fieldsValues = getFieldsValue(keys); let fieldsValues = getFieldsValue(keys);
@ -95,13 +96,13 @@
createMessage.success('连接成功'); createMessage.success('连接成功');
} }
}) })
.catch((error) => {}) .catch((error) => { })
.finally(() => loading()); .finally(() => loading());
}); });
} }
//表单提交事件 //表单提交事件
async function handleSubmit(v) { async function handleSubmit(v) {
try { try {
let values = await validate(); let values = await validate();
setModalProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
@ -114,5 +115,5 @@
} finally { } finally {
setModalProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }
} }
</script> </script>

6
src/views/monitor/datasource/datasource.api.ts
View File

@ -13,6 +13,7 @@ enum Api {
getByCode = '/sys/dataSource/queryBySysOrgCode', getByCode = '/sys/dataSource/queryBySysOrgCode',
// exportXlsUrl = 'sys/dataSource/exportXls', // exportXlsUrl = 'sys/dataSource/exportXls',
// importExcelUrl = 'sys/dataSource/importExcel', // importExcelUrl = 'sys/dataSource/importExcel',
validCode = '/sys/dataSource/validCode',
} }
// /** // /**
// * 导出api // * 导出api
@ -99,3 +100,8 @@ export const queryDeparts = (params) => {
export const getDataSourceByCode = (params) => { export const getDataSourceByCode = (params) => {
return defHttp.get({ url: Api.getByCode, params }); return defHttp.get({ url: Api.getByCode, params });
}; };
export const validCode = (params) => {
return defHttp.get({ url: Api.validCode, params });
};

46
src/views/monitor/datasource/datasource.data.ts
View File

@ -1,4 +1,5 @@
import { BasicColumn, FormSchema } from '/@/components/Table'; import { BasicColumn, FormSchema } from '/@/components/Table';
import { validCode } from './datasource.api'
const dbDriverMap = { const dbDriverMap = {
// MySQL 数据库 // MySQL 数据库
@ -69,6 +70,12 @@ const dbUrlMap = {
}; };
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{
title: '数据源名称',
dataIndex: 'name',
width: 150,
align: 'left',
},
{ {
title: '所属机构', title: '所属机构',
dataIndex: 'sysOrgCode_dictText', dataIndex: 'sysOrgCode_dictText',
@ -81,12 +88,6 @@ export const columns: BasicColumn[] = [
width: 150, width: 150,
align: 'left', align: 'left',
}, },
{
title: '数据源名称',
dataIndex: 'name',
width: 150,
align: 'left',
},
{ {
title: '数据库类型', title: '数据库类型',
dataIndex: 'dbType_dictText', dataIndex: 'dbType_dictText',
@ -143,11 +144,17 @@ export const formSchema: FormSchema[] = [
component: 'Input', component: 'Input',
show: false, show: false,
}, },
{
field: 'name',
label: '数据源名称',
component: 'Input',
required: true,
},
{ {
field: 'sysOrgCode', field: 'sysOrgCode',
label: '所属机构', label: '所属机构',
component: 'Input', component: 'Input',
required: true, required: false,
slot: 'departSelect', slot: 'departSelect',
}, },
{ {
@ -155,13 +162,24 @@ export const formSchema: FormSchema[] = [
label: '数据源编码', label: '数据源编码',
component: 'Input', component: 'Input',
required: true, required: true,
dynamicDisabled: true dynamicDisabled: (val) => {
return !!val.model.sysOrgCode;
}, },
{ // dynamicDisabled:true,
field: 'name', // rules: [
label: '数据源名称', // {
component: 'Input', // validator: async (_, value) => {
required: true, // if (!value) return Promise.resolve();
// const res = await validCode({code:value});
// if (res == 'exist') {
// return Promise.reject('编码已存在！');
// }
// return Promise.resolve();
// },
// trigger: 'blur',
// }
// ]
}, },
{ {
field: 'dbType', field: 'dbType',
@ -230,7 +248,7 @@ export function useDataSourceFormSchema() {
label: '数据源编码', label: '数据源编码',
component: 'Input', component: 'Input',
// required: true, // required: true,
dynamicDisabled: true dynamicDisabled: true,
}, },
{ {
field: 'name', field: 'name',

2
src/views/synchronization/directive/index.vue
View File

@ -424,7 +424,7 @@ const handleResetOrg = () => {
} }
onMounted(() => { onMounted(() => {
queryDepartTreeSync().then(res => { queryDepartTreeSync({platType:'ywjg'}).then(res => {
orgTable.value = res; orgTable.value = res;
}); });
}); });

4
src/views/system/depart/components/DepartFormModal.vue
View File

@ -48,6 +48,10 @@
treeData: props.rootTreeData, treeData: props.rootTreeData,
}, },
}, },
{
field: 'platType',
show: !isChild
},
{ {
field: 'orgCode', field: 'orgCode',
show: false, show: false,

4
src/views/system/depart/depart.data.ts
View File

@ -37,10 +37,10 @@ export function useBasicFormSchema() {
componentProps: { options: [] }, componentProps: { options: [] },
}, },
{ {
field: 'platType_dictText', field: 'platType',
label: '业务平台类型', label: '业务平台类型',
defaultValue:'ywjg',
component: 'JDictSelectTag', component: 'JDictSelectTag',
defaultValue:"ywjg",
componentProps: { componentProps: {
dictCode: 'iz_test_site' dictCode: 'iz_test_site'
}, },