From 94e8a0258a696ecd8a9a1400eabb802bf8628397 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 14 十月 2025 13:47:05 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console4.html | 85 +++++++++++++-----------------------------
1 files changed, 27 insertions(+), 58 deletions(-)
diff --git a/src/main/webapp/views/console4.html b/src/main/webapp/views/console4.html
index cb3dc96..a02a8ac 100644
--- a/src/main/webapp/views/console4.html
+++ b/src/main/webapp/views/console4.html
@@ -43,9 +43,6 @@
<div class="floorBtnBox" v-for="(lev,idx) in floorList">
<el-button :style="{background:currentLev === lev ? '#7DCDFF':''}" @click="changeFloor(lev)">{{lev}}F</el-button>
</div>
- <div>
- <el-button @click="testMove()">娴嬭瘯绉诲姩杞�</el-button>
- </div>
<div style="margin-top: 10px;">
<el-button @click="resetMap()">閲嶇疆鍦板浘</el-button>
</div>
@@ -150,7 +147,7 @@
data: {
map: [],
currentLev: 1,
- floorList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], //褰撳墠椤圭洰妤煎眰
+ floorList: [1, 2, 3], //褰撳墠椤圭洰妤煎眰
currentLevShuttleList: [],//褰撳墠妤煎眰鍥涘悜绌挎杞﹂泦鍚�
shuttleColorList: [],//鍥涘悜绌挎杞﹂鑹查泦鍚�
drawer: false,
@@ -184,7 +181,7 @@
deep: true,
handler(val) {
if (!val) {
- var sprite = pixiStageList[this.drawerLocNoData.x][this.drawerLocNoData.y];
+ var sprite = pixiStageList[this.drawerLocNoData.x - 1][this.drawerLocNoData.y];
updateColor(sprite, 0xFFFFFF);//鎭㈠棰滆壊
}
}
@@ -206,7 +203,6 @@
this.getShuttleStateInfo() //鑾峰彇鍥涘悜绌挎杞︿俊鎭�
this.getLiftStateInfo() //鑾峰彇鎻愬崌鏈轰俊鎭�
this.getSiteInfo() //鑾峰彇杈撻�佺珯鐐规暟鎹�
- // this.getCodeData()//鑾峰彇鏉＄爜
}, 1000)
},
@@ -504,7 +500,7 @@
}
if (val.value == -999) {
- pixiShuttleLockPathMap.set(this.getLocNoByXYZ(index + 1, idx, this.currentLev), sprite);
+ pixiShuttleLockPathMap.set(this.getLocNoByXYZ(val.row, val.bay, this.currentLev), sprite);
objectsContainer3.addChild(sprite);
}else {
objectsContainer.addChild(sprite);
@@ -512,6 +508,11 @@
pixiStageList[index][idx] = sprite
}
});
+
+ //瑙嗚灞呬腑
+ let containerWidth = (pixiApp.view.width - objectsContainer.width) / 2;
+ let containerHeight = (pixiApp.view.height - objectsContainer.height) / 2;
+ pixiApp.stage.position.set(containerWidth, containerHeight);
}else {
let diff = this.findDiffList(this.map, map);
diff.forEach((item, index) => {
@@ -587,37 +588,6 @@
});
return flag;
- },
- findShuttlePathDiffList(list1, list2) {
- //妫�娴嬮泦鍚�1閲岄潰鐨勫皬杞﹂璁¤矾寰勬槸鍚﹀湪闆嗗悎2涓湁鍙樺姩
- if (list1.length == 0) {
- return false;//闆嗗悎涓虹┖
- }
- if (list1.length != list2.length) {
- return false;//涓や釜闆嗗悎闀垮害涓嶄竴鑷�
- }
-
- for (var index = 0; index < list1.length; index++) {
- let item = list1[index];
- for (var i = 0; i < list2.length; i++) {
- if (item.shuttleNo != list2[i].shuttleNo) {
- continue;//鎵句笉鍒板皬杞﹀彿
- }
-
- if (item.moveAdvancePath == null) {
- item.moveAdvancePath = [];
- }
-
- if (list2[i].moveAdvancePath == null) {
- list2[i].moveAdvancePath = [];
- }
-
- if (!(item.moveAdvancePath.length == list2[i].moveAdvancePath.length)) {
- return false;//灏忚溅棰勮璺緞闀垮害涓嶄竴鑷�
- }
- }
- }
- return true;
},
checkStaInListDiff(sta, list) {
//妫�娴嬬珯鐐规槸鍚﹀湪闆嗗悎涓湁鍙樺姩
@@ -827,26 +797,7 @@
}
},
getLocNoByXYZ(x, y, z) {
- let locNo = "";
- if (x < 10) {
- locNo += "0" + x;
- }else {
- locNo += x;
- }
-
- if (y < 100) {
- locNo += "0" + y;
- }else if (y < 10) {
- locNo += "00" + y;
- }else {
- locNo += y;
- }
-
- if (z < 10) {
- locNo += "0" + z;
- }else {
- locNo += z;
- }
+ let locNo = x + "-" + y + "-" + z;
return locNo;
},
addMoveAdvancePath(moveAdvancePath, shuttleNo) {//娣诲姞棰勮璺緞
@@ -927,6 +878,24 @@
})
}
},
+ resetMap() {
+ //閲嶇疆鍦板浘
+ let that = this
+ $.ajax({
+ url:baseUrl+"/console/map/resetMap/" + this.currentLev,
+ headers:{
+ 'token': localStorage.getItem('token')
+ },
+ data:{},
+ method:'get',
+ success:function (res) {
+ that.$message({
+ message: that.currentLev + '灞傚湴鍥鹃噸缃畬鎴�',
+ type: 'success'
+ });
+ }
+ })
+ },
}
})
--
Gitblit v1.9.1