[update]更新0.1.4

jumpserver · Apr 20, 2020 · 7b2e5c7 · 7b2e5c7
1 parent de2f684
commit 7b2e5c7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/renderer/components/player/guaPlayer.vue b/src/renderer/components/player/guaPlayer.vue
@@ -60,6 +60,7 @@ export default {
       position: '00:00',
       asset: '',
       date_start: '',
+      date_end: '',
       admin_user: '',
       system_user: '',
       version_internal: Number
@@ -109,8 +110,10 @@ export default {
           } catch (e) {
             this.$message.error('播放错误')
           }
-          let date = new Date(Date.parse(jsonData.date_start))
-          this.date_start = date.toLocaleString('zh-CN', { hour12: false }).split('/').join('-')
+          let dateStart = new Date(Date.parse(jsonData.date_start))
+          let dataEnd = new Date(Date.parse(jsonData.date_end))
+          this.date_start = dateStart.toLocaleString('zh-CN', { hour12: false }).split('/').join('-')
+          this.date_end = dataEnd.toLocaleString('zh-CN', { hour12: false }).split('/').join('-')
           this.asset = jsonData.asset
           this.system_user = jsonData.system_user
           this.admin_user = jsonData.user

diff --git a/src/renderer/components/player/linuxPlayer.vue b/src/renderer/components/player/linuxPlayer.vue
@@ -68,6 +68,7 @@ export default {
       starttime: '',
       asset: '',
       date_start: '',
+      date_end: '',
       admin_user: '',
       system_user: '',
       version_internal: ''
@@ -108,8 +109,10 @@ export default {
           } catch (e) {
             this.$message.error('播放错误')
           }
-          let date = new Date(Date.parse(jsonData.date_start))
-          this.date_start = date.toLocaleString('zh-CN', { hour12: false }).split('/').join('-')
+          let dateStart = new Date(Date.parse(jsonData.date_start))
+          let dataEnd = new Date(Date.parse(jsonData.date_end))
+          this.date_start = dateStart.toLocaleString('zh-CN', { hour12: false }).split('/').join('-')
+          this.date_end = dataEnd.toLocaleString('zh-CN', { hour12: false }).split('/').join('-')
           this.asset = jsonData.asset
           this.system_user = jsonData.system_user
           this.admin_user = jsonData.user