bill 1 year ago
parent
commit
8106b86054

+ 7 - 5
src/env/index.ts

@@ -1,5 +1,5 @@
 import { getToken } from '@/api'
-import { lang } from '@/lang'
+import { lang, langNameEum } from '@/lang'
 import { strToParams } from '@/shared'
 
 export type Params = {
@@ -9,12 +9,14 @@ export type Params = {
 export const params = strToParams(location.search) as Params
 export const baseURL = import.meta.env.DEV ? '/api' : '/'
 
+export const gotoLang = lang === langNameEum.zh ? 'zh' : 'en'
+
 const goto = import.meta.env.DEV ? 'https://test.4dkankan.com' : '/'
-export const registerLink = `${goto}?lang=${lang}#/login/register`
-export const forgetLink = `${goto}?lang=${lang}#/login/forget`
-export const userInfoLink = `${goto}?lang=${lang}#/information`
+export const registerLink = `${goto}?lang=${gotoLang}#/login/register`
+export const forgetLink = `${goto}?lang=${gotoLang}#/login/forget`
+export const userInfoLink = `${goto}?lang=${gotoLang}#/information`
 
-export let projectManage = `${goto}smarts/smart-viewer.html?lang=${lang}`
+export let projectManage = `${goto}smarts/smart-viewer.html?lang=${gotoLang}`
 
 setTimeout(() => {
   if (import.meta.env.DEV) {

+ 2 - 0
src/lang/en/code.ts

@@ -1,6 +1,8 @@
 export default {
     "0": "Successful",
     "2001": "Operation is too frequent, please refresh and try again.",
+    "3014": "账号或密码不正确",
+    "3015": "用户不存在",
     "4001": "Parameter missing",
     "4002": "No access",
     "4003": "User does not exist",

+ 2 - 2
src/lang/en/material.ts

@@ -3,7 +3,7 @@ export default {
     "userNameLabel": "Account",
     "remarkLabel": "Notes",
     "roleLabel": "Role",
-    "bindAccountLabel": "Phone Number",
+    "bindAccountLabel": "Phone",
     "createTimeLabel": "Added Time",
     "name": "Project Members",
     "ruleUserName": "Please enter a user account",
@@ -14,7 +14,7 @@ export default {
     "ruleRole": "Please select a project role",
     "rulebindAccount": "Please enter the user's mobile phone number",
     "addMertial": "New Note",
-    "filterName": "Please enter the name of the note",
+    "filterName": "Please enter ",
     "add": "Add a new member",
     "delTip": "Continue to remove this user?"
 }

+ 1 - 1
src/lang/en/sys.ts

@@ -52,7 +52,7 @@ export default {
     "projectSceneCount": "Project scenes",
     "projectOverCount": "Completed project",
     "operLog": "Operation Record",
-    "updateInfo": "Operation Record",
+    "updateInfo": "Modify information",
     "updatePwd": "Change Password",
     "delTip": "Can't recover from deletion, are you sure?",
     "selectTime": "Select Date",

+ 3 - 1
src/lang/ja/code.ts

@@ -1,11 +1,13 @@
 export default {
     "0": "操作に成功しました",
     "2001": "操作が頻繁すぎるので、リセットしてからもう一度試してください",
+    "3014": "アカウントまたはパスワードが誤っています。",
+    "3015": "ユーザーが存在しません",
     "4001": "パラメーター不足",
     "4002": "権限なし",
     "4003": "アカウントは存在しません。",
     "4004": "ユーザ追加に成功",
-    "4005": "项目创建人不能删除",
+    "4005": "プロジェクト作成者は削除できません",
     "4008": "ユーザはログインされていません。",
     "4009": "ログインに失敗しました。",
     "4010": "自分の役割を削除",

+ 4 - 4
src/lang/ja/project.ts

@@ -1,6 +1,6 @@
 export default {
     "desc": {
-        "done": "已完成",
+        "done": "終了",
         "undone": "未完成"
     },
     "bimDesc": {
@@ -34,8 +34,8 @@ export default {
     "projectImgLabel": "サムネイル",
     "projectBimLabel": "BIMファイル",
     "projectImgTip": "推奨サイズ:500 * 500 画素",
-    "projectNameLabel": "プロジェクト名",
-    "projectMsgLabel": "プロジェクトの説明",
+    "projectNameLabel": "タイトル",
+    "projectMsgLabel": "説明",
     "projectCreaterLabel": "作成者",
     "createTimeLabel": "作成時間",
     "updateTimeLabel": "アップデート時間",
@@ -43,7 +43,7 @@ export default {
     "addTitle": "プロジェクトを新規作成",
     "delTitle": "削除",
     "updateTitle": "調整",
-    "finshTitle": "完成",
+    "finshTitle": "終了",
     "projectNameRule": "プロジェクト名を入力してください。最大{max}字まd",
     "projectMsgRule": "説明を入力してください。最大{max}字まで",
     "projectNamePleac": "入力してください",

+ 2 - 2
src/lang/ja/sys.ts

@@ -52,13 +52,13 @@ export default {
     "projectSceneCount": "物件数",
     "projectOverCount": "完成数",
     "operLog": "情報の変更",
-    "updateInfo": "操作記録",
+    "updateInfo": "情報の変更",
     "updatePwd": "パスワードを変更",
     "delTip": "削除後には元に戻せないので確定しますか?",
     "selectTime": "時間",
     "search": "検索",
     "reset": "リセット",
-    "all": "全部",
+    "all": "すべて",
     "edit": "編集",
     "sync": "シンクロ",
     "select": "選択",

+ 2 - 0
src/lang/zh/code.ts

@@ -1,6 +1,8 @@
 export default {
     "0": "操作成功",
     "2001": "操作过于频繁,请刷新后再试",
+    "3014": "账号或密码不正确",
+    "3015": "用户不存在",
     "4001": "参数缺少",
     "4002": "没有权限",
     "4003": "用户不存在",

+ 1 - 0
src/layout/system.vue

@@ -3,6 +3,7 @@
     <div class="content">
       <div class="sys">
         <img
+          :style="{ width: lang === langNameEum.zh ? '500px' : '614px' }"
           :src="
             lang === langNameEum.zh
               ? './images/logo_login_cn@2x.png'

+ 11 - 7
src/views/project/list.vue

@@ -27,12 +27,14 @@
         />
       </a-form-item>
       <a-form-item :label="$t('sys.selectTime')" name="day">
-        <a-date-picker
-          v-model:value="filterState.day"
-          style="width: 100%"
-          :placeholder="$t('project.dayPleac')"
-          allow-clear
-        />
+        <a-config-provider :locale="lang === langNameEum.zh ? zh : en">
+          <a-date-picker
+            v-model:value="filterState.day"
+            style="width: 100%"
+            :placeholder="$t('project.dayPleac')"
+            allow-clear
+          />
+        </a-config-provider>
       </a-form-item>
       <a-form-item
         :label="$t('project.projectStatusLabel')"
@@ -99,7 +101,9 @@ import {
 import type { All, InsertProjectData } from '@/api'
 import type { FormInstance } from 'ant-design-vue'
 import type { Dayjs } from 'dayjs'
-import { ui18n } from '@/lang'
+import { ui18n, lang, langNameEum } from '@/lang'
+import zh from 'ant-design-vue/es/locale/zh_CN'
+import en from 'ant-design-vue/es/locale/en_US'
 
 const statusOptions = [
   { label: ui18n.t('sys.all'), value: all },