大屏修改

js/index.js

@@ -1,8 +1,13 @@
-var ip="http://172.19.50.70:10012"
-//仓库 01 三联 02 二联
-var warehouseId="01"
-//入出库端 1 入库 2 出库
-var type="1"
+// ===== 仓库/端口 IP 映射 =====
+var warehouseIpMap = {
+	"02": "http://172.19.40.46:10012",  // 二联
+	"01": "http://172.19.50.70:10012"   // 三联
+};
+
+// ===== 从 localStorage 读取配置，默认二联/入库端 =====
+var warehouseId = localStorage.getItem("warehouseId") || "02";
+var type        = localStorage.getItem("type")        || "1";
+var ip          = warehouseIpMap[warehouseId];
 function getData() {
 	$.ajax({
 		url: ip+"/api/stock/all",
@@ -405,7 +410,7 @@ $(document).ready(function() {
 	getLaneData();
 	window.setInterval(getLaneData, 1500);
 
-	window.setInterval(scrollAlarmList, 1000);
+	// window.setInterval(scrollAlarmList, 1000);
 })
 
 function getAlarmData() {
@@ -668,14 +673,14 @@ function scrollAlarmList() {
 	var firstItem = list.find("li:first");
 	if (firstItem.length === 0) return;
 
-	var height = firstItem.height();
+	var height = firstItem.outerHeight(true);
 	// Default to some height if 0 (e.g. if hidden)
-	if (height === 0) height = 30;
+	if (height === 0) height = 44;
 
-	if (list.children().length > 3) {
+	if (list.children().length >= 1) {
 		firstItem.animate({
 			marginTop: -height + "px"
-		}, 500, function() {
+		}, 600, function() {
 			firstItem.css("marginTop", 0).appendTo(list);
 		});
 	}
@@ -721,3 +726,71 @@ function mockLaneData() {
 		$("#" + id).html(content);
 	});
 }
+
+// ===== 服务器设置弹窗 =====
+
+// 临时选中状态（未保存前不生效）
+var _pendingWarehouse = warehouseId;
+var _pendingType      = type;
+
+function openSettingModal() {
+	_pendingWarehouse = warehouseId;
+	_pendingType      = type;
+
+	// 初始化选中状态
+	$("#warehouseOptions .setting-option").each(function() {
+		$(this).toggleClass("active", $(this).data("value") === _pendingWarehouse);
+	});
+	$("#typeOptions .setting-option").each(function() {
+		$(this).toggleClass("active", $(this).data("value") + "" === _pendingType + "");
+	});
+
+	updatePreview();
+	$("#settingModalMask").fadeIn(200);
+	$("#settingModal").fadeIn(200);
+}
+
+function closeSettingModal() {
+	$("#settingModalMask").fadeOut(200);
+	$("#settingModal").fadeOut(200);
+}
+
+function selectOption(group, el) {
+	var val = $(el).data("value") + "";
+	if (group === "warehouse") {
+		_pendingWarehouse = val;
+		$("#warehouseOptions .setting-option").removeClass("active");
+	} else {
+		_pendingType = val;
+		$("#typeOptions .setting-option").removeClass("active");
+	}
+	$(el).addClass("active");
+	updatePreview();
+}
+
+function updatePreview() {
+	var whName  = _pendingWarehouse === "02" ? "二联" : "三联";
+	var typeName = _pendingType === "1" ? "入库端" : "出库端";
+	var previewIp = warehouseIpMap[_pendingWarehouse];
+	$("#settingPreview").html(
+		"仓库：<b>" + whName + "</b>　端口：<b>" + typeName + "</b><br>" +
+		"IP：" + previewIp
+	);
+}
+
+function saveSettings() {
+	// 更新全局变量
+	warehouseId = _pendingWarehouse;
+	type        = _pendingType;
+	ip          = warehouseIpMap[warehouseId];
+
+	// 持久化到 localStorage
+	localStorage.setItem("warehouseId", warehouseId);
+	localStorage.setItem("type",        type);
+
+	closeSettingModal();
+
+	// 立即刷新数据
+	getAlarmData();
+	getLaneData();
+}