diff --git a/src/lang/en.js b/src/lang/en.js index 4fb5eddc..432b99cb 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -69,6 +69,17 @@ export default { permissions: 'Your permissions', switchPermissions: 'Switch permissions' }, + table: { + dynamicTips1: 'Fixed header, sorted by header order', + dynamicTips2: 'Not fixed header, sorted by click order', + dragTips1: 'The default order', + dragTips2: 'The Drag after order' + }, + errorLog: { + tips: 'Please click the bug icon in the upper right corner', + description: 'Now the management system are basically the form of the spa, it enhances the user experience, but it also increases the possibility of page problems, a small negligence may lead to the entire page deadlock. Fortunately Vue provides a way to catch handling exceptions, where you can handle errors or report exceptions.', + documentation: 'Document introduction' + }, excel: { export: 'Export', selectedExport: 'Export selected items', @@ -77,5 +88,9 @@ export default { zip: { export: 'Export', placeholder: 'Please enter the file name(default file)' + }, + theme: { + change: 'Theme change', + documentation: 'Theme documentation' } } diff --git a/src/lang/zh.js b/src/lang/zh.js index fd0804b0..996fd7b6 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -69,6 +69,17 @@ export default { permissions: '你的权限', switchPermissions: '切换权限' }, + table: { + dynamicTips1: '固定表头, 按照表头顺序排序', + dynamicTips2: '不固定表头, 按照点击顺序排序', + dragTips1: '默认顺序', + dragTips2: '拖拽后顺序' + }, + errorLog: { + tips: '请点击右上角bug小图标', + description: '现在的管理后台基本都是spa的形式了，它增强了用户体验，但同时也会增加页面出问题的可能性，可能一个小小的疏忽就导致整个页面的死锁。好在 Vue 官网提供了一个方法来捕获处理异常，你可以在其中进行错误处理或者异常上报。', + documentation: '文档介绍' + }, excel: { export: '导出', selectedExport: '导出已选择项', @@ -77,5 +88,9 @@ export default { zip: { export: '导出', placeholder: '请输入文件名(默认file)' + }, + theme: { + change: '换肤', + documentation: '换肤文档' } } diff --git a/src/mock/article.js b/src/mock/article.js index e589940d..bd9fbd17 100644 --- a/src/mock/article.js +++ b/src/mock/article.js @@ -10,7 +10,7 @@ for (let i = 0; i < count; i++) { timestamp: +Mock.Random.date('T'), author: '@first', auditor: '@name', - title: '@title(10, 20)', + title: '@title(5, 10)', forecast: '@float(0, 100, 2, 2)', importance: '@integer(1, 3)', 'type|1': ['CN', 'US', 'JP', 'EU'], diff --git a/src/styles/index.scss b/src/styles/index.scss index 5cc936b3..f98127f1 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -102,7 +102,8 @@ code { margin-bottom: 20px; display: block; line-height: 36px; - font-size: 14px; + font-size: 15px; + font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif; a { color: #337ab7; cursor: pointer; diff --git a/src/views/errorLog/index.vue b/src/views/errorLog/index.vue index 21f4817d..a0dd8608 100644 --- a/src/views/errorLog/index.vue +++ b/src/views/errorLog/index.vue @@ -2,11 +2,13 @@
- -

请点击右上角bug小图表

+ +

{{$t('errorLog.tips')}}

- 现在的管理后台基本都是spa的形式了，它增强了用户体验，但同时也会增加页面出问题的可能性，可能一个小小的疏忽就导致整个页面的死锁。好在 Vue 官网提供了一个方法来捕获处理异常. - 文档介绍 + {{$t('errorLog.description')}} + + {{$t('errorLog.documentation')}} + diff --git a/src/views/example/tab/components/tabPane.vue b/src/views/example/tab/components/tabPane.vue index 1052d609..ad0da617 100644 --- a/src/views/example/tab/components/tabPane.vue +++ b/src/views/example/tab/components/tabPane.vue @@ -1,45 +1,45 @@ diff --git a/src/views/example/table/dynamicTable/fixedThead.vue b/src/views/example/table/dynamicTable/fixedThead.vue index 18aa7f74..9f4cfc5f 100644 --- a/src/views/example/table/dynamicTable/fixedThead.vue +++ b/src/views/example/table/dynamicTable/fixedThead.vue @@ -11,7 +11,7 @@ - + @@ -22,7 +22,7 @@