From 5bd42df0ef1bcdbc3911381274b4f3f267d0203b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 13 八月 2025 09:45:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev
---
src/main/webapp/views/admin/basShuttle/basShuttle.html | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/admin/basShuttle/basShuttle.html b/src/main/webapp/views/admin/basShuttle/basShuttle.html
index 79e3dcd..fa5c78c 100644
--- a/src/main/webapp/views/admin/basShuttle/basShuttle.html
+++ b/src/main/webapp/views/admin/basShuttle/basShuttle.html
@@ -47,6 +47,9 @@
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-sm" lay-event="oneUpdateCharge">涓�閿慨鏀圭數閲忕嚎</button>
+ <button class="layui-btn layui-btn-sm" lay-event="shuttleGather">灏忚溅闆嗗悎</button>
+ <button class="layui-btn layui-btn-sm" lay-event="demoOpen">婕旂ず-寮�</button>
+ <button class="layui-btn layui-btn-sm" lay-event="demoClose">婕旂ず-鍏�</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
</div>
</script>
@@ -90,12 +93,6 @@
<input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ヤ换鍔″彿">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">鏆傚瓨搴撲綅: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="idleLoc" placeholder="璇疯緭鍏ユ殏瀛樺簱浣�">
- </div>
- </div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">鑷姩鍏呯數: </label>-->
<!-- <div class="layui-input-block">-->
@@ -112,12 +109,6 @@
<label class="layui-form-label">澶囨敞: </label>
<div class="layui-input-block">
<input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鎻愬崌鏈哄彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="liftNo" placeholder="璇疯緭鍏ユ彁鍗囨満鍙�">
</div>
</div>
<div class="layui-form-item">
--
Gitblit v1.9.1