diff --git a/src/i18n/temp/en.json b/src/i18n/temp/en.json index a1a845d..cfeb271 100644 --- a/src/i18n/temp/en.json +++ b/src/i18n/temp/en.json @@ -2292,5 +2292,9 @@ "spdm.taskList.title": "Task List", "spdm.taskList.des": "List of tasks I perform", "spdm.todoCalendar.title": "Todo Calendar", - "spdm.todoCalendar.des": "To-do task calendar" + "spdm.todoCalendar.des": "To-do task calendar", + "spdm.tapnav.task.focus": "My Focus", + "spdm.tapnav.task.todayTmrTasks": "Today & Tomorrow", + "spdm.tapnav.task.inProgress": "In Progress", + "spdm.tapnav.task.postponed": "Overdue Tasks" } \ No newline at end of file diff --git a/src/i18n/temp/zh-cn.json b/src/i18n/temp/zh-cn.json index 928630f..b359fd0 100644 --- a/src/i18n/temp/zh-cn.json +++ b/src/i18n/temp/zh-cn.json @@ -2292,5 +2292,9 @@ "spdm.taskList.title": "任务列表", "spdm.taskList.des": "我执行的任务列表_spdm", "spdm.todoCalendar.title": "待办日历", - "spdm.todoCalendar.des": "待办任务日历_spdm" + "spdm.todoCalendar.des": "待办任务日历_spdm", + "spdm.tapnav.task.focus":"我关注的", + "spdm.tapnav.task.todayTmrTasks":"今明任务", + "spdm.tapnav.task.inProgress":"进行中任务", + "spdm.tapnav.task.postponed":"逾期任务" } \ No newline at end of file diff --git a/src/spdm/views/home/components/TaskList.vue b/src/spdm/views/home/components/TaskList.vue index 41219ed..252f4a5 100644 --- a/src/spdm/views/home/components/TaskList.vue +++ b/src/spdm/views/home/components/TaskList.vue @@ -27,7 +27,7 @@ export default { - + diff --git a/src/spdm/views/home/components/TaskMessage.vue b/src/spdm/views/home/components/TaskMessage.vue index cad2f07..8e68d8d 100644 --- a/src/spdm/views/home/components/TaskMessage.vue +++ b/src/spdm/views/home/components/TaskMessage.vue @@ -27,7 +27,7 @@ export default { - + diff --git a/src/spdm/views/home/components/TopNavSpdm.vue b/src/spdm/views/home/components/TopNavSpdm.vue index 763be33..1e36257 100644 --- a/src/spdm/views/home/components/TopNavSpdm.vue +++ b/src/spdm/views/home/components/TopNavSpdm.vue @@ -10,27 +10,31 @@ const tenantInfo = ref(null); const list = ref([ { - label:'我关注的', + name: '我关注的', + label: 'spdm.tapnav.task.focus', count: 0, color: 'rgb(221, 221, 9)', path: '/spdm/task/attention', }, { - label: '今明任务', + name: '今明任务', + label: 'spdm.tapnav.task.todayTmrTasks', count: 0, key: 'todayTmrTasks', color: '#FF9900', path: '/spdm/task/execute', }, { - label: '进行中任务', + name: '进行中任务', + label: 'spdm.tapnav.task.inProgress', count: 0, key: 'inProgress', color: '#1890ff', path: '/spdm/task/execute', }, { - label: '逾期任务', + name: '逾期任务', + label: 'spdm.tapnav.task.postponed', count: 0, key: 'postponed', color: '#FF0000', @@ -111,7 +115,7 @@ const handleClick = (item: any) => {
-
{{ item.label }}
+
{{ t(item.label) }}
{{ item.count ?? 0 }}
diff --git a/src/stores/tagsViewRoutes.ts b/src/stores/tagsViewRoutes.ts index d41924f..afa343b 100644 --- a/src/stores/tagsViewRoutes.ts +++ b/src/stores/tagsViewRoutes.ts @@ -9,33 +9,33 @@ import mittBus from '/@/utils/mitt'; import {cloneDeep} from 'lodash'; -// SPDM CODE 默认常用功能 +// SPDM CODE 默认常用功能,这里的应用名称要做多语言 const defaultFavoriteRoutes = [ { contextMenuClickId: 5, path: '/spdm/competenceCenter/condition', - name: '仿真工况库', + name: 'moduleRoutes.spdmCompetenceCenterCondition', meta: { icon: 'ele-Suitcase' }, url: '/spdm/competenceCenter/condition', }, { contextMenuClickId: 5, path: '/spdm/competenceCenter/indicator', - name: '仿真指标库', + name: 'moduleRoutes.spdmCompetenceCenterIndicator', meta: { icon: 'ele-Money' }, url: '/spdm/competenceCenter/indicator', }, { contextMenuClickId: 5, path: '/spdm/simulation/process', - name: '仿真流程', + name: 'moduleRoutes.spdmSimulationProcess', meta: { icon: 'ele-FolderChecked' }, url: '/spdm/simulation/process', }, { contextMenuClickId: 5, path: '/spdm/simulation/application', - name: '应用中心', + name: 'moduleRoutes.spdmSystemApplication', meta: { icon: 'ele-Cellphone' }, url: '/spdm/simulation/application', }, diff --git a/src/views/home/shortcut/index.vue b/src/views/home/shortcut/index.vue index ec28254..3b4e79b 100644 --- a/src/views/home/shortcut/index.vue +++ b/src/views/home/shortcut/index.vue @@ -5,13 +5,15 @@ {{ props.title }} - - - - - - - +
+ + + + + + +
+ @@ -85,7 +87,11 @@ const showRoutes = computed(() => { } } // SPDM CODE -.menu-list { - height: 300px; +.card-list { + height: 310px; + overflow-y: auto; + overflow-x: hidden; } + +