From f34da12c558d57d156529e23c04e2388e60b94e5 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 14 六月 2023 10:27:17 +0800
Subject: [PATCH] #组托逻辑
---
src/main/webapp/views/home/map.html | 53 ++++++++++++++++++++---------------------------------
1 files changed, 20 insertions(+), 33 deletions(-)
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index 49ffc1e..7c60b79 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -16,7 +16,7 @@
<style>
.pointContainer {
display: flex;
- justify-content: center;
+ justify-content: flex-start;
margin-top: 1px;
}
@@ -35,8 +35,8 @@
.pointBox {
background: #fffef9;
- width: 40px;
- height: 40px;
+ width: 35px;
+ height: 35px;
margin-right: 1px;
display: flex;
justify-content: center;
@@ -102,7 +102,7 @@
}
.pointBoxDefault {
- background: #f9f4dc;
+ background: #ffffff;
}
.pointBoxSelected {
@@ -424,9 +424,9 @@
</style>
</head>
<body>
-<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap: nowrap; scale: 0.9" @click="bgClick()">
- <div style="flex: 3;" :style="{scale:showScale/100.0,marginTop:(showScale-100)*5 + 'px'}">
- <div>
+<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)">
@@ -465,7 +465,7 @@
</div>
</div>
- <div style="width: 40px;display: flex;justify-content: center;align-items: center;">
+ <div style="width: 40px; display: flex;justify-content: flex-end;align-items: center;">
{{ getRealRowByX(index) }}
</div>
@@ -552,20 +552,16 @@
<p class="text-title" style="text-align: center;">搴撳尯 {{areaName}}</p>
<div class="text-body" style="display: flex;">
<div class="floorSelect">
- <label for="area01">绔嬪簱</label>
+ <label for="area01">A鍖�</label>
<input id="area01" type="radio" name="r" v-model="area" value="1" checked="">
- <label for="area03">骞冲簱B鍖�</label>
+ <label for="area03">B鍖�</label>
<input id="area03" type="radio" v-model="area" name="r" value="3">
- <label for="area032">骞冲簱B鍖�2灞�</label>
- <input id="area032" type="radio" v-model="area" name="r" value="32">
- <label for="area04">骞冲簱C鍖�</label>
+ <label for="area04">C鍖�</label>
<input id="area04" type="radio" v-model="area" name="r" value="4">
- <label for="area042">骞冲簱C鍖�2灞�</label>
- <input id="area042" type="radio" v-model="area" name="r" value="42">
- <label for="area05">骞冲簱D鍖�</label>
+ <label for="area05">D鍖�</label>
<input id="area05" type="radio" v-model="area" name="r" value="5">
- <label for="area052">骞冲簱D鍖�2灞�</label>
- <input id="area052" type="radio" v-model="area" name="r" value="52">
+ <label for="area06">E鍖�</label>
+ <input id="area06" type="radio" v-model="area" name="r" value="6">
</div>
</div>
@@ -756,7 +752,7 @@
deep: true,
handler(val) {
if (val == 1){
- this.areaName = "绔嬪簱"
+ this.areaName = "A鍖�"
}else if (val == 3){
this.areaName = "B鍖�"
@@ -767,14 +763,8 @@
else if (val == 5){
this.areaName = "D鍖�"
}
- else if (val == 32){
- this.areaName = "B鍖�2灞�"
- }
- else if (val == 42){
- this.areaName = "C鍖�2灞�"
- }
- else if (val == 52){
- this.areaName = "D鍖�2灞�"
+ else if (val == 6){
+ this.areaName = "E鍖�"
}
@@ -830,7 +820,7 @@
val.searchStatus = false//鎼滅储鏍囪
data2.push(val)
})
- this.pointContainerWidth = item.length * (40+1)
+ this.pointContainerWidth = item.length * (35+1)
data.push(data2)
})
this.map = data
@@ -849,10 +839,10 @@
let locNo = rowData[i].locNo;
return "#" + parseInt(locNo.substr(0, 2));
}
- }else if (this.area > 10){
+ }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 {
@@ -861,9 +851,6 @@
return "#" + parseInt(locNo.substr(7, 2));
}
}
-
-
-
}
return "";
--
Gitblit v1.9.1