From ba4eee2e5ced6aef3e85a7c7b8317817b7ad3cae Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 14 八月 2025 10:05:53 +0800
Subject: [PATCH] Merge branch 'lishui-Smartor' of http://116.62.18.175:6699/r/~yxh/smartor-web

---
 src/views/login.vue |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index da63f30..d506da5 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -37,7 +37,7 @@
         </el-input>
       </el-form-item>
       <!-- 涓�===================姘� -->
-      <el-form-item prop="orgid">
+      <!-- <el-form-item prop="orgid">
         <el-select style="width: 100%;" v-model="loginForm.orgid"  placeholder="璇烽�夋嫨闄㈠尯">
           <el-option
             v-for="item in options"
@@ -48,7 +48,7 @@
           </el-option>
           <i slot="prefix" class="el-icon-mobile"></i>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item prop="code" v-if="captchaEnabled">
         <el-input
           v-model="loginForm.code"
@@ -112,13 +112,15 @@
         password: "",
         rememberMe: false,
         code: "",
-        orgid:'47255004333112711A1001',
+        orgid:'1',
       },
       options: [
         { value: "47255004333112711A1001", label: "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�" },
         { value: "47231022633110211A2101", label: "涓芥按甯備腑鍖婚櫌" },
         { value: "47246102433112211A2101", label: "缂欎簯鍘夸腑鍖诲尰闄� " },
         { value: "47240018433118111A2101", label: "榫欐硥甯備腑鍖诲尰闄� " },
+        { value: "47243006833112611A2101", label: "搴嗗厓鍘夸腑鍖诲尰闄� " },
+        { value: "47234002X33112111A2101", label: "闈掔敯鍘夸腑鍖诲尰闄� " },
        ],
       loginRules: {
         username: [
@@ -192,12 +194,15 @@
             Cookies.remove("password");
             Cookies.remove("rememberMe");
           }
-          // this.loginForm.orgid = '1',
+          this.loginForm.orgid = '1',
           this.$store
             .dispatch("Login", this.loginForm)
-            .then(() => {
-              // this.$router.push({ path: this.redirect || "/" }).catch(() => {});
-              this.$router.push({ path:"/followvisit/discharge" }).catch(() => {});
+            .then((res) => {
+              if (this.loginForm.username=='admin') {
+              this.$router.push({ path:"/index" }).catch(() => {});
+              }else{
+                this.$router.push({ path:"/followvisit/discharge" }).catch(() => {});
+              }
             })
             .catch(() => {
               this.loading = false;

--
Gitblit v1.9.3