diff --git a/js/index.js b/js/index.js
index f02f53c..571d556 100644
--- a/js/index.js
+++ b/js/index.js
@@ -396,14 +396,10 @@ function liebiao(res) {
var t = null;
$(document).ready(function() {
time()
- // getData()
- // window.setInterval("getData()", 10000);
- // getData2()
- // window.setInterval("getData2()", 3000);
- // info()
- // window.setInterval("info()", 3000);
- // mockAlarmData();
+ // 初始化巷道标题
+ updateLaneHeaders();
+
getAlarmData();
window.setInterval(getAlarmData, 1500);
@@ -489,14 +485,27 @@ function getLaneData() {
}
function renderLaneData(data) {
- var laneIds = ['1', '2', '3']; // Keys in the data object
+ // 根据仓库ID动态设置巷道编号
+ let laneIds;
+ if (warehouseId === "02") {
+ laneIds = ['4', '5', '6']; //二联:4、5、6巷道
+ } else {
+ laneIds = ['1', '2', '3']; //三联:1、2、3巷道
+ }
- laneIds.forEach(function(key) {
+ console.log(laneIds);
+ // 前端dom固定 lane1/lane2/lane3,依次渲染三个巷道
+ const domIdList = ["lane1", "lane2", "lane3"];
+
+ // 同步更新页面顶部巷道标题
+ updateLaneHeaders();
+
+ laneIds.forEach(function(key, idx) {
var list = data[key] || [];
var content = "";
content += "
";
- // Header
+ // Header:把表头改成当前真实巷道号
content += "";
for (var i = 0; i < list.length; i++) {
- var item = list[i];
- var taskId = item.taskNo;
- var palletId = item.trayCode || "";
- var typeName = getTaskTypeName(item.inOrOut);
- var statusName = getTaskStatusName(item.status);
+ var item = list[i];
+ var taskId = item.taskNo;
+ var palletId = item.trayCode || "";
+ var typeName = getTaskTypeName(item.inOrOut);
+ var statusName = getTaskStatusName(item.status);
- var statusColor = (statusName === "执行中" || statusName === "完成") ? "#00ffc0" : "#ffb742";
- var typeColor = (typeName.indexOf("入") > -1) ? "#0dede4" : "#ff7e00";
- var bg = i % 2 == 0 ? "rgba(4, 101, 102, 0.5)" : "rgba(5, 56, 60, 0.5)";
+ var statusColor = (statusName === "执行中" || statusName === "完成") ? "#00ffc0" : "#ffb742";
+ var typeColor = (typeName.indexOf("入") > -1) ? "#0dede4" : "#ff7e00";
+ var bg = i % 2 == 0 ? "rgba(4, 101, 102, 0.5)" : "rgba(5, 56, 60, 0.5)";
- content += "- " +
+ content += "
- " +
"
" + taskId + "
" +
"" + palletId + "
" +
"" + typeName + "
" +
@@ -523,7 +532,8 @@ function renderLaneData(data) {
" ";
}
content += "
";
- $("#lane" + key).html(content);
+ // 依次填充 lane1/lane2/lane3
+ $("#" + domIdList[idx]).html(content);
});
}
@@ -532,7 +542,7 @@ function getTaskTypeName(code) {
if (!code) return "";
// 将编码转为数字(兼容字符串/数字类型入参),判断大小后返回对应名称
const numCode = Number(code);
- return numCode > 20 ? "出库" : "入库";
+ return numCode >= 20 ? "出库" : "入库";
}
function getTaskStatusName(code) {
@@ -778,6 +788,16 @@ function updatePreview() {
);
}
+function updateLaneHeaders() {
+ var laneIds = (warehouseId === "02") ? ['4', '5', '6'] : ['1', '2', '3'];
+ var laneHeaders = document.querySelectorAll(".lane-header");
+ laneIds.forEach(function(key, idx) {
+ if (laneHeaders[idx]) {
+ laneHeaders[idx].textContent = key + "巷道";
+ }
+ });
+}
+
function saveSettings() {
// 更新全局变量
warehouseId = _pendingWarehouse;
@@ -788,6 +808,9 @@ function saveSettings() {
localStorage.setItem("warehouseId", warehouseId);
localStorage.setItem("type", type);
+ // 立即更新巷道标题
+ updateLaneHeaders();
+
closeSettingModal();
// 立即刷新数据