diff --git a/src/views/dashboard/modules/MenuManageModal.vue b/src/views/dashboard/modules/MenuManageModal.vue index 8bb588c..8cbfbf2 100644 --- a/src/views/dashboard/modules/MenuManageModal.vue +++ b/src/views/dashboard/modules/MenuManageModal.vue @@ -17,7 +17,7 @@ :filter-option="filterOption" :target-keys="targetKeys" :row-key="item => item.id" - :render="item => item.name" + :render="item => $i18n.locale === 'zh-cn' ? item.name : item.menuEn" :listStyle="listStyle" :locale="locale" @change="handleChange" diff --git a/src/views/dashboard/modules/QuickEnterCard.vue b/src/views/dashboard/modules/QuickEnterCard.vue index cd1b955..edc6b6b 100644 --- a/src/views/dashboard/modules/QuickEnterCard.vue +++ b/src/views/dashboard/modules/QuickEnterCard.vue @@ -7,17 +7,16 @@
- - - - + + +
- +

{{ $t('dashboard.quickEnter.newFunction') }}

@@ -44,6 +43,12 @@ export default { created () { this.loadData() }, + computed: { + // 是否中文 + isCn () { + return this.$i18n.locale === 'zh-cn' + } + }, methods: { // 获取快捷入口 loadData () { @@ -89,8 +94,8 @@ export default { margin-top: 12px; grid-template-columns: repeat(auto-fill, calc(100% / 14)); - & > .content-div, - & > .plus-div { + & > .content-div > span, + & > .plus-div > span { padding: 9px 16px 0; display: flex; flex-direction: column; diff --git a/src/views/documentTool/ocrTextRecognition/modules/OcrSelectStandard.vue b/src/views/documentTool/ocrTextRecognition/modules/OcrSelectStandard.vue index d1450e9..13f5187 100644 --- a/src/views/documentTool/ocrTextRecognition/modules/OcrSelectStandard.vue +++ b/src/views/documentTool/ocrTextRecognition/modules/OcrSelectStandard.vue @@ -12,7 +12,7 @@ - + import JTable from '../../../../components/jero/JTable.vue' import { JeroListMixin } from '../../../../mixins/JeroListMixin.js' -import { getForeignStandardTree } from '@api/standardRegulationLibraryApi' import { filterObj } from '@/utils/util' import { StandardSource } from '@/enums/commonEnums' @@ -124,8 +123,6 @@ export default { showAction: false, flag: 'header', disableMixinCreated: true, - // 标准结构树 - standardStructureTree: [], filters: { fileSuffix: '.pdf', // 排除文本状态为其他的 @@ -137,9 +134,6 @@ export default { } } }, - created () { - // this.loadStandardStructureTree() - }, methods: { getQueryParams () { // 获取查询条件 @@ -157,16 +151,6 @@ export default { } return filterObj(param) }, - // 加载标准结构树 - loadStandardStructureTree () { - // option 不传显示我的收藏,1不显示我的收藏 - getForeignStandardTree({ option: 1 }).then(res => { - if (res.success) { - console.log(res.result) - this.standardStructureTree = res.result || [] - } - }) - }, open () { this.visible = true this.queryParam = Object.assign({}, this.defaultQueryParam) diff --git a/src/views/system/DictList.vue b/src/views/system/DictList.vue index 544615c..5437976 100644 --- a/src/views/system/DictList.vue +++ b/src/views/system/DictList.vue @@ -91,7 +91,7 @@ export default { // 表头 columns: [ { - title: '序号', + title: this.$t('serialNumber'), dataIndex: '', key: 'rowIndex', width: 60,