Merge remote-tracking branch 'origin/master'

rtsp-vue/.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 若依管理系统
+VITE_APP_TITLE = 福安德视频监控分析
 
 # 开发环境配置
 VITE_APP_ENV = 'development'

rtsp-vue/.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 若依管理系统
+VITE_APP_TITLE = 福安德视频监控分析
 
 # 生产环境配置
 VITE_APP_ENV = 'production'

rtsp-vue/.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 若依管理系统
+VITE_APP_TITLE = 福安德视频监控分析
 
 # 生产环境配置
 VITE_APP_ENV = 'staging'

rtsp-vue/index.html

@@ -6,8 +6,8 @@
   <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="/favicon.ico">
+  <link rel="icon" href="/favicon.png">
-  <title>若依管理系统</title>
+  <title>福安德视频监控分析</title>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
     html,

rtsp-vue/package.json

@@ -1,8 +1,8 @@
 {
   "name": "ruoyi",
   "version": "3.8.9",
-  "description": "若依管理系统",
+  "description": "福安德视频监控分析",
-  "author": "若依",
+  "author": "KLP",
   "license": "MIT",
   "type": "module",
   "scripts": {

rtsp-vue/src/layout/components/Navbar.vue

@@ -8,14 +8,6 @@
       <template v-if="appStore.device !== 'mobile'">
         <header-search id="header-search" class="right-menu-item" />
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
         <el-tooltip content="主题模式" effect="dark" placement="bottom">

rtsp-vue/src/store/modules/user.js

@@ -1,7 +1,7 @@
 import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { isHttp, isEmpty } from "@/utils/validate"
-import defAva from '@/assets/images/profile.jpg'
+import defAva from '@/assets/images/avatar.png'
 
 const useUserStore = defineStore(
   'user',

rtsp-vue/src/views/index.vue

@@ -4,29 +4,7 @@
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
         <h2>RTSP视频分析平台</h2>
         <p>
-          这是一个基于ruoyi-vue框架改进而来的RTSP视频分析平台。项目集成了虹软SDK，实现了人脸识别、活体检测、3D角度分析、年龄及性别识别等功能；同时，利用JavaCV进行高效的视频处理。后端采用SpringBoot框架，前端则运用了Vue3框架，确保系统的稳定与用户体验的流畅。<br>
+          RTSP视频分析平台。项目集成了虹软SDK，实现了人脸识别、活体检测、3D角度分析、年龄及性别识别等功能；同时，利用JavaCV进行高效的视频处理。后端采用SpringBoot框架，前端则运用了Vue3框架，确保系统的稳定与用户体验的流畅。<br>
-          特别感谢ruoyi和EasyMedia两位开源项目的大佬，他们的无私奉献为本项目奠定了坚实的基础。
-        </p>
-        <p>
-          <b>当前版本:</b> <span>v1.0.0</span>
-        </p>
-        <p>
-          <el-tag type="danger">&yen;免费开源</el-tag>
-        </p>
-        <p>
-          <el-button
-              type="primary"
-              icon="Cloudy"
-              plain
-              @click="goTarget('https://gitee.com/xiaochemgzi')"
-          >访问码云</el-button
-          >
-          <el-button
-              icon="HomeFilled"
-              plain
-              @click="goTarget('https://gitee.com/xiaochemgzi')"
-          >访问码云主页</el-button
-          >
         </p>
       </el-col>
 
@@ -66,23 +44,6 @@
     </el-row>
     <el-divider />
     <el-row :gutter="20">
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <template v-slot:header>
-            <div class="clearfix">
-              <span>联系信息</span>
-            </div>
-          </template>
-          <div class="body">
-            <p>
-              <i class="el-icon-chat-dot-round"></i> 微信：<a
-                href="javascript:;"
-            >chenbai0511</a
-            >
-            </p>
-          </div>
-        </el-card>
-      </el-col>
       <el-col :xs="24" :sm="24" :md="12" :lg="8">
         <el-card class="update-log">
           <template v-slot:header>
@@ -101,25 +62,6 @@
           </el-collapse>
         </el-card>
       </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <template v-slot:header>
-            <div class="clearfix">
-              <span>捐赠支持</span>
-            </div>
-          </template>
-          <div class="body">
-            <img
-                src="@/assets/images/pay.png"
-                alt="donate"
-                style="width:100%"
-            />
-            <span style="display: inline-block; height: 30px; line-height: 30px"
-            >你可以请作者喝杯咖啡表示鼓励</span
-            >
-          </div>
-        </el-card>
-      </el-col>
     </el-row>
   </div>
 </template>

rtsp-vue/src/views/login.vue

@@ -1,65 +1,35 @@
 <template>
-  <div class="login">
+  <div class="login-container">
-    <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
+    <div class="login-header">
-      <h3 class="title">若依后台管理系统</h3>
+      <h1>福安德视频监控平台</h1>
-      <el-form-item prop="username">
+    </div>
-        <el-input
+    <div class="login-content">
-          v-model="loginForm.username"
+      <div class="qr-code-section">
-          type="text"
+      </div>
-          size="large"
+      <div class="login-form-section">
-          auto-complete="off"
+        <div class="login-form-card">
-          placeholder="账号"
+          <h2 class="form-title">用户登录</h2>
-        >
+          <div>
-          <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
+            <div class="form-group">
-        </el-input>
+              <input type="text" v-model="loginForm.username" placeholder="账号" class="form-input" />
-      </el-form-item>
+              <p class="error-tip" v-if="loginForm.username === ''">用户名不能为空</p>
-      <el-form-item prop="password">
+            </div>
-        <el-input
+            <div class="form-group">
-          v-model="loginForm.password"
+              <input type="password" v-model="loginForm.password" placeholder="密码" class="form-input" />
-          type="password"
+              <p class="error-tip" v-if="loginForm.password === ''">密码不能为空</p>
-          size="large"
+            </div>
-          auto-complete="off"
+            <div class="form-group captcha-group">
-          placeholder="密码"
+              <input type="text" v-model="loginForm.code" placeholder="验证码" class="form-input captcha-input" />
-          @keyup.enter="handleLogin"
+              <img :src="codeUrl" @click="getCode" alt="验证码" class="captcha-img" />
-        >
+            </div>
-          <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
+            <div class="remember-group">
-        </el-input>
+              <input type="checkbox" id="remember" v-model="loginForm.rememberMe" class="remember-checkbox" />
-      </el-form-item>
+              <label for="remember" class="remember-label">记住密码</label>
-      <el-form-item prop="code" v-if="captchaEnabled">
+            </div>
-        <el-input
+            <button type="button" class="login-btn" @click="handleLogin" v-loading="loading">登录</button>
-          v-model="loginForm.code"
+          </div>
-          size="large"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter="handleLogin"
-        >
-          <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
-        </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
-      </el-form-item>
+      </div>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="large"
-          type="primary"
-          style="width:100%;"
-          @click.prevent="handleLogin"
-        >
-          <span v-if="!loading">登 录</span>
-          <span v-else>登 录 中...</span>
-        </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
-        </div>
-      </el-form-item>
-    </el-form>
-    <!--  底部  -->
-    <div class="el-login-footer">
-      <span>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</span>
     </div>
   </div>
 </template>
@@ -102,8 +72,8 @@ watch(route, (newRoute) => {
 }, { immediate: true });
 
 function handleLogin() {
-  proxy.$refs.loginRef.validate(valid => {
+  // proxy.$refs.loginRef.validate(valid => {
-    if (valid) {
+    // if (valid) {
       loading.value = true;
       // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
       if (loginForm.value.rememberMe) {
@@ -133,8 +103,8 @@ function handleLogin() {
           getCode();
         }
       });
-    }
+  //   }
-  });
+  // });
 }
 
 function getCode() {
@@ -162,66 +132,151 @@ getCode();
 getCookie();
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
-.login {
+.login-container {
-  display: flex;
+  width: 100%;
-  justify-content: center;
+  height: 100vh;
-  align-items: center;
+  background: url('../assets/images/login-back.png') no-repeat center center;
-  height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
   background-size: cover;
-}
+  display: flex;
-.title {
+  flex-direction: column;
-  margin: 0px auto 30px auto;
+  justify-content: space-between;
-  text-align: center;
+  padding: 20px;
-  color: #707070;
+  box-sizing: border-box;
-}
 
-.login-form {
+  .login-header {
-  border-radius: 6px;
+    h1 {
-  background: #ffffff;
+      color: #fff;
-  width: 400px;
+      font-size: 24px;
-  padding: 25px 25px 5px 25px;
+      font-weight: bold;
-  .el-input {
-    height: 40px;
-    input {
-      height: 40px;
     }
   }
-  .input-icon {
+
-    height: 39px;
+  .login-content {
-    width: 14px;
+    display: flex;
-    margin-left: 0px;
+    justify-content: space-between;
+    align-items: center;
+    flex: 1;
+    padding: 0 50px;
+
+    .qr-code-section {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
+      .qr-code-item {
+        text-align: center;
+        margin-bottom: 10px;
+
+        .qr-code-img {
+          width: 120px;
+          height: 120px;
+          margin-bottom: 5px;
+        }
+
+        .platform-label {
+          color: #fff;
+          font-size: 14px;
+        }
+      }
+
+      .qr-tips {
+        text-align: center;
+        color: #fff;
+
+        p {
+          margin: 5px 0;
+        }
+      }
+    }
+
+    .login-form-section {
+      .login-form-card {
+        background: rgba(255, 255, 255, 0.6);
+        backdrop-filter: blur(10px);
+        padding: 30px;
+        border-radius: 8px;
+        width: 500px;
+
+        .form-title {
+          font-size: 30px;
+          color: #333;
+          margin-bottom: 30px;
+          padding-bottom: 20px;
+          border-bottom: 1px solid #eee;
+        }
+
+        .form-group {
+          margin-bottom: 30px;
+
+          .form-input {
+            width: 100%;
+            padding: 10px;
+            border: 1px solid #ddd;
+            border-radius: 4px;
+            box-sizing: border-box;
+            font-size: 18px;
+            outline: none;
+            line-height: 24px;
+            height: 44px;
+          }
+
+          .error-tip {
+            color: red;
+            font-size: 12px;
+            margin-top: 5px;
+          }
+        }
+
+        .captcha-group {
+          display: flex;
+          align-items: center;
+
+          .captcha-input {
+            flex: 1;
+            margin-right: 10px;
+          }
+
+          .captcha-img {
+            width: 100px;
+            height: 44px;
+            object-fit: cover;
+            border-radius: 4px;
+          }
+        }
+
+        .remember-group {
+          display: flex;
+          align-items: center;
+          margin-bottom: 20px;
+
+          .remember-checkbox {
+            margin-right: 5px;
+          }
+
+          .remember-label {
+            font-size: 14px;
+            color: #333;
+          }
+        }
+
+        .login-btn {
+          width: 100%;
+          padding: 10px;
+          background: #007bff;
+          color: #fff;
+          border: none;
+          border-radius: 4px;
+          font-size: 16px;
+          cursor: pointer;
+          transition: background 0.3s ease;
+
+          &:hover {
+            background: #0056b3;
+          }
+        }
+      }
+    }
   }
 }
-.login-tip {
-  font-size: 13px;
-  text-align: center;
-  color: #bfbfbf;
-}
-.login-code {
-  width: 33%;
-  height: 40px;
-  float: right;
-  img {
-    cursor: pointer;
-    vertical-align: middle;
-  }
-}
-.el-login-footer {
-  height: 40px;
-  line-height: 40px;
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  text-align: center;
-  color: #fff;
-  font-family: Arial;
-  font-size: 12px;
-  letter-spacing: 1px;
-}
-.login-code-img {
-  height: 40px;
-  padding-left: 12px;
-}
 </style>

rtsp-vue/src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">福安德视频监控分析</h3>
       <el-form-item prop="username">
         <el-input 
           v-model="registerForm.username"