From 8e9dd8e355464e5da29ab837752ce82d5379a2ed Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 25 七月 2023 13:13:11 +0800
Subject: [PATCH] 输送站点设备
---
src/main/webapp/static/wms/js/realtimeWatch/pipeline.js | 97 ++++++++++++--------------------
src/main/java/com/zy/asrs/controller/SiteController.java | 32 ++++++++++
src/main/webapp/views/realtimeWatch/pipeline.html | 26 ++++----
3 files changed, 83 insertions(+), 72 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index bbcb229..1370c6e 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -85,6 +85,38 @@
return R.ok().add(list);
}
+ @GetMapping("/list/auth")
+ @ManagerAuth(memo = "绔欑偣淇℃伅琛�")
+ public R crnList(){
+ List<SiteTableVo> list = new ArrayList<>();
+ // 鍐呭瓨鏁版嵁
+ Map<Integer, StaProtocol> station = new HashMap<>();
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ station.putAll(devpThread.getStation());
+ }
+ // 鎸佷箙鏁版嵁
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>().orderBy("dev_no"));
+ for (BasDevp devp : basDevps) {
+ SiteTableVo vo = new SiteTableVo();
+ vo.setDevNo(devp.getDevNo()); // 绔欑偣缂栧彿
+ list.add(vo);
+ StaProtocol staProtocol = station.get(devp.getDevNo());
+ if (null == staProtocol) { continue; }
+ vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
+ vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
+ vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
+ vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
+ vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
+ vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
+ vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
+ }
+ return R.ok().add(list);
+ }
+
@PostMapping("/table/plc/errors")
@ManagerAuth(memo = "杈撻�佽澶噋lc寮傚父淇℃伅琛�")
public R plcErrorTable(){
diff --git a/src/main/webapp/static/wms/js/realtimeWatch/pipeline.js b/src/main/webapp/static/wms/js/realtimeWatch/pipeline.js
index aa6238a..8bbc989 100644
--- a/src/main/webapp/static/wms/js/realtimeWatch/pipeline.js
+++ b/src/main/webapp/static/wms/js/realtimeWatch/pipeline.js
@@ -2,6 +2,7 @@
var tableData;
// 瀹氫箟涓�涓彉閲忔潵淇濆瓨婊氬姩鏉＄殑浣嶇疆
var scrollLeft = 0;
+var scrollTop = 0;
layui.config({
base: baseUrl + "/static/wms/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
@@ -14,9 +15,9 @@
// 鏁版嵁娓叉煋
tableIns = table.render({
- elem: '#crn',
+ elem: '#pipeline',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/crn/list/auth',
+ url: baseUrl+'/site/list/auth',
page: false,
limit: 500,
limits: [15, 30, 50, 100, 200, 500],
@@ -24,32 +25,17 @@
cellMinWidth: 100,
height: 'full-120',
cols: [[
- {field: 'crnNo', align: 'center',title: '鍫嗗灈鏈�'}
+ {field: 'devNo', align: 'center',title: '绔欏彿'}
,{field: 'workNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'statusType', align: 'center',title: '妯″紡'}
- ,{field: 'wrkStatus', align: 'center',title: '浠诲姟鐘舵��',width: 120}
- ,{field: 'deviceStatus', align: 'center',title: '璁惧鐘舵��'}
+ ,{field: 'autoing', align: 'center',title: '鑷姩'}
,{field: 'loading', align: 'center',title: '鏈夌墿'}
- ,{field: 'bay', align: 'center',title: '鍒�'}
- ,{field: 'lev', align: 'center',title: '灞�'}
- ,{field: 'warnCode', align: 'center',title: '鏁呴殰浠ｇ爜'}
- ,{field: 'alarm', align: 'center',title: '鏁呴殰鎻忚堪'}
- ,{field: 'sourceStaNo', align: 'center',title: '婧愮珯'}
+ ,{field: 'inEnable', align: 'center',title: '鍙叆'}
+ ,{field: 'outEnable', align: 'center',title: '鍙嚭'}
+ ,{field: 'pakMk', align: 'center',title: '鍏ュ簱鏍囪'}
+ ,{field: 'emptyMk', align: 'center',title: '绌烘澘淇″彿'}
,{field: 'staNo', align: 'center',title: '鐩爣绔�'}
- ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
- ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'forkOffset', align: 'center',title: '璐у弶瀹氫綅'}
- ,{field: 'liftPos', align: 'center',title: '杞借揣鍙板畾浣�'}
- ,{field: 'walkPos', align: 'center',title: '璧拌鍦ㄥ畾浣�'}
- ,{field: 'xspeed', align: 'center',title: '璧拌閫熷害锛坢/min)'}
- ,{field: 'yspeed', align: 'center',title: '鍗囬檷閫熷害锛坢/min)'}
- ,{field: 'zspeed', align: 'center',title: '鍙夌墮閫熷害锛坢/min)'}
- ,{field: 'xdistance', align: 'center',title: '璧拌璺濈(Km)'}
- ,{field: 'ydistance', align: 'center',title: '鍗囬檷璺濈(Km)'}
- ,{field: 'xduration', align: 'center',title: '璧拌鏃堕暱(H)'}
- ,{field: 'yduration', align: 'center',title: '鍗囬檷鏃堕暱(H)'}
-
- // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ,{field: 'locType1', align: 'center',title: '楂樹綆搴撲綅'}
+ ,{title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
request: {
pageName: 'curr',
@@ -79,7 +65,7 @@
});
// 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(crn)', function (obj) {
+ table.on('sort(pipeline)', function (obj) {
var searchData = {};
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
@@ -93,7 +79,7 @@
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(crn)', function (obj) {
+ table.on('toolbar(pipeline)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id).data;
switch(obj.event) {
case 'addData':
@@ -141,7 +127,7 @@
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(crn)', function(obj){
+ table.on('tool(pipeline)', function(obj){
var data = obj.data;
switch (obj.event) {
case 'edit':
@@ -155,7 +141,7 @@
admin.open({
type: 1,
area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '鎺ュ彛閰嶇疆',
+ title: (mData ? '淇敼' : '娣诲姞') + '杈撻�佽澶�',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
layDateRender(mData);
@@ -163,16 +149,20 @@
form.on('submit(editSubmit)', function (data) {
var loadIndex = layer.load(2);
$.ajax({
- url: baseUrl+"/apiConfig/"+(mData?'update':'add')+"/auth",
+ url: baseUrl+"/site//detl/update",
headers: {'token': localStorage.getItem('token')},
- data: data.field,
+ data: {
+ siteId: $('#devNo').val(),
+ workNo: $('#workNo').val(),
+ staNo: $('#staNo').val(),
+ pakMk: $('#pakMk').val()
+ },
method: 'POST',
success: function (res) {
layer.close(loadIndex);
if (res.code === 200){
layer.close(dIndex);
- layer.msg(res.msg, {icon: 1});
- tableReload();
+ layer.msg("淇敼鎴愬姛",{icon: 1,});
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
@@ -249,9 +239,10 @@
setInterval(() => {
// 鑾峰彇褰撳墠婊氬姩鏉′綅缃�
- scrollLeft = $("#crn").next('.layui-table-view').find('.layui-table-body').scrollLeft();
+ scrollLeft = $("#pipeline").next('.layui-table-view').find('.layui-table-body').scrollLeft();
+ scrollTop = $("#pipeline").next('.layui-table-view').find('.layui-table-body').scrollTop();
$.ajax({
- url: baseUrl+"/crn/list/auth",
+ url: baseUrl+"/site/list/auth",
headers: {'token': localStorage.getItem('token')},
data: {},
dataType:'json',
@@ -260,7 +251,7 @@
success: function (res) {
console.log(res)
table.render({
- elem: '#crn',
+ elem: '#pipeline',
headers: {token: localStorage.getItem('token')},
data: res.data,
page: false,
@@ -270,32 +261,17 @@
cellMinWidth: 100,
height: 'full-120',
cols: [[
- {field: 'crnNo', align: 'center',title: '鍫嗗灈鏈�'}
+ {field: 'devNo', align: 'center',title: '绔欏彿'}
,{field: 'workNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'statusType', align: 'center',title: '妯″紡'}
- ,{field: 'wrkStatus', align: 'center',title: '浠诲姟鐘舵��',width: 120}
- ,{field: 'deviceStatus', align: 'center',title: '璁惧鐘舵��'}
+ ,{field: 'autoing', align: 'center',title: '鑷姩'}
,{field: 'loading', align: 'center',title: '鏈夌墿'}
- ,{field: 'bay', align: 'center',title: '鍒�'}
- ,{field: 'lev', align: 'center',title: '灞�'}
- ,{field: 'warnCode', align: 'center',title: '鏁呴殰浠ｇ爜'}
- ,{field: 'alarm', align: 'center',title: '鏁呴殰鎻忚堪'}
- ,{field: 'sourceStaNo', align: 'center',title: '婧愮珯'}
+ ,{field: 'inEnable', align: 'center',title: '鍙叆'}
+ ,{field: 'outEnable', align: 'center',title: '鍙嚭'}
+ ,{field: 'pakMk', align: 'center',title: '鍏ュ簱鏍囪'}
+ ,{field: 'emptyMk', align: 'center',title: '绌烘澘淇″彿'}
,{field: 'staNo', align: 'center',title: '鐩爣绔�'}
- ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
- ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'forkOffset', align: 'center',title: '璐у弶瀹氫綅'}
- ,{field: 'liftPos', align: 'center',title: '杞借揣鍙板畾浣�'}
- ,{field: 'walkPos', align: 'center',title: '璧拌鍦ㄥ畾浣�'}
- ,{field: 'xspeed', align: 'center',title: '璧拌閫熷害锛坢/min)'}
- ,{field: 'yspeed', align: 'center',title: '鍗囬檷閫熷害锛坢/min)'}
- ,{field: 'zspeed', align: 'center',title: '鍙夌墮閫熷害锛坢/min)'}
- ,{field: 'xdistance', align: 'center',title: '璧拌璺濈(Km)'}
- ,{field: 'ydistance', align: 'center',title: '鍗囬檷璺濈(Km)'}
- ,{field: 'xduration', align: 'center',title: '璧拌鏃堕暱(H)'}
- ,{field: 'yduration', align: 'center',title: '鍗囬檷鏃堕暱(H)'}
-
- // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ,{field: 'locType1', align: 'center',title: '楂樹綆搴撲綅'}
+ ,{title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
request: {
pageName: 'curr',
@@ -320,7 +296,8 @@
limit();
tableData = table.cache.crn;
// 鎭㈠婊氬姩鏉′綅缃�
- $("#crn").next('.layui-table-view').find('.layui-table-body').scrollLeft(scrollLeft);
+ $("#pipeline").next('.layui-table-view').find('.layui-table-body').scrollLeft(scrollLeft);
+ $("#pipeline").next('.layui-table-view').find('.layui-table-body').scrollTop(scrollTop);
$(".layui-table-tool").hide()
}
diff --git a/src/main/webapp/views/realtimeWatch/pipeline.html b/src/main/webapp/views/realtimeWatch/pipeline.html
index 7d337d4..9be0ae6 100644
--- a/src/main/webapp/views/realtimeWatch/pipeline.html
+++ b/src/main/webapp/views/realtimeWatch/pipeline.html
@@ -32,7 +32,7 @@
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
- <table class="layui-hide" id="crn" lay-filter="crn"></table>
+ <table class="layui-hide" id="pipeline" lay-filter="pipeline"></table>
</div>
</div>
</div>
@@ -47,7 +47,7 @@
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>-->
</script>
<script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script>
@@ -63,25 +63,27 @@
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-form-item">
- <label class="layui-form-label">api鍦板潃: </label>
+ <label class="layui-form-label">绔欏彿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="url" placeholder="璇疯緭鍏pi鍦板潃">
+ <input class="layui-input" id="devNo" name="devNo" disabled placeholder="">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鐘舵��: </label>
+ <label class="layui-form-label">宸ヤ綔鍙�: </label>
<div class="layui-input-block">
- <select name="status">
- <option value="">璇烽�夋嫨鐘舵��</option>
- <option value="0">姝ｅ父</option>
- <option value="1">绂佺敤</option>
- </select>
+ <input class="layui-input" id="workNo" name="workNo" placeholder="">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">澶囨敞: </label>
+ <label class="layui-form-label">鐩爣绔�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ <input class="layui-input" id="staNo" name="staNo" placeholder="">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍏ュ簱鏍囪: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" id="pakMk" name="pakMk" placeholder="">
</div>
</div>
--
Gitblit v1.9.1