From 747422acd1b85db6fdb98310dc9c35ac6471168c Mon Sep 17 00:00:00 2001
From: Liu Wu <2780205363@qq.com>
Date: Thu, 26 Sep 2024 20:22:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.js                   |  4 ++--
 src/store/modules/user.js          |  3 ++-
 src/views/login.vue                | 18 ++++++++++++++++--
 src/views/system/user/authRole.vue |  3 ++-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/api/login.js b/src/api/login.js
index e07482b..7461dcf 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 
 // 登录方法
-export function login(username, password, code, uuid) {
+export function login(firmName,username, password, code, uuid) {
   return request({
     url: '/auth/login',
     headers: {
@@ -10,7 +10,7 @@ export function login(username, password, code, uuid) {
       repeatSubmit: false
     },
     method: 'post',
-    data: {username, password, code, uuid}
+    data: {firmName,username, password, code, uuid}
   })
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 6c109a6..57bdd68 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -38,12 +38,13 @@ const user = {
   actions: {
     // 登录
     Login({commit}, userInfo) {
+      const firName = userInfo.firmName
       const username = userInfo.username.trim()
       const password = userInfo.password
       const code = userInfo.code
       const uuid = userInfo.uuid
       return new Promise((resolve, reject) => {
-        login(username, password, code, uuid).then(res => {
+        login(firName , username, password, code, uuid).then(res => {
           let data = res.data
           setToken(data.access_token)
           commit('SET_TOKEN', data.access_token)
diff --git a/src/views/login.vue b/src/views/login.vue
index 53eded5..ad9ac1c 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,7 +1,17 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">车联网运营管理系统</h3>
+      <el-form-item>
+        <el-input
+          v-model="loginForm.firmName"
+          auto-complete="off"
+          placeholder="公司"
+          type="text">
+          <svg-icon slot="prefix" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
+
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -72,6 +82,7 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
+        firmName: "若依科技",
         username: "admin",
         password: "admin123",
         rememberMe: false,
@@ -79,6 +90,9 @@ export default {
         uuid: ""
       },
       loginRules: {
+        firmName: [
+          {required: true, trigger: "blur", message: "请输入您的公司"}
+        ],
         username: [
           {required: true, trigger: "blur", message: "请输入您的账号"}
         ],
@@ -91,7 +105,7 @@ export default {
       // 验证码开关
       captchaEnabled: false,
       // 注册开关
-      register: false,
+      register: true,
       redirect: undefined
     };
   },
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index e849c05..db8eccd 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -103,7 +103,8 @@ export default {
     submitForm() {
       const userId = this.form.userId;
       const roleIds = this.roleIds.join(",");
-      updateAuthRole({userId: userId, roleIds: roleIds}).then((response) => {
+      const user={userId: userId, roleIds: roleIds}
+      updateAuthRole(user).then((response) => {
         this.$modal.msgSuccess("授权成功");
         this.close();
       });