From 539803b07eaa9fe4184e1b0bfc2e03f5709a771a Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 25 九月 2020 17:42:40 +0800
Subject: [PATCH] 修复摄像机声音选择显示
---
src/pages/cameraAccess/components/CameraInfo.vue | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/pages/cameraAccess/components/CameraInfo.vue b/src/pages/cameraAccess/components/CameraInfo.vue
index ed1adcc..a7e4ea4 100644
--- a/src/pages/cameraAccess/components/CameraInfo.vue
+++ b/src/pages/cameraAccess/components/CameraInfo.vue
@@ -64,7 +64,7 @@
<div class="flex-wrap" style="margin-left:-10px">
<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"
@@ -230,7 +230,8 @@
},
resolutionList: [],
//浼犳劅鍣ㄥ垪琛�
- sensors: []
+ sensors: [],
+ voice: null
};
},
computed: {
@@ -259,7 +260,6 @@
this.getSounds();
this.eventAudio.addEventListener("ended", () => {
- console.log("audio end")
this.togglePlay = true
})
},
@@ -312,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") {
@@ -335,6 +337,13 @@
}
this.$nextTick(() => {
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 {
@@ -351,6 +360,16 @@
let list = this.$refs.cameraEditor.getResult()
// console.log(list, "sensor")
// id涓虹┖锛屾柊澧炴憚鍍忔満
+
+ if (this.form.voiceEnable && this.form.voiceId === "") {
+ this.$notify({
+ type: "error",
+ message: "璇烽�夋嫨涓�涓簨浠跺0闊�"
+ });
+
+ return;
+ }
+
this.$refs[formName].validate(async valid => {
if (valid) {
const isRequire = this.verifyRequrie();
--
Gitblit v1.8.0