From 574b449a39019a59dc90ecc19dda9f63d3aa9636 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期三, 18 十一月 2026 15:35:47 +0800
Subject: [PATCH] 测试完成
---
src/views/login.vue | 73 ++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 32 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index c166a26..002b4f6 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -39,16 +39,17 @@
</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"
+ :key="item.value"
:label="item.label"
- :value="item.campusid"
+ :value="item.value"
>
</el-option>
<i slot="prefix" class="el-icon-mobile"></i>
@@ -127,7 +128,7 @@
password: "",
rememberMe: false,
code: "",
- orgid: "H41010500003",
+ orgid: "",
},
options: [],
loginRules: {
@@ -137,7 +138,7 @@
password: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" },
],
- campusid: [{ required: true, trigger: "blur", message: "璇烽�夋嫨闄㈠尯" }],
+ orgid: [{ required: true, trigger: "change", message: "璇烽�夋嫨闄㈠尯" }],
},
loading: false,
// 楠岃瘉鐮佸紑鍏�
@@ -164,11 +165,11 @@
// this.loginForm.orgid = localStorage.getItem('orgid');
// }
},
- computed: {
+ computed: {
isAdmin() {
const roles = this.$store.getters.roles || [];
return roles.includes("mydstaff");
- }
+ },
},
methods: {
getCode() {
@@ -184,11 +185,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,
+ };
+ });
}
});
},
@@ -200,7 +213,7 @@
return label.includes("鍗楀崕") && label.includes("闄勪竴");
});
if (hasNanhua) {
- this.loginForm.password = "nhfy@0230";
+ this.loginForm.password = "Nhfy@023299.*";
}
},
getCookie() {
@@ -233,33 +246,30 @@
Cookies.remove("rememberMe");
}
- // 鍔ㄦ�佽缃� campusid 鍙傛暟
const selectedOrg = this.options.find(
- (item) => item.campusid === this.loginForm.campusid
+ (item) => item.value === this.loginForm.orgid
);
- this.loginForm.campusid = selectedOrg.campusid || 1;
- this.loginForm.orgid = selectedOrg.value || 1;
- this.loginForm.orgname = selectedOrg.label || "";
- // 甯備竴澶勭悊-----------------
- // if (selectedOrg) {
- // if (selectedOrg.label.includes("婀栨花")) {
- // this.loginForm.campusid = 1;
- // } else if (selectedOrg.label.includes("鍚村北")) {
- // this.loginForm.campusid = 2;
- // } else {
- // this.loginForm.campusid = 1; // 榛樿鍊兼垨鍏朵粬澶勭悊
- // }
- // }
- // --------------------------------
+ if (!selectedOrg) {
+ this.loading = false;
+ this.$message.error("闄㈠尯淇℃伅宸插け鏁堬紝璇烽噸鏂伴�夋嫨闄㈠尯");
+ return;
+ }
+ // 涓嬫媺妗嗗瓨鐨勬槸鍞竴閿紝鎻愪氦鍓嶆崲鎴愬悗绔渶瑕佺殑鐪熷疄 orgid / campusid
+ const loginInfo = {
+ ...this.loginForm,
+ campusid: selectedOrg.campusid,
+ orgid: selectedOrg.orgid,
+ orgname: selectedOrg.label,
+ };
this.$store
- .dispatch("Login", this.loginForm)
+ .dispatch("Login", loginInfo)
.then((res) => {
if (this.loginForm.username == "admin") {
this.$router.push({ path: "/index" }).catch(() => {});
} else if (this.isAdmin) {
console.log(1);
- this.$router
+ this.$router
.push({ path: "/Intelligentcenter/dispose" })
.catch(() => {});
} else {
@@ -281,7 +291,6 @@
}
});
},
-
},
};
</script>
--
Gitblit v1.9.3