From fb34ba28cb908bd328cf6690ab0b19a56428f4e2 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期五, 13 十一月 2026 10:56:55 +0800
Subject: [PATCH] 测试完成
---
src/views/login.vue | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index cc50c59..1b23cef 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -39,16 +39,16 @@
</el-input>
</el-form-item>
<!-- 涓�===================姘� -->
- <el-form-item prop="campusid">
+ <el-form-item prop="orgid">
<el-select
style="width: 100%"
- v-model="loginForm.campusid"
+ v-model="loginForm.orgid"
placeholder="璇烽�夋嫨闄㈠尯"
>
<el-option
v-for="item in options"
:label="item.label"
- :value="item.campusid"
+ :value="item.value"
>
</el-option>
<i slot="prefix" class="el-icon-mobile"></i>
@@ -127,7 +127,7 @@
password: "",
rememberMe: false,
code: "",
- orgid: "H41010500003",
+ orgid: "",
},
options: [],
loginRules: {
@@ -137,7 +137,7 @@
password: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" },
],
- campusid: [{ required: true, trigger: "blur", message: "璇烽�夋嫨闄㈠尯" }],
+ orgid: [{ required: true, trigger: "change", message: "璇烽�夋嫨闄㈠尯" }],
},
loading: false,
// 楠岃瘉鐮佸紑鍏�
@@ -164,11 +164,11 @@
// this.loginForm.orgid = localStorage.getItem('orgid');
// }
},
- computed: {
+ computed: {
isAdmin() {
const roles = this.$store.getters.roles || [];
return roles.includes("mydstaff");
- }
+ },
},
methods: {
getCode() {
@@ -184,11 +184,23 @@
getorganization() {
getorganization({ pageSize: 30 }).then((res) => {
if (res.code == 200) {
- this.options = res.rows.map((item) => ({
- value: item.orgid,
- label: item.organizationName,
- campusid: item.organizationID,
- }));
+ // 鍚屽痉绯诲垪 / 鍗楀崕绯诲垪 / 娴欐睙鐪佹柊鍗庡尰闄細鐢� campusid(organizationID) 浣滀笅鎷夐敭鍊硷紱
+ // 鍏朵綑锛堜附姘村尯鍩� organizationID 鍏ㄤ负 "1" 涓嶅敮涓�锛夛細鐢� orgid 浣滀笅鎷夐敭鍊�
+ const campusidKeywords = ["鍚屽痉", "鍗楀崕", "娴欐睙鐪佹柊鍗庡尰闄�"];
+ this.options = (res.rows || []).map((item) => {
+ console.log(item.organizationName);
+
+ const name = item.organizationName || "";
+ const useCampusid = campusidKeywords.some((kw) =>
+ name.includes(kw)
+ );
+ return {
+ value: String(useCampusid ? item.organizationID : item.orgid),
+ label: name,
+ campusid: item.organizationID,
+ orgid: item.orgid,
+ };
+ });
}
});
},
@@ -233,13 +245,16 @@
Cookies.remove("rememberMe");
}
- // 鍔ㄦ�佽缃� campusid 鍙傛暟
+ // 閿�艰鍒欙細涓芥按鍖哄煙鐢� orgid锛坥rganizationID/campusid 鍧囦负 "1" 涓嶅敮涓�锛夛紱
+ // 鍚屽痉/鍗楀崕/娴欐睙鐪佹柊鍗庡尰闄㈢瓑鍖哄煙鐢� campusid(organizationID) 浣滀笅鎷夐敭鍊�
const selectedOrg = this.options.find(
- (item) => item.campusid === this.loginForm.campusid
+ (item) => String(item.value) === String(this.loginForm.orgid)
);
- this.loginForm.campusid = selectedOrg.campusid || 1;
- this.loginForm.orgid = selectedOrg.value || 1;
- this.loginForm.orgname = selectedOrg.label || "";
+ if (selectedOrg) {
+ this.loginForm.campusid = selectedOrg.campusid;
+ this.loginForm.orgid = selectedOrg.orgid;
+ this.loginForm.orgname = selectedOrg.label;
+ }
// 甯備竴澶勭悊-----------------
// if (selectedOrg) {
// if (selectedOrg.label.includes("婀栨花")) {
@@ -259,7 +274,7 @@
} else if (this.isAdmin) {
console.log(1);
- this.$router
+ this.$router
.push({ path: "/Intelligentcenter/dispose" })
.catch(() => {});
} else {
@@ -281,7 +296,6 @@
}
});
},
-
},
};
</script>
--
Gitblit v1.9.3