From afc12f9bbd372b55a4539c1fc40b17dbd5949cb1 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 19 八月 2025 13:44:38 +0800
Subject: [PATCH] 1
---
src/main/webapp/views/pipeline.html | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index b4fe318..5780974 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -7,7 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
- <link rel="stylesheet" type="text/css" href="../static/css/common.css">
+ <link rel="stylesheet" type="text/css" href="../static/css/common_wcs.css">
<link rel="stylesheet" type="text/css" href="../static/css/pipeline.css">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
@@ -15,7 +15,7 @@
<style>
.io-mode-box {
float: left;
- width: 25%;
+ /*width: 25%;*/
text-align: center;
}
.io-mode-box label {
@@ -23,7 +23,7 @@
}
.ioModeBtn {
vertical-align: middle;
- width: 50%;
+ width: 25%;
height: 30px;
left: 0;
top: 0;
@@ -63,14 +63,6 @@
<label>1#</label>
<button id="io-mode-1" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
</div>
- <div class="io-mode-box">
- <label>2#</label>
- <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
- </div>
- <div class="io-mode-box">
- <label>3#</label>
- <button id="io-mode-3" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
- </div>
</fieldset>
</div>
</div>
@@ -107,9 +99,12 @@
<th>鏈夌墿</th>
<th>鍙叆</th>
<th>鍙嚭</th>
- <th>鍏ュ簱鏍囪</th>
- <th>绌烘澘淇″彿</th>
+ <th>鍑哄叆搴撴ā寮�</th>
+ <th>瀹岀粨宸ヤ綔鍙�</th>
<th>鐩爣绔�</th>
+ <th>鎵樼洏鐮�</th>
+<!-- <th>鎻愬崌鏈哄埌浣嶄俊鍙�</th>-->
+<!-- <th>楂樹綆淇″彿</th>-->
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
@@ -292,9 +287,12 @@
setVal(tr.children("td").eq(3), table[i-1].loading);
setVal(tr.children("td").eq(4), table[i-1].inEnable);
setVal(tr.children("td").eq(5), table[i-1].outEnable);
- setVal(tr.children("td").eq(6), table[i-1].pakMk);
- setVal(tr.children("td").eq(7), table[i-1].emptyMk);
+ setVal(tr.children("td").eq(6), table[i-1].outInModel);
+ setVal(tr.children("td").eq(7), table[i-1].finishWorkNo);
setVal(tr.children("td").eq(8), table[i-1].staNo);
+ setVal(tr.children("td").eq(9), table[i-1].barcode);
+ // setVal(tr.children("td").eq(9), table[i-1].liftArrival);
+ //setVal(tr.children("td").eq(10), table[i-1].locType1);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -380,6 +378,8 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#site-table tbody').after(html);
--
Gitblit v1.9.1