From ced1be74b3ccec5a600b11bad27afd2242773b31 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 27 Jun 2024 16:25:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=8C=96=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E6=A8=A1=E5=9D=97=E3=80=81=E8=BF=AD=E4=BB=A3=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=EF=BC=8C=E6=8F=90=E4=BE=9B=E6=89=B9=E9=87=8F=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/admin.js | 16 +
.../system/i18n/components/BatchAddForm.vue | 235 +++++++-----
src/views/system/i18n/components/I18nForm.vue | 191 +++++++---
src/views/system/i18n/index.vue | 360 ++++++++++++------
4 files changed, 543 insertions(+), 259 deletions(-)
diff --git a/src/api/admin.js b/src/api/admin.js
index 361ec37f..c03b0d81 100644
--- a/src/api/admin.js
+++ b/src/api/admin.js
@@ -277,3 +277,19 @@ export function batchAddInternationalization(param) {
data: param
})
}
+
+// 国际化获取迭代列表
+export function getPublishVersionSelect() {
+ return request({
+ url: `/PublishLog/getPublishVersionSelect`,
+ method: 'get',
+ })
+}
+// 国际化批量更新
+export function batchUpdateInternationalInfo(data) {
+ return request({
+ url: `/Internationalization/batchUpdateInternationalInfo`,
+ method: 'put',
+ data
+ })
+}
diff --git a/src/views/system/i18n/components/BatchAddForm.vue b/src/views/system/i18n/components/BatchAddForm.vue
index f8e89aa0..b20bc815 100644
--- a/src/views/system/i18n/components/BatchAddForm.vue
+++ b/src/views/system/i18n/components/BatchAddForm.vue
@@ -6,122 +6,162 @@
v-loading="loading"
:model="form"
size="small"
+ :rules="rules"
>
{{ item.label }}
+ >{{ item.label }}
{{ item.label }}
+ >{{ item.label }}
-
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
{{ $t('common:button:new') }}
+ >{{ $t("common:button:new") }}
@@ -138,81 +179,97 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.$index)"
- >{{ $t('common:button:delete') }}
+ >{{ $t("common:button:delete") }}
-
- 取消
- 保存
+ 取消
+ 保存
diff --git a/src/views/system/i18n/components/I18nForm.vue b/src/views/system/i18n/components/I18nForm.vue
index 68ff924d..7e8150d0 100644
--- a/src/views/system/i18n/components/I18nForm.vue
+++ b/src/views/system/i18n/components/I18nForm.vue
@@ -9,147 +9,216 @@
label-width="130px"
size="small"
>
-
+
{{ item.label }}
+ >{{ item.label }}
-
+
-
+
-
+
-
+
-
{{ item.label }}
+ >{{ item.label }}
+
+
+
+
+
+
+
+
- 取消
- 保存
+ 取消
+ 保存
+
diff --git a/src/views/system/i18n/index.vue b/src/views/system/i18n/index.vue
index 2606c775..5ba45484 100644
--- a/src/views/system/i18n/index.vue
+++ b/src/views/system/i18n/index.vue
@@ -7,11 +7,11 @@
v-model="searchData.InternationalizationType"
clearable
filterable
- style="width:130px;"
+ style="width: 130px"
>
@@ -19,10 +19,10 @@
@@ -30,7 +30,7 @@
v-model="searchData.Code"
size="small"
clearable
- style="width:130px;"
+ style="width: 130px"
/>
@@ -38,27 +38,55 @@
v-model="searchData.ValueCN"
size="small"
clearable
- style="width:130px;"
+ style="width: 130px"
/>
-
+
+
+
+
+
+
+
+
+
批量新增
+
+ 批量更新
+
-
+ @selection-change="handleSelectionChange"
+ >
+
-
- {{ $fd('InternationalizationType', scope.row.InternationalizationType) }}
+
+ {{
+ $fd(
+ "InternationalizationType",
+ scope.row.InternationalizationType
+ )
+ }}
-
- {{ $fd('InternationalizationType', scope.row.InternationalizationType) }}
+
+ {{
+ $fd(
+ "InternationalizationType",
+ scope.row.InternationalizationType
+ )
+ }}
- {{ $fd('InternationalizationType', scope.row.InternationalizationType) }}
+ {{
+ $fd(
+ "InternationalizationType",
+ scope.row.InternationalizationType
+ )
+ }}
@@ -154,16 +210,30 @@
>
- {{ $fd('InternationalizationKeyState', scope.row.State) }}
+ {{ $fd("InternationalizationKeyState", scope.row.State) }}
- {{ $fd('InternationalizationKeyState', scope.row.State) }}
+ {{ $fd("InternationalizationKeyState", scope.row.State) }}
- {{ $fd('InternationalizationKeyState', scope.row.State) }}
+ {{ $fd("InternationalizationKeyState", scope.row.State) }}
+
+
删除
-
-
+
From e0b095ebc952329ae77012325c50f6f23cfdc205 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 27 Jun 2024 16:41:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=94=B9=E4=B8=BA=E5=90=8E=E7=AB=AF?=
=?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/dictionary/dictionary.js | 8 +++++++-
src/main.js | 5 ++++-
src/views/login/index.vue | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/api/dictionary/dictionary.js b/src/api/dictionary/dictionary.js
index cb2aaec8..35748423 100644
--- a/src/api/dictionary/dictionary.js
+++ b/src/api/dictionary/dictionary.js
@@ -51,4 +51,10 @@ export function batchAddOrUpdateFrontInternationalization(params) {
data: params
})
}
-
+// 获取当前版本
+export function getCurrentPublishInfo() {
+ return request({
+ url: `/PublishLog/getCurrentPublishInfo`,
+ method: 'get'
+ })
+}
diff --git a/src/main.js b/src/main.js
index 638ad4af..fda19646 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,7 +3,7 @@ import Vue from 'vue'
import 'normalize.css/normalize.css' // A modern alternative to CSS resets
import ElementUI, { MessageBox } from 'element-ui'
-import { getBasicDataAllSelect, getFrontInternationalizationList } from '@/api/dictionary/dictionary'
+import { getBasicDataAllSelect, getFrontInternationalizationList, getCurrentPublishInfo } from '@/api/dictionary/dictionary'
import { sendMFAEmail } from "@/api/user.js";
import { resetReadingRestTime } from '@/api/trials/reading'
// import 'element-ui/lib/theme-chalk/index.css'
@@ -186,6 +186,9 @@ async function VueInit() {
zhMessages[v.Code] = v.ValueCN
enMessages[v.Code] = v.Value
})
+ // 获取版本信息
+ let PublishInfo = await getCurrentPublishInfo();
+ Vue.prototype.$version = PublishInfo.Result;
// 获取检查部位
Vue.prototype.$getBodyPart = (id) => {
return new Promise(async (resolve, reject) => {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 7584ccc6..4578d267 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -167,7 +167,7 @@
{{ $t("login:title:system_title") }}
{{ $t("login:title:system") }}
- V1.5.1.001
+ V{{ $version.Version }}
Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
版权所有