From 1ac2c31898b2a10906c0058b1b62f73f5ea6daf9 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期四, 29 八月 2024 09:07:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC26WMS
---
HTML/js/public.js | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/HTML/js/public.js b/HTML/js/public.js
index 879c061..59bbbe0 100644
--- a/HTML/js/public.js
+++ b/HTML/js/public.js
@@ -13,7 +13,7 @@
{
sendData(IP + "/Basis/GetFunSettingByNo?funSetNo="+"Fun013", {}, 'get', function (res) {
console.log(res.data.SetValue)
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
if(res.data.IsEnable == 'NO')
{
pageCnt = parseInt(res.data.SetValue);
@@ -38,8 +38,15 @@
if (url!=IP+"/WeatherForecast/Login") {
if (!$.cookie('token')) {
callbackFun("鐧诲綍浜轰俊鎭凡澶辨晥");
+ try{
+ parent.window.location.href = '/views/Login.html';
+ }
+ catch(error){
+ window.location.href = '/views/Login.html';
+ }
+ return;
}
- if(isExpired = isTokenExpired($.cookie('token'))){
+ if(isTokenExpired($.cookie('token'))){
try{
parent.window.location.href = '/views/Login.html';
}
@@ -203,9 +210,9 @@
var bodyHeight = $("#body").outerHeight();
var topHeight = $("#top").outerHeight();
var centerHeight = $("#center").outerHeight();
-// console.log(bodyHeight);
-// console.log(topHeight);
-// console.log(centerHeight);
+ console.log(bodyHeight);
+ console.log(topHeight);
+ console.log(centerHeight);
var hh = bodyHeight - topHeight-centerHeight - 26 ;//6鏄痓ody涓婂唴杈硅窛
return hh;
@@ -268,7 +275,7 @@
function GetIsSetColW()
{
sendData(IP + "/Basis/GetFunSettingByNo?funSetNo="+"Fun014", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
if(res.data.IsEnable == 'NO')
{
isSetColW=true;
@@ -358,11 +365,30 @@
});
}
+//鍒嗛〉鏍煎紡鍖�
var FnParseData = function (res) {
return {
- "code": res.code == 200 ? 0 : res.code, // 瑙ｆ瀽鎺ュ彛鐘舵��
+ "code": res.code == 0 ? 0 : res.code, // 瑙ｆ瀽鎺ュ彛鐘舵��
"msg": res.msg, // 瑙ｆ瀽鎻愮ず鏂囨湰
"count": res.data.Total, // 瑙ｆ瀽鏁版嵁闀垮害
"data": res.data.Items // 瑙ｆ瀽鏁版嵁鍒楄〃
};
+}
+
+//璋冪敤鎵撳嵃
+function openPrintDialog(printData, printType){
+ layer.open({
+ type: 2,
+ title: '鎵撳嵃',
+ // content: '../../js/hiprint/custom.html',
+ content: '/views/SystemSettings/PrintModule.html',
+ maxmin: true,
+ area: ['100%', '100%'],
+ data: printData,
+ success: function (layero, index) {
+ var body = layer.getChildFrame('body',index);
+ body.find('#printData').val(JSON.stringify(printData));
+ body.find('#printType').val(printType);
+ }
+ });
}
\ No newline at end of file
--
Gitblit v1.8.0