From ecb6cadc3f016cf9968f48e0cc77479a1e56365b Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期日, 20 十二月 2020 17:32:06 +0800
Subject: [PATCH] 标定添加关联摄像机tab,绘制区域组件参数更新
---
src/pages/cameraAccess/components/CameraInfo.vue | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/src/pages/cameraAccess/components/CameraInfo.vue b/src/pages/cameraAccess/components/CameraInfo.vue
index ed1adcc..58eee53 100644
--- a/src/pages/cameraAccess/components/CameraInfo.vue
+++ b/src/pages/cameraAccess/components/CameraInfo.vue
@@ -61,10 +61,11 @@
</el-col>
<el-col :span="9" :offset="1">
<el-form-item label="浜嬩欢澹伴煶">
- <div class="flex-wrap" style="margin-left:-10px">
+ <div class="flex-wrap" style="margin-top: 10px;">
<el-switch v-model="form.voiceEnable" :width="50"></el-switch>
- <el-select
- v-model="form.voiceId"
+ <!-- 灞忚斀澹伴煶閫夋嫨,璋冩暣鍒板満鏅� -->
+ <!-- <el-select
+ v-model="voice"
placeholder="閫夋嫨澹伴煶"
size="small"
value-key="id"
@@ -88,7 +89,7 @@
class="el-icon-video-pause"
style="font-size:26px; vertical-align:middle; color:#409eff"
></i>
- </span>
+ </span>-->
</div>
</el-form-item>
</el-col>
@@ -230,7 +231,8 @@
},
resolutionList: [],
//浼犳劅鍣ㄥ垪琛�
- sensors: []
+ sensors: [],
+ voice: null
};
},
computed: {
@@ -259,7 +261,6 @@
this.getSounds();
this.eventAudio.addEventListener("ended", () => {
- console.log("audio end")
this.togglePlay = true
})
},
@@ -312,6 +313,8 @@
this.isAdd = false;
this.videoItem = null;
this.$refs.addForm.resetFields();
+ this.voice = null;
+
// this.initFormData();
// this.$refs.addForm.clearValidate();
if (node.type === "4") {
@@ -334,7 +337,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 {
@@ -351,6 +362,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();
@@ -379,6 +400,11 @@
message: "鎽勫儚鏈轰俊鎭慨鏀瑰け璐ワ紒"
});
}
+ }).catch(err => {
+ this.$notify({
+ type: "error",
+ message: err.data
+ });
});
} else {
this.form.areaid = this.addParentId;
--
Gitblit v1.8.0