You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/08/12 10:06:44 UTC
[incubator-linkis] branch dev-1.2.1 updated: linkis-cst-time-format (#2684)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.2.1 by this push:
new a4e402d6c linkis-cst-time-format (#2684)
a4e402d6c is described below
commit a4e402d6ca2ae9dc201fc2a81df1ade0fd81b29e
Author: zhaoyun006 <27...@qq.com>
AuthorDate: Fri Aug 12 18:06:38 2022 +0800
linkis-cst-time-format (#2684)
Co-authored-by: zhaozhiqiang <zh...@lixiang.com>
---
linkis-web/src/apps/linkis/module/resourceManagement/index.vue | 3 +++
1 file changed, 3 insertions(+)
diff --git a/linkis-web/src/apps/linkis/module/resourceManagement/index.vue b/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
index 5e3197089..7338b6842 100644
--- a/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
@@ -528,6 +528,9 @@ export default {
},
// 时间格式转换
timeFormat(row) {
+ if (row.startTime.indexOf('CST') > 0) {
+ return moment(new Date(row.startTime)).utc().subtract(6, 'hour').format('YYYY-MM-DD HH:mm:ss')
+ }
return moment(new Date(row.startTime)).format('YYYY-MM-DD HH:mm:ss')
},
calcCompany(resource) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org