From f2bc08e28dda7022202f07217f6a3c150f818af7 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 20 一月 2025 08:32:16 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms
---
HTML/js/public.js | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/HTML/js/public.js b/HTML/js/public.js
index 7b8cf0d..a15a788 100644
--- a/HTML/js/public.js
+++ b/HTML/js/public.js
@@ -1,10 +1,11 @@
//var IP = "http://47.104.149.73:1991";//鎺ュ彛IP
// var IP = "http://172.16.71.101:8082/";//鎺ュ彛IP
//var IP = "http://localhost:13243/api";
-var IP = "http://localhost:50515/api";
+var IP = "http://localhost:50515/api"; //鏈湴
// var IP = "http://localhost:44318/api";
//var IP = "http://192.168.1.6:8017";
//var IP = "http://192.168.1.226:8086";
+// var IP = "http://192.168.62.200:8888/api"; //bkl鏈嶅姟鍣�
var pageCnt = 15;
var pageLimits = [10, 15, 20, 30, 50, 70, 100];
@@ -179,6 +180,9 @@
var bodyHeight = $("#body").outerHeight();
var topHeight = $("#top").outerHeight();
var centerHeight = $("#center").outerHeight();
+// console.log(bodyHeight);
+// console.log(topHeight);
+// console.log(centerHeight);
var hh = bodyHeight - topHeight-centerHeight - 26 ;//6鏄痓ody涓婂唴杈硅窛
return hh;
@@ -207,6 +211,20 @@
var h2 = parseInt(hh*0.4)
return h2;
}
+//鑾峰彇闄ゆ悳绱㈡潯浠朵互鍙婇〉绛惧楂樺害
+function GetTableTabHeight() {
+ var bodyHeight = $("#body").outerHeight();
+ var topHeight = $("#top").outerHeight();
+ var centerHeight = $("#center").outerHeight();
+ var tabHeight = $("#tab").outerHeight();
+ // console.log(bodyHeight);
+ // console.log(topHeight);
+ // console.log(centerHeight);
+ // console.log(tabHeight);
+
+ var hh = bodyHeight - topHeight-centerHeight-tabHeight - 57 ;//6鏄痓ody涓婂唴杈硅窛
+ return hh;
+}
//鍒ゆ柇鏄惁姝ｆ暣鏁� true 姝ｆ暣鏁� false 鍏朵粬
function isIntNum(val){
--
Gitblit v1.8.0