From df79f2a0702de355d96c6889adf61977b4284005 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 19 三月 2026 19:35:00 +0800
Subject: [PATCH] 1.修复登录页面 2.新增强制入库或者正常入库
---
src/main/webapp/views/login.html | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index 6456928..b89c4c4 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -314,9 +314,17 @@
if (!needOpen) {
return;
}
- var message = sessionStorage.getItem("licenseInvalidReason") || "绯荤粺褰撳墠鏈娴嬪埌鍙敤璁稿彲璇侊紝璇峰厛瀵煎叆鏂扮殑璁稿彲璇併��";
- showLicenseEntry(message);
- openLicenseTool(message);
+ verifyLicenseAvailability(function (isValid) {
+ if (isValid) {
+ clearLicensePromptState();
+ hideLicenseEntry();
+ clearLicenseQueryFlag();
+ return;
+ }
+ var message = sessionStorage.getItem("licenseInvalidReason") || "绯荤粺褰撳墠鏈娴嬪埌鍙敤璁稿彲璇侊紝璇峰厛瀵煎叆鏂扮殑璁稿彲璇併��";
+ showLicenseEntry(message);
+ openLicenseTool(message);
+ });
}
function showLicenseEntry(message) {
@@ -324,6 +332,39 @@
if (message) {
$("#licenseEntryMessage").text(message);
}
+ }
+
+ function hideLicenseEntry() {
+ $("#updateLicense").hide();
+ }
+
+ function clearLicensePromptState() {
+ sessionStorage.removeItem("licensePanelAutoOpen");
+ sessionStorage.removeItem("licenseInvalidReason");
+ }
+
+ function clearLicenseQueryFlag() {
+ if (window.history && window.history.replaceState && getQueryValue("license") === "invalid") {
+ window.history.replaceState(null, document.title, window.location.pathname);
+ }
+ }
+
+ function verifyLicenseAvailability(callback) {
+ $.ajax({
+ url: baseUrl + "/license/getLicenseDays",
+ method: 'GET',
+ success: function (res) {
+ if (res.code == 200) {
+ var days = Number(getResponseValue(res));
+ callback(!isNaN(days) && days >= 0);
+ return;
+ }
+ callback(false);
+ },
+ error: function () {
+ callback(false);
+ }
+ });
}
function escapeHtml(text) {
@@ -645,8 +686,8 @@
method: 'POST',
success: function (res) {
if (res.code == 200) {
- sessionStorage.removeItem("licensePanelAutoOpen");
- sessionStorage.removeItem("licenseInvalidReason");
+ clearLicensePromptState();
+ clearLicenseQueryFlag();
if (licenseToolState.uploadLayerIndex !== null) {
layer.close(licenseToolState.uploadLayerIndex);
}
@@ -717,6 +758,8 @@
method: 'POST',
success: function (res) {
if (res.code === 200) {
+ clearLicensePromptState();
+ clearLicenseQueryFlag();
localStorage.setItem("token", res.data.token);
localStorage.setItem("username", res.data.username);
window.location.href = "index.html";
--
Gitblit v1.9.1