From e2f534e0008c5ca8e7287b7f4ab7a098ae6396c2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Sat, 19 Oct 2024 21:01:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E5=B1=8F=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E5=AF=BC=E8=87=B4=E7=9A=84=E5=90=8E=E5=8F=B0=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/DeviceTreeForZtree.vue  | 112 ------------------
 web_src/src/components/live.vue               |   6 +-
 2 files changed, 3 insertions(+), 115 deletions(-)
 delete mode 100755 web_src/src/components/common/DeviceTreeForZtree.vue

diff --git a/web_src/src/components/common/DeviceTreeForZtree.vue b/web_src/src/components/common/DeviceTreeForZtree.vue
deleted file mode 100755
index 6c02bcca..00000000
--- a/web_src/src/components/common/DeviceTreeForZtree.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-  <div id="DeviceTree" style="width: 100%;height: 100%; background-color: #FFFFFF; overflow: auto">
-    <el-container>
-      <el-header>设备列表</el-header>
-      <el-main style="background-color: #ffffff;">
-        <div class="device-tree-main-box">
-          <tree
-            :nodes="nodes"
-            @onClick="onClick"
-            @onCheck="onCheck"
-            @onExpand="onExpand"
-            @onCreated="handleCreated"
-          />
-        </div>
-      </el-main>
-    </el-container>
-  </div>
-</template>
-
-<script>
-import DeviceService from "../service/DeviceService.js";
-import tree from "vue-giant-tree";
-
-export default {
-    name: 'DeviceTreeForZtree',
-    components: {
-      tree
-    },
-    data() {
-        return {
-          deviceService: new DeviceService(),
-          device: null,
-          nodes:[],
-          setting: {
-            callback: {
-              beforeExpand: this.beforeExpand
-            },
-            // async: {
-            //   enable: true,
-            //   type: "get",
-            //   url: `/api/device/query/tree`,
-            //   contentType: "application/json",
-            //   // autoParam: ["pid=parentId"],
-            // },
-            check: {
-              enable: false,
-            },
-            edit: {
-              enable: false,
-            }
-          },
-          defaultProps: {
-            children: 'children',
-            label: 'name',
-            isLeaf: 'isLeaf'
-          }
-        };
-    },
-    props: ['clickEvent', 'contextMenuEvent'],
-    mounted() {
-      this.deviceService.getAllDeviceList((data)=>{
-        console.log(data)
-        for (let i = 0; i < data.length; i++) {
-          console.log(data[i].name)
-          let node = {
-            name: data[i].name || data[i].deviceId,
-            id: data[i].deviceId,
-            isParent: true,
-          }
-          this.nodes.push(node)
-        }
-      }, (list)=>{
-        console.log("设备加载完成")
-      })
-    },
-    methods: {
-      onClick(evt, treeId, treeNode) {
-        console.log(evt)
-        console.log(treeId)
-        console.log(treeNode)
-      },
-      onCheck(evt, treeId, treeNode) {
-        console.log(evt)
-      },
-      beforeExpand(treeId, treeNode) {
-        console.log(treeId)
-        console.log(treeNode)
-        return true;
-      },
-      onExpand(evt, treeId, treeNode) {
-        // console.log(evt)
-        // console.log(treeId)
-        // console.log(treeNodes)
-      },
-      handleCreated(ztreeObj) {
-        console.log(ztreeObj)
-      }
-    }
-}
-</script>
-
-<style>
-.device-tree-main-box{
-  text-align: left;
-}
-.device-online{
-  color: #252525;
-}
-.device-offline{
-  color: #727272;
-}
-</style>
diff --git a/web_src/src/components/live.vue b/web_src/src/components/live.vue
index 1529cdf8..4af8e5e7 100755
--- a/web_src/src/components/live.vue
+++ b/web_src/src/components/live.vue
@@ -200,9 +200,9 @@ export default {
 
     },
     checkPlayByParam() {
-      let channelId = this.$route.query
-      if (channelId) {
-        this.sendDevicePush(channelId)
+      let query = this.$route.query
+      if (query.channelId) {
+        this.sendDevicePush(query.channelId)
       }
     },
     shot(e) {