From 55129aa7f1f5910e88f7c615502c27a18e427815 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 05 十二月 2024 15:14:12 +0800
Subject: [PATCH] 优化界面显示
---
src/main/webapp/views/agvBasDevpVisualized/basDevp.html | 142 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 107 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
index 521e936..8b1adbb 100644
--- a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
+++ b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
@@ -35,7 +35,7 @@
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item">
- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="searchByStaion" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="searchByStaion">鎼滅储</button>
<button id="checkAll" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="checkAll">鍏ㄩ��</button>
<button id="uncheckAll" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="uncheckAll">鍙嶉��</button>
<button id="start" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="start">鍚姩鍏ュ簱</button>
@@ -57,17 +57,34 @@
<input type="checkbox" lay-skin="primary" name="cardCheckBox" value="{{devNo}}"/>
</div>
<div style="float:right; width:85%;">
+<!-- <div>-->
+<!-- <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}">鎷ｆ枡鍏ュ簱</button>-->
+<!-- </div>-->
+
+ {{#if containerMoveOutFlag}}
+ <div style=" padding-bottom: 20px">
+ <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}" lay-submit lay-filter="containerMoveOut">璐ф灦绂诲満</button>
+ </div>
+ {{/if}}
+ {{#if pickInFlag}}
+ <div style=" padding-bottom: 20px">
+ <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}" lay-submit lay-filter="pickIn">鎷ｆ枡/鐩樼偣鍏ュ簱</button>
+ </div>
+ {{/if}}
<div>
宸ヤ綔绔欑紪鐮侊細{{devNo}} </br>
绔欑偣鐘舵�侊細{{locSts$}}
</div>
{{#if agvWaitPakin}}
<div style="padding-top: 10px;">
+ {{#if agvWaitPakin.orderNo}}
+ 璁㈠崟鍙凤細{{agvWaitPakin.orderNo}} </br>
+ {{/if}}
鐗╂枡鍙凤細{{agvWaitPakin.matnr}} </br>
{{#if agvWaitPakin.batch}}
搴忓垪鐮侊細{{agvWaitPakin.batch}} </br>
{{/if}}
- 鎵樼洏鐮侊細{{agvWaitPakin.zpallet}} </br>
+ 璐ф灦鐮侊細{{agvWaitPakin.suppCode}} </br>
鏁伴噺锛歿{agvWaitPakin.anfme}}
</div>
{{/if}}
@@ -76,6 +93,19 @@
宸ヤ綔鍙凤細{{agvWrkMast.wrkNo}} </br>
宸ヤ綔鐘舵�侊細{{agvWrkMast.wrkSts$ }} </br>
宸ヤ綔绫诲瀷锛歿{agvWrkMast.ioType$}}
+ </div>
+ {{/if}}
+ {{#if agvWrkDetl}}
+ <div style="padding-top: 10px;">
+ {{#if agvWrkDetl.orderNo}}
+ 璁㈠崟鍙凤細{{agvWrkDetl.orderNo}} </br>
+ {{/if}}
+ 鐗╂枡鍙凤細{{agvWrkDetl.matnr}} </br>
+ {{#if agvWrkDetl.batch}}
+ 搴忓垪鐮侊細{{agvWrkDetl.batch}} </br>
+ {{/if}}
+ 璐ф灦鐮侊細{{agvWrkDetl.suppCode}} </br>
+ 鍙栬揣鏁伴噺锛歿{agvWrkDetl.anfme}} 缁撲綑鏁伴噺锛歿{agvWrkDetl.volume}}
</div>
{{/if}}
</div>
@@ -114,49 +144,32 @@
var table = layui.table;
var layer = layui.layer;
var param = {'stationCode' : 'CS-101'};
+ loadData(param);
form.on('select(floorSelect)', function (data) {
$('#rowSelect').empty();
if(data.value == 1){
- $('#rowSelect').append("<option value=CS-101>1鍙�</option>");
- $('#rowSelect').append("<option value=CS-102>2鍙�</option>")
+ $('#rowSelect').append("<option value=CS-101>101</option>");
+ $('#rowSelect').append("<option value=CS-102>102</option>")
}
if(data.value == 3){
- $('#rowSelect').append("<option value=CS-305>1鍙�</option>");
- $('#rowSelect').append("<option value=CS-306>2鍙�</option>")
- $('#rowSelect').append("<option value=CS-307>3鍙�</option>")
+ $('#rowSelect').append("<option value=CS-305>305</option>");
+ $('#rowSelect').append("<option value=CS-306>306</option>");
+ $('#rowSelect').append("<option value=CS-307>307</option>");
+ $('#rowSelect').append("<option value=CS-308>308</option>")
+ $('#rowSelect').append("<option value=CS-309>309</option>")
}
form.render();
});
// 鎼滅储
- form.on('submit(search)', function (data) {
- param = null;
- param = {'stationCode' : $('#rowSelect').val()};
- loadData(param);
- // $.ajax({
- // url: baseUrl+"/agv/basDevp/visualized/list/auth",
- // headers: {'token': localStorage.getItem('token')},
- // data: JSON.stringify(param),
- // dataType:'json',
- // contentType:'application/json;charset=UTF-8',
- // method: 'POST',
- // success: function (res) {
- // if (res.code === 200){
- // var tpl = $("#basDevpMapTemplate").html();
- // var template = Handlebars.compile(tpl);
- // var html = template(res.data);
- // $('#basDevpMap').html(html);
- // } else if (res.code === 403){
- // top.location.href = baseUrl+"/";
- // }else {
- // layer.msg(res.msg)
- // }
- // }
- // })
- });
+ // form.on('submit(search)', function (data) {
+ // param = null;
+ // param = {'stationCode' : $('#rowSelect').val()};
+ // loadData(param);
+ // });
//鍏ㄩ��
form.on('submit(checkAll)', function () {
@@ -166,12 +179,71 @@
}
});
+ //鎼滅储
+ form.on('submit(searchByStaion)', function () {
+ console.log("search.....")
+ param = null;
+ param = {'stationCode' : $('#rowSelect').val()};
+ loadData(param);
+ });
+
//鍙嶉��
form.on('submit(uncheckAll)', function () {
var cks = document.querySelectorAll("#tb input");
for (var i = 0; i < cks.length; i++) {
cks[i].checked = !cks[i].checked;
}
+ });
+
+ //璐ф灦绂诲満
+ form.on('submit(containerMoveOut)', function () {
+ var devNoList = [];
+ devNoList.push(this.value);
+ var moveOutParam = {'devNo' : devNoList};
+ $.ajax({
+ url: baseUrl+"/agv/basDevp/visualized/container/moveOut",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(moveOutParam),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg(res.msg);
+ loadData(param);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+
+ });
+
+ //鎷ｆ枡/鐩樼偣鍏ュ簱
+ form.on('submit(pickIn)', function () {
+ var devNoList = [];
+ devNoList.push(this.value);
+ var pickInParam = {'devNo' : devNoList};
+ $.ajax({
+ url: baseUrl+"/agv/basDevp/visualized/container/pickIn",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(pickInParam),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg(res.msg);
+ loadData(param);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
});
//鍚姩鍏ュ簱
@@ -206,9 +278,9 @@
//瀹氭椂鍒锋柊鏁版嵁
//setInterval(loadData(param), 1000);
- setInterval(function() {
- loadData(param);
- }, 1000);
+ // setInterval(function() {
+ // loadData(param);
+ // }, 1000);
function loadData(param){
$.ajax({
--
Gitblit v1.9.1