From b4d2703e653bf702d705b18c20d9edb9066c7c8a Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期三, 03 十一月 2021 17:35:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/vue-smart-ai
---
src/pages/cameraAccess/components/CameraInfo.vue | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/pages/cameraAccess/components/CameraInfo.vue b/src/pages/cameraAccess/components/CameraInfo.vue
index a7e4ea4..6b829ac 100644
--- a/src/pages/cameraAccess/components/CameraInfo.vue
+++ b/src/pages/cameraAccess/components/CameraInfo.vue
@@ -61,9 +61,10 @@
</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
+ <!-- 灞忚斀澹伴煶閫夋嫨,璋冩暣鍒板満鏅� -->
+ <!-- <el-select
v-model="voice"
placeholder="閫夋嫨澹伴煶"
size="small"
@@ -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>
@@ -173,7 +174,6 @@
</template>
<script>
import {
- checkCameraConnet,
createCamera,
updateCameraInfo,
getCameraInfo,
@@ -336,6 +336,7 @@
this.sensors = res.data.sensors
}
this.$nextTick(() => {
+ this.initFormData()
Object.assign(this.form, res.data)
this.soundList.forEach(element => {
@@ -361,14 +362,14 @@
// console.log(list, "sensor")
// id涓虹┖锛屾柊澧炴憚鍍忔満
- if (this.form.voiceEnable && this.form.voiceId === "") {
- this.$notify({
- type: "error",
- message: "璇烽�夋嫨涓�涓簨浠跺０闊�"
- });
+ // if (this.form.voiceEnable && this.form.voiceId === "") {
+ // this.$notify({
+ // type: "error",
+ // message: "璇烽�夋嫨涓�涓簨浠跺０闊�"
+ // });
- return;
- }
+ // return;
+ // }
this.$refs[formName].validate(async valid => {
if (valid) {
@@ -380,10 +381,11 @@
this.form.sensors = list
this.form.resolution_width = Number(this.form.resolution.split("*")[0])
this.form.resolution_height = Number(this.form.resolution.split("*")[1])
-
+ let _this = this;
// 鏇存柊
if (this.form.id !== "") {
this.form.areaid = this.TreeDataPool.getParent(this.form.id, this.isGb28182);
+ console.log(this.TreeDataPool.selectedNode)
updateCameraInfo(this.form).then(rsp => {
if (rsp.success) {
this.$notify({
@@ -391,6 +393,15 @@
message: "鎽勫儚鏈轰俊鎭慨鏀规垚鍔燂紒"
});
this.TreeDataPool.fetchTreeData();
+ console.log(this.TreeDataPool.selectedNode)
+ //_this.$root.$children[0].$refs['leftTree'].$refs.tree.ztreeObj.checkNode(_this.TreeDataPool.selectedNode, true, false, false);
+ //閫変腑淇敼鍚庣殑鑺傜偣
+ let {evt,treeId} = _this.$root.$children[0].$refs['leftTree'].$refs.tree;
+ console.log(evt,treeId)
+ // this.$nextTick(()=>{
+ //_this.$root.$children[0].$refs['leftTree'].$refs.tree.handleCreated()
+ // })
+
} else {
this.selectCamera(this.TreeDataPool.selectedNode);
this.$notify({
@@ -398,6 +409,11 @@
message: "鎽勫儚鏈轰俊鎭慨鏀瑰け璐ワ紒"
});
}
+ }).catch(err => {
+ this.$notify({
+ type: "error",
+ message: err.data
+ });
});
} else {
this.form.areaid = this.addParentId;
--
Gitblit v1.8.0