From 6e4fc1e79b7b4b91d6eb36f6b5638fa902665a50 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期六, 23 四月 2022 23:34:36 +0800
Subject: [PATCH] 1.修正了播放地址无法正常播放视频的问题，包含两个错误： 1.1修正播放器界面路由（此页面不需要layout边框，之前已经修复但在地图代码合并时又被错误覆盖） 1.2修正播放器id属性，此属性现在不需要父级组件传入（这是之前导致独立播放页面失效的主要原因） 2.调整滚动条美化样式到app.vue中，使其真正全局生效
---
web_src/src/components/common/DeviceTree.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/web_src/src/components/common/DeviceTree.vue b/web_src/src/components/common/DeviceTree.vue
index 43a797b..fab895f 100644
--- a/web_src/src/components/common/DeviceTree.vue
+++ b/web_src/src/components/common/DeviceTree.vue
@@ -1,10 +1,10 @@
<template>
- <div id="DeviceTree" style="width: 100%;height: 100%; background-color: #FFFFFF">
+ <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">
- <el-tree :props="defaultProps" :load="loadNode" lazy @node-click="handleNodeClick"@node-contextmenu="handleContextMenu">
+ <el-tree :props="defaultProps" :load="loadNode" lazy @node-click="handleNodeClick"@node-contextmenu="handleContextMenu" style="min-width: 100%; display:inline-block !important;">
<span class="custom-tree-node" slot-scope="{ node, data }" style="width: 100%">
<span v-if="node.data.type === 0 && node.data.online" title="鍦ㄧ嚎璁惧" class="device-online iconfont icon-jiedianleizhukongzhongxin2"></span>
<span v-if="node.data.type === 0 && !node.data.online " title="绂荤嚎璁惧" class="device-offline iconfont icon-jiedianleizhukongzhongxin2"></span>
@@ -49,16 +49,17 @@
},
props: ['clickEvent', 'contextMenuEvent'],
methods: {
- handleNodeClick(data) {
+ handleNodeClick(data,node,element) {
console.log("鐐瑰嚮浜嬩欢")
+ console.log(data)
if(typeof (this.clickEvent) == "function") {
this.clickEvent(data.userData)
}
},
- handleContextMenu(data) {
+ handleContextMenu(event,data,node,element) {
console.log("鍙抽敭鐐瑰嚮浜嬩欢")
if(typeof (this.contextMenuEvent) == "function") {
- this.contextMenuEvent(data.userData)
+ this.contextMenuEvent(event, data.userData)
}
},
loadNode: function(node, resolve){
--
Gitblit v1.8.0