From ca8f5a8f133e7f5b00b9d35ff6d15720804569af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 31 一月 2024 10:15:32 +0800
Subject: [PATCH] Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs
---
src/main/webapp/static/wcs/js/console.js | 108 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 93 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/static/wcs/js/console.js b/src/main/webapp/static/wcs/js/console.js
index 71073e8..3787624 100644
--- a/src/main/webapp/static/wcs/js/console.js
+++ b/src/main/webapp/static/wcs/js/console.js
@@ -40,10 +40,16 @@
}
}else {
bNum = minBayNo
+ let hiddenArr = [];
+ if (rackss[i].hiddenArr != undefined) {
+ hiddenArr = rackss[i].hiddenArr
+ }
for (let j = 0; j < bLen; j++) {
-
- bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
- bays = bays + bay
+ bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>";
+ if (hiddenArr.indexOf(bNum) != -1) {
+ bay = "<button class='item' style='width: "+ bayWidth +"px;visibility: hidden'>" + bNum + "</button>";
+ }
+ bays = bays + bay;
bNum = bNum + minBayNo;
}
}
@@ -57,17 +63,17 @@
racks = racks + rack
// getCrnInfo(minBayNo);
}
- // 璐ф灦鎻忚堪
- for (let i = 0;i < rackDescss.length;i++) {
- rackDesc = "<div class='rackDescs' id='" + rackDescss[i].id +
- "'style='width:"+ rackDescss[i].width +
- "px;height: "+ rackDescss[i].height+
- "px;line-height: "+ rackDescss[i].height+
- "px;top: "+ rackDescss[i].top +
- "px;left: "+ rackDescss[i].left +
- "px'>" + rackDescss[i].text + "</div>"
- rackDescs = rackDescs + rackDesc
- }
+ // // 璐ф灦鎻忚堪
+ // for (let i = 0;i < rackDescss.length;i++) {
+ // rackDesc = "<div class='rackDescs' id='" + rackDescss[i].id +
+ // "'style='width:"+ rackDescss[i].width +
+ // "px;height: "+ rackDescss[i].height+
+ // "px;line-height: "+ rackDescss[i].height+
+ // "px;top: "+ rackDescss[i].top +
+ // "px;left: "+ rackDescss[i].left +
+ // "px'>" + rackDescss[i].text + "</div>"
+ // rackDescs = rackDescs + rackDesc
+ // }
// 鍫嗗灈鏈哄拰鍦拌建
for (let i = 0;i < crnss.length;i++) {
if (crnss[i].type == "crane") {
@@ -148,4 +154,76 @@
$("#line-total").empty()
$("#line-total").html(total[e])
// listenChange();
-}
\ No newline at end of file
+}
+
+
+layui.config({
+ base: baseUrl + "/static/wms/layui/lay/modules/"
+}).use(['table', 'form'], function () {
+ var table = layui.table;
+ var $ = layui.jquery;
+ var cache;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#deviceInfo',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl + '/console/deviceInfo',
+ page: false,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
+ cellMinWidth: 50,
+ cols: [[
+ {field: 'device', align: 'center', title: '璁惧'}
+ , {field: 'deviceId', align: 'center', title: '缂栧彿'}
+ , {field: 'battery', align: 'center', title: '鐢甸噺'}
+ , {field: 'error', align: 'center', title: '寮傚父', templet: '#errorTpl'}
+ , {field: 'status', align: 'center', title: '鐘舵��', width: 150}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function (res, curr, count) {
+ $(".layui-table-tool").hide()
+ $(".layui-table-view").css({"margin":"0px"})
+ $(".layui-table-box").css({"padding-bottom":"0px"})
+
+ cache = table.cache['deviceInfo'];
+ }
+ });
+
+ setInterval(() => {
+ tableReload()
+ },10000)
+
+ function tableReload() {
+ $.ajax({
+ url: baseUrl + "/console/deviceInfo",
+ headers: {'token': localStorage.getItem('token')},
+ contentType: 'application/json;charset=UTF-8',
+ method: 'GET',
+ traditional: true,
+ success: function (res) {
+ cache = res.data.records
+ table.reload('deviceInfo',{
+ data: cache
+ })
+ }
+ })
+ }
+
+});
+
--
Gitblit v1.9.1