admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-01-23 17:42:42 +08:00
parent 688b95165b
commit b4b0d6fdcb
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env.development
View File

@ -2,10 +2,11 @@
NODE_ENV = 'development' NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/api/index.ts文件中使用)
# VITE_API_URL = 'http://192.168.34.155:6677' VITE_API_URL = 'http://192.168.34.155:6688'
# VITE_API_URL = 'http://183.63.230.59:6090'
# VITE_API_URL = 'http://2xliv7gs.shenzhuo.vip:55296' # VITE_API_URL = 'http://2xliv7gs.shenzhuo.vip:55296'
VITE_WPAPI_URL = "http://jxjzw.zhgdyun.com:8081" VITE_WPAPI_URL = "http://jxjzw.zhgdyun.com:8081"
VITE_API_URL = "http://jxjzw.zhgdyun.com:9013" # VITE_API_URL = "http://jxjzw.zhgdyun.com:9013"
# 上传 # 上传
# VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' # VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

4
.env.production
View File

@ -3,8 +3,8 @@ NODE_ENV = "production"
# 线上环境接口地址(easymock) # 线上环境接口地址(easymock)
# VITE_API_URL = "http://139.9.66.234:6688" # VITE_API_URL = "http://139.9.66.234:6688"
# VITE_API_URL = 'http://10.75.253.12:6090' VITE_API_URL = 'http://10.75.253.12:6090'
VITE_API_URL = 'http://183.63.230.59:6090' # VITE_API_URL = 'http://183.63.230.59:6090'
# VITE_API_URL = "http://jxjzw.zhgdyun.com:9013" # VITE_API_URL = "http://jxjzw.zhgdyun.com:9013"
VITE_WPAPI_URL = "http://jxjzw.zhgdyun.com:8081" VITE_WPAPI_URL = "http://jxjzw.zhgdyun.com:8081"
# VITE_API_URL = "http://101.43.164.214:6688" # VITE_API_URL = "http://101.43.164.214:6688"

3
src/views/goverment/huizhou/userManagement/roleManage/index.vue
View File

@ -347,6 +347,9 @@ const saveItem = async (formEl: FormInstance | undefined, form: any) => {
if (!formEl) return; if (!formEl) return;
await formEl.validate(async (valid, fields) => { await formEl.validate(async (valid, fields) => {
if (valid) { if (valid) {
if (!store.enterpriseType.includes(1)) {
delete form.roleType;
}
if (form.roleId) { if (form.roleId) {
// console.log(form.dictCode); // console.log(form.dictCode);
const res = await editRole(form); const res = await editRole(form);

16
src/views/goverment/huizhou/userManagement/userManage/index.vue
View File

@ -150,9 +150,9 @@ const store = GlobalStore();
const roleList = ref<any>([]); // 角色列表 const roleList = ref<any>([]); // 角色列表
const engineerProjectList = ref([]); // 项目列表 const engineerProjectList = ref([]); // 项目列表
const enterpriseList = ref([]); // 企业列表 const enterpriseList = ref([]); // 企业列表
const typeList = ref([]); const typeList = ref([] as any);
const ruleFormRef = ref(); const ruleFormRef = ref();
const departmentList = ref([]); const departmentList = ref([] as any);
const visible = ref(false); const visible = ref(false);
const authorityVisible = ref(false); const authorityVisible = ref(false);
const title = ref(""); const title = ref("");
@ -376,6 +376,7 @@ const handleEditItem = async (index: number, row: any) => {
} }
await getRoleData(); await getRoleData();
visible.value = true; visible.value = true;
ruleFormRef.value.clearValidate();
}; };
// 删除用户信息 // 删除用户信息
@ -390,6 +391,9 @@ const saveItem = async (formEl: FormInstance | undefined, form: any) => {
if (!formEl) return; if (!formEl) return;
await formEl.validate(async (valid, fields) => { await formEl.validate(async (valid, fields) => {
if (valid) { if (valid) {
if (!store.enterpriseType.includes(1)) {
delete form.accountType;
}
if (form.userId) { if (form.userId) {
const res = await editUser(form); const res = await editUser(form);
proTable.value.getTableList(); proTable.value.getTableList();
@ -411,15 +415,15 @@ const saveItem = async (formEl: FormInstance | undefined, form: any) => {
}); });
}; };
onMounted(async () => { onMounted(async () => {
const res1 = await getTreeList({ deptId: "", status: 1 }); const res1: any = await getTreeList({ deptId: "", status: 1 });
departmentList.value = res1.result.map(i => { departmentList.value = res1.result.map((i: any) => {
return { return {
label: i.deptName, label: i.deptName,
value: i.deptId value: i.deptId
}; };
}); });
const res2: any = await getentNamelist({}); const res2: any = await getentNamelist({});
enterpriseList.value = res2.result.map(item => { enterpriseList.value = res2.result.map((item: any) => {
return { return {
label: item.enterpriseName, label: item.enterpriseName,
value: item.enterpriseSn value: item.enterpriseSn
@ -427,7 +431,7 @@ onMounted(async () => {
}); });
const res3: any = await engineerList({}); const res3: any = await engineerList({});
engineerProjectList.value = res3.result.map(item => { engineerProjectList.value = res3.result.map((item: any) => {
return { return {
label: item.engineeringName, label: item.engineeringName,
value: item.engineeringSn value: item.engineeringSn