From 40d95599c1ac6ef89d465e031132d9c627a7f0bc Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 19 十一月 2025 13:38:54 +0800
Subject: [PATCH] #增加出入库模式
---
src/main/webapp/views/pipeline.html | 113 +++++++++++++++++---------------------------------------
1 files changed, 34 insertions(+), 79 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 11507ba..5c60e6b 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -53,27 +53,31 @@
<!-- plc寮傚父鏃ュ織鐩戞帶鐗� -->
<div id="plc-error" class="main-board" style="padding-left: 10px">
<!-- 澶撮儴 -->
- <div class="plc-log-header">
- <!-- 璁惧浠诲姟鎿嶄綔 -->
- <div class="io-mode-oper">
- <fieldset>
- <legend>鍏ュ嚭搴撴ā寮忥紙IO-Mode锛�</legend>
- <div class="io-mode-box">
- <label>2F</label>
- <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
- </div>
- </fieldset>
- </div>
- <!-- <div style="height: 40%">-->
- <!-- <span>涓滀晶PLC鎵ц鎸囦护</span>-->
- <!-- </div>-->
- <!-- <div style="height: 40%">-->
- <!-- <span>瑗夸晶PLC鎵ц鎸囦护</span>-->
- <!-- </div>-->
- <!-- <div>-->
- <!-- <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>-->
- <!-- </div>-->
- </div>
+<!-- <div class="plc-log-header">-->
+<!-- <!– 璁惧浠诲姟鎿嶄綔 –>-->
+<!-- <div class="io-mode-oper">-->
+<!-- <fieldset>-->
+<!-- <legend>鍏ュ嚭搴撴ā寮忥紙IO-Mode锛�</legend>-->
+<!-- <div class="io-mode-box">-->
+<!-- <label>F2</label>-->
+<!-- <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>-->
+<!-- </div>-->
+<!-- <div class="io-mode-box">-->
+<!-- <label>F4</label>-->
+<!-- <button id="io-mode-4" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>-->
+<!-- </div>-->
+<!-- </fieldset>-->
+<!-- </div>-->
+<!-- <!– <div style="height: 40%">–>-->
+<!-- <!– <span>涓滀晶PLC鎵ц鎸囦护</span>–>-->
+<!-- <!– </div>–>-->
+<!-- <!– <div style="height: 40%">–>-->
+<!-- <!– <span>瑗夸晶PLC鎵ц鎸囦护</span>–>-->
+<!-- <!– </div>–>-->
+<!-- <!– <div>–>-->
+<!-- <!– <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>–>-->
+<!-- <!– </div>–>-->
+<!-- </div>-->
<!-- 涓讳綋 -->
<div class="plc-log-body">
<div>
@@ -144,6 +148,12 @@
</div>
</div>
<div class="form-item">
+ <label class="form-label">鎵樼洏灏哄:</label>
+ <div class="form-input">
+ <input id="palletSize" name="palletSize" type="number" class="layui-input" lay-verify="number" autocomplete="off">
+ </div>
+ </div>
+ <div class="form-item">
<label class="form-label">鍏ュ簱鏍囪:</label>
<div class="form-input">
<input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
@@ -170,7 +180,6 @@
var siteTableFullRows = 0;
var outputDom = document.getElementById("output");
$(document).ready(function() {
- getIoModeInfo();
initPlcErrorTable();
getPlcError();
initSiteTable();
@@ -180,7 +189,6 @@
setInterval(function () {
getPlcError();
starGetSite();
- getIoModeInfo();
}, 1000);
setInterval(function () {
getSiteOutput();
@@ -191,61 +199,6 @@
} else {
getSite();
}
- }
-
- var ioModeData;
- function getIoModeInfo() {
- $.ajax({
- url: baseUrl+ "/site/io/mode/info/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- ioModeData = res.data;
- ioModeData.forEach(function (e) {
- $("#io-mode-"+e.floor).html(e.modeDesc);
- })
- } else if (res.code === 403){
- window.location.href = baseUrl+"/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- /**
- * 寮哄埗鍒囨崲鍏ュ嚭搴撴ā寮�
- */
- function ioModeSwitch(el) {
- var floor = el.split("-")[2];
- if (ioModeData != null && ioModeData.length > 1) {
- ioModeData.forEach(function(e) {
- if (e.floor === Number(floor)) {
- if (e.modeVal === 3 || e.modeVal === 4) {
- layer.confirm('纭畾鍒囨崲涓哄叆搴撴ā寮忓悧锛�',function () {
- $.ajax({
- url: baseUrl+ "/site/io/mode/action/site",
- headers: {'token': localStorage.getItem('token')},
- data: {floor: e.floor},
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- layer.msg("鏆傛椂涓嶈兘鍒囨崲锛�", {icon: 1})
- } else if (res.code === 403){
- window.location.href = baseUrl+"/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- layer.closeAll();
- })
- }
- }
- });
- }
-
}
// plc寮傚父淇℃伅琛ㄨ幏鍙�
@@ -428,10 +381,11 @@
});
$(document).on('click ','#save', function () {
- http.post(baseUrl+ "/site//detl/update", {
+ http.post(baseUrl+ "/site/detl/update", {
siteId: $('#siteId').val(),
workNo: $('#workNo').val(),
staNo: $('#staNo').val(),
+ palletSize: $('#palletSize').val(),
pakMk: $('#pakMk').val()
}, function (res) {
layer.msg("淇敼鎴愬姛",{icon: 1,});
@@ -441,6 +395,7 @@
$('#siteId').val("");
$('#workNo').val("");
$('#staNo').val("");
+ $('#palletSize').val("");
$('#pakMk').val("");
layer.close(layerDetl);
})
--
Gitblit v1.9.1