From 542e58347a8559e90d0410e2091a6bab8cc3d80e Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Mon, 16 Jun 2025 22:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=90=8D=E7=A7=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A8=E5=B1=80=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.js                      |  3 ++
 public/index.html                     | 57 +++++++++++++++++++-------
 src/components/layouts/UserLayout.vue |  2 +-
 src/components/page/GlobalHeader.vue  | 51 +++++++++++------------
 src/views/user/Login.vue              | 58 ++++++++++++++++-----------
 5 files changed, 106 insertions(+), 65 deletions(-)
 create mode 100644 public/config.js

diff --git a/public/config.js b/public/config.js
new file mode 100644
index 0000000..10c53dd
--- /dev/null
+++ b/public/config.js
@@ -0,0 +1,3 @@
+window.AppConfig = { 
+    systemTitle: '末端数据接入处理系统'
+}
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index da30630..72d2429 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,6 +7,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title></title>
   <link rel="icon" href="<%= BASE_URL %>logo.png">
+  <script src="<%= BASE_URL %>./config.js"></script>
   <script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>
   <style>
     html,
@@ -16,12 +17,14 @@
       margin: 0px;
       padding: 0px;
     }
+
     .chromeframe {
       margin: 0.2em 0;
       background: #ccc;
       color: #000;
       padding: 0.2em 0;
     }
+
     #loader-wrapper {
       position: fixed;
       top: 0;
@@ -30,6 +33,7 @@
       height: 100%;
       z-index: 999999;
     }
+
     #loader {
       display: block;
       position: relative;
@@ -54,6 +58,7 @@
       /* Chrome, Firefox 16+, IE 10+, Opera */
       z-index: 1001;
     }
+
     #loader:before {
       content: "";
       position: absolute;
@@ -76,6 +81,7 @@
       animation: spin 3s linear infinite;
       /* Chrome, Firefox 16+, IE 10+, Opera */
     }
+
     #loader:after {
       content: "";
       position: absolute;
@@ -98,6 +104,7 @@
       animation: spin 1.5s linear infinite;
       /* Chrome, Firefox 16+, IE 10+, Opera */
     }
+
     @-webkit-keyframes spin {
       0% {
         -webkit-transform: rotate(0deg);
@@ -107,6 +114,7 @@
         transform: rotate(0deg);
         /* Firefox 16+, IE 10+, Opera */
       }
+
       100% {
         -webkit-transform: rotate(360deg);
         /* Chrome, Opera 15+, Safari 3.1+ */
@@ -116,6 +124,7 @@
         /* Firefox 16+, IE 10+, Opera */
       }
     }
+
     @keyframes spin {
       0% {
         -webkit-transform: rotate(0deg);
@@ -125,6 +134,7 @@
         transform: rotate(0deg);
         /* Firefox 16+, IE 10+, Opera */
       }
+
       100% {
         -webkit-transform: rotate(360deg);
         /* Chrome, Opera 15+, Safari 3.1+ */
@@ -134,6 +144,7 @@
         /* Firefox 16+, IE 10+, Opera */
       }
     }
+
     #loader-wrapper .loader-section {
       position: fixed;
       top: 0;
@@ -149,12 +160,15 @@
       transform: translateX(0);
       /* Firefox 16+, IE 10+, Opera */
     }
+
     #loader-wrapper .loader-section.section-left {
       left: 0;
     }
+
     #loader-wrapper .loader-section.section-right {
       right: 0;
     }
+
     /* Loaded */
     .loaded #loader-wrapper .loader-section.section-left {
       -webkit-transform: translateX(-100%);
@@ -166,6 +180,7 @@
       -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
       transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
     }
+
     .loaded #loader-wrapper .loader-section.section-right {
       -webkit-transform: translateX(100%);
       /* Chrome, Opera 15+, Safari 3.1+ */
@@ -176,11 +191,13 @@
       -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
       transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
     }
+
     .loaded #loader {
       opacity: 0;
       -webkit-transition: all 0.3s ease-out;
       transition: all 0.3s ease-out;
     }
+
     .loaded #loader-wrapper {
       visibility: hidden;
       -webkit-transform: translateY(-100%);
@@ -192,13 +209,16 @@
       -webkit-transition: all 0.3s 1s ease-out;
       transition: all 0.3s 1s ease-out;
     }
