From 1acb2169d78d74e347bdfc2e962a88e6cb585bb7 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期五, 30 十月 2020 14:22:34 +0800
Subject: [PATCH] 修复数据栈文件删除列表仍有遗留的bug
---
src/pages/cameraAccess/components/CameraInfo.vue | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/src/pages/cameraAccess/components/CameraInfo.vue b/src/pages/cameraAccess/components/CameraInfo.vue
index 24b9f41..ddeaae0 100644
--- a/src/pages/cameraAccess/components/CameraInfo.vue
+++ b/src/pages/cameraAccess/components/CameraInfo.vue
@@ -62,9 +62,9 @@
<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"
+ v-model="voice"
placeholder="閫夋嫨澹伴煶"
size="small"
value-key="id"
@@ -77,9 +77,15 @@
:value="item"
></el-option>
</el-select>
- <span class="player-btn" @click="togglePlayer">
+ <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,7 @@
<li style="width:100%">
<info-card
style="width:100%;min-width: 440px"
- :realtime="PollData.RealTimeSum"
+ :realtime="PollData.RealTimeValidCount"
:polling="PollData.PollValidCount"
:dataStack="PollData.stackChannelCount"
></info-card>
@@ -224,7 +230,8 @@
},
resolutionList: [],
//浼犳劅鍣ㄥ垪琛�
- sensors: []
+ sensors: [],
+ voice: null
};
},
computed: {
@@ -251,6 +258,10 @@
this.visibilitychange();
});
this.getSounds();
+
+ this.eventAudio.addEventListener("ended", () => {
+ this.togglePlay = true
+ })
},
methods: {
getSounds() {
@@ -264,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) {
@@ -275,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) {
@@ -297,6 +312,8 @@
this.isAdd = false;
this.videoItem = null;
this.$refs.addForm.resetFields();
+ this.voice = null;
+
// this.initFormData();
// this.$refs.addForm.clearValidate();
if (node.type === "4") {
@@ -319,7 +336,15 @@
this.sensors = res.data.sensors
}
this.$nextTick(() => {
+ this.initFormData()
Object.assign(this.form, res.data)
+
+ this.soundList.forEach(element => {
+ if (this.form.voiceId == element.id) {
+ this.voice = element
+ }
+ })
+
if (this.form.run_type !== -1) {
this.form.isAI = true
} else {
@@ -336,6 +361,16 @@
let list = this.$refs.cameraEditor.getResult()
// console.log(list, "sensor")
// id涓虹┖锛屾柊澧炴憚鍍忔満
+
+ if (this.form.voiceEnable && this.form.voiceId === "") {
+ this.$notify({
+ type: "error",
+ message: "璇烽�夋嫨涓�涓簨浠跺０闊�"
+ });
+
+ return;
+ }
+
this.$refs[formName].validate(async valid => {
if (valid) {
const isRequire = this.verifyRequrie();
--
Gitblit v1.8.0