From 878ce80ef3ca88a2c108fbc713cd6ea461c44de1 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期三, 13 十月 2021 13:51:03 +0800
Subject: [PATCH] 拓扑图

---
 src/pages/cameraAccess/components/CameraInfo.vue |   52 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/pages/cameraAccess/components/CameraInfo.vue b/src/pages/cameraAccess/components/CameraInfo.vue
index ed1adcc..8f0c382 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>
@@ -173,14 +174,12 @@
 </template>
 <script>
 import {
-  checkCameraConnet,
   createCamera,
   updateCameraInfo,
   getCameraInfo,
   delCamera
 } from "@/api/camera";
 import { getSoundList } from "@/api/event";
-import { changeRunType } from "@/api/pollConfig";
 
 import CameraPlayer from "@/components/player";
 import eChartsBar from '@/components/subComponents/eChartsBar'
@@ -230,7 +229,8 @@
       },
       resolutionList: [],
       //浼犳劅鍣ㄥ垪琛�
-      sensors: []
+      sensors: [],
+      voice: null
     };
   },
   computed: {
@@ -259,7 +259,6 @@
     this.getSounds();
 
     this.eventAudio.addEventListener("ended", () => {
-      console.log("audio end")
       this.togglePlay = true
     })
   },
@@ -267,7 +266,7 @@
     getSounds() {
       getSoundList().then(res => {
         if (res.success) {
-          this.soundList = res.data.list
+          this.soundList = res.data;
         }
       }).catch(
         e => console.log(e)
@@ -312,6 +311,8 @@
       this.isAdd = false;
       this.videoItem = null;
       this.$refs.addForm.resetFields();
+      this.voice = null;
+
       // this.initFormData();
       // this.$refs.addForm.clearValidate();
       if (node.type === "4") {
@@ -333,8 +334,17 @@
               this.resolutionList = list
               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 {
@@ -349,8 +359,6 @@
     // 淇濆瓨
     onSubmit(formName) {
       let list = this.$refs.cameraEditor.getResult()
-      // console.log(list, "sensor")
-      // id涓虹┖锛屾柊澧炴憚鍍忔満
       this.$refs[formName].validate(async valid => {
         if (valid) {
           const isRequire = this.verifyRequrie();
@@ -361,10 +369,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({
@@ -372,6 +381,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({
@@ -379,6 +397,11 @@
                   message: "鎽勫儚鏈轰俊鎭慨鏀瑰け璐ワ紒"
                 });
               }
+            }).catch(err => {
+              this.$notify({
+                type: "error",
+                message: err.msg
+              });
             });
           } else {
             this.form.areaid = this.addParentId;
@@ -399,6 +422,11 @@
                   message: "鎽勫儚鏈烘坊鍔犲け璐ワ紒"
                 });
               }
+            }).catch((err) => {
+              this.$notify({
+                type: "error",
+                message: err.msg
+              });
             });
           }
         }

--
Gitblit v1.8.0