登录页面登录跳转修改，首页数据页面绘制

public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>canteen2.ico">
+    <link rel="icon" href="<%= BASE_URL %>logo2.ico">
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <script src="./monitor/codebase/jsPlugin-1.2.0.min.js"></script>

src/assets/styles/sidebar.scss

@@ -19,10 +19,10 @@
     transition: width 0.28s;
     width: $base-sidebar-width !important;
     background-color: $base-menu-background;
-    height: 90%;
+    height: 92%;
     position: absolute;
     font-size: 0px;
-    top: 84px;
+    top: 68px;
     bottom: 0;
     left: 0;
     z-index: 1001;

src/layout/components/AppMain.vue

@@ -29,7 +29,7 @@ export default {
 <style lang="scss" scoped>
 .app-main {
   /* 50= navbar  50  */
-  max-height: 85vh;
+  max-height: 87vh;
   // overflow-y: auto;
   width: 100%;
   position: relative;
@@ -43,12 +43,12 @@ export default {
 .hasTagsView {
   .app-main {
     /* 84 = navbar + tags-view = 50 + 34 */
-    max-height: 85vh;
+    max-height: 87vh;
     overflow-y: auto;
   }
 
   .fixed-header + .app-main {
-    padding-top: 84px;
+    padding-top: 68px;
   }
 }
 </style>

src/layout/components/Navbar.vue

@@ -2,7 +2,7 @@
   <div class="navbar">
     <!-- <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> -->
     <!-- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/> -->
-    <div style="position: absolute;left: 0;top: 20px;width: 15%;">
+    <div style="position: absolute;left: 0;top: 10px;width: 15%;">
       <router-link key="collapse" class="sidebar-logo-link" to="/">
         <!-- <div style="height: 42px;width: 42px;background: #fff;border-radius: 50%;margin-right: 20px;display: flex;align-items: center;justify-content: center;">
           <img :src="logo" class="sidebar-logo" />
@@ -118,7 +118,7 @@ export default {
 
 <style lang="scss" scoped>
 .navbar {
-  height: 84px;
+  height: 68px;
   overflow: hidden;
   position: relative;
   background: #006F68;

src/views/certificate/certificateManage/certificateInfo/index.vue

@@ -27,7 +27,7 @@
             <el-col :span="6">
               <div class="top-view">
                 <div class="flex-between" style="width: 80%;margin: 6px auto;">
-                  <span>港澳通行证</span><span>共计 {{statistics.hMCardNum}} 本</span>
+                  <span>港澳通行证</span><span>共计 {{statistics.hmcardNum}} 本</span>
                 </div>
                 <div class="flex-between" style="width: 80%;margin: 6px auto;">
                   <span>已借出  {{statistics.outHMCardNum}}件</span><span>待入库 {{statistics.inHMCardNum}}件</span>

src/views/login.vue

@@ -1,206 +1,483 @@
 <template>
-  <div class="login">
+  <div class="container">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
+    <div class="login">
-      <h3 class="title">公职人员护照管理系统</h3>
+      <div class="login-form-box" style="width: 60%;">
-      <el-form-item prop="username">
+        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" >
-        <el-input
+          <h3 class="title">欢迎登录</h3>
-          v-model="loginForm.username"
+          <template v-if="loginMethod === 'password'">
-          type="text"
+            <el-form-item prop="username">
-          auto-complete="off"
+              <el-input
-          placeholder="账号"
+                v-model="loginForm.username"
-        >
+                type="text" around
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+                auto-complete="off"
-        </el-input>
+                :placeholder="`用户名${config.loginConfig.phonePassword ? '/手机号' : ''}${config.loginConfig.emailPassword ? '/邮箱' : ''}`"
-      </el-form-item>
+              >
-      <el-form-item prop="password">
+                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon"/>
-        <el-input
+              </el-input>
-          v-model="loginForm.password"
+            </el-form-item>
-          type="password"
+            <el-form-item prop="password">
-          auto-complete="off"
+              <el-input
-          placeholder="密码"
+                v-model="loginForm.password"
-          @keyup.enter.native="handleLogin"
+                type="password"
-        >
+                auto-complete="off"
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+                placeholder="密码" show-password
-        </el-input>
+                @keyup.enter.native="handleLogin"
-      </el-form-item>
+              >
-      <el-form-item prop="code" v-if="captchaEnabled">
+                <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/>
-        <el-input
+              </el-input>
-          v-model="loginForm.code"
+            </el-form-item>
-          auto-complete="off"
+            <el-form-item prop="code" v-if="captchaEnabled">
-          placeholder="验证码"
+              <el-input
-          style="width: 63%"
+                v-model="loginForm.code"
-          @keyup.enter.native="handleLogin"
+                auto-complete="off"
-        >
+                placeholder="验证码"
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+                style="width: 63%"
-        </el-input>
+                @keyup.enter.native="handleLogin"
-        <div class="login-code">
+              >
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+                <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon"/>
-        </div>
+              </el-input>
-      </el-form-item>
+              <div class="login-code">
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+                <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-      <el-form-item style="width:100%;">
+              </div>
-        <el-button
+            </el-form-item>
-          :loading="loading"
+            <el-form-item v-show="isAdmin" prop="verificationCode">
-          size="medium"
+              <el-input v-model="loginForm.verificationCode" placeholder="请输入验证码">
-          type="primary"
+                <template slot="append">
-          style="width:100%;"
+                  <el-button
-          @click.native.prevent="handleLogin"
+                    type="primary"
-        >
+                    @click="sendAdminCode"
-          <span v-if="!loading">登 录</span>
+                    :disabled="isSendingCode || captchaEnabled?!loginForm.code:false"
-          <span v-else>登 录 中...</span>
+                    class="send-code-button"
-        </el-button>
+                  >
-        <div style="float: right;" v-if="register">
+                    {{ countdown === 0 ? '获取验证码' : `${countdown}s` }}
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
+                  </el-button>
-        </div>
+                </template>
-      </el-form-item>
+                <svg-icon slot="prefix" icon-class="message" class="el-input__icon input-icon"/>
-    </el-form>
+              </el-input>
-    <!--  底部  -->
+            </el-form-item>
-    <div class="el-login-footer">
+          </template>
-      <span>Copyright © 2018-2024 bonus.vip All Rights Reserved.</span>
+          <template v-else>
+            <el-form-item prop="mobile">
+              <el-input
+                v-model="loginForm.mobile"
+                type="text"
+                auto-complete="off"
+                :placeholder="`${config.loginConfig.phoneCode ? '手机号' : '/'}${config.loginConfig.emailCode ? '邮箱' : ''}`"
+              >
+                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon"/>
+              </el-input>
+            </el-form-item>
+            <el-form-item prop="code" v-if="captchaEnabled">
+              <el-input
+                v-model="loginForm.code"
+                auto-complete="off"
+                placeholder="验证码"
+                style="width: 63%"
+                @keyup.enter.native="handleLogin"
+              >
+                <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon"/>
+              </el-input>
+              <div class="login-code">
+                <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+              </div>
+            </el-form-item>
+            <el-form-item prop="verificationCode">
+              <el-input v-model="loginForm.verificationCode" placeholder="请输入验证码">
+                <template slot="append">
+                  <el-button
+                    type="primary"
+                    @click="sendCode"
+                    :disabled="isSendingCode || captchaEnabled?!loginForm.code:false"
+                    class="send-code-button"
+                  >
+                    {{ countdown === 0 ? '获取验证码' : `${countdown}s` }}
+                  </el-button>
+                </template>
+                <svg-icon slot="prefix" icon-class="message" class="el-input__icon input-icon"/>
+              </el-input>
+            </el-form-item>
+          </template>
+          <div class="login-form-center">
+            <el-link v-if="config.loginConfig.emailCode ||config.loginConfig.phoneCode " @click="toggleLoginMethod">
+              {{ loginMethod === 'password' ? '短信登录' : '密码登录' }}
+            </el-link>
+            <div></div>
+            <!-- <router-link v-if="config.registersConfig.emailRegisters || config.registersConfig.phoneRegisters" to="/register">
+              <el-link>注册账号</el-link>
+            </router-link> -->
+            <el-checkbox v-model="loginForm.rememberMe">记住密码</el-checkbox>
+          </div>
+          <el-form-item style="width: 100%;">
+            <el-button v-if="!isAdmin"
+                       :loading="loading"
+                       size="medium"
+                       type="primary"
+                       style="width: 100%;margin-bottom: 20px;"
+                       @click="loginMethod === 'password' ?IsAdmin():handleLogin()"
+            >
+              <span v-if="!loading">登 录</span>
+              <span v-else>登 录 中...</span>
+            </el-button>
+            <el-button v-if="isAdmin"
+                       :loading="loading"
+                       size="medium"
+                       type="primary"
+                       style="width: 100%;margin-bottom: 20px;"
+                       @click="handleLogin()"
+            >
+              <span v-if="!loading">登 录</span>
+              <span v-else>登 录 中...</span>
+            </el-button>
+              <router-link v-if="config.registersConfig.emailRegisters || config.registersConfig.phoneRegisters" to="/register">
+              <el-button size="medium" type="normal" style="width: 100%;" >
+                <span>注册</span>
+              </el-button>
+            </router-link>
+            
+          </el-form-item> 
+        </el-form>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-import { getCodeImg } from "@/api/login";
+import { getCodeImg } from '@/api/login'
-import Cookies from "js-cookie";
+import Cookies from 'js-cookie'
-import { encrypt, decrypt } from '@/utils/jsencrypt'
+import { decrypt, encrypt } from '@/utils/jsencrypt'
-
+import dingding from '@/assets/images/dingding.svg'
+import wx from '@/assets/images/wx.svg'
+import qq from '@/assets/images/QQ.svg'
+import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
 export default {
-  name: "Login",
+  name: 'Login',
   data() {
     return {
-      codeUrl: "",
+      dingding: dingding,
+      wx: wx,
+      qq: qq,
+      codeUrl: '',
+      isAdmin: false,
       loginForm: {
-        username: "",
+        username: '',
-        password: "",
+        password: '',
         rememberMe: false,
-        code: "",
+        code: '',
-        uuid: ""
+        mobile: '',
+        verificationCode: '',
+        uuid: '',
+        loginType: '',
+        phoneUuid: '',
+        mobileCodeType: 'LOGIN'
       },
-      loginRules: {
+      passwordLoginRules: {
-        username: [
+        username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
-          { required: true, trigger: "blur", message: "请输入您的账号" }
+        password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
-        ],
+        code: [{ required: true, trigger: 'change', message: '请输入验证码' }]
-        password: [
+      },
-          { required: true, trigger: "blur", message: "请输入您的密码" }
+      mobileLoginRules: {
-        ],
+        mobile: [{ required: true, trigger: 'blur', message: '请输入您的手机号' }],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+        verificationCode: [{ required: true, trigger: 'blur', message: '请输入验证码' }]
       },
       loading: false,
-      // 验证码开关
       captchaEnabled: true,
-      // 注册开关
+      redirect: undefined,
-      register: false,
+      isSendingCode: false,
-      redirect: undefined
+      countdown: 0,
-    };
+      loginMethod: 'password', // 'password' or 'mobile'
+      supportsPhoneLogin: false,
+      supportsEmailLogin: false
+    }
+  },
+  computed: {
+    config() {
+      return JSON.parse(localStorage.getItem('systemConfig')) || {loginConfig:{
+        phonePassword: true,
+          emailPassword: true,
+          phoneCode: false,
+          emailCode: false
+      },registersConfig: {
+          phoneRegisters: true,
+          emailRegisters: true
+        }}; // 获取 JSON 对象
+    },
+    loginRules() {
+      return this.loginMethod === 'password' ? this.passwordLoginRules : this.mobileLoginRules
+    }
   },
   watch: {
     $route: {
-      handler: function(route) {
+      handler(route) {
-        this.redirect = route.query && route.query.redirect;
+        this.redirect = route.query && route.query.redirect
       },
       immediate: true
     }
   },
   created() {
-    this.getCode();
+    this.getCode()
-    this.getCookie();
+    this.getCookie()
   },
   methods: {
     getCode() {
       getCodeImg().then(res => {
-        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
+        this.captchaEnabled = res.captchaEnabled !== undefined ? res.captchaEnabled : true
         if (this.captchaEnabled) {
-          this.codeUrl = "data:image/gif;base64," + res.img;
+          this.codeUrl = 'data:image/gif;base64,' + res.img
-          this.loginForm.uuid = res.uuid;
+          this.loginForm.uuid = res.uuid
         }
-      });
+      })
     },
     getCookie() {
-      const username = Cookies.get("username");
+      const username = Cookies.get('username')
-      const password = Cookies.get("password");
+      const password = Cookies.get('password')
       const rememberMe = Cookies.get('rememberMe')
-      this.loginForm = {
+      this.loginForm.username = username || ''
-        username: username === undefined ? this.loginForm.username : username,
+      this.loginForm.password = password ? decrypt(password) : ''
-        password: password === undefined ? this.loginForm.password : decrypt(password),
+      this.loginForm.rememberMe = rememberMe === 'true'
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
-      };
     },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
-          this.loading = true;
+          this.loading = true
           if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 });
+            Cookies.set('username', this.loginForm.username, { expires: 30 })
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
+            Cookies.set('password', encrypt(this.loginForm.password), { expires: 30 })
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
+            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 })
           } else {
-            Cookies.remove("username");
+            Cookies.remove('username')
-            Cookies.remove("password");
+            Cookies.remove('password')
-            Cookies.remove('rememberMe');
+            Cookies.remove('rememberMe')
           }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
+          this.loginForm.loginMethod = this.loginMethod
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+          this.$store.dispatch('Login', this.loginForm)
-          }).catch(() => {
+            .then(res => {
-            this.loading = false;
+              this.loading = false
-            if (this.captchaEnabled) {
+              // console.log(res)
-              this.getCode();
+              if (res.code===200){
-            }
+                if (res.isLogin){
-          });
+                  this.$modal.confirm('账号已在其他地方登录是否继续登录！！！！').then(function() {
+                    return this.$router.push({ path: this.redirect || '/index' });
+                  }).then(() => {
+                    this.loading = false
+                  }).catch(() => {
+                    this.loading = false
+                  })
+                }else {
+                  this.$router.push({ path: this.redirect || '/index' });
+                }
+              }
+            })
+            .catch(() => {
+              this.loading = false
+              if (this.captchaEnabled) this.getCode()
+            })
         }
