liubiao/dyf-vue-ui
1
0
Fork 0
forked from dyf/dyf-vue-ui
Code Pull Requests Activity

修复类型字典问题

Browse Source
This commit is contained in:
微微一笑
2025-08-20 13:47:12 +08:00
parent d96b28a0b9
commit 1cfb5581c8
10 changed files with 104 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/views/equipmentManagement/deviceType/index.vue
View File

@ -42,7 +42,7 @@
<el-table-column label="型号名称" align="center" prop="typeName" />
<el-table-column label="类型code" align="center" prop="modelDictionary">
<template #default="scope">
{{ modelDictionaryOptions.find(item => item.dictValue == scope.row.modelDictionary)?.dictLabel }}
{{ modelDictionaryOptions.find(item => item.dictValue === String(scope.row.modelDictionary))?.dictLabel }}
</template>
</el-table-column>
<el-table-column label="是否支持蓝牙" align="center" prop="isSupportBle">
@ -119,11 +119,11 @@
<el-col :span="24">
<el-form-item label="定位方式" prop="locateMode">
<el-select v-model="form.locateMode" placeholder="请选择">
<el-option label="无" value="0" />
<el-option label="GPS" value="1" />
<el-option label="基站" value="2" />
<el-option label="wifi" value="3" />
<el-option label="北斗" value="4" />
<el-option label="无" :value="0" />
<el-option label="GPS" :value="1" />
<el-option label="基站" :value="2" />
<el-option label="wifi" :value="3" />
<el-option label="北斗" :value="4" />
</el-select>
</el-form-item>
</el-col>
@ -132,8 +132,8 @@
<el-col :span="24">
<el-form-item label="通讯方式" prop="communicationMode">
<el-select v-model="form.communicationMode" placeholder="请选择">
<el-option label="4G" value="0" />
<el-option label="蓝牙" value="1" />
<el-option label="4G" :value="0" />
<el-option label="蓝牙" :value="1" />
</el-select>
</el-form-item>
</el-col>
@ -160,9 +160,9 @@ interface deviceTypeVO {
id: string | number;
typeName: string;
isSupportBle: boolean;
locateMode: string;
locateMode: number;
modelDictionary: string;
communicationMode: string;
communicationMode: number;
createTime: string;
createByName: string;
}
@ -188,9 +188,9 @@ const dialog = reactive<DialogOption>({
const initFormData: DeviceTypeForm = {
typeName: '',
isSupportBle: false,
locateMode: '',
locateMode: 0,
modelDictionary: '',
communicationMode: '',
communicationMode: 0,
id: '',
createTime: '',
createByName: '',
@ -300,9 +300,10 @@ const handleUpdate = async (row?: DeviceTypeForm) => {
try {
const deviceData = row || ids.value[0];
Object.assign(form.value, deviceData);
if (form.value.modelDictionary) {
form.value.modelDictionary = String(form.value.modelDictionary);
}
// 确保数据类型正确
form.value.modelDictionary = String(form.value.modelDictionary || '');
form.value.locateMode = Number(form.value.locateMode) || 0;
form.value.communicationMode = Number(form.value.communicationMode) || 0;
} catch (error) {
dialog.visible = false;
}
@ -316,7 +317,9 @@ const submitForm = () => {
try {
const payload = {
...form.value,
modelDictionary: Number(form.value.modelDictionary)
modelDictionary: form.value.modelDictionary,
locateMode: Number(form.value.locateMode),
communicationMode: Number(form.value.communicationMode)
};
form.value.id ? await api.updateDeviceType(payload) : await api.addDeviceType(payload);
proxy?.$modal.msgSuccess('操作成功');

32
src/views/login.vue
View File

@ -6,7 +6,7 @@
</div>
<el-form-item v-if="tenantEnabled" prop="tenantId">
<el-select v-model="loginForm.tenantId" filterable :placeholder="proxy.$t('login.selectPlaceholder')"
style="width: 100%">
style="width: 100%" @change="onTenantChange">
<el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName"
:value="item.tenantId"></el-option>
<template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
@ -56,7 +56,7 @@ import { HttpStatus } from '@/enums/RespEnum';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const title = import.meta.env.VITE_APP_TITLE;
const title = ref(import.meta.env.VITE_APP_TITLE);
const userStore = useUserStore();
const router = useRouter();
@ -102,19 +102,30 @@ const handleLogin = () => {
loginRef.value?.validate(async (valid: boolean, fields: any) => {
if (valid) {
loading.value = true;
// 获取选中租户的名称并设置到登录表单中
const tenantName = tenantList.value.find(item => item.tenantId === loginForm.value.tenantId)?.companyName;
loginForm.value.tenantName = tenantName;
// 勾选了需要记住密码设置在 localStorage 中设置记住用户名和密码
if (loginForm.value.rememberMe) {
localStorage.setItem('tenantId', String(loginForm.value.tenantId));
localStorage.setItem('tenantName', String(tenantName || ''));
localStorage.setItem('username', String(loginForm.value.username));
localStorage.setItem('password', String(loginForm.value.password));
localStorage.setItem('rememberMe', String(loginForm.value.rememberMe));
} else {
// 否则移除
localStorage.removeItem('tenantId');
localStorage.removeItem('tenantName');
localStorage.removeItem('username');
localStorage.removeItem('password');
localStorage.removeItem('rememberMe');
}
// 无论是否记住密码，都保存租户名称用于页面刷新时恢复
if (tenantName) {
localStorage.setItem('currentTenantName', tenantName);
}
// 调用action的登录方法
const [err] = await to(userStore.login(loginForm.value));
if (!err) {
@ -170,6 +181,8 @@ const initTenantList = async () => {
tenantList.value = data.voList;
if (tenantList.value != null && tenantList.value.length !== 0) {
loginForm.value.tenantId = tenantList.value[0].tenantId;
// 初始化标题为第一个租户的名称
onTenantChange(tenantList.value[0].tenantId);
}
}
};
@ -189,6 +202,21 @@ const doSocialLogin = (type: string) => {
});
};
/**
* 租户变化时更新标题
*/
const onTenantChange = (tenantId: string) => {
const selectedTenant = tenantList.value.find(item => item.tenantId === tenantId);
if (selectedTenant) {
title.value = selectedTenant.companyName;
// 同时更新页面标题
document.title = selectedTenant.companyName;
} else {
title.value = import.meta.env.VITE_APP_TITLE;
document.title = import.meta.env.VITE_APP_TITLE;
}
};
onMounted(() => {
getCode();
initTenantList();