From eb5eb35a7ef56a01a4c788a8c2efef9fc7b823e7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 三月 2023 14:04:54 +0800
Subject: [PATCH] 四向穿梭车线程完善
---
src/main/webapp/views/console.html | 413 ++++++++++++++++++++++++++++------------------------------
1 files changed, 199 insertions(+), 214 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index cf0e3b8..060086b 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -16,227 +16,17 @@
<h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
</header>
<main class="main">
- <!--绗�1鍒� -->
- <div class="site-row site-row-1" id="fool1">
- <div id="site-100" class="site" style="height: 38px;line-height: 38px;width:156px;">100</div>
-
- <div id="site-101" class="site" style="height: 38px;line-height: 38px;width:156px;">101</div>
-
- <div id="site-102" class="site" style="height: 38px;line-height: 38px;width:156px;">102</div>
- </div>
- <!--绗�2鍒�-->
- <div class="site-row site-row-2" id="fool2" style="display: none">
- <div id="site-200" class="site" style="height: 38px;line-height: 38px;width:156px;">200</div>
-
- <div id="site-201" class="site" style="height: 38px;line-height: 38px;width:156px;">201</div>
-
- <div id="site-202" class="site" style="height: 38px;line-height: 38px;width:156px;">202</div>
- </div>
-
- <!--绗�3鍒�-->
- <div class="site-row site-row-3" id="fool3" style="display: none">
- <div id="site-300" class="site" style="height: 38px;line-height: 38px;width:156px;">300</div>
-
- <div id="site-301" class="site" style="height: 38px;line-height: 38px;width:156px;">301</div>
-
- <div id="site-302" class="site" style="height: 38px;line-height: 38px;width:156px;">302</div>
- </div>
-
<!--妤煎眰鎸夐挳-->
-
<button class="floorBtn btn-16" onclick="changFloor(1)" style="margin-top: 150px">1F</button>
<button class="floorBtn btn-16" onclick="changFloor(2)" style="margin-top: 200px">2F</button>
<button class="floorBtn btn-16" onclick="changFloor(3)" style="margin-top: 250px">3F</button>
+ <button class="floorBtn btn-16" onclick="testMove()" style="margin-top: 250px">娴嬭瘯绉诲姩灏忚溅</button>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
<div class="main-part">
<!-- 绗竴缁� -->
- <div class="lane" style="margin-bottom: 280px">
- <!-- 璐ф灦 -->
- <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" style="border: none;background-color: #6ca7a8"></button>
- <button class="item" style="border: none;background-color: #6ca7a8"></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>
- <span class="row-no">1#</span>
- </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" style="border: none;background-color: #6ca7a8"></button>
- <button class="item" style="border: none;background-color: #6ca7a8"></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>
- <span class="row-no">2#</span>
- </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" style="border: none;background-color: #6ca7a8"></button>
- <button class="item" style="border: none;background-color: #6ca7a8"></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>
- <span class="row-no">3#</span>
- </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" style="border: none;background-color: #6ca7a8"></button>
- <button class="item" style="border: none;background-color: #6ca7a8"></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>
- <span class="row-no">4#</span>
- </div>
-
- <!-- 鍫嗗灈鏈� -->
- <div class="crn">
- <hr class="pathway">
- <div id="crn-1" class="machine"></div>
- </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>
- <span class="row-no">5#</span>
- </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>
- <span class="row-no">6#</span>
- </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>
- <span class="row-no">7#</span>
- </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>
- <span class="row-no">8#</span>
- </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>
- <span class="row-no">9#</span>
- </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>
- <span class="row-no">10#</span>
- </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>
- <span class="row-no">11#</span>
- </div>
+ <div class="lane" id="mapDataId" style="margin-bottom: 280px">
+ <div class="sxcar" id="sxcar-1"></div>
</div>
</div>
</main>
@@ -549,6 +339,7 @@
var tData1 = []
var tData2 = []
var tData3 = []
+ var mapData = [] //鍦板浘鏁版嵁
function getCodeData(){
$.ajax({
url:baseUrl +'/console/barcode/output/site',
@@ -600,6 +391,200 @@
var str3 = '<li><span>' + tData3[k].barcode + '</span><span class="right">' + tData3[k].time + '</span></li>'
$('#barcode3').append(str3)
}
+ }
+
+
+ $(function (){
+ initMap()
+ })
+
+ //璁＄畻鍥涘悜绌挎杞﹀浘鏍囦綅缃�
+ function getCarPosition(x,y) {
+ let top = (x * 35 - 35) + "px" //闇�瑕佸噺鍘诲皬杞﹁嚜宸辨墍鍗犻珮搴�
+ let left = (y * 70 - 70) + "px" //闇�瑕佸噺鍘诲皬杞﹁嚜宸辨墍鍗犲搴�
+ return [top,left];
+ }
+
+ //绉诲姩鍥涘悜绌挎杞﹀浘鏍�
+ function moveCar(id,x,y) {
+ //鑾峰彇鍏蜂綋浣嶇疆top鍜宭eft鍊�
+ let position = getCarPosition(x,y)
+ let top = position[0]
+ let left = position[1]
+ $("#sxcar-" + id).animate({top: top,left: left}, 1000);
+ }
+
+ //鍒濆鍖栧湴鍥�
+ function initMap() {
+ //姣嶈建閬撶涓�娆＄储寮曪紝鐢ㄤ簬瀹氫綅灏忚溅
+ let firstMotherIndex = [0,0];
+
+ $.ajax({
+ type:"get",
+ url: baseUrl + "/static/js/map.json",
+ success: (data) => {
+ mapData = data
+ let content = ""
+ data.forEach((rowData,index) => {
+ let lastGroup = '<div class="stock-group">'
+ //鍘绘帀涓婁笅杈圭紭绂佸尯
+ if(!(index == 0 || data.length - 1 == index)){
+ let row = '<div class="stock-group">';
+ rowData.forEach((colData,idx) => {
+ //鍘绘帀宸﹀彸杈圭紭绂佸尯
+ if(!(idx == 0 || rowData.length - 1 == idx)){
+ let col;
+ switch (colData.value){
+ case -1:
+ col = '<button class="item" style="visibility: hidden">' + idx + '</button>';
+ break;
+ case 3:
+ //姣嶈建閬�
+ col = '<button class="item" style="background: #5af;">⇅⇄</button>';
+ if (firstMotherIndex[0] === 0 && firstMotherIndex[1] === 0) {
+ //绗竴娆￠亣鍒版瘝杞ㄩ亾锛屽垯淇濆瓨璇ヨ建閬撳湴鍧�(鐢ㄤ簬灏忚溅鍒濆鍖栧畾浣�)
+ 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>';
+ }
+
+ if(data.length - 2 == index){
+ //鍒拌揪鐪熷疄鏁版嵁鐨勬渶鍚庝竴琛岋紝鎵撲笂琛屾暟鏍囪
+ lastGroup += '<button class="item">' + idx + '#</button>';
+ }
+ row += col
+ }
+ })
+ lastGroup += '</div>';
+ row += lastGroup;
+ row += '</div>';
+ content += row
+ }
+ })
+
+ 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" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 6,\n" +
+ "\t\t\"y\": 5\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 7,\n" +
+ "\t\t\"y\": 5\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 8,\n" +
+ "\t\t\"y\": 5\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 9,\n" +
+ "\t\t\"y\": 5\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 10,\n" +
+ "\t\t\"y\": 5\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 11,\n" +
+ "\t\t\"y\": 5\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 11,\n" +
+ "\t\t\"y\": 6\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 12,\n" +
+ "\t\t\"y\": 6\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 13,\n" +
+ "\t\t\"y\": 6\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 14,\n" +
+ "\t\t\"y\": 6\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 15,\n" +
+ "\t\t\"y\": 6\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 16,\n" +
+ "\t\t\"y\": 6\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 17,\n" +
+ "\t\t\"y\": 6\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 18,\n" +
+ "\t\t\"y\": 6\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 19,\n" +
+ "\t\t\"y\": 6\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 19,\n" +
+ "\t\t\"y\": 7\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 19,\n" +
+ "\t\t\"y\": 8\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 20,\n" +
+ "\t\t\"y\": 8\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 21,\n" +
+ "\t\t\"y\": 8\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 22,\n" +
+ "\t\t\"y\": 8\n" +
+ "\t},\n" +
+ "\t{\n" +
+ "\t\t\"x\": 23,\n" +
+ "\t\t\"y\": 8\n" +
+ "\t}\n" +
+ "]";
+ json = JSON.parse(json)
+ json.forEach((item,index) => {
+ moveCar(1, item.x, item.y);
+ })
+
}
// 灏忚溅鍋忕Щ鍔ㄧ敾
@@ -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