From 2bceb7a71cb67d88af51e0b0412b317f202532ad Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 26 十二月 2023 08:45:32 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/map.html | 367 +++++++++------------------------------------------
1 files changed, 68 insertions(+), 299 deletions(-)
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index 13a6764..4293e01 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -17,48 +17,28 @@
.pointContainer {
display: flex;
justify-content: center;
- margin-top: 1px;
+ /*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: #fffef9;
+ background: #bababa;
width: 40px;
height: 40px;
- margin-right: 1px;
+ /*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%;*/
}
.pointBox:hover{
- /*background: #20a162;*/
- /*background: #55bb8a;*/
- background: #945833;
- /*background: #20894d;*/
+ background: #00ff7f;
}
.pointBoxEmpty {
- /*background: #12a182;*/
- background: #57c3c2;
+ background: #c2c934;
}
.pointBoxOut {
@@ -70,19 +50,19 @@
}
.pointBoxInYy {
- background: #e2c027;
+ background: #fa736f;
}
.pointBoxGreen {
- background: #945833;
+ background: #00ff7f;
}
.pointBoxBlue {
- background: #89BCEF;
+ background: #55aaff;
}
.pointBoxRed {
- background: #ee4866;
+ background: #ff0000;
}
.pointBoxStart {
@@ -102,16 +82,15 @@
}
.pointBoxDefault {
- background: #f9f4dc;
+ background: #86779d;
}
.pointBoxSelected {
- /*background: #945833 !important;*/
- background: #20894d !important;
+ background: #00ff7f !important;
}
.pointBoxSearch {
- background: #8076a3;
+ background: #9900ff;
}
.crnLine{
@@ -121,29 +100,6 @@
background: #000;
position: relative;
}
-
- /*.crnBox{*/
- /* width: 120px;*/
- /* height: 40px;*/
- /* background: url("../../static/image/Crane_manual.png") no-repeat;*/
- /* position: absolute;*/
- /* top: -25px;*/
- /* left: -120px;*/
- /* transition:left 2s;*/
- /* cursor: pointer;*/
- /*}*/
-
- /*.carBox{*/
- /* width: 40px;*/
- /* height: 40px;*/
- /* background: url("../../static/image/ste/car.png") no-repeat;*/
- /* background-size: 100% 100%;*/
- /* position: absolute;*/
- /* top: 0;*/
- /* left: 0;*/
- /* transition:left 2s;*/
- /* cursor: pointer;*/
- /*}*/
.popBox {
position: absolute;
@@ -217,7 +173,7 @@
/*婊戝姩鍗＄墖start*/
.hoverCard {
- width: 140px;
+ width: 150px;
height: 224px;
border-radius: 20px;
background: #f5f5f5;
@@ -424,43 +380,37 @@
</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: wrap;" @click="bgClick()">
+ <div style="flex: 3;overflow:auto;display: flex;justify-content: center;" :style="{zoom:showScale/100.0,marginTop:(showScale)*2 + 'px'}">
+ <div style="margin-top: 10px; 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)">
<div v-if="map[index][idx].locSts == 'O'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxBlue">{{ map[index][idx].locSts }}</div>
- <div v-else-if="map[index][idx].locSts == 'F'" @click.left.stop="selectLoc(index,idx)" :class="{'pointBoxSelected':map[index][idx].locOutSelected,'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxRed">{{ map[index][idx].locSts }}</div>
+ <div v-else-if="map[index][idx].locSts == 'F'" @click.left="selectLoc(index,idx)" :class="{'pointBoxSelected':map[index][idx].locOutSelected,'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxRed">{{ map[index][idx].locSts }}</div>
<div v-else-if="map[index][idx].locSts == 'D'" :class="{'pointBoxSearch':map[index][idx].searchStatus}" class="pointBox pointBoxEmpty">{{ map[index][idx].locSts }}</div>
<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 == 'S'" class="pointBox pointBoxInYy">{{ map[index][idx].locSts }}</div>
<div v-else class="pointBox pointBoxDefault" :class="{'pointBoxSearch':map[index][idx].searchStatus}">{{ map[index][idx].locSts }}</div>
</div>
<!--鍫嗗灈鏈�-->
<div v-else-if="map[index][idx].value == 3">
- <div v-if="idx == 1" class="crnLine" :style="{width:pointContainerWidth + 'px'}">
-<!-- <div v-if="index == 2" @contextmenu.prevent="clickCrnBox($event,1)" :style="{left:crnList[0].left + 'px'}" class="crnBox" id="crnBox1"></div>-->
-<!-- <div v-else @contextmenu.prevent="clickCrnBox($event,2)" :style="{left:crnList[1].left + 'px'}" class="crnBox" id="crnBox2"></div>-->
+ <div v-if="idx == 1" class="crnLine" style="width: 100vh">
</div>
</div>
- <div v-else-if="map[index][idx].value == 4" class="pointBox pointBoxStation"
- @contextmenu.prevent="rightEvent(index,idx,$event)"></div>
+ <!--绔欑偣-->
+ <div v-else-if="map[index][idx].value == 4" class="pointBox pointBoxStation" style="visibility: hidden;"></div>
<div v-else-if="map[index][idx].value == 5" class="pointBox chargeStation"
@contextmenu.prevent="rightEvent(index,idx,$event)"></div>
<div v-else-if="map[index][idx].value == 9" class="pointBox pointBoxRed"
@contextmenu.prevent="rightEvent(index,idx,$event)"></div>
- <div v-else-if="map[index][idx].value == 10" class="pointBox pointBoxRed" style="visibility: hidden"
- @contextmenu.prevent="rightEvent(index,idx,$event)">
- <!--绌挎杞﹁建閬�-->
- </div>
</div>
</div>
@@ -471,8 +421,18 @@
</div>
</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>
</div>
- <div style="padding: 20px;flex: 1;margin-top: -70px;">
+ <div style="padding: 40px 20px 10px 10px;" :style="window.innerWidth < 2100 ? 'flex: 1;margin-top: 0px;' : 'flex: 1;margin-top: -10px;'">
<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%;">
@@ -490,14 +450,14 @@
</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>-->
<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 style="margin-left: 10px;">
- <button @click="locToLoc2" 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>
@@ -518,55 +478,6 @@
</div>
</div>
<button class="card-button">鍔熻兘鍖�</button>
- </div>
-
-
-
- <div class="hoverCard">
- <div class="card-details">
- <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>
- <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">
- <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;">搴撳尯 {{area}}</p>
- <div class="text-body" style="display: flex;">
- <div class="floorSelect">
- <label for="area01">绔嬪簱</label>
- <input id="area01" type="radio" name="r" v-model="area" value="1" checked="">
- <label for="area02">骞冲簱A鍖�</label>
- <input id="area02" type="radio" v-model="area" name="r" value="2">
- <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">搴撳尯 {{area}}</button>
</div>
<div class="hoverCard">
@@ -597,12 +508,31 @@
<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 style="font-size: 10px;">鍏朵粬</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>-->
+ <!-- <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>
@@ -631,11 +561,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 +619,6 @@
rightBoxLeft: "0px",
pointContainerWidth: 0,
currentLev: 1,
- area:1,
crnList: null,
crnBox: false,
crnBoxTop: "0px",
@@ -703,7 +632,7 @@
searchLocNo: "",
outSite: null,
outSites: null,
- showScale: 85, //鎺у埗鍦板浘鏄剧ず澶у皬姣斾緥
+ showScale: 45, //鎺у埗鍦板浘鏄剧ず澶у皬姣斾緥
showScaleMarks: {//姣斾緥婊戝姩鏉℃樉绀烘爣璁�
0: "0%",
50: {
@@ -715,17 +644,11 @@
100: "100%",
},
locStsList: [],//搴撲綅鐘舵�佸垪琛�
- y: 1
},
created(){
this.init()
- this.getOutSite()
-
- // setInterval((that) => {
- // //瀹氭椂鑾峰彇鍫嗗灈鏈烘暟鎹�
- // that.getCrnData()
- // },1000,this)
+ // this.getOutSite()
},
watch: {
map: {
@@ -746,34 +669,16 @@
this.searchLoc()
}
}
- },
- area: {
- deep: true,
- handler(val) {
- this.init()
- if (this.searchMatnr != ""
- || this.searchOrderNo != ""
- || this.searchSpecs != ""
- || this.searchMaktx != ""
- || this.searchLocNo != "") {
- this.searchLoc()
- }
- }
}
},
methods: {
init(){
let that = this
$.ajax({
- url: baseUrl + "/map/getData/auth",
- data:{
- lev : this.currentLev,
- area : this.area
- },
+ url: baseUrl + "/map/getData/" + this.currentLev + "/auth",
headers: {'token': localStorage.getItem('token')},
method: "get",
success: (data) => {
- console.log(data)
that.importDataClick(data)
}
})
@@ -813,24 +718,11 @@
//鑾峰彇鐪熷疄搴撲綅琛屽彿锛岄�氳繃鍧愭爣x
let data = this.map
let rowData = data[x]
- console.log(x)
-
for (var i = 1; i < rowData.length; i++) {
-
- 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));;
- }
+ if (rowData[i].locNo != undefined) {
+ let locNo = rowData[i].locNo;
+ return "#" + parseInt(locNo.substr(0, 2));
}
-
-
-
}
return "";
@@ -1008,111 +900,6 @@
}
})
- // let result = true;//鏈�缁堢粨鏋�
- // //妫�娴嬪簱浣嶆槸鍚︾己灏戦�夋嫨瀵艰嚧涓嶅畬鏁�
- // bayList.forEach((item,index) => {
- // //鎼滅储褰撳墠宸烽亾鏈夋晥鍦ㄥ簱list
- // //涓婂崐閮ㄥ垎锛屽贩閬�
- // let topList = []
- // for (var i = 8; i >= 3; i--) {
- // let obj = {
- // x: i,
- // y: index,
- // status: false,
- // locNo: map[i][index].locNo
- // }
- //
- // if (map[i][index].locSts == 'F') {
- // //鍦ㄥ簱鐘舵�侊紝瀛樺叆宸烽亾鍦ㄥ簱list
- // topList.push(obj)
- // }
- // }
- //
- // //涓嬪崐閮ㄥ垎锛屽贩閬�
- // let bottomList = []
- // for (var i = 9; i < 14; i++) {
- // let obj = {
- // x: i,
- // y: index,
- // status: false,
- // locNo: map[i][index].locNo
- // }
- //
- // if (map[i][index].locSts == 'F') {
- // //鍦ㄥ簱鐘舵�侊紝瀛樺叆宸烽亾鍦ㄥ簱list
- // bottomList.push(obj)
- // }
- // }
- //
- // // if (topList.length == 0 && bottomList.length == 0) {
- // // result = false;
- // // }
- //
- // for (var i = 0; i < item.length; i++) {
- // if (item[i].x > 8) {
- // //涓嬪崐閮ㄥ垎鏁版嵁
- // let index = this.searchDataIndex(item[i],bottomList)
- // // console.log(item[i],bottomList,index)
- // if (index == -1) {
- // continue
- // }
- // bottomList[index].status = true
- // }else {
- // //涓婂崐閮ㄥ垎鏁版嵁
- // let index = this.searchDataIndex(item[i],topList)
- // // console.log(item[i],topList,index)
- // if (index == -1) {
- // continue
- // }
- // topList[index].status = true
- // }
- //
- // }
- //
- // let tmp1 = []
- // let tmp2 = []
- // for (var i = item.length - 1; i >= 0; i--) {
- // if (item[i].x < 9) {
- // tmp1.push(item[i]);
- // }
- // }
- // for (var i = 0; i < item.length; i++) {
- // if (item[i].x > 8) {
- // tmp2.push(item[i]);
- // }
- // }
- //
- // if (tmp1.length > 0) {
- // //鍒ゆ柇涓婂崐閮ㄥ垎鍑哄簱鏄惁閫夋嫨瀹屾暣
- // let topIndex = this.searchDataIndex(tmp1[0],topList);
- // if (topIndex != -1) {
- // for (var i = topIndex; i < topList.length; i++) {
- // if (topList[i].status != true) {
- // result = false;
- // }
- // }
- // }
- // }
- //
- // if (tmp2.length > 0) {
- // //鍒ゆ柇涓嬪崐閮ㄥ垎鍑哄簱鏄惁閫夋嫨瀹屾暣
- // let bottomIndex = this.searchDataIndex(tmp2[0],bottomList)
- // if (bottomIndex != -1) {
- // for (var i = bottomIndex; i < bottomList.length; i++) {
- // if (bottomList[i].status != true) {
- // result = false;
- // }
- // }
- // console.log(tmp2[0],bottomList,bottomIndex)
- // }
- // }
- // })
- //
- // if (!result) {
- // $layui.layer.msg("鍑哄簱璺緞閫夋嫨鏈夎");
- // return;
- // }
-
//鍑嗗鍑哄簱
if (this.outSite == null) {
$layui.layer.msg("璇烽�夋嫨鍑哄簱绔欑偣");
@@ -1261,25 +1048,7 @@
})
})
- // data.forEach((item,index) => {
- // let locNo = item.locNo
- // let y = parseInt(locNo.substr(2,3))
- // let x = parseInt(locNo.substr(0,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//鎼滅储鏍囪
- // })
+
data.forEach((item,i) => {
let locNo = item.locNo
tmp.forEach((item,index) => {
--
Gitblit v1.9.1