+
     /* JavaScript Turned Off */
     .no-js #loader-wrapper {
       display: none;
     }
+
     .no-js h1 {
       color: #222222;
     }
+
     #loader-wrapper .load_title {
       font-family: 'Open Sans';
       color: #FFF;
@@ -211,6 +231,7 @@
       opacity: 1;
       line-height: 30px;
     }
+
     #loader-wrapper .load_title span {
       font-weight: normal;
       font-style: italic;
@@ -218,25 +239,31 @@
       color: #FFF;
       opacity: 0.5;
     }
+
     /* 滚动条优化 start */
-    ::-webkit-scrollbar{
-      width:8px;
-      height:8px;
+    ::-webkit-scrollbar {
+      width: 8px;
+      height: 8px;
     }
-    ::-webkit-scrollbar-track{
+
+    ::-webkit-scrollbar-track {
       background: #f6f6f6;
-      border-radius:2px;
+      border-radius: 2px;
     }
-    ::-webkit-scrollbar-thumb{
+
+    ::-webkit-scrollbar-thumb {
       background: #cdcdcd;
-      border-radius:2px;
+      border-radius: 2px;
     }
-    ::-webkit-scrollbar-thumb:hover{
+
+    ::-webkit-scrollbar-thumb:hover {
       background: #747474;
     }
+
     ::-webkit-scrollbar-corner {
       background: #f6f6f6;
     }
+
     /* 滚动条优化 end */
   </style>
   <!-- 全局配置 -->
@@ -246,16 +273,16 @@
 </head>
 
 <body>
-<div id="app">
-  <div id="loader-wrapper">
-    <div id="loader"></div>
-    <div class="loader-section section-left"></div>
-    <div class="loader-section section-right"></div>
-    <div class="load_title">正在加载,请耐心等待
+  <div id="app">
+    <div id="loader-wrapper">
+      <div id="loader"></div>
+      <div class="loader-section section-left"></div>
+      <div class="loader-section section-right"></div>
+      <div class="load_title">正在加载,请耐心等待
 
+      </div>
     </div>
   </div>
-</div>
 
 </body>
 
diff --git a/src/components/layouts/UserLayout.vue b/src/components/layouts/UserLayout.vue
index 1f4f8a1..71e4116 100644
--- a/src/components/layouts/UserLayout.vue
+++ b/src/components/layouts/UserLayout.vue
@@ -114,7 +114,7 @@ export default {
     .main {
       width: 596px;
       height: 468px;
-      margin: 335px 1173px;
+      margin: 400px 1173px; 
       padding-top: 80px;
       background: url(~@/assets/img/login_bg.png) no-repeat;
     }
diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue
index 84eaca5..d56ea76 100644
--- a/src/components/page/GlobalHeader.vue
+++ b/src/components/page/GlobalHeader.vue
@@ -1,21 +1,12 @@
 <template>
   <!-- , width: fixedHeader ? `calc(100% - ${sidebarOpened ? 256 : 80}px)` : '100%'  -->
-  <a-layout-header
-    v-if="!headerBarFixed"
-    :class="[fixedHeader && 'ant-header-fixedHeader',sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed',]"
-    :style="{ padding: '0' }"
-  >
+  <a-layout-header v-if="!headerBarFixed"
+    :class="[fixedHeader && 'ant-header-fixedHeader', sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed',]"
+    :style="{ padding: '0' }">
     <div v-if="mode === 'sidemenu'" class="header" :class="theme">
-      <a-icon
-        v-if="device==='mobile'"
-        class="trigger"
-        :type="collapsed ? 'menu-fold' : 'menu-unfold'"
+      <a-icon v-if="device === 'mobile'" class="trigger" :type="collapsed ? 'menu-fold' : 'menu-unfold'"
         @click="toggle"></a-icon>
-      <a-icon
-        v-else
-        class="trigger"
-        :type="collapsed ? 'menu-unfold' : 'menu-fold'"
-        @click="toggle"/>
+      <a-icon v-else class="trigger" :type="collapsed ? 'menu-unfold' : 'menu-fold'" @click="toggle" />
 
       <span v-if="device === 'desktop'"></span>
       <span v-else>Jeecg-Boot</span>
@@ -25,13 +16,14 @@
     <!-- 顶部导航栏模式 -->
     <div v-else :class="['top-nav-header-index', theme]">
       <div>
-        <div class="header-index-center header-nowTime" > <img src="~@/assets/img/main-logo.png"/>末端数据接入处理系统</div>
-        <div class="header-index-center" >
+        <div class="header-index-center header-nowTime"> <img src="~@/assets/img/main-logo.png" />{{ sysTitle }}</div>
+        <div class="header-index-center">
           <div class="header-index-wide">
             <div class="header-index-center" :style="topMenuStyle.topmenuCenter">
-              <s-menu mode="horizontal" :menu="menus" :theme="theme" @triggerSubMenuAction="triggerSubMenuAction" @updateMenuTitle="handleUpdateMenuTitle"></s-menu>
+              <s-menu mode="horizontal" :menu="menus" :theme="theme" @triggerSubMenuAction="triggerSubMenuAction"
+                @updateMenuTitle="handleUpdateMenuTitle"></s-menu>
             </div>
-            
+
           </div>
         </div>
         <user-menu class="header-index-right" :theme="theme" />
@@ -89,6 +81,7 @@ export default {
   },
   data() {
     return {
+      sysTitle: null,
       headerBarFixed: false,
       nowTime: '',
       nowDate: '',
@@ -125,6 +118,9 @@ export default {
       this.buildTopMenuStyle()
     }
   },
+  created() {
+    this.sysTitle = window.AppConfig.systemTitle
+  },
   methods: {
     handleScroll() {
       if (this.autoHideHeader) {
@@ -160,11 +156,11 @@ export default {
         }
       }
     },
-    
-      // update-begin-author:sunjianlei date:20210508 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题
-      handleUpdateMenuTitle(value) {
-        this.$emit('updateMenuTitle', value)
-      },
+
+    // update-begin-author:sunjianlei date:20210508 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题
+    handleUpdateMenuTitle(value) {
+      this.$emit('updateMenuTitle', value)
+    },
   },
 }
 </script>
@@ -183,8 +179,10 @@ export default {
         line-height: 64px;
       }
     }
+
     .trigger {
       line-height: 64px;
+
       &:hover {
         background: rgba(0, 0, 0, 0.05);
       }
@@ -213,14 +211,17 @@ export default {
     }
   }
 }
-.header-index-center{
+
+.header-index-center {
   text-align: center;
 }
+
 .ant-layout-header {
   height: 64px;
   line-height: 64px;
 }
-.header-index-right{
+
+.header-index-right {
   position: absolute;
   right: 10px;
   top: -4px;
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 2e48f20..1492e65 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -2,36 +2,31 @@
   <div class="main">
     <a-form :form="form" class="user-layout-login" ref="formLogin" id="formLogin">
       <div class="header">
-        <img src="~@/assets/img/logo.png"/>
+        <!-- <img src="~@/assets/img/logo.png"/> -->
+        <img src="~@/assets/img/main-logo.png" style="width: 336px;height: 160px;" />
+        <span style="display: block; color: #ffffff; font-size: 48px;">{{ sysTitle }}</span>
       </div>
       <!-- <div class="name">
         <span class="title"></span>
       </div> -->
       <a-form-item label=" " :labelCol="labelCol" :wrapperCol="wrapperCol" style="margin-right: 100px">
-        <img class="aicon" src="~@/assets/img/icon-账户.png"/>
+        <img class="aicon" src="~@/assets/img/icon-账户.png" />
         <div class="inputbg">
           <a-input size="large" v-decorator="['username']" type="text" placeholder="请输入账号"> </a-input>
         </div>
       </a-form-item>
 
       <a-form-item label=" " :labelCol="labelCol" :wrapperCol="wrapperCol" style="margin-right: 100px">
-        <img class="aicon" src="~@/assets/img/icon-密码.png"/>
+        <img class="aicon" src="~@/assets/img/icon-密码.png" />
         <div class="inputbg">
           <a-input v-decorator="['password']" size="large" type="password" autocomplete="false" placeholder="请输入密码">
-        </a-input>
+          </a-input>
         </div>
       </a-form-item>
 
       <a-form-item style="margin-top: 76px; margin-left: 80px">
-        <a-button
-          size="large"
-          type="primary"
-          htmlType="submit"
-          class="login-button"
-          :loading="loginBtn"
-          @click.stop.prevent="handleSubmit"
-          :disabled="loginBtn"
-        >
+        <a-button size="large" type="primary" htmlType="submit" class="login-button" :loading="loginBtn"
+          @click.stop.prevent="handleSubmit" :disabled="loginBtn">
           登录
         </a-button>
       </a-form-item>
@@ -62,6 +57,7 @@ export default {
   },
   data() {
     return {
+      sysTitle: null,
       customActiveKey: 'tab1',
       loginBtn: false,
       // login type: 0 email, 1 username, 2 telephone
@@ -102,6 +98,7 @@ export default {
     }
   },
   created() {
+    this.sysTitle = window.AppConfig.systemTitle
     this.currdatetime = new Date().getTime()
     Vue.ls.remove(ACCESS_TOKEN)
     this.getRouterData()
@@ -301,23 +298,29 @@ export default {
 <style lang="less">
 .user-layout-login {
   .header {
+    width: 596px;
+    text-align: center;
     position: absolute;
     text-align: center;
     top: 160px;
-    left: 1230px;
+    // left: 1230px;
+    left: 1180px;
+
     .title {
       font-family: 'REEJI-FlashSansGB-Flash-Heavy';
       font-weight: 800;
       font-size: 40px;
       color: #FFFFFF;
-      text-shadow: 0px 3px 8px rgba(4,0,0,0.51);
+      text-shadow: 0px 3px 8px rgba(4, 0, 0, 0.51);
     }
   }
+
   .name {
     padding-top: 53px;
     height: 110px;
     line-height: 30px;
     text-align: center;
+
     .title {
       font-weight: 400;
       font-size: 24px;
@@ -327,9 +330,11 @@ export default {
     }
   }
 }
+
 .user-layout-login .ant-form-item {
   margin-bottom: 30px !important;
 }
+
 .user-layout-login input {
   font-size: 20px;
   width: 444px;
@@ -344,28 +349,27 @@ export default {
 }
 
 /* chrome 记住密码样式 */
-.user-layout-login  input:-webkit-autofill {
-  -webkit-box-shadow: none  !important;
-  -webkit-text-fill-color: #fff  !important;
+.user-layout-login input:-webkit-autofill {
+  -webkit-box-shadow: none !important;
+  -webkit-text-fill-color: #fff !important;
   background: transparent !important;
   font-size: 20px;
   transition: background-color 5000s ease-in-out 0s;
 }
 
-.user-layout-login .inputbg
-{
+.user-layout-login .inputbg {
   width: 444px;
   height: 60px;
   background: url(~@assets/img/login_button.png) !important;
 }
 
-.user-layout-login .aicon
-{
+.user-layout-login .aicon {
   position: absolute;
   left: 30px;
   top: 20px;
   z-index: 11;
 }
+
 .user-layout-login input::placeholder {
   color: #2F6480;
 }
@@ -375,9 +379,11 @@ export default {
 .user-layout-login .valid-error .ant-select-selection__placeholder {
   color: #f5222d;
 }
+
 .user-layout-login .ant-form-item-label {
   line-height: 50px !important;
 }
+
 .user-layout-login .ant-form-item-label label {
   font-size: 16px !important;
   color: #00c3ff !important;
@@ -385,16 +391,18 @@ export default {
   letter-spacing: 4px !important;
   float: right !important;
 }
+
 .user-layout-login .ant-input-lg {
   height: 60px !important;
   width: 444px !important;
   border-radius: 0px;
 }
 
-.user-layout-login .ant-form-item-label > label::after {
+.user-layout-login .ant-form-item-label>label::after {
   content: '';
 }
-.user-layout-login .login-button{
+
+.user-layout-login .login-button {
   width: 444px !important;
   height: 60px !important;
   border: none !important;
@@ -404,10 +412,12 @@ export default {
   line-height: 3px;
   font-family: 'Microsoft YaHei';
 }
+
 .user-layout-login .login-button:hover,
 .user-layout-login .login-button:active {
   background: url(~@assets/img/login_button_hover.png) !important;
 }
+
 .user-layout-login .ant-tabs-ink-bar {
   display: none !important;
 }