From 8f1c5854c90f2f18bdce3f421a8bd20b410f34e1 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 22 四月 2026 09:17:13 +0800
Subject: [PATCH] 充电逻辑补充，充电桩分为手动充电和自动充电，手动充电模式下也不可以发任务给小车；协议补充0x71和0x72
---
zy-asc-conveyor/src/main/webapp/views/pipeline.html | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/zy-asc-conveyor/src/main/webapp/views/pipeline.html b/zy-asc-conveyor/src/main/webapp/views/pipeline.html
index 65846fd..46ba19b 100644
--- a/zy-asc-conveyor/src/main/webapp/views/pipeline.html
+++ b/zy-asc-conveyor/src/main/webapp/views/pipeline.html
@@ -781,12 +781,14 @@
<th>宸ヤ綔鍙�</th>
<th>鑷姩</th>
<th>鏈夌墿</th>
- <th>鍙叆</th>
- <th>鍙嚭</th>
- <th>鍏ュ簱鏍囪</th>
- <th>绌烘澘淇″彿</th>
+ <th>闇�姹傚叆</th>
+ <th>闇�姹傚嚭</th>
+ <th>閲嶉噺淇″彿</th>
+ <th>绌烘弧淇″彿</th>
<th>鐩爣绔�</th>
- <th>楂樹綆搴撲綅</th>
+ <th>鏉＄爜</th>
+ <th>瀹夊叏淇″彿</th>
+ <!-- <th>楂樹綆淇″彿</th>-->
</tr>
</thead>
<tbody>
@@ -824,24 +826,25 @@
</div>
<div class="form-group">
<label class="form-label" for="workNo">宸ヤ綔鍙�:</label>
- <input id="workNo" name="workNo" type="number" class="form-input"
+ <input id="workNo" name="workNo" type="number" min="0" class="form-input"
autocomplete="off">
</div>
<div class="form-group">
<label class="form-label" for="staNo">鐩爣绔�:</label>
- <input id="staNo" name="staNo" type="number" class="form-input"
+ <input id="staNo" name="staNo" type="number" min="0" class="form-input"
autocomplete="off">
</div>
- <div class="form-group">
- <label class="form-label" for="pakMk">鍏ュ簱鏍囪:</label>
- <input id="pakMk" name="pakMk" type="text" class="form-input"
- autocomplete="off">
- </div>
+ <!-- <div class="form-group">-->
+ <!-- <label class="form-label" for="pakMk">鍏ュ簱鏍囪:</label>-->
+ <!-- <input id="pakMk" name="pakMk" type="text" class="form-input"-->
+ <!-- autocomplete="off">-->
+ <!-- </div>-->
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" id="save">淇濆瓨</button>
<button type="button" class="btn btn-secondary" id="clear">娓呴櫎</button>
+ <button type="button" class="btn btn-secondary" id="safe">琛ュ厖瀹夊叏淇″彿</button>
<button type="button" class="btn btn-secondary" id="cancel">鍙栨秷</button>
</div>
</div>
@@ -987,10 +990,11 @@
${site.outEnable === 'Y' ? 'Y' : 'N'}
</span>
</td>
- <td>${site.pakMk || '--'}</td>
+ <td>${site.weight || '--'}</td>
<td>${site.emptyMk || '--'}</td>
<td>${site.staNo || '--'}</td>
- <td>${site.locType1 || '--'}</td>
+ <td>${site.barcode || '--'}</td>
+ <td>${site.allow || '--'}</td>
</tr>
`;
}
@@ -1081,8 +1085,7 @@
http.post(`${baseUrl}/site/detl/update`, {
siteId: $('#siteId').val(),
workNo: $('#workNo').val(),
- staNo: $('#staNo').val(),
- pakMk: $('#pakMk').val()
+ staNo: $('#staNo').val()
}, (res) => {
showSuccessMessage("淇敼鎴愬姛");
setTimeout(() => {
@@ -1097,6 +1100,18 @@
$('#staNo').val(0);
});
+ // 琛ュ厖瀹夊叏淇″彿
+ $(document).on('click', '#safe', function () {
+ http.post(`${baseUrl}/site/detl/safe`, {
+ siteId: $('#siteId').val()
+ }, (res) => {
+ showSuccessMessage("琛ュ厖鎴愬姛");
+ setTimeout(() => {
+ closeModal();
+ }, 1500);
+ });
+ });
+
// 鍙栨秷绔欑偣淇℃伅淇敼
$(document).on('click', '#cancel', function () {
closeModal();
--
Gitblit v1.9.1