[update]v0.1.2

jumpserver · Mar 9, 2020 · 7ffc7cb · 7ffc7cb
1 parent be54bc7
commit 7ffc7cb
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 24 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jumpserver_video_player",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "author": "OrangeM21 <[email protected]>",
   "description": "An electron-vue project",
   "license": null,

diff --git a/src/renderer/components/mainPage.vue b/src/renderer/components/mainPage.vue
@@ -41,7 +41,7 @@ export default {
       ispushed: false,
       filename: '',
       fullscreenLoading: false,
-      version: null
+      version: Number
       // version 1 旧版本
       // version 2 新版本
     }
@@ -61,10 +61,12 @@ export default {
         this.filename = data.file.name.substring(0, data.file.name.length - 4)
         compressing.tar.uncompress(data.file.path, configDir).then((files) => {
           this.uploadfile(this.filename, (configDir + '/' + this.filename + '.replay.gz'))
+          this.version = 2
         })
       } else if (data.file.name.substring(data.file.name.length - 2, data.file.name.length) === 'gz') {
         this.filename = data.file.name.substring(0, data.file.name.length - 6)
         this.uploadfile(this.filename, data.file.path)
+        this.version = 1
       } else {
         this.$message.error('录像文件错误')
       }

diff --git a/src/renderer/components/player/guaPlayer.vue b/src/renderer/components/player/guaPlayer.vue
@@ -20,7 +20,7 @@
       <el-col :span="2" :offset="2">
       <p style="line-height:32px;text-aligin:center;">{{this.position}}/{{this.duration}}</p>
       </el-col>
-      <el-col :span="2" :offset="2">
+      <el-col :span="2" :offset="2" :v-if="this.version_internal === 2">
         <el-tooltip placement="top" style="line-height:32px;">
           <div slot="content">资产名: {{this.asset}}<br/>开始时间: {{this.date_start}}<br/>用户: {{this.admin_user}}</div>
           <i class="el-icon-warning"></i>
@@ -60,7 +60,8 @@ export default {
       position: '00:00',
       asset: '',
       date_start: '',
-      admin_user: ''
+      admin_user: '',
+      version_internal: Number
     }
   },
   created: function () {
@@ -96,14 +97,18 @@ export default {
         this.initRecording()
         console.log(err)
       })
-      // eslint-disable-next-line handle-callback-err
-      fs.readFile(jsonpeth, 'utf-8', (err, basicdata) => {
-        let jsonData = JSON.parse(basicdata)
-        let date = new Date(Date.parse(jsonData.date_start))
-        this.date_start = date.toLocaleString('zh-CN', { hour12: false }).split('/').join('-')
-        this.asset = jsonData.asset
-        this.admin_user = jsonData.user
-      })
+      this.version_internal = 1
+      if (this.$route.params.version === 2) {
+        this.version_internal = 2
+        // eslint-disable-next-line handle-callback-err
+        fs.readFile(jsonpeth, 'utf-8', (err, basicdata) => {
+          let jsonData = JSON.parse(basicdata)
+          let date = new Date(Date.parse(jsonData.date_start))
+          this.date_start = date.toLocaleString('zh-CN', { hour12: false }).split('/').join('-')
+          this.asset = jsonData.asset
+          this.admin_user = jsonData.user
+        })
+      }
     },
     zeroPad: function (num, minLength) {
       let str = num.toString()

diff --git a/src/renderer/components/player/linuxPlayer.vue b/src/renderer/components/player/linuxPlayer.vue
@@ -23,8 +23,8 @@
       <el-col :span="4">
        <p style="line-height:32px;text-aligin:center;">当前播放速度:{{this.speed}}倍</p>
       </el-col>
-      <el-col :span="2">
-        <el-tooltip placement="top" style="line-height:32px;">
+      <el-col :span="2" :v-if="this.version_internal === 2">
+        <el-tooltip placement="top" style="line-height:32px;" >
           <div slot="content">资产名: {{this.asset}}<br/>开始时间: {{this.date_start}}<br/>用户: {{this.admin_user}}</div>
           <i class="el-icon-warning"></i>
         </el-tooltip>
@@ -68,7 +68,8 @@ export default {
       starttime: '',
       asset: '',
       date_start: '',
-      admin_user: ''
+      admin_user: '',
+      version_internal: ''
     }
   },
   created: function () {
@@ -84,17 +85,20 @@ export default {
         this.formatdata()
         console.log(err)
       })
-
+      this.version_internal = 1
       // const date = new Date(Date.parse(this.replay.date_start));
       // this.starttime = date.toLocaleString('zh-CN', { hour12: false }).split('/').join('-');
-      // eslint-disable-next-line handle-callback-err
-      fs.readFile(this.jsonpeth, 'utf-8', (err, basicdata) => {
-        let jsonData = JSON.parse(basicdata)
-        let date = new Date(Date.parse(jsonData.date_start))
-        this.date_start = date.toLocaleString('zh-CN', { hour12: false }).split('/').join('-')
-        this.asset = jsonData.asset
-        this.admin_user = jsonData.user
-      })
+      if (this.$route.params.version === 2) {
+        this.version_internal = 2
+        // eslint-disable-next-line handle-callback-err
+        fs.readFile(this.jsonpeth, 'utf-8', (err, basicdata) => {
+          let jsonData = JSON.parse(basicdata)
+          let date = new Date(Date.parse(jsonData.date_start))
+          this.date_start = date.toLocaleString('zh-CN', { hour12: false }).split('/').join('-')
+          this.asset = jsonData.asset
+          this.admin_user = jsonData.user
+        })
+      }
     },
     formatdata: function () {
       this.timeList = Object.keys(this.replayData)