From a5faf6e7b42f1e358ee8396c77452a07d9f976e8 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 12 二月 2025 13:54:12 +0800
Subject: [PATCH] 测试完成
---
src/views/login.vue | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 0072023..9e7b2f7 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -37,8 +37,13 @@
</el-input>
</el-form-item>
<!-- 涓�===================姘� -->
- <el-form-item prop="guid">
- <el-select style="width: 100%;" v-model="loginForm.guid" placeholder="璇烽�夋嫨闄㈠尯">
+<<<<<<< HEAD
+ <el-form-item prop="orgid">
+ <el-select style="width: 100%;" v-model="loginForm.orgid" placeholder="璇烽�夋嫨闄㈠尯">
+=======
+ <!-- <el-form-item prop="orgid">
+ <el-select style="width: 100%;" v-model="loginForm.orgid" placeholder="璇烽�夋嫨闄㈠尯">
+>>>>>>> master
<el-option
v-for="item in options"
:key="item.value"
@@ -112,8 +117,12 @@
password: "",
rememberMe: false,
code: "",
+<<<<<<< HEAD
uuid: "",
- guid:'1',
+ orgid:'1',
+=======
+ orgid:'1',
+>>>>>>> master
},
options: [
{ value: "1", label: "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�" },
@@ -126,7 +135,11 @@
password: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" },
],
- guid: [{ required: true, trigger: "blur", message: "璇烽�夋嫨闄㈠尯" }],
+<<<<<<< HEAD
+ orgid: [{ required: true, trigger: "blur", message: "璇烽�夋嫨闄㈠尯" }],
+=======
+ // orgid: [{ required: true, trigger: "blur", message: "璇烽�夋嫨闄㈠尯" }],
+>>>>>>> master
},
loading: false,
// 楠岃瘉鐮佸紑鍏�
@@ -147,9 +160,9 @@
created() {
this.getCode();
this.getCookie();
- if (localStorage.getItem('guid')) {
- this.loginForm.guid = localStorage.getItem('guid');
- }
+ // if (localStorage.getItem('orgid')) {
+ // this.loginForm.orgid = localStorage.getItem('orgid');
+ // }
},
methods: {
getCode() {
@@ -191,7 +204,7 @@
Cookies.remove("password");
Cookies.remove("rememberMe");
}
- localStorage.removeItem('guid');
+ this.loginForm.orgid = '1',
this.$store
.dispatch("Login", this.loginForm)
.then(() => {
--
Gitblit v1.9.3