From fd15b2a99a4ebd476a54671c560b3a89f69b621e Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期二, 27 八月 2024 10:26:42 +0800
Subject: [PATCH] feat: 修改bug
---
src/views/authority/users/index.vue | 93 +++++++++++++++++++++++++++-------------------
src/router/index.ts | 3 +
src/views/dmx/knowledgeLib/config.vue | 5 +-
3 files changed, 59 insertions(+), 42 deletions(-)
diff --git a/src/router/index.ts b/src/router/index.ts
index e230a4b..b1b97ac 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,4 +1,4 @@
-import { createRouter, createWebHistory } from 'vue-router';
+import { createRouter, createWebHistory,createWebHashHistory } from 'vue-router';
import NProgress from 'nprogress'; // progress bar
import 'nprogress/nprogress.css';
@@ -10,6 +10,7 @@
const router = createRouter({
history: createWebHistory(),
+ // history: createWebHashHistory(),
routes: [
{
path: '/',
diff --git a/src/views/authority/users/index.vue b/src/views/authority/users/index.vue
index d6110cc..de2d8b7 100644
--- a/src/views/authority/users/index.vue
+++ b/src/views/authority/users/index.vue
@@ -123,12 +123,18 @@
@ok="editHandleOk"
width="48%"
>
- <a-form ref="formRef" :model="editform">
+ <a-form ref="formRefPaw" :model="editform">
<a-row :gutter="20">
<a-col :span="10">
- <a-form-item field="loginName" label="鐢ㄦ埛鍚�" :rules="[{required:true,message:'鐢ㄦ埛鍚嶅繀濉�'},{maxLength:50,message:'闀垮害涓嶈秴杩�50'}]"
- >
- <a-input v-model="editform.loginName" />
+ <a-form-item
+ field="loginName"
+ label="鐢ㄦ埛鍚�"
+ :rules="[
+ { required: true, message: '鐢ㄦ埛鍚嶅繀濉�' },
+ { maxLength: 50, message: '闀垮害涓嶈秴杩�50' },
+ ]"
+ >
+ <a-input v-model="editform.loginName" />
</a-form-item>
</a-col>
<a-col :span="10">
@@ -144,7 +150,15 @@
</a-form-item>
</a-col>
<a-col :span="10">
- <a-form-item required field="email" label="閭" :rules="[{required:true,message:'閭蹇呭～'},{maxLength:50,message:'闀垮害涓嶈秴杩�50'}]" >
+ <a-form-item
+ required
+ field="email"
+ label="閭"
+ :rules="[
+ { required: true, message: '閭蹇呭～' },
+ { maxLength: 50, message: '闀垮害涓嶈秴杩�50' },
+ ]"
+ >
<a-input v-model="editform.email" />
</a-form-item>
</a-col>
@@ -156,7 +170,12 @@
</a-form-item>
</a-col>
<a-col :span="10">
- <a-form-item required field="role" label="瑙掕壊" :rules="[{required:true,message:'瑙掕壊蹇呴��'}]" >
+ <a-form-item
+ required
+ field="role"
+ label="瑙掕壊"
+ :rules="[{ required: true, message: '瑙掕壊蹇呴��' }]"
+ >
<a-select
v-model="editform.role"
:options="roles"
@@ -234,10 +253,7 @@
>
<a-space wrap>
鑿滃崟鍔熻兘锛�
- <a-tag
- v-for="(tag, index) of checkStrictlyMenu"
- :key="tag.menuId"
- >
+ <a-tag v-for="(tag, index) of checkStrictlyMenu" :key="tag.menuId">
{{ tag.menuName }}
</a-tag>
</a-space>
@@ -283,19 +299,21 @@
DialogList,
KnowledgeList,
OrganizationList,
- ResourceList, Role, RoleList,
+ ResourceList,
+ Role,
+ RoleList,
User,
UserAdd,
UserChangePwd,
UserDelete,
UserEdit,
UserList,
- Userstatus
- } from "@/api/authority";
+ Userstatus,
+ } from '@/api/authority';
import { Modal } from '@arco-design/web-vue';
import Authheader from '@/views/authority/components/authheader.vue';
import { create } from 'lodash';
- import { queryCanvasList } from "@/api/Agent";
+ import { queryCanvasList } from '@/api/Agent';
const fieldNames = { value: 'roleId', label: 'roleName' };
const roles = ref([]);
@@ -309,6 +327,7 @@
let checkStrictlyDialog = ref([]);
let checkStrictlyAgent = ref([]);
let formRef = ref();
+ const formRefPaw = ref();
let menuTips = ref(['鏉冮檺绠＄悊', '璐﹀彿']);
type SizeProps = 'mini' | 'small' | 'medium' | 'large';
@@ -333,10 +352,10 @@
phoneNumber: '',
status: '',
userId: '',
- loginName:'',
+ loginName: '',
userName: '',
- psw:'',
- role:'',
+ psw: '',
+ role: '',
});
let size = ref<SizeProps>('medium');
@@ -345,11 +364,11 @@
let resourcevisible = ref(false);
let selectUser = ref({});
- const loadRole=async () => {
- await RoleList(null).then((res) => {
- roles.value = res.rows;
- });
- }
+ const loadRole = async () => {
+ await RoleList(null).then((res) => {
+ roles.value = res.rows;
+ });
+ };
const roleChange = (val) => {
editform.value.role = val;
@@ -452,26 +471,24 @@
});
};
-
const cb = async (err) => {
if (err) {
visible.value = true;
} else {
if (editform.value.userId.length > 0) {
await UserEdit({
- ...editform.value
+ ...editform.value,
} as unknown as User).then((res) => {
fetchData();
});
} else {
await UserAdd({
- ...editform.value
+ ...editform.value,
} as unknown as User).then((res) => {
fetchData();
});
}
}
-
};
const editHandleOk = () => {
formRef.value.validate(cb);
@@ -507,13 +524,14 @@
//缂栬緫
if (t == 2) {
visible.value = true;
+ formRefPaw.value?.resetFields();
save.value = '缂栬緫';
editform.value.userId = record.userId;
editform.value.userName = record.userName;
editform.value.loginName = record.loginName;
editform.value.email = record.email;
editform.value.phoneNumber = record.phoneNumber;
- if (record.roles?.length>0) {
+ if (record.roles?.length > 0) {
editform.value.role = record.roles[0].roleId;
}
}
@@ -535,9 +553,9 @@
selectUser.value = record;
let agents;
- if (record.agents){
- agents=record.agents
- }else{
+ if (record.agents) {
+ agents = record.agents;
+ } else {
agents = record.roles ? record.roles[0].agents : null;
}
if (agents) {
@@ -546,13 +564,12 @@
agentId: val.id,
agentName: val.title,
});
-
});
}
let resources;
- if (record.resources){
- resources=record.resources
- }else{
+ if (record.resources) {
+ resources = record.resources;
+ } else {
resources = record.roles ? record.roles[0].resources : null;
}
if (resources) {
@@ -561,7 +578,6 @@
menuId: val.menuId,
menuName: val.menuName,
});
-
});
}
let knowledges;
@@ -628,9 +644,9 @@
if (user.roles) {
for (const r of user.roles) {
if (user.roleName) {
- user.roleName += r.roleName + ",";
+ user.roleName += r.roleName + ',';
} else {
- user.roleName = r.roleName + ",";
+ user.roleName = r.roleName + ',';
}
}
}
@@ -664,10 +680,9 @@
});
};
-
fetchData();
OrganizationData('');
- loadRole()
+ loadRole();
const reset = () => {
formModel.value = generateFormModel();
diff --git a/src/views/dmx/knowledgeLib/config.vue b/src/views/dmx/knowledgeLib/config.vue
index 52ed4e5..29d9de8 100644
--- a/src/views/dmx/knowledgeLib/config.vue
+++ b/src/views/dmx/knowledgeLib/config.vue
@@ -226,7 +226,7 @@
],
}
let visible = ref(false);
-const formRef = ref(null);
+const formRef = ref();
const modelList = ref({});
const mobileData= ref<any>([])
const file = ref();
@@ -349,8 +349,9 @@
};
const changekbObj = (value) => {
+
+ formRef.value.resetFields();
nextTick(()=>{
- // formRef.value.resetFields();
kbObj = value;
console.log(kbObj, 'kbObj');
let configObj = {
--
Gitblit v1.8.0