From 9799e992bc987425f21ad0b799e3d25d822329e3 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 13 十一月 2026 16:41:37 +0800
Subject: [PATCH] 登录问题处理

---
 src/views/login.vue |   59 +++++++++++++++++++++++------------------------------------
 1 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index 1b23cef..c0bf921 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -47,6 +47,7 @@
         >
           <el-option
             v-for="item in options"
+            :key="item.value"
             :label="item.label"
             :value="item.value"
           >
@@ -184,23 +185,15 @@
     getorganization() {
       getorganization({ pageSize: 30 }).then((res) => {
         if (res.code == 200) {
-          // 鍚屽痉绯诲垪 / 鍗楀崕绯诲垪 / 娴欐睙鐪佹柊鍗庡尰闄細鐢� 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,
-            };
-          });
+          // 涓嬫媺鍊煎繀椤诲敮涓�锛氬競涓� 3 涓櫌鍖虹殑 orgid 閮芥槸 1锛�
+          // 涓芥按鍖哄煙鍚勬満鏋勭殑 organizationID 閮芥槸 1锛屽崟鐢ㄤ换涓�瀛楁閮戒細閲嶅銆�
+          // 杩欓噷鐢ㄣ�宱rgid + organizationID + 涓嬫爣銆嶇粍鎴愬敮涓�閿紝鐧诲綍鏃跺啀鍙栫湡瀹炲弬鏁般��
+          this.options = (res.rows || []).map((item, index) => ({
+            value: `${item.orgid}__${item.organizationID}__${index}`,
+            label: item.organizationName || "",
+            campusid: item.organizationID,
+            orgid: item.orgid,
+          }));
         }
       });
     },
@@ -245,29 +238,23 @@
             Cookies.remove("rememberMe");
           }
 
-          // 閿�艰鍒欙細涓芥按鍖哄煙鐢� orgid锛坥rganizationID/campusid 鍧囦负 "1" 涓嶅敮涓�锛夛紱
-          // 鍚屽痉/鍗楀崕/娴欐睙鐪佹柊鍗庡尰闄㈢瓑鍖哄煙鐢� campusid(organizationID) 浣滀笅鎷夐敭鍊�
           const selectedOrg = this.options.find(
-            (item) => String(item.value) === String(this.loginForm.orgid)
+            (item) => item.value === this.loginForm.orgid
           );
-          if (selectedOrg) {
-            this.loginForm.campusid = selectedOrg.campusid;
-            this.loginForm.orgid = selectedOrg.orgid;
-            this.loginForm.orgname = selectedOrg.label;
+          if (!selectedOrg) {
+            this.loading = false;
+            this.$message.error("闄㈠尯淇℃伅宸插け鏁堬紝璇烽噸鏂伴�夋嫨闄㈠尯");
+            return;
           }
-          // 甯備竴澶勭悊-----------------
-          // if (selectedOrg) {
-          //   if (selectedOrg.label.includes("婀栨花")) {
-          //     this.loginForm.campusid = 1;
-          //   } else if (selectedOrg.label.includes("鍚村北")) {
-          //     this.loginForm.campusid = 2;
-          //   } else {
-          //     this.loginForm.campusid = 1; // 榛樿鍊兼垨鍏朵粬澶勭悊
-          //   }
-          // }
-          // --------------------------------
+          // 涓嬫媺妗嗗瓨鐨勬槸鍞竴閿紝鎻愪氦鍓嶆崲鎴愬悗绔渶瑕佺殑鐪熷疄 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(() => {});

--
Gitblit v1.9.3