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/devicePosition.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/web_src/src/components/devicePosition.vue b/web_src/src/components/devicePosition.vue
index cc74dc1..a807363 100644
--- a/web_src/src/components/devicePosition.vue
+++ b/web_src/src/components/devicePosition.vue
@@ -1,6 +1,6 @@
<template>
<div id="devicePosition" style="width: 100vw; height: 91vh;">
- <el-container style="height: 91vh;" v-loading="isLoging">
+ <el-container v-if="onOff" style="height: 91vh;" v-loading="isLoging">
<el-aside width="auto" style="background-color: #ffffff">
<DeviceTree ref="deviceTree" :clickEvent="clickEvent" :contextMenuEvent="contextmenuEventHandler" ></DeviceTree>
</el-aside>
@@ -8,6 +8,9 @@
<MapComponent ref="map"></MapComponent>
</el-main>
</el-container>
+ <div v-if="!onOff" style="width: 100%; height:100%; text-align: center; line-height: 5rem">
+ <p>鍦板浘鍔熻兘宸插叧闂�</p>
+ </div>
<div ref="infobox" v-if="channel != null " >
<div v-if="channel != null" class="infobox-content">
<el-descriptions class="margin-top" :title="channel.name" :column="1" :colon="true" size="mini" :labelStyle="labelStyle" >
@@ -55,6 +58,7 @@
},
data() {
return {
+ onOff: typeof window.mapParam !== "undefined",
deviceService: new DeviceService(),
layer: null,
lineLayer: null,
--
Gitblit v1.8.0