{{ `${item.value || ' '}` }}
diff --git a/src/views/configManage/configParamTreeTable/index.vue b/src/views/configManage/configParamTreeTable/index.vue
index 0147b50f..d1be67f4 100644
--- a/src/views/configManage/configParamTreeTable/index.vue
+++ b/src/views/configManage/configParamTreeTable/index.vue
@@ -119,7 +119,6 @@ function fnActiveConfigNode(key: string | number) {
});
arrayState.columns = columns;
- arrayState.collapseActiveKey = [];
arrayEditClose();
}
} else {
@@ -273,8 +272,6 @@ function listEditOk() {
/**多列列表状态类型 */
type ArrayStateType = {
- /**面板激活项 */
- collapseActiveKey: string[];
/**紧凑型 */
size: SizeType;
/**多列嵌套记录字段 */
@@ -288,26 +285,16 @@ type ArrayStateType = {
data: Record
[];
/**多列记录规则 */
dataRule: Record;
- /**新增行记录Index 编辑-1/新增>=0 */
- newIndex: number;
- /**编辑行Key值 */
- editKey: number | string;
- /**编辑行记录 */
- editRecord: Record;
};
/**多列列表状态 */
let arrayState: ArrayStateType = reactive({
- collapseActiveKey: [],
size: 'middle',
columns: [],
columnsData: [],
arrayChildExpandKeys: [],
data: [],
dataRule: {},
- newIndex: -2,
- editKey: -1,
- editRecord: {},
});
/**多列表编辑 */
@@ -504,8 +491,6 @@ type ArrayChildStateType = {
title: string;
/**层级index */
loc: string;
- /**面板激活项 */
- collapseActiveKey: string[];
/**紧凑型 */
size: SizeType;
/**多列嵌套记录字段 */
@@ -517,27 +502,17 @@ type ArrayChildStateType = {
data: Record[];
/**多列嵌套记录规则 */
dataRule: Record;
- /**新增嵌套行记录Index 编辑-1/新增>=0 */
- newIndex: number;
- /**编辑嵌套行Key值 */
- editKey: number | string;
- /**编辑嵌套行记录 */
- editRecord: Record;
};
/**表格状态 */
let arrayChildState: ArrayChildStateType = reactive({
title: '',
loc: '',
- collapseActiveKey: [],
size: 'middle',
columns: [],
columnsData: [],
data: [],
dataRule: {},
- newIndex: -2,
- editKey: -1,
- editRecord: {},
});
/**多列表展开嵌套行 */
@@ -625,11 +600,8 @@ function arrayChildExpand(
arrayState.arrayChildExpandKeys = [indexRow];
arrayChildState.loc = `${loc}/${from['name']}`;
- arrayChildState.newIndex = -3;
// 设置展开列表标题
arrayChildState.title = `${from['display']}`;
- // 关闭默认展开
- arrayChildState.collapseActiveKey = [];
}
/**多列表展开嵌套行 */
@@ -1357,12 +1329,13 @@ onMounted(() => {
+
{{
t('views.configManage.configParamForm.arrayMore')
}}
@@ -1437,11 +1410,16 @@ onMounted(() => {
{{ text.comment }}
-
- {{
- t('views.configManage.configParamForm.arrayMore')
- }}
-
+
+
+
+ {{
+ t(
+ 'views.configManage.configParamForm.arrayMore'
+ )
+ }}
+
+
{{ `${text.value || ' '}` }}
diff --git a/src/views/configManage/neManage/index.vue b/src/views/configManage/neManage/index.vue
index c5f168e0..fb988723 100644
--- a/src/views/configManage/neManage/index.vue
+++ b/src/views/configManage/neManage/index.vue
@@ -450,9 +450,9 @@ function fnModalCancel() {
*/
function fnRecordDelete(row: Record
) {
message.success({
- content: t('common.msgSuccess', { msg: t('common.deleteText') }),
- duration: 2,
- });
+ content: t('common.msgSuccess', { msg: t('common.deleteText') }),
+ duration: 2,
+ });
Modal.confirm({
title: t('common.tipTitle'),
content: t('views.configManage.neManage.delSure', { msg: row.neName }),
@@ -904,7 +904,10 @@ onMounted(() => {
{{ t('views.configManage.neManage.stop') }}
-
+
{{ t('views.configManage.neManage.reload') }}
@@ -1030,7 +1033,9 @@ onMounted(() => {
- 最大范围0~65535
+
+ {{ t('views.configManage.neManage.portTip') }}
+
diff --git a/src/views/index.vue b/src/views/index.vue
index c823855f..9488501e 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -12,7 +12,12 @@ import * as echarts from 'echarts/core';
import { TitleComponent, LegendComponent } from 'echarts/components';
import { PieChart } from 'echarts/charts';
import { LabelLayout } from 'echarts/features';
+import { useRoute } from 'vue-router';
+import useAppStore from '@/store/modules/app';
+const appStore = useAppStore();
+const route = useRoute();
const { t } = useI18n();
+
echarts.use([
TooltipComponent,
GaugeChart,
@@ -370,7 +375,20 @@ function rowClick(record: any, index: any) {
};
}
let timer: any;
+
+/**
+ * 国际化翻译转换
+ */
+ function fnLocale( ) {
+ let title = route.meta.title as string;
+ if (title.indexOf('router.') !== -1) {
+ title = t(title);
+ }
+ appStore.setTitle(title);
+}
+
onMounted(() => {
+ fnLocale()
fnGetList();
timer = setInterval(fnGetList, 10000); // 每隔10秒执行一次
});
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index eb86ba98..75c35b66 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -104,17 +104,17 @@ let tableColumns: ColumnsType = [
{
title: t('views.system.config.configName'),
dataIndex: 'configName',
- align: 'center',
+ align: 'left',
},
{
title: t('views.system.config.configKey'),
dataIndex: 'configKey',
- align: 'center',
+ align: 'left',
},
{
title: t('views.system.config.configValue'),
dataIndex: 'configValue',
- align: 'center',
+ align: 'left',
},
{
title: t('views.system.config.configType'),
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 52edbc64..cb4c24b8 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -96,7 +96,7 @@ let tableColumns: ColumnsType = [
{
title: t('views.system.menu.menuName'),
dataIndex: 'menuName',
- align: 'center',
+ align: 'left',
},
{
title: t('views.system.menu.menuId'),
@@ -117,12 +117,12 @@ let tableColumns: ColumnsType = [
{
title: t('views.system.menu.perId'),
dataIndex: 'perms',
- align: 'center',
+ align: 'left',
},
{
title: t('views.system.menu.formLoc'),
dataIndex: 'component',
- align: 'center',
+ align: 'left',
},
{
title: t('views.system.menu.status'),
@@ -687,8 +687,11 @@ onMounted(() => {
-
- {{t('views.system.menu.addSon')}}
+
+ {{ t('views.system.menu.addSon') }}
{
- {{t('views.system.menu.perms')}}
+ {{ t('views.system.menu.perms') }}
diff --git a/src/views/system/setting/components/change-logo.vue b/src/views/system/setting/components/change-logo.vue
index d09020e0..4dea17f0 100644
--- a/src/views/system/setting/components/change-logo.vue
+++ b/src/views/system/setting/components/change-logo.vue
@@ -2,6 +2,7 @@
import { Modal, message } from 'ant-design-vue/lib';
import { FileType } from 'ant-design-vue/lib/upload/interface';
import { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
+import IconFont from '@/components/IconFont/index.vue';
import { onMounted, reactive } from 'vue';
import useAppStore from '@/store/modules/app';
import useI18n from '@/hooks/useI18n';
@@ -175,7 +176,10 @@ onMounted(() => {
{{ appStore.appName }}
-
+
@@ -291,7 +295,7 @@ onMounted(() => {
&-menu {
width: 90px;
- line-height: 45px;
+ line-height: 40px;
color: #ffffff;
align-self: center;
text-align: center;