From 90ca6b5d5483cbc1c7140ba5d88b956bb0689de9 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 08 八月 2024 14:19:02 +0800
Subject: [PATCH] pda盘点优化

---
 HTML/js/public.js |   68 +++++++++++++++++++++++++++++----
 1 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/HTML/js/public.js b/HTML/js/public.js
index b1ca696..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,6 +38,22 @@
   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(isTokenExpired($.cookie('token'))){
+      try{
+        parent.window.location.href = '/views/Login.html';
+      }
+      catch(error){
+        window.location.href = '/views/Login.html';
+      }
+      return;
     }
   } 
   $.ajax({
@@ -57,9 +73,7 @@
       // console.log(status);
       callbackFun(res);
     },
-    error: function (res, status, error) {  
-      // console.log(res);
-      // console.log(status);
+    error: function (res, status, error) {
       callbackFun(res.responseJSON, status, error);
       // layer.msg(res.statusText, {
       //   icon: 2,
@@ -67,6 +81,23 @@
       // }, function() {});
     },
   });
+}
+function isTokenExpired(token) {
+  const tokenParts = token.split('.');
+  if (tokenParts.length !== 3) {
+    return true; // JWT 鏍煎紡涓嶆纭�
+  }
+  const payloadBase64 = tokenParts[1];
+  const payload = JSON.parse(atob(payloadBase64));
+  
+  if (!payload || !payload.exp) {
+    return true; // 娌℃湁鏈夋晥杞借嵎鎴栬�呮病鏈夎繃鏈熸椂闂�
+  }
+  
+  const now = Date.now() / 1000; // 褰撳墠鏃堕棿鎴筹紙绉掞級
+  const expiration = payload.exp;
+  
+  return now >= expiration;
 }
 function synData(url, data, type, callbackFun) {
   var deferred = $.Deferred();
@@ -179,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;
@@ -244,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;
@@ -334,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