From 9bbaf1fdf110e78d3daf76f2b8033aae48f322ca Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 十一月 2023 13:16:28 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/map.html | 329 ++++++++++++++++++++++++------------------------------
1 files changed, 147 insertions(+), 182 deletions(-)
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index f2a5062..d9be059 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -6,23 +6,25 @@
<link rel="stylesheet" href="../../static/wms/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../static/wms/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../../static/wms/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/wcs/css/element.css">
<script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/wms/layui/layui.js"></script>
<script type="text/javascript" src="../../static/wms/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/wms/js/common.js"></script>
- <script type="text/javascript" src="../../static/wms/js/vue.min.js"></script>
+ <script type="text/javascript" src="../../static/wcs/js/vue.min.js"></script>
+ <script type="text/javascript" src="../../static/wcs/js/element.js"></script>
<style>
.pointContainer {
display: flex;
justify-content: center;
- margin-top: 1px;
+ /*margin-top: 1px;*/
}
.pointBox {
background: #bababa;
width: 40px;
height: 40px;
- margin-right: 1px;
+ /*margin-right: 1px;*/
display: flex;
justify-content: center;
align-items: center;
@@ -171,7 +173,7 @@
/*婊戝姩鍗＄墖start*/
.hoverCard {
- width: 160px;
+ width: 150px;
height: 224px;
border-radius: 20px;
background: #f5f5f5;
@@ -379,8 +381,8 @@
</head>
<body>
<div id="app" style="display: flex;justify-content: space-around;margin-top: 50px;flex-wrap: wrap;" @click="bgClick()">
- <div style="flex: 12;scale: 0.85;">
- <div style="margin-top: -110px;">
+ <div style="flex: 18;display: flex;justify-content: center;" :style="{zoom:showScale/100.0,marginTop:(showScale)*2 + 'px'}">
+ <div style="margin-top: 10px;">
<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)">
@@ -388,18 +390,19 @@
<!--搴撲綅-->
<div v-else-if="map[index][idx].value == 0" @contextmenu.prevent="rightEvent(index,idx,$event)">
- <div v-if="map[index][idx].locSts == 'O'" 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 == 'D'" class="pointBox pointBoxEmpty">{{ map[index][idx].locSts }}</div>
- <div v-else-if="map[index][idx].locSts == 'P'" class="pointBox pointBoxOut">{{ map[index][idx].locSts }}</div>
+ <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="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="pointBox pointBoxInYy">{{ map[index][idx].locSts }}</div>
- <div v-else class="pointBox pointBoxDefault">{{ 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 class="pointBox" style="visibility: hidden;"></div>
+ <div v-if="idx == 1" class="crnLine" style="width: 100vh">
+ </div>
</div>
<!--绔欑偣-->
@@ -411,10 +414,27 @@
</div>
</div>
+
+ <div style="width: 40px;display: flex;justify-content: center;align-items: center;">
+ {{ getRealRowByX(index) }}
+ </div>
+
</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 style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 8" :style="{background: currentLev==8?'red':''}">8F</button></div>
+ </div>
</div>
- <div style="padding: 20px;flex: 5;margin-top: -70px;">
+ <div style="padding: 40px 20px 10px 10px;" :style="window.innerWidth < 2100 ? 'margin-top: 0px;' : 'flex: 5;margin-top: -70px;'" v-if="false">
+ <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;">
@@ -431,10 +451,16 @@
</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 v-if="!locOutStatus">
+ <!-- <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;">
@@ -465,24 +491,6 @@
<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;">鍏朵粬</div><div class="pointBox pointBoxDefault">鍏朵粬</div>
</div>
</div>
@@ -490,24 +498,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>
@@ -530,17 +538,20 @@
搴撲綅鍙�: {{ map[mapI][mapJ].locNo }}
</div>
<div style="margin-top: 10px;">
- 搴撲綅鐘舵��: {{ map[mapI][mapJ].locSts$ }}
+ 搴撲綅鐘舵��: {{ getLocSts(map[mapI][mapJ].locSts) }}
+ </div>
+ <div style="margin-top: 10px;">
+ 鎵樼洏鍙�: {{ map[mapI][mapJ].barcode }}
</div>
<div style="margin-top: 10px;display: flex;justify-content: space-between;flex-wrap: wrap;">
- <div style="margin-top: 5px;">
+ <div style="margin-top: 5px;display: none;">
<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>
@@ -607,16 +618,23 @@
searchLocNo: "",
outSite: null,
outSites: null,
+ showScale: 65, //鎺у埗鍦板浘鏄剧ず澶у皬姣斾緥
+ showScaleMarks: {//姣斾緥婊戝姩鏉℃樉绀烘爣璁�
+ 0: "0%",
+ 50: {
+ style: {
+ color: '#1989FA'
+ },
+ label: "50%"
+ },
+ 100: "100%",
+ },
+ locStsList: [],//搴撲綅鐘舵�佸垪琛�
},
created(){
this.init()
- this.getOutSite()
-
- // setInterval((that) => {
- // //瀹氭椂鑾峰彇鍫嗗灈鏈烘暟鎹�
- // that.getCrnData()
- // },1000,this)
+ // this.getOutSite()
},
watch: {
map: {
@@ -629,6 +647,13 @@
deep: true,
handler(val) {
this.init()
+ if (this.searchMatnr != ""
+ || this.searchOrderNo != ""
+ || this.searchSpecs != ""
+ || this.searchMaktx != ""
+ || this.searchLocNo != "") {
+ this.searchLoc()
+ }
}
}
},
@@ -646,6 +671,16 @@
this.locOutStatus = false
this.locOutLocNo = []
+
+ this.getLocStsList();//鑾峰彇搴撲綅鐘舵�佸垪琛�
+ },
+ resetSearch(){
+ this.searchMatnr = ""
+ this.searchOrderNo = ""
+ this.searchSpecs = ""
+ this.searchMaktx = ""
+ this.searchLocNo = ""
+ this.searchLoc()
},
printData() {
this.mapData = JSON.stringify(this.map)
@@ -664,6 +699,19 @@
})
this.map = data
this.printData()
+ },
+ getRealRowByX(x) {
+ //鑾峰彇鐪熷疄搴撲綅琛屽彿锛岄�氳繃鍧愭爣x
+ let data = this.map
+ let rowData = data[x]
+ for (var i = 1; i < rowData.length; i++) {
+ if (rowData[i].locNo != undefined) {
+ let locNo = rowData[i].locNo;
+ return "#" + parseInt(locNo.substr(0, 2));
+ }
+ }
+
+ return "";
},
rightEvent(x, y, e) {
this.rightBox = true
@@ -687,6 +735,29 @@
success: function(layero, index){
}
});
+ },
+ getLocStsList() {
+ //鑾峰彇搴撲綅鐘舵�佸垪琛�
+ let that = this
+ $.ajax({
+ url: baseUrl + "/basLocSts/list/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: "get",
+ success: (res) => {
+ that.locStsList = res.data.records
+ }
+ })
+ },
+ getLocSts(locSts) {
+ //鑾峰彇搴撲綅鐘舵��
+ let locStsList = this.locStsList
+ let locDesc = ""
+ locStsList.forEach((item,index) => {
+ if (item.locSts == locSts) {
+ locDesc = item.locDesc
+ }
+ })
+ return locDesc
},
locMove(locNo) {
//搴撲綅绉昏浆
@@ -814,111 +885,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) {
@@ -1068,17 +1034,16 @@
})
})
- data.forEach((item,index) => {
- 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;
- }
- tmp[x][y].searchStatus = true//鎼滅储鏍囪
+ data.forEach((item,i) => {
+ let locNo = item.locNo
+ tmp.forEach((item,index) => {
+ item.forEach((val,idx) => {
+ if (tmp[index][idx].locNo == locNo) {
+ tmp[index][idx].searchStatus = true//鎼滅储鏍囪
+ }
+ })
+ })
})
that.map = tmp
$layui.layer.msg("鎼滅储鎴愬姛");
--
Gitblit v1.9.1