From cb7339c12d6cd3f4d1668d27d34dbb4b515cc6c1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 26 五月 2023 09:50:20 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/map.html | 63 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index 8176b69..33085a6 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -18,8 +18,21 @@
margin-top: 1px;
}
+ /*.pointBox {*/
+ /* background: #bababa;*/
+ /* width: 40px;*/
+ /* height: 40px;*/
+ /* margin-right: 1px;*/
+ /* display: flex;*/
+ /* justify-content: center;*/
+ /* align-items: center;*/
+ /* font-size: 14px;*/
+ /* user-select: none;*/
+ /* color: #fff;*/
+ /*}*/
+
.pointBox {
- background: #bababa;
+ background: #fffef9;
width: 40px;
height: 40px;
margin-right: 1px;
@@ -29,14 +42,20 @@
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);
}
.pointBox:hover{
- background: #00ff7f;
+ /*background: #20a162;*/
+ /*background: #55bb8a;*/
+ background: #945833;
+ /*background: #20894d;*/
}
.pointBoxEmpty {
- background: #c2c934;
+ /*background: #12a182;*/
+ background: #57c3c2;
}
.pointBoxOut {
@@ -48,19 +67,19 @@
}
.pointBoxInYy {
- background: #fa736f;
+ background: #e2c027;
}
.pointBoxGreen {
- background: #00ff7f;
+ background: #945833;
}
.pointBoxBlue {
- background: #55aaff;
+ background: #89BCEF;
}
.pointBoxRed {
- background: #ff0000;
+ background: #ee4866;
}
.pointBoxStart {
@@ -80,15 +99,16 @@
}
.pointBoxDefault {
- background: #86779d;
+ background: #f9f4dc;
}
.pointBoxSelected {
- background: #00ff7f !important;
+ /*background: #945833 !important;*/
+ background: #20894d !important;
}
.pointBoxSearch {
- background: #9900ff;
+ background: #8076a3;
}
.crnLine{
@@ -513,7 +533,7 @@
<div style="font-size: 10px;">閫夋嫨缁撴灉</div><div class="pointBox pointBoxSelected"></div>
</div>
<div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">鍏朵粬</div><div class="pointBox pointBoxDefault">鍏朵粬</div>
+ <div style="font-size: 10px;text-align: center">鍏朵粬</div><div class="pointBox pointBoxDefault"></div>
</div>
</div>
</div>
@@ -676,9 +696,6 @@
headers: {'token': localStorage.getItem('token')},
method: "get",
success: (data) => {
- console.log("========")
- console.log(data)
- console.log("========")
that.importDataClick(data)
}
})
@@ -690,9 +707,6 @@
this.mapData = JSON.stringify(this.map)
},
importDataClick(mapData) {
- console.log("========")
- console.log(mapData)
- console.log("========")
let tmp = JSON.parse(mapData);
let data = []
tmp.forEach((item, index) => {
@@ -1114,11 +1128,18 @@
let locNo = item.locNo
let y = parseInt(locNo.substr(2,3))
let x = parseInt(locNo.substr(0,2))
- if (x >= 2 && x <= 12) {
- x += 1;
- }else if (x == 13) {
- x += 2;
+ console.log(x)
+ // if ( (x+2) %5 === 0 ) {
+ // x = 5*item.crnNo-2;
+ // }else
+ if(x<17){
+ if (x % 4 == 0 || (x+1) % 4 == 0){
+ x = item.crnNo+x
+ }else {
+ x = item.crnNo+x-1
+ }
}
+ console.log(x)
tmp[x][y].searchStatus = true//鎼滅储鏍囪
})
--
Gitblit v1.9.1