From a88314bd5d59f1dde2d430899555a3a5730f2ef9 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 25 九月 2020 09:37:00 +0800
Subject: [PATCH] 优化card时间显示和摄像机音频试听功能

---
 src/pages/cameraAccess/components/CameraInfo.vue |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/pages/cameraAccess/components/CameraInfo.vue b/src/pages/cameraAccess/components/CameraInfo.vue
index d77d8c0..ed1adcc 100644
--- a/src/pages/cameraAccess/components/CameraInfo.vue
+++ b/src/pages/cameraAccess/components/CameraInfo.vue
@@ -62,7 +62,7 @@
         <el-col :span="9" :offset="1">
           <el-form-item label="浜嬩欢澹伴煶">
             <div class="flex-wrap" style="margin-left:-10px">
-              <el-switch v-model="form.voiceEnable" active-color="#409eff" :width="50"></el-switch>
+              <el-switch v-model="form.voiceEnable" :width="50"></el-switch>
               <el-select
                 v-model="form.voiceId"
                 placeholder="閫夋嫨澹伴煶"
@@ -79,7 +79,13 @@
               </el-select>
               <span class="player-btn" @click="togglePlayer" style="cursor:pointer;">
                 <i
+                  v-if="togglePlay"
                   class="el-icon-video-play"
+                  style="font-size:26px; vertical-align:middle; color:#409eff"
+                ></i>
+                <i
+                  v-else
+                  class="el-icon-video-pause"
                   style="font-size:26px; vertical-align:middle; color:#409eff"
                 ></i>
               </span>
@@ -146,7 +152,6 @@
                 <li style="width:100%">
                   <info-card
                     style="width:100%;min-width: 440px"
-                   
                     :realtime="PollData.RealTimeValidCount"
                     :polling="PollData.PollValidCount"
                     :dataStack="PollData.stackChannelCount"
@@ -252,6 +257,11 @@
       this.visibilitychange();
     });
     this.getSounds();
+
+    this.eventAudio.addEventListener("ended", () => {
+      console.log("audio end")
+      this.togglePlay = true
+    })
   },
   methods: {
     getSounds() {
@@ -265,7 +275,10 @@
     },
     selSound(sound) {
       this.soundPath = sound.path;
-      this.form.voiceId = sound.id
+      this.form.voiceId = sound.id;
+      this.togglePlay = true;
+      this.eventAudio.pause()
+      // this.eventAudio.
     },
     togglePlayer() {
       if (!this.soundPath) {
@@ -276,13 +289,14 @@
         return false;
       }
       this.eventAudio.src = this.soundPath;
-
       if (this.togglePlay) {
         this.eventAudio.play();
+        this.togglePlay = false
       } else {
         this.eventAudio.pause()
+        this.togglePlay = true
       }
-      this.togglePlay = !this.togglePlay
+      // this.togglePlay = !this.togglePlay
     },
     visibilitychange() {
       switch (document.visibilityState) {

--
Gitblit v1.8.0