Merge branch 'master' of http://47.95.120.53:8083/r/JC26WMS

zhaowc

2024-08-29 1ac2c31898b2a10906c0058b1b62f73f5ea6daf9

 HTML/js/public.js

@@ -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是body上内边距 
  return hh;