Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-ui/src/lang/zh.js

ruoyi-ui/src/lang/en.js

@@ -1,12 +1,14 @@
 // en.js
 export default {
+  
   login: {
-    title: 'RuoYi Login Form',
+    title: 'FORTUCKY WMS SYSTEM',
     logIn: 'Login in',
     username: 'Username',
     password: 'Password',
     code: 'Code',
-    rememberMe: 'Remember Me'
+    rememberMe: 'Remember Me',
+    bottom:'Copyright © 2025 ForTucky All Rights Reserved.400-1882-319'
   },
   tagsView: {
     refresh: 'Refresh',
@@ -627,6 +629,7 @@ export default {
   },
 
   viewsMain: {
+    systemTitle: 'RuoYi Admin',
     title: 'homePage',
     unfinishedInboundTask: 'Unfinished Inbound Task Overview',
     taskKey: 'Task Key',

ruoyi-ui/src/lang/zh.js

@@ -5,12 +5,13 @@ import 'core-js/features/symbol'
 
 export default {
   login: {
-    title: '若依后台管理系统',
+    title: '福莱瑞达WMS系统',
     logIn: '登录',
     username: '账号',
     password: '密码',
     code: '验证码',
-    rememberMe: '记住密码'
+    rememberMe: '记住密码',
+    bottom:'Copyright © 2025 ForTucky All Rights Reserved.400-1882-319'
   },
   tagsView: {
     refresh: '刷新',
@@ -633,6 +634,24 @@ export default {
 
   },
 
+  viewsMain: {
+    systemTitle: '福莱瑞达管理系统',
+    title: '首页',
+    unfinishedInboundTask: '未完成入库任务概览',
+    taskKey: '任务键值',
+    unfinishedInboundTaskName: '未完成入库任务',
+    totalUnfinishedCount: '全部未完成数量',
+    todayUnfinishedCount: '今日未完成数量',
+    finishedInboundTask: '已完成入库任务概览',
+    finishedInboundTaskName: '已完成入库任务',
+    totalFinishedCount: '全部已完成数量',
+    todayFinishedCount: '今日已完成数量',
+    unfinishedOutboundTask: '未完成出库任务概览',
+    unfinishedOutboundTaskName: '未完成出库任务',
+    finishedOutboundTask: '已完成出库任务概览',
+    finishedOutboundTaskName: '已完成出库任务'
+  },
+
   searchViewStockSecure: {
     stockId: '库存ID',
     cargoSpaceId: '货位ID',

ruoyi-ui/src/utils/dynamicTitle.js

@@ -1,13 +1,14 @@
 import store from '@/store'
 import defaultSettings from '@/settings'
+import i18n from '@/lang'
 
 /**
  * 动态修改标题
  */
 export function useDynamicTitle() {
   if (store.state.settings.dynamicTitle) {
-    document.title = store.state.settings.title + ' - ' + defaultSettings.title
+    document.title = store.state.settings.title + ' - ' + i18n.t(defaultSettings.title)
   } else {
-    document.title = defaultSettings.title
+    document.title = i18n.t(defaultSettings.title)
   }
 }

ruoyi-ui/src/views/login.vue

@@ -57,7 +57,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
+      <span>{{ $t('login.bottom') }}</span>
     </div>
   </div>
 </template>

ruoyi-ui/src/views/tool/build/index.vue

@@ -147,7 +147,7 @@ import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/
 import { makeUpJs } from '@/utils/generator/js'
 import { makeUpCss } from '@/utils/generator/css'
 import drawingDefault from '@/utils/generator/drawingDefault'
-import logo from '@/assets/logo/logo.png'
+import logo from '@/assets/logo/logo1.png'
 import CodeTypeDialog from './CodeTypeDialog'
 import DraggableItem from './DraggableItem'