From bcb19e8c93c3cabf0d8eb3ee34ed819b3c5a10ef Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 25 十一月 2024 13:14:11 +0800
Subject: [PATCH] #优化地图
---
src/main/webapp/views/home/agvMap.html | 163 +++++++++++++++++++++++++++---------------------------
1 files changed, 82 insertions(+), 81 deletions(-)
diff --git a/src/main/webapp/views/home/agvMap.html b/src/main/webapp/views/home/agvMap.html
index e3c0e7a..75fd145 100644
--- a/src/main/webapp/views/home/agvMap.html
+++ b/src/main/webapp/views/home/agvMap.html
@@ -380,12 +380,12 @@
</style>
</head>
<body>
-<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap: wrap;" @click="bgClick()">
-
+<div id="app" style="display: flex;justify-content: space-around;margin-top: 0px;flex-wrap: wrap;" @click="bgClick()">
<div style="margin-top: 20px;"><button class="layui-btn" @click="currentFloor = 1" :style="{background: currentFloor==1?'red':''}">1妤�</button></div>
+ <div style="margin-top: 20px;"><button class="layui-btn" @click="currentFloor = 2" :style="{background: currentFloor==2?'red':''}">2妤�</button></div>
<div style="margin-top: 20px;"><button class="layui-btn" @click="currentFloor = 3" :style="{background: currentFloor==3?'red':''}">3妤�</button></div>
- <div style="flex: 18;display: flex;justify-content: center;" :style="{zoom:showScale/100.0,marginTop:(showScale)*4 + 'px'}">
+ <div style="flex: 18;display: flex;justify-content: center;" :style="{zoom:showScale/100.0,marginTop:(showScale)*3 + 'px'}">
<div style="margin-top: -110px;">
<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">
@@ -426,67 +426,67 @@
</div>
<div>
- <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 1" :style="{background: currentLev==1?'red':''}">1F</button></div>
- <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 2" :style="{background: currentLev==2?'red':''}">2F</button></div>
- <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 3" :style="{background: currentLev==3?'red':''}">3F</button></div>
- <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 4" :style="{background: currentLev==4?'red':''}">4F</button></div>
- <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 5" :style="{background: currentLev==5?'red':''}">5F</button></div>
- <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 6" :style="{background: currentLev==6?'red':''}">6F</button></div>
- <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 7" :style="{background: currentLev==7?'red':''}">7F</button></div>
- <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">8F</button></div>
- <div class="lev-for-floor3" style="margin-top: 20px; display: none;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">9F</button></div>
- <div class="lev-for-floor3" style="margin-top: 20px; display: none;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">10F</button></div>
- <div class="lev-for-floor3" style="margin-top: 20px; display: none;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">11F</button></div>
- <div class="lev-for-floor3" style="margin-top: 20px; display: none;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">12F</button></div>
+ <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 1" :style="{background: currentLev==1?'red':''}">1F</button></div>-->
+ <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 2" :style="{background: currentLev==2?'red':''}">2F</button></div>-->
+ <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 3" :style="{background: currentLev==3?'red':''}">3F</button></div>-->
+ <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 4" :style="{background: currentLev==4?'red':''}">4F</button></div>-->
+ <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 5" :style="{background: currentLev==5?'red':''}">5F</button></div>-->
+ <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 6" :style="{background: currentLev==6?'red':''}">6F</button></div>-->
+ <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 7" :style="{background: currentLev==7?'red':''}">7F</button></div>-->
+ <!--<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">8F</button></div>-->
+ <!--<div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">9F</button></div>-->
+ <!--<div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">10F</button></div>-->
+ <!--<div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">11F</button></div>-->
+ <!--<div class="lev-for-floor1" style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">12F</button></div>-->
</div>
</div>
<div style="padding: 40px 20px 10px 10px;" :style="window.innerWidth < 2000 ? 'margin-top: 0px;' : 'flex: 5;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%;">
- <div class="card-details" style="place-content: normal;height: auto;">
- <div class="text-body" style="display: flex;flex-wrap: wrap;">
- <div style="width: 100%;margin-bottom: 20px;">
- <div style="display: flex;justify-content: space-between;">
- <div><input v-model="searchMatnr" placeholder="鐗╂枡鍙�" type="text" class="search-input"></div>
- <div><input v-model="searchOrderNo" placeholder="璁㈠崟鍙�" type="text" class="search-input"></div>
- </div>
- <div style="display: flex;justify-content: space-between;margin-top: 10px;">
- <div><input style="width: 110px;" v-model="searchMaktx" placeholder="鐗╂枡鍚嶇О" type="text" class="search-input"></div>
- <div><input style="width: 110px;" v-model="searchSpecs" placeholder="瑙勬牸" type="text" class="search-input"></div>
- <div><input style="width: 110px;" v-model="searchLocNo" placeholder="搴撲綅鍙�" type="text" class="search-input"></div>
- </div>
- <button style="width: 100%;margin-top: 10px;" @click="searchLoc" class="layui-btn layui-btn-sm">鎼滅储</button>
- </div>
-<!-- <div>-->
-<!-- <button @click="locToLoc2" class="layui-btn layui-btn-sm">渚ц竟绉诲簱</button>-->
+<!-- <div class="hoverCard" style="width: 100%;">-->
+<!-- <div class="card-details" style="place-content: normal;height: auto;">-->
+<!-- <div class="text-body" style="display: flex;flex-wrap: wrap;">-->
+<!-- <div style="width: 100%;margin-bottom: 20px;">-->
+<!-- <div style="display: flex;justify-content: space-between;">-->
+<!-- <div><input v-model="searchMatnr" placeholder="鐗╂枡鍙�" type="text" class="search-input"></div>-->
+<!-- <div><input v-model="searchOrderNo" placeholder="璁㈠崟鍙�" type="text" class="search-input"></div>-->
+<!-- </div>-->
+<!-- <div style="display: flex;justify-content: space-between;margin-top: 10px;">-->
+<!-- <div><input style="width: 110px;" v-model="searchMaktx" placeholder="鐗╂枡鍚嶇О" type="text" class="search-input"></div>-->
+<!-- <div><input style="width: 110px;" v-model="searchSpecs" placeholder="瑙勬牸" type="text" class="search-input"></div>-->
+<!-- <div><input style="width: 110px;" v-model="searchLocNo" placeholder="搴撲綅鍙�" type="text" class="search-input"></div>-->
+<!-- </div>-->
+<!-- <button style="width: 100%;margin-top: 10px;" @click="searchLoc" class="layui-btn layui-btn-sm">鎼滅储</button>-->
<!-- </div>-->
- <div>
- <button @click="init" class="layui-btn layui-btn-sm">鍒锋柊</button>
- </div>
- <div style="margin-left: 10px;">
- <button @click="resetSearch" 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>
- </div>
- <div style="display: flex;justify-content: center;align-items: center;">
- <select v-model="outSite">
- <option v-for="(item,index) in outSites" :key="index" :value="item.siteId">{{ item.desc }}</option>
- </select>
- </div>
- <div>
- <button @click="locOut" class="layui-btn layui-btn-sm">鍑哄簱</button>
- </div>
- </div>
- </div>
- </div>
- <button class="card-button">鍔熻兘鍖�</button>
- </div>
+<!--<!– <div>–>-->
+<!--<!– <button @click="locToLoc2" class="layui-btn layui-btn-sm">渚ц竟绉诲簱</button>–>-->
+<!--<!– </div>–>-->
+<!-- <div>-->
+<!-- <button @click="init" class="layui-btn layui-btn-sm">鍒锋柊</button>-->
+<!-- </div>-->
+<!-- <div style="margin-left: 10px;">-->
+<!-- <button @click="resetSearch" 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>-->
+<!-- </div>-->
+<!-- <div style="display: flex;justify-content: center;align-items: center;">-->
+<!-- <select v-model="outSite">-->
+<!-- <option v-for="(item,index) in outSites" :key="index" :value="item.siteId">{{ item.desc }}</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- <div>-->
+<!-- <button @click="locOut" class="layui-btn layui-btn-sm">鍑哄簱</button>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <button class="card-button">鍔熻兘鍖�</button>-->
+<!-- </div>-->
<div class="hoverCard">
<div class="card-details">
@@ -523,24 +523,24 @@
<button class="card-button">搴撲綅鐘舵��</button>
</div>
-<!-- <div class="hoverCard">-->
-<!-- <div class="card-details">-->
-<!-- <p class="text-title" style="text-align: center;">妤煎眰 {{currentLev}}F</p>-->
-<!-- <div class="text-body" style="display: flex;">-->
-<!-- <div class="floorSelect">-->
-<!-- <label for="01">1F</label>-->
-<!-- <input id="01" type="radio" name="r" v-model="currentLev" value="1" checked="">-->
-<!-- <label for="02">2F</label>-->
-<!-- <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">-->
-<!-- </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;">妤煎眰 {{currentLev}}F</p>
+ <div class="text-body" style="display: flex;">
+ <div class="floorSelect">
+ <label for="01">1F</label>
+ <input id="01" type="radio" name="r" v-model="currentLev" value="1" checked="">
+ <label for="02">2F</label>
+ <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">
+ </div>
+ </div>
+ </div>
+ <button class="card-button">妤煎眰 {{currentLev}}F</button>
+ </div>
</div>
</div>
@@ -682,10 +682,10 @@
currentFloor: {
deep: true,
handler(val) {
- if(this.currentFloor == 3){
- $(".lev-for-floor3").show();
+ if(this.currentFloor == 1){
+ $(".lev-for-floor1").show();
}else{
- $(".lev-for-floor3").hide();
+ $(".lev-for-floor1").hide();
}
this.init()
@@ -747,10 +747,11 @@
//鑾峰彇鐪熷疄搴撲綅琛屽彿锛岄�氳繃鍧愭爣x
let data = this.map
let rowData = data[x]
- for (var i = 1; i < rowData.length; i++) {
+ for (var i = 0; i < rowData.length; i++) {
if (rowData[i].locNo != undefined) {
let locNo = rowData[i].locNo;
- return "#" + parseInt(locNo.substr(0, 2));
+ //return "#" + parseInt(locNo.substr(0, 2));
+ return "#" + (x < 10 ? '0' + x : x);
}
}
--
Gitblit v1.9.1