From 178bace75121ea2e460dbf4ff1c2f74ffdbc34ed Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 22 三月 2023 11:12:29 +0800
Subject: [PATCH] 主控图地图绘制优化
---
src/main/webapp/views/console.html | 67 +++++++++++++--------------------
1 files changed, 26 insertions(+), 41 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index b660346..060086b 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -27,40 +27,6 @@
<!-- 绗竴缁� -->
<div class="lane" id="mapDataId" style="margin-bottom: 280px">
<div class="sxcar" id="sxcar-1"></div>
- <!-- 璐ф灦 -->
-<!-- <div class="stock-group">-->
-<!-- <button class="item">1</button>-->
-<!-- <button class="item">2</button>-->
-<!-- <button class="item">3</button>-->
-<!-- <button class="item">4</button>-->
-<!-- <button class="item">5</button>-->
-<!-- <button class="item">6</button>-->
-<!-- <button class="item">7</button>-->
-<!-- <button class="item">8</button>-->
-<!-- <button class="item">9</button>-->
-<!-- <button class="item">10</button>-->
-<!-- <button class="item">11</button>-->
-<!-- <button class="item">12</button>-->
-<!-- <button class="item">13</button>-->
-<!-- <button class="item">14</button>-->
-<!-- <button class="item">15</button>-->
-<!-- <button class="item">16</button>-->
-<!-- <button class="item">17</button>-->
-<!-- <button class="item">18</button>-->
-<!-- <button class="item">19</button>-->
-<!-- <button class="item">20</button>-->
-<!-- <button class="item">21</button>-->
-<!-- <button class="item">22</button>-->
-<!-- <button class="item">23</button>-->
-<!-- <button class="item">24</button>-->
-<!-- <button class="item">25</button>-->
-<!-- <span class="row-no">1#</span>-->
-<!-- </div>-->
- <!-- 鍫嗗灈鏈� -->
-<!-- <div class="crn">-->
-<!-- <hr class="pathway">-->
-<!-- <div id="crn-1" class="machine"></div>-->
-<!-- </div>-->
</div>
</div>
</main>
@@ -373,6 +339,7 @@
var tData1 = []
var tData2 = []
var tData3 = []
+ var mapData = [] //鍦板浘鏁版嵁
function getCodeData(){
$.ajax({
url:baseUrl +'/console/barcode/output/site',
@@ -433,8 +400,8 @@
//璁＄畻鍥涘悜绌挎杞﹀浘鏍囦綅缃�
function getCarPosition(x,y) {
- let top = (x * 30) + "px"
- let left = (y * 40 - 40) + "px" //闇�瑕佸噺鍘诲皬杞﹁嚜宸辨墍鍗犲搴�
+ let top = (x * 35 - 35) + "px" //闇�瑕佸噺鍘诲皬杞﹁嚜宸辨墍鍗犻珮搴�
+ let left = (y * 70 - 70) + "px" //闇�瑕佸噺鍘诲皬杞﹁嚜宸辨墍鍗犲搴�
return [top,left];
}
@@ -444,7 +411,6 @@
let position = getCarPosition(x,y)
let top = position[0]
let left = position[1]
- console.log(top,left)
$("#sxcar-" + id).animate({top: top,left: left}, 1000);
}
@@ -457,6 +423,7 @@
type:"get",
url: baseUrl + "/static/js/map.json",
success: (data) => {
+ mapData = data
let content = ""
data.forEach((rowData,index) => {
let lastGroup = '<div class="stock-group">'
@@ -467,9 +434,8 @@
//鍘绘帀宸﹀彸杈圭紭绂佸尯
if(!(idx == 0 || rowData.length - 1 == idx)){
let col;
- switch (colData){
+ switch (colData.value){
case -1:
- //-1绂佸尯涓嶆樉绀猴紝浣嗘槸闇�瑕佸崰鐢ㄥ厓绱犱綅缃�
col = '<button class="item" style="visibility: hidden">' + idx + '</button>';
break;
case 3:
@@ -479,6 +445,11 @@
//绗竴娆￠亣鍒版瘝杞ㄩ亾锛屽垯淇濆瓨璇ヨ建閬撳湴鍧�(鐢ㄤ簬灏忚溅鍒濆鍖栧畾浣�)
firstMotherIndex = [index,idx]
}
+ break;
+ case 4:
+ //绔欑偣
+ let data = colData.data
+ col = '<div id="site-' + data + '" class="site">' + data + '(9991)</div>';
break;
default:
col = '<button class="item">' + index + '</button>';
@@ -498,14 +469,28 @@
}
})
-
moveCar(1, firstMotherIndex[0], firstMotherIndex[1]);
$("#mapDataId").append(content)
}
})
}
+ //灏嗗湴鍥炬暟鎹浆鎹㈡垚int浜岀淮鏁扮粍(鍚庣画鐢ㄤ簬璇锋眰璁＄畻璺緞鏃舵惡甯﹀湴鍥炬暟鎹弬鏁颁娇鐢�)
+ function getMap2TwoArr() {
+ let data = []
+ mapData.forEach((item,index) => {
+ let data2 = []
+ item.forEach((val,idx) => {
+ data2.push(val.value)
+ })
+ data.push(data2)
+ })
+
+ return data;
+ }
+
function testMove() {
+ getMap2TwoArr()//娴嬭瘯鍦板浘鏁版嵁杞崲鏄惁姝ｅ父
let json = "[{\n" +
"\t\t\"x\": 5,\n" +
"\t\t\"y\": 5\n" +
@@ -659,7 +644,7 @@
</script>
<script type="text/javascript">
// 寮圭獥绔欑偣淇℃伅
- $('.site').on('click',function(){
+ $('#mapDataId').on('click','.site',function(){
var id = this.id.split("-")[1];
$("#siteWindow").attr("style","display:block;");//鏄剧ずdiv
$("#crnWindow").attr("style","display:none;");
--
Gitblit v1.9.1