From f4f8f9f923f11ab4fbe4b1a46f442ca56d337cc6 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 22 May 2019 14:39:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=9B=BD=E8=AF=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Former-commit-id: c30641d894f4a3dd6436262ec8274cd6af5bc976 [formerly c30641d894f4a3dd6436262ec8274cd6af5bc976 [formerly c30641d894f4a3dd6436262ec8274cd6af5bc976 [formerly c30641d894f4a3dd6436262ec8274cd6af5bc976 [formerly 939916e28478409e52951c9a398601de4dcd64f3 [formerly 5990314c4157c9e8083c8566c478a3f260ba4886]]]]]
Former-commit-id: 5aff5445ce1bc11830ef450a555a0f02be09faf4
Former-commit-id: d5c676d30957683bb7a420999aca4f26643f3780
Former-commit-id: 054af47ada509b687df935011c27b74015a50673 [formerly 5b706cd5573dfabb2e97a834c474535393af32d1]
Former-commit-id: fa29f751bd36435b57c17daa6d601a84d166e247
Former-commit-id: 28e2e32b327a61600dc71fc03c6bd6a4e2c16605
Former-commit-id: 5c6d379d593a3e07dddb745bb9522a38a0218f96
Former-commit-id: 6e01935c320da49cc9983001be504e1f46486189
Former-commit-id: e8eb886b3e6a197677c44d836bfab724bdbb6af1
---
locales.babel.REMOVED.git-id | 2 +-
src/locales/en.json | 31 ++++++++++++++++++++++++++
src/locales/ja.json | 31 ++++++++++++++++++++++++++
src/locales/zh-chs.json | 31 ++++++++++++++++++++++++++
src/locales/zh-cht.json | 31 ++++++++++++++++++++++++++
src/views/system/log/index.vue | 40 +++++++++++++++++-----------------
6 files changed, 145 insertions(+), 21 deletions(-)
diff --git a/locales.babel.REMOVED.git-id b/locales.babel.REMOVED.git-id
index 8a21c886..717b4d1d 100644
--- a/locales.babel.REMOVED.git-id
+++ b/locales.babel.REMOVED.git-id
@@ -1 +1 @@
-ae7f3c4ffa4b6ebe316947483e293276b9eb95fb
\ No newline at end of file
+88eed29c0d330f88fa9db7630c40dc370c1240cc
\ No newline at end of file
diff --git a/src/locales/en.json b/src/locales/en.json
index 88483ea3..eef99523 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -62,6 +62,37 @@
}
}
},
+ "log": {
+ "notify": {
+ "more": {
+ "message": "",
+ "title": ""
+ },
+ "upload": {
+ "start": {
+ "message": "",
+ "title": ""
+ },
+ "success": {
+ "message": "",
+ "title": ""
+ }
+ }
+ },
+ "table": {
+ "empty-text": "",
+ "label": {
+ "component": "",
+ "message": "",
+ "more": "",
+ "time": "",
+ "url": ""
+ }
+ },
+ "upload": {
+ "button": ""
+ }
+ },
"login": {
"footer": {
"button": {
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 5f524b92..f556a512 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -62,6 +62,37 @@
}
}
},
+ "log": {
+ "notify": {
+ "more": {
+ "message": "",
+ "title": ""
+ },
+ "upload": {
+ "start": {
+ "message": "",
+ "title": ""
+ },
+ "success": {
+ "message": "",
+ "title": ""
+ }
+ }
+ },
+ "table": {
+ "empty-text": "",
+ "label": {
+ "component": "",
+ "message": "",
+ "more": "",
+ "time": "",
+ "url": ""
+ }
+ },
+ "upload": {
+ "button": ""
+ }
+ },
"login": {
"footer": {
"button": {
diff --git a/src/locales/zh-chs.json b/src/locales/zh-chs.json
index 656fca1b..11629df5 100644
--- a/src/locales/zh-chs.json
+++ b/src/locales/zh-chs.json
@@ -62,6 +62,37 @@
}
}
},
+ "log": {
+ "notify": {
+ "more": {
+ "message": "完整的日志内容已经打印到控制台",
+ "title": "日志详情"
+ },
+ "upload": {
+ "start": {
+ "message": "开始上传 {number} 条日志",
+ "title": "日志上传"
+ },
+ "success": {
+ "message": "上传成功",
+ "title": "提示"
+ }
+ }
+ },
+ "table": {
+ "empty-text": "暂无日志信息",
+ "label": {
+ "component": "触发组件",
+ "message": "信息",
+ "more": "查看详细信息",
+ "time": "时间",
+ "url": "触发页面"
+ }
+ },
+ "upload": {
+ "button": "上传 {number} 条数据"
+ }
+ },
"login": {
"footer": {
"button": {
diff --git a/src/locales/zh-cht.json b/src/locales/zh-cht.json
index fa767f56..427150fc 100644
--- a/src/locales/zh-cht.json
+++ b/src/locales/zh-cht.json
@@ -62,6 +62,37 @@
}
}
},
+ "log": {
+ "notify": {
+ "more": {
+ "message": "",
+ "title": ""
+ },
+ "upload": {
+ "start": {
+ "message": "",
+ "title": ""
+ },
+ "success": {
+ "message": "",
+ "title": ""
+ }
+ }
+ },
+ "table": {
+ "empty-text": "",
+ "label": {
+ "component": "",
+ "message": "",
+ "more": "",
+ "time": "",
+ "url": ""
+ }
+ },
+ "upload": {
+ "button": ""
+ }
+ },
"login": {
"footer": {
"button": {
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index adc11106..7264aee0 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -4,31 +4,31 @@
:data="log"
size="mini"
style="width: 100%"
- empty-text="暂无日志信息"
+ :empty-text="$t('views.system.log.table.empty-text')"
stripe>
-
+
-
+
+ :label="$t('views.system.log.table.label.message')">
-
+
{{get(scope.row, 'meta.url')}}
-
+
@@ -40,11 +40,11 @@
-
+
- Upload {{log.length}} log data
+ {{ $t('views.system.log.upload.button', { number: log.length }) }}
@@ -86,11 +86,11 @@ export default {
methods: {
get,
handleShowMore (log) {
- // 打印一条日志的所有信息到控制台
+ // Print all information from a log to the console
this.$notify({
type: 'info',
- title: '日志详情',
- message: '完整的日志内容已经打印到控制台'
+ title: this.$t('views.system.log.notify.more.title'),
+ message: this.$t('views.system.log.notify.more.message')
})
this.$log.capsule('D2Admin', 'handleShowMore', 'primary')
console.group(log.message)
@@ -99,20 +99,20 @@ export default {
console.log(log.meta)
console.groupEnd()
},
- // 日志上传
+ // Log upload
handleUpload () {
this.uploading = true
this.$notify({
type: 'info',
- title: '日志上传',
- message: `开始上传${this.log.length}条日志`
+ title: this.$t('views.system.log.notify.upload.start.title'),
+ message: this.$t('views.system.log.notify.upload.start.message', { number: this.log.length })
})
setTimeout(() => {
this.uploading = false
this.$notify({
type: 'success',
- title: '日志上传',
- message: '上传成功'
+ title: this.$t('views.system.log.notify.upload.success.title'),
+ message: this.$t('views.system.log.notify.upload.success.message')
})
}, 3000)
}