From 2e08b12324fc490d747078ea9e60d87c1b772063 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 05 六月 2023 14:20:17 +0800
Subject: [PATCH] #平库地图更改
---
src/main/webapp/views/home/map.html | 106 ++++++++++++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 45 deletions(-)
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index 448015b..4d0f8d5 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -239,7 +239,7 @@
.hoverCard .card-button {
transform: translate(-50%, 125%);
- width: 60%;
+ width: 50%;
border-radius: 1rem;
border: none;
background-color: #008bf8;
@@ -424,8 +424,8 @@
</style>
</head>
<body>
-<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap: wrap;" @click="bgClick()">
- <div style="flex: 12;" :style="{scale:showScale/100.0,marginTop:(showScale-100)*5 + 'px'}">
+<div id="app" style="display: flex;justify-content: space-between;margin-top: 50px;flex-wrap: nowrap; scale: 0.9" @click="bgClick()">
+ <div style="flex: 4;" :style="{scale:showScale/100.0,marginTop:(showScale-100)*5 + 'px'}">
<div>
<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">
@@ -472,7 +472,7 @@
</div>
</div>
</div>
- <div style="padding: 20px;flex: 5;margin-top: -70px;">
+ <div style="padding: 20px;flex: 1;margin-top: -70px; ">
<el-slider v-model="showScale" :marks="showScaleMarks"></el-slider>
<div style="display: flex;justify-content: space-between;flex-wrap: wrap;">
<div class="hoverCard" style="width: 100%;">
@@ -520,44 +520,11 @@
<button class="card-button">鍔熻兘鍖�</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>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">鍦ㄥ簱</div><div class="pointBox pointBoxRed">F</div>
- </div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">绌烘澘</div><div class="pointBox pointBoxEmpty">D</div>
- </div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">鍑哄簱涓�</div><div class="pointBox pointBoxOut">P</div>
- </div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">鍑哄簱棰勭害</div><div class="pointBox pointBoxOutYy">R</div>
- </div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">鍏ュ簱棰勭害</div><div class="pointBox pointBoxInYy">S</div>
- </div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">鎼滅储缁撴灉</div><div class="pointBox pointBoxSearch"></div>
- </div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">閫夋嫨缁撴灉</div><div class="pointBox 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>
- </div>
- </div>
- <button class="card-button">搴撲綅鐘舵��</button>
- </div>
+
<div class="hoverCard">
<div class="card-details">
- <p class="text-title" style="text-align: center;">妤煎眰 {{currentLev}}F</p>
+ <p class="text-title" style="text-align: center;">搴撲綅灞� {{currentLev}}</p>
<div class="text-body" style="display: flex;">
<div class="floorSelect">
<label for="01">1F</label>
@@ -600,6 +567,41 @@
</div>
</div>
<button class="card-button">搴撳尯 {{area}}</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>
+ <div style="flex: 1;margin-top: 10px;">
+ <div style="font-size: 10px;">鍦ㄥ簱</div><div class="pointBox pointBoxRed">F</div>
+ </div>
+ <div style="flex: 1;margin-top: 10px;">
+ <div style="font-size: 10px;">绌烘澘</div><div class="pointBox pointBoxEmpty">D</div>
+ </div>
+ <div style="flex: 1;margin-top: 10px;">
+ <div style="font-size: 10px;">鍑哄簱涓�</div><div class="pointBox pointBoxOut">P</div>
+ </div>
+ <div style="flex: 1;margin-top: 10px;">
+ <div style="font-size: 10px;">鍑哄簱棰勭害</div><div class="pointBox pointBoxOutYy">R</div>
+ </div>
+ <div style="flex: 1;margin-top: 10px;">
+ <div style="font-size: 10px;">鍏ュ簱棰勭害</div><div class="pointBox pointBoxInYy">S</div>
+ </div>
+ <div style="flex: 1;margin-top: 10px;">
+ <div style="font-size: 10px;">鎼滅储缁撴灉</div><div class="pointBox pointBoxSearch"></div>
+ </div>
+ <div style="flex: 1;margin-top: 10px;">
+ <div style="font-size: 10px;">閫夋嫨缁撴灉</div><div class="pointBox 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>
+ </div>
+ </div>
+ <button class="card-button">搴撲綅鐘舵��</button>
</div>
</div>
@@ -687,7 +689,7 @@
rightBoxLeft: "0px",
pointContainerWidth: 0,
currentLev: 1,
- area:5,
+ area:1,
crnList: null,
crnBox: false,
crnBoxTop: "0px",
@@ -701,7 +703,7 @@
searchLocNo: "",
outSite: null,
outSites: null,
- showScale: 75, //鎺у埗鍦板浘鏄剧ず澶у皬姣斾緥
+ showScale: 85, //鎺у埗鍦板浘鏄剧ず澶у皬姣斾緥
showScaleMarks: {//姣斾緥婊戝姩鏉℃樉绀烘爣璁�
0: "0%",
50: {
@@ -713,6 +715,7 @@
100: "100%",
},
locStsList: [],//搴撲綅鐘舵�佸垪琛�
+ y: 1
},
created(){
this.init()
@@ -770,6 +773,7 @@
headers: {'token': localStorage.getItem('token')},
method: "get",
success: (data) => {
+ console.log(data)
that.importDataClick(data)
}
})
@@ -809,12 +813,24 @@
//鑾峰彇鐪熷疄搴撲綅琛屽彿锛岄�氳繃鍧愭爣x
let data = this.map
let rowData = data[x]
+ console.log(x)
+
for (var i = 1; i < rowData.length; i++) {
- console.log(rowData[i],rowData[i].locNo,rowData[i].locNo != undefined)
- if (rowData[i].locNo != undefined) {
- let locNo = rowData[i].locNo;
- return "#" + parseInt(locNo.substr(0, 2));
+
+ if (this.area == 1){
+ if (rowData[i].locNo != undefined) {
+ let locNo = rowData[i].locNo;
+ return "#" + parseInt(locNo.substr(0, 2));
+ }
+ }else {
+ if (rowData[i].locNo != undefined) {
+ let locNo = rowData[i].locNo;
+ return "#" + parseInt(locNo.substr(7, 2));;
+ }
}
+
+
+
}
return "";
--
Gitblit v1.9.1