From 92421b46cc3dd019ab6943ada8c4145f751e5926 Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期五, 22 四月 2022 16:55:46 +0800
Subject: [PATCH] 支持关闭地图功能，添加授权声明
---
web_src/src/components/devicePosition.vue | 6 +++++-
web_src/index.html | 2 +-
README.md | 2 ++
src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java | 5 ++++-
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index aec9555..ee03012 100644
--- a/README.md
+++ b/README.md
@@ -128,6 +128,8 @@
QQ缇�: 901799015, ZLM浣跨敤鏂囨。[https://github.com/ZLMediaKit/ZLMediaKit](https://github.com/ZLMediaKit/ZLMediaKit)
QQ绉佷俊涓�鑸笉鍥�, 绮惧姏鏈夐檺.娆㈣繋澶у鍦ㄧ兢閲岃璁�.瑙夊緱椤圭洰瀵逛綘鏈夊府鍔╋紝娆㈣繋star鍜屾彁浜r銆�
+# 鎺堟潈鍗忚
+鏈」鐩嚜鏈変唬鐮佷娇鐢ㄥ鏉剧殑MIT鍗忚锛屽湪淇濈暀鐗堟潈淇℃伅鐨勬儏鍐典笅鍙互鑷敱搴旂敤浜庡悇鑷晢鐢ㄣ�侀潪鍟嗕笟鐨勯」鐩�� 浣嗘槸鏈」鐩篃闆剁鐨勪娇鐢ㄤ簡涓�浜涘叾浠栫殑寮�婧愪唬鐮侊紝鍦ㄥ晢鐢ㄧ殑鎯呭喌涓嬭鑷鏇夸唬鎴栧墧闄わ紱 鐢变簬浣跨敤鏈」鐩�屼骇鐢熺殑鍟嗕笟绾犵悍鎴栦镜鏉冭涓轰竴姒備笌鏈」鐩強寮�鍙戣�呮棤鍏筹紝璇疯嚜琛屾壙鎷呮硶寰嬮闄┿�� 鍦ㄤ娇鐢ㄦ湰椤圭洰浠ｇ爜鏃讹紝涔熷簲璇ュ湪鎺堟潈鍗忚涓悓鏃惰〃鏄庢湰椤圭洰渚濊禆鐨勭涓夋柟搴撶殑鍗忚
# 鑷磋阿
鎰熻阿浣滆�匸澶忔](https://github.com/xia-chu) 鎻愪緵杩欎箞妫掔殑寮�婧愭祦濯掍綋鏈嶅姟妗嗘灦,骞跺湪寮�鍙戣繃绋嬩腑缁欎簣鏀寔涓庡府鍔┿��
diff --git a/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java b/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
index e1d7c49..ef4492f 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
@@ -87,9 +87,12 @@
// 绉诲姩浣嶇疆璁㈤槄閫氱煡
public static final String VM_MSG_SUBSCRIBE_MOBILE_POSITION = "mobileposition";
- // 鎶ヨ璁㈤槄鐨勯�氱煡
+ // 鎶ヨ璁㈤槄鐨勯�氱煡锛堟敹鍒版姤璀﹀悜redis鍙戝嚭閫氱煡锛�
public static final String VM_MSG_SUBSCRIBE_ALARM = "alarm";
+ // 鎶ヨ閫氱煡鐨勫彂閫� 锛堟敹鍒皉edis鍙戝嚭鐨勯�氱煡锛岃浆鍙戠粰鍏朵粬骞冲彴锛�
+ public static final String VM_MSG_SUBSCRIBE_ALARM_RECEIVE= "alarm_receive";
+
// 璁惧鐘舵�佽闃呯殑閫氱煡
public static final String VM_MSG_SUBSCRIBE_DEVICE_STATUS = "device";
diff --git a/web_src/index.html b/web_src/index.html
index 24d5ee2..1ce43e0 100644
--- a/web_src/index.html
+++ b/web_src/index.html
@@ -17,7 +17,7 @@
<script>
// map缁勪欢鍏ㄥ眬鍙傛暟
window.mapParam = {
- // 鍧愭爣绯� GCJ-02 WGS-84, 榛樿WGS-84
+ // 鍧愭爣绯� GCJ-02 WGS-84,
coordinateSystem: "GCJ-02",
// 鍦板浘鐡︾墖鍦板潃
tilesUrl: "http://webrd0{1-4}.is.autonavi.com/appmaptile?x={x}&y={y}&z={z}&lang=zh_cn&size=1&scale=1&style=8",
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