From 1cea8144b4ddd9ed19f8e2542b5374ca13c030f4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 22 十二月 2023 15:42:44 +0800
Subject: [PATCH] Merge branch 'hzjzwms' of http://47.97.1.152:5880/r/zy-asrs into tzhnewms
---
src/main/webapp/views/home/map.html | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index f81f4a0..1108a13 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -513,12 +513,12 @@
<div style="margin-left: 10px;">
<button @click="resetSearch" class="layui-btn layui-btn-sm">閲嶇疆</button>
</div>
- <div style="margin-left: 10px;">
- <button @click="locToLoc2" class="layui-btn layui-btn-sm">渚ц竟绉诲簱</button>
- </div>
- <div v-if="!locOutStatus" style="margin-left: 10px;">
- <button @click="locOutStatus = true" class="layui-btn layui-btn-sm">鍑哄簱閫夋嫨</button>
- </div>
+<!-- <div style="margin-left: 10px;">-->
+<!-- <button @click="locToLoc2" class="layui-btn layui-btn-sm">渚ц竟绉诲簱</button>-->
+<!-- </div>-->
+<!-- <div v-if="!locOutStatus" style="margin-left: 10px;">-->
+<!-- <button @click="locOutStatus = true" class="layui-btn layui-btn-sm">鍑哄簱閫夋嫨</button>-->
+<!-- </div>-->
<div v-else style="margin-left: 10px;border: 1px red solid;display: flex;">
<div>
<button @click="cancelSelectLoc" class="layui-btn layui-btn-sm">鍙栨秷閫夋嫨</button>
@@ -587,30 +587,30 @@
<div style="flex: 1;margin-top: 10px;">
<div style="font-size: 10px;">鍦ㄥ簱</div><div class="pointBox2 pointBoxRed">F</div>
</div>
+<!-- <div style="flex: 1;margin-top: 10px;">-->
+<!-- <div style="font-size: 10px;">绌烘澘</div><div class="pointBox2 pointBoxEmpty">D</div>-->
+<!-- </div>-->
+<!-- <div style="flex: 1;margin-top: 10px;">-->
+<!-- <div style="font-size: 10px;">鍑哄簱涓�</div><div class="pointBox2 pointBoxOut">P</div>-->
+<!-- </div>-->
+<!-- <div style="flex: 1;margin-top: 10px;">-->
+<!-- <div style="font-size: 10px;">鍑哄簱棰勭害</div><div class="pointBox2 pointBoxOutYy">R</div>-->
+<!-- </div>-->
+<!-- <div style="flex: 1;margin-top: 10px;">-->
+<!-- <div style="font-size: 10px;">鍏ュ簱棰勭害</div><div class="pointBox2 pointBoxInYy">S</div>-->
+<!-- </div>-->
<div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">绌烘澘</div><div class="pointBox2 pointBoxEmpty">D</div>
+ <div style="font-size: 10px;">鎼滅储</div><div class="pointBox2 pointBoxSearch"></div>
</div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">鍑哄簱涓�</div><div class="pointBox2 pointBoxOut">P</div>
- </div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">鍑哄簱棰勭害</div><div class="pointBox2 pointBoxOutYy">R</div>
- </div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">鍏ュ簱棰勭害</div><div class="pointBox2 pointBoxInYy">S</div>
- </div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">鎼滅储缁撴灉</div><div class="pointBox2 pointBoxSearch"></div>
- </div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">閫夋嫨缁撴灉</div><div class="pointBox2 pointBoxSelected"></div>
- </div>
+<!-- <div style="flex: 1;margin-top: 10px;">-->
+<!-- <div style="font-size: 10px;">閫夋嫨</div><div class="pointBox2 pointBoxSelected"></div>-->
+<!-- </div>-->
<div style="flex: 1;margin-top: 10px;">
<div style="font-size: 10px;text-align: center">鍏朵粬</div><div class="pointBox2 pointBoxDefault"></div>
</div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;text-align: center">鍐荤粨</div><div class="pointBox2 pointBoxEnd"></div>
- </div>
+<!-- <div style="flex: 1;margin-top: 10px;">-->
+<!-- <div style="font-size: 10px;text-align: center">鍐荤粨</div><div class="pointBox2 pointBoxEnd"></div>-->
+<!-- </div>-->
</div>
</div>
<button class="card-button">搴撲綅鐘舵��</button>
--
Gitblit v1.9.1