-      });
+      })
+    },
+    IsAdmin() {
+      this.loginForm.loginMethod = this.loginMethod;
+      let param = {
+        ...this.loginForm
+      }
+      param.username = encryptWithSM4(this.loginForm.username)
+      param.password = encryptWithSM4(this.loginForm.password)
+      this.$store.dispatch('IsAdmin', param).then(res => {
+        if (res.data) {
+          this.isAdmin = res.data
+          this.$message.success('检测到您是超级管理账号,需进行手机检验')
+        } else {
+          this.handleLogin()
+        }
+      })
+    },
+    isLogin() {
+      this.$refs.loginForm.validate(valid => {
+        if (valid) {
+          this.loading = true
+          let that = this
+          this.loginForm.loginMethod = this.loginMethod
+          this.$store.dispatch('IsLogin', this.loginForm)
+            .then(res => {
+              if (res.data) {
+                this.$modal.confirm('账号已在其他地方登录是否继续登录！！！！').then(function() {
+                  return that.handleLogin()
+                }).then(() => {
+                  this.loading = false
+                }).catch(() => {
+                  this.loading = false
+                })
+              } else {
+                that.handleLogin()
+              }
+            })
+            .catch(() => {
+              this.loading = false
+              if (this.captchaEnabled) this.getCode()
+            })
+        }
+      })
+    },
+    sendAdminCode() {
+      this.loginForm.mobile = this.loginForm.username
+      this.$store.dispatch('GetPhoneCode', this.loginForm)
+        .then(res => {
+          if (res.code === 200) {
+            this.loginForm.phoneUuid = res.data
+            this.$message.success('验证码发送成功')
+            this.isSendingCode = true
+            this.countdown = 60
+            const timer = setInterval(() => {
+              this.countdown -= 1
+              if (this.countdown <= 0) {
+                clearInterval(timer)
+                this.isSendingCode = false
+              }
+            }, 1000)
+          }
+        })
+        .catch(() => {
+          this.loading = false
+          // 如果启用了验证码，则重新获取验证码
+          if (this.captchaEnabled) {
+            this.getCode()
+          }
+          // 其他失败处理逻辑
+          this.isSendingCode = false
+          this.countdown = 0
+        })
+    },
+    sendCode() {
+      if (this.captchaEnabled ? !this.loginForm.code : false) {
+        this.$message.error('请先填写验证码')
+        return
+      }
+      if (!this.loginForm.mobile) {
+        this.$message.error('请先填写'+this.config.loginConfig.phoneCode ? '手机号' : '/' + this.config.loginConfig.emailCode ? '邮箱' : '')
+        return
+      }
+      this.$store.dispatch('GetPhoneCode', this.loginForm)
+        .then(() => {
+          this.isSendingCode = true
+          this.countdown = 60
+          const timer = setInterval(() => {
+            this.countdown -= 1
+            if (this.countdown <= 0) {
+              clearInterval(timer)
+              this.isSendingCode = false
+            }
+          }, 1000)
+        })
+        .catch(() => {
+          this.loading = false
+          // 如果启用了验证码，则重新获取验证码
+          if (this.captchaEnabled) {
+            this.getCode()
+          }
+          // 其他失败处理逻辑
+          this.isSendingCode = false
+          this.countdown = 0
+        })
+    },
+    toggleLoginMethod() {
+      this.loginMethod = this.loginMethod === 'password' ? 'mobile' : 'password'
+      this.loginForm.username = ''
+      this.loginForm.password = ''
+      this.loginForm.code = ''
+      this.loginForm.verificationCode = ''
+      this.loginForm.loginMethod = ''
+      this.isAdmin = false
+      this.getCode()
     }
   }
-};
+}
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style lang="scss">
+.container {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  height: 100%;
+  width: 100%;
+  background-image: url("../assets/images/login-bg.png");
+  background-repeat: no-repeat;
+  background-size: 100% 100%; /* 确保背景图覆盖整个容器 */
+  background-position: center center; /* 居中显示背景图 */
+}
+
 .login {
+  width: 44%;
   display: flex;
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
-  background-size: cover;
-}
-.title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #707070;
 }
 
+.title {
+  margin: 0 auto 30px;
+  // text-align: center;
+  color: #2A2B2F;
+  font-weight: 600;
+  font-size: 24px;
+  margin-bottom: 60px;
+}
+.login-form-box{
+  border-radius: 6px;
+  background: #ffffff;
+  width: 100%;
+  padding: 25px;
+  height: 600px;
+  display: flex;
+  flex-direction: column;
+  align-content: center;
+  justify-content: center ;
+}
 .login-form {
   border-radius: 6px;
   background: #ffffff;
-  width: 400px;
+  width: 100%;
-  padding: 25px 25px 5px 25px;
+  padding: 25px;
+  height: auto;
+
   .el-input {
-    height: 38px;
+    height: 38px; 
+
     input {
       height: 38px;
     }
   }
+
   .input-icon {
     height: 39px;
     width: 14px;
     margin-left: 2px;
   }
+
+  .login-form-center {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    padding: 1%;
+    margin-bottom: 12%; 
+  }
 }
+
 .login-tip {
   font-size: 13px;
   text-align: center;
   color: #bfbfbf;
 }
+
 .login-code {
   width: 33%;
-  height: 38px;
   float: right;
+
   img {
     cursor: pointer;
     vertical-align: middle;
   }
 }
+
 .el-login-footer {
   height: 40px;
   line-height: 40px;
@@ -213,7 +490,56 @@ export default {
   font-size: 12px;
   letter-spacing: 1px;
 }
+
 .login-code-img {
   height: 38px;
 }
+
+.login-container {
+  text-align: center;
+  margin-top: 50px;
+}
+
+.login-divider {
+  display: flex;
+  align-items: center;
+  text-align: center;
+  margin: 20px 0;
+}
+
+.login-divider::before,
+.login-divider::after {
+  content: '';
+  flex: 1;
+  border-bottom: 1px solid #ccc;
+}
+
+.login-divider:not(:empty)::before {
+  margin-right: .25em;
+}
+
+.login-divider:not(:empty)::after {
+  margin-left: .25em;
+}
+
+.login-icons {
+  display: flex;
+  justify-content: center;
+  gap: 20px;
+}
+
+.login-icon {
+  width: 50px;
+  height: 50px;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+
+.login-icon img {
+  width: 50px;
+  height: 50px;
+}
 </style>

src/views/login1.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="container">
     <div class="login">
-      <div class="login-form" style="width: 450px;">
+      <div class="login-form-box" style="width: 60%;">
         <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" >
-          <h3 class="title">公职人员护照管理系统</h3>
+          <h3 class="title">欢迎登录</h3>
           <template v-if="loginMethod === 'password'">
             <el-form-item prop="username">
               <el-input
                 v-model="loginForm.username"
-                type="text"
+                type="text" around
                 auto-complete="off"
                 :placeholder="`用户名${config.loginConfig.phonePassword ? '/手机号' : ''}${config.loginConfig.emailPassword ? '/邮箱' : ''}`"
               >
@@ -101,9 +101,10 @@
             <el-link v-if="config.loginConfig.emailCode ||config.loginConfig.phoneCode " @click="toggleLoginMethod">
               {{ loginMethod === 'password' ? '短信登录' : '密码登录' }}
             </el-link>
-            <router-link v-if="config.registersConfig.emailRegisters || config.registersConfig.phoneRegisters" to="/register">
+            <div></div>
+            <!-- <router-link v-if="config.registersConfig.emailRegisters || config.registersConfig.phoneRegisters" to="/register">
               <el-link>注册账号</el-link>
-            </router-link>
+            </router-link> -->
             <el-checkbox v-model="loginForm.rememberMe">记住密码</el-checkbox>
           </div>
           <el-form-item style="width: 100%;">
@@ -111,7 +112,7 @@
                        :loading="loading"
                        size="medium"
                        type="primary"
-                       style="width: 100%;"
+                       style="width: 100%;margin-bottom: 20px;"
                        @click="loginMethod === 'password' ?IsAdmin():handleLogin()"
             >
               <span v-if="!loading">登 录</span>
@@ -121,27 +122,19 @@
                        :loading="loading"
                        size="medium"
                        type="primary"
-                       style="width: 100%;"
+                       style="width: 100%;margin-bottom: 20px;"
                        @click="handleLogin()"
             >
               <span v-if="!loading">登 录</span>
               <span v-else>登 录 中...</span>
             </el-button>
-          </el-form-item>
+              <router-link v-if="config.registersConfig.emailRegisters || config.registersConfig.phoneRegisters" to="/register">
-          <!-- <el-form-item>
+              <el-button size="medium" type="normal" style="width: 100%;" >
-            <div class="login-divider">第三方登录</div>
+                <span>注册</span>
-            <div class="login-icons">
+              </el-button>
-              <div class="login-icon">
+            </router-link>
-                <img :src="dingding" alt="Weibo">
+            
-              </div>
+          </el-form-item> 
-              <div class="login-icon">
-                <img :src="wx" alt="WeChat">
-              </div>
-              <div class="login-icon">
-                <img :src="qq" alt="QQ">
-              </div>
-            </div>
-          </el-form-item> -->
         </el-form>
       </div>
     </div>
@@ -263,14 +256,14 @@ export default {
               if (res.code===200){
                 if (res.isLogin){
                   this.$modal.confirm('账号已在其他地方登录是否继续登录！！！！').then(function() {
-                    return this.$router.push({ path: this.redirect || '/canteen/index' });
+                    return this.$router.push({ path: this.redirect || '/index' });
                   }).then(() => {
                     this.loading = false
                   }).catch(() => {
                     this.loading = false
                   })
                 }else {
-                  this.$router.push({ path: this.redirect || '/canteen/index' });
+                  this.$router.push({ path: this.redirect || '/index' });
                 }
               }
             })
@@ -406,14 +399,14 @@ export default {
   align-items: center;
   height: 100%;
   width: 100%;
-  background-image: url("../assets/images/logind.jpg");
+  background-image: url("../assets/images/login-bg.png");
   background-repeat: no-repeat;
   background-size: 100% 100%; /* 确保背景图覆盖整个容器 */
   background-position: center center; /* 居中显示背景图 */
 }
 
 .login {
-  width: 50%;
+  width: 44%;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -422,18 +415,32 @@ export default {
 
 .title {
   margin: 0 auto 30px;
-  text-align: center;
+  // text-align: center;
-  color: #707070;
+  color: #2A2B2F;
+  font-weight: 600;
+  font-size: 24px;
+  margin-bottom: 60px;
+}
+.login-form-box{
+  border-radius: 6px;
+  background: #ffffff;
+  width: 100%;
+  padding: 25px;
+  height: 600px;
+  display: flex;
+  flex-direction: column;
+  align-content: center;
+  justify-content: center ;
 }
-
 .login-form {
   border-radius: 6px;
   background: #ffffff;
-  width: 400px;
+  width: 100%;
   padding: 25px;
+  height: auto;
 
   .el-input {
-    height: 38px;
+    height: 38px; 
 
     input {
       height: 38px;
@@ -451,7 +458,7 @@ export default {
     justify-content: space-between;
     align-items: flex-start;
     padding: 1%;
-    margin-bottom: 5%;
+    margin-bottom: 12%; 
   }
 }
 

src/views/monitor/job/log.vue

@@ -241,7 +241,7 @@ export default {
     },
     // 返回按钮
     handleClose() {
-      const obj = { path: "/canteen/monitor/job" };
+      const obj = { path: "/monitor/job" };
       this.$tab.closeOpenPage(obj);
     },
     /** 搜索按钮操作 */

src/views/register1.vue

@@ -270,7 +270,7 @@ export default {
   justify-content: flex-end;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/bg.png");
+  background-image: url("../assets/images/login-bg.png");
   background-size: cover;
 }
 

src/views/system/dict/data.vue

@@ -326,7 +326,7 @@ export default {
     },
     /** 返回按钮操作 */
     handleClose() {
-      const obj = { path: "/canteen/system/dict" };
+      const obj = { path: "/system/dict" };
       this.$tab.closeOpenPage(obj);
     },
     /** 重置按钮操作 */

src/views/system/role/authUser.vue

@@ -151,7 +151,7 @@ export default {
     },
     // 返回按钮
     handleClose() {
-      const obj = { path: "/canteen/system/role" };
+      const obj = { path: "/system/role" };
       this.$tab.closeOpenPage(obj);
     },
     /** 搜索按钮操作 */

src/views/system/user/authRole.vue

@@ -109,7 +109,7 @@ export default {
     },
     /** 关闭按钮 */
     close() {
-      const obj = { path: "/canteen/system/user" };
+      const obj = { path: "/system/user" };
       this.$tab.closeOpenPage(obj);
     },
   },