From b9eee33b8d3f3adf57fd40a9ff225c6717d20158 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 15 十二月 2023 14:27:17 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/map.html | 110 ++++++++++++++++++++++++++++++------------------------
1 files changed, 61 insertions(+), 49 deletions(-)
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index cd9ec96..f81f4a0 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -33,7 +33,7 @@
/* color: #fff;*/
/*}*/
- .pointBox {
+ .pointBox2 {
background: #fffef9;
width: 35px;
height: 35px;
@@ -45,7 +45,23 @@
user-select: none;
color: #fff;
/*transform: perspective(130px) rotateX(30deg) translateZ(-20px);*/
- box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.5);
+ /*box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.5);*/
+ /*border-radius: 50% 20% / 10% 40%;*/
+ }
+
+ .pointBox {
+ background: #fffef9;
+ width: 300px;
+ height: 35px;
+ margin-right: 1px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 14px;
+ user-select: none;
+ color: #fff;
+ /*transform: perspective(130px) rotateX(30deg) translateZ(-20px);*/
+ /*box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.5);*/
/*border-radius: 50% 20% / 10% 40%;*/
}
@@ -424,13 +440,13 @@
</style>
</head>
<body>
-<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap: nowrap; " @click="bgClick()">
+<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap:nowrap; " @click="bgClick()">
<div style="flex: 3;overflow: auto; " :style="{scale:showScale/100.0,marginTop:(showScale-100)*5 + 'px'}">
<div style="width: 100%;overflow: auto;">
<div class="pointContainer" v-for="(x,index) in map" :key="index">
<div v-if="index != 0 && (index != map.length-1)" v-for="(y,idx) in x" :key="idx">
<div v-if="idx != 0 && (idx != map[index].length-1)">
- <div v-if="map[index][idx].value < 0" class="pointBox"></div>
+ <div v-if="map[index][idx].value < 0" style="visibility: hidden;" class="pointBox"></div>
<!--搴撲綅-->
<div v-else-if="map[index][idx].value == 0" @contextmenu.prevent="rightEvent(index,idx,$event)">
@@ -440,6 +456,7 @@
<div v-else-if="map[index][idx].locSts == 'P'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxOut">{{ map[index][idx].locSts }}</div>
<div v-else-if="map[index][idx].locSts == 'R'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxOutYy">{{ map[index][idx].locSts }}</div>
<div v-else-if="map[index][idx].locSts == 'S'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxInYy">{{ map[index][idx].locSts }}</div>
+ <div v-else-if="map[index][idx].locSts == 'X'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxEnd">{{ map[index][idx].locSts }}</div>
<div v-else class="pointBox pointBoxDefault" :class="{'pointBoxSearch':map[index][idx].searchStatus}">{{ map[index][idx].locSts }}</div>
</div>
@@ -533,71 +550,66 @@
<input id="02" type="radio" v-model="currentLev" name="r" value="2">
<label for="03">3F</label>
<input id="03" type="radio" v-model="currentLev" name="r" value="3">
- <label for="04">4F</label>
- <input id="04" type="radio" v-model="currentLev" name="r" value="4">
- <label for="05">5F</label>
- <input id="05" type="radio" v-model="currentLev" name="r" value="5">
- <label for="06">6F</label>
- <input id="06" type="radio" v-model="currentLev" name="r" value="6">
- <label for="07">7F</label>
- <input id="07" type="radio" v-model="currentLev" name="r" value="7">
+
</div>
</div>
</div>
<button class="card-button">妤煎眰 {{currentLev}}F</button>
</div>
- <div class="hoverCard">
- <div class="card-details">
- <p class="text-title" style="text-align: center;">搴撳尯 {{areaName}}</p>
- <div class="text-body" style="display: flex;">
- <div class="floorSelect">
- <label for="area01">A鍖�</label>
- <input id="area01" type="radio" name="r" v-model="area" value="1" checked="">
- <label for="area03">B鍖�</label>
- <input id="area03" type="radio" v-model="area" name="r" value="3">
- <label for="area04">C鍖�</label>
- <input id="area04" type="radio" v-model="area" name="r" value="4">
- <label for="area05">D鍖�</label>
- <input id="area05" type="radio" v-model="area" name="r" value="5">
- <label for="area06">E鍖�</label>
- <input id="area06" type="radio" v-model="area" name="r" value="6">
+<!-- <div class="hoverCard">-->
+<!-- <div class="card-details">-->
+<!-- <p class="text-title" style="text-align: center;">搴撳尯 {{areaName}}</p>-->
+<!-- <div class="text-body" style="display: flex;">-->
+<!-- <div class="floorSelect">-->
+<!-- <label for="area01">A鍖�</label>-->
+<!-- <input id="area01" type="radio" name="r" v-model="area" value="1" checked="">-->
+<!-- <label for="area03">B鍖�</label>-->
+<!-- <input id="area03" type="radio" v-model="area" name="r" value="3">-->
+<!-- <label for="area04">C鍖�</label>-->
+<!-- <input id="area04" type="radio" v-model="area" name="r" value="4">-->
+<!-- <label for="area05">D鍖�</label>-->
+<!-- <input id="area05" type="radio" v-model="area" name="r" value="5">-->
- </div>
- </div>
- </div>
- <button class="card-button">搴撳尯 {{areaName}}</button>
- </div>
+
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <button class="card-button">搴撳尯 {{areaName}}</button>-->
+<!-- </div>-->
<div class="hoverCard">
<div class="card-details">
<div class="text-body" style="display: flex;justify-content: space-around;flex-wrap: wrap;">
<div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">绌哄簱浣�</div><div class="pointBox pointBoxBlue">O</div>
+ <div style="font-size: 10px;">绌哄簱浣�</div><div class="pointBox2 pointBoxBlue">O</div>
</div>
<div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">鍦ㄥ簱</div><div class="pointBox pointBoxRed">F</div>
+ <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="pointBox pointBoxEmpty">D</div>
+ <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="pointBox pointBoxOut">P</div>
+ <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="pointBox pointBoxOutYy">R</div>
+ <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="pointBox pointBoxInYy">S</div>
+ <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="pointBox pointBoxSearch"></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="pointBox pointBoxSelected"></div>
+ <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="pointBox pointBoxDefault"></div>
+ <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>
</div>
@@ -631,11 +643,11 @@
<div style="margin-top: 5px;">
<button class="layui-btn layui-btn-sm" @click="openLocDetail(map[mapI][mapJ].locNo)">搴撲綅璇︽儏</button>
</div>
- <div style="margin-top: 5px;">
- <button v-if="map[mapI][mapJ].locSts == 'F'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">搴撲綅绉昏浆</button>
- <button v-else-if="map[mapI][mapJ].locSts == 'D'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">搴撲綅绉昏浆</button>
- <button v-else class="layui-btn layui-btn-sm layui-btn-disabled" disabled>搴撲綅绉昏浆</button>
- </div>
+<!-- <div style="margin-top: 5px;">-->
+<!-- <button v-if="map[mapI][mapJ].locSts == 'F'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">搴撲綅绉昏浆</button>-->
+<!-- <button v-else-if="map[mapI][mapJ].locSts == 'D'" class="layui-btn layui-btn-sm" @click="locMove(map[mapI][mapJ].locNo)">搴撲綅绉昏浆</button>-->
+<!-- <button v-else class="layui-btn layui-btn-sm layui-btn-disabled" disabled>搴撲綅绉昏浆</button>-->
+<!-- </div>-->
</div>
</div>
</div>
@@ -689,7 +701,7 @@
rightBoxLeft: "0px",
pointContainerWidth: 0,
currentLev: 1,
- area:6,
+ area:1,
areaName:"绔嬪簱",
crnList: null,
crnBox: false,
@@ -837,12 +849,12 @@
if (this.area == 1){
if (rowData[i].locNo != undefined) {
let locNo = rowData[i].locNo;
- return "#" + parseInt(locNo.substr(0, 2));
+ return "#" + parseInt(locNo.substr(2, 2));
}
}else if (this.area == 6){
if (rowData[i].locNo != undefined) {
let locNo = rowData[i].locNo;
- return "#" + parseInt(locNo.substr(8, 2));
+ return "#" + parseInt(locNo.substr(7, 2));
}
}
else {
--
Gitblit v1.9.1