From b00eeab31bd13ba34a03301aa441b0751d6a93e4 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 19 十二月 2025 17:00:51 +0800
Subject: [PATCH] 第六排成品可以放第七排原材料
---
src/main/webapp/views/index.html | 206 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 161 insertions(+), 45 deletions(-)
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index f878f38..eb700fb 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -2,12 +2,18 @@
<html>
<head>
<meta charset="utf-8">
- <title>鑷姩浠撳偍绠＄悊绯荤粺</title>
+ <title>鑷姩浠撳偍 - 绠＄悊绯荤粺</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="icon" type="image/x-icon" href="../static/image/log.png" />
<link rel="stylesheet" href="../static/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../static/layuiadmin/style/admin.css" media="all">
+ <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="../static/js/common.js"></script>
+ <script type="text/javascript" src="../static/layuiadmin/layui/layui.js"></script>
+ <link rel="stylesheet" href="../static/css/layx.min.css" type="text/css" />
+ <script type="text/javascript" src="../static/js/tools/layx.min.js"></script>
<style>
.layui-layout-admin .layui-footer {
box-sizing: border-box;
@@ -24,17 +30,43 @@
font-weight: bold
}
- /*todo:luxiaotao*/
.layui-layout-admin .layui-logo {
letter-spacing: 2px;
font-size: 22px;
- height: 80px;
- padding: 20px 0;
- font-weight: 400;
- color: white;
+ height: 110px;
+ padding: 20px 10px;
+ font-weight: bolder;
+ /*color: #2c7dc2;*/
+ color: #f3f3f3;
+ text-align: center;
+ line-height: 40px;
+ }
+ .layadmin-side-shrink .layui-layout-admin .layui-logo {
+ background-image: none;
}
.layui-side-menu .layui-nav {
- margin-top: 80px;
+ margin-top: 110px;
+ }
+ /* 寮圭獥鏍峰紡 */
+ .popup {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0,0,0,0.5);
+ display: none;
+ justify-content: center;
+ align-items: center;
+ z-index: 9999;
+ }
+
+ .popup-content {
+ background-color: #fff;
+ padding: 20px;
+ border-radius: 5px;
+ box-shadow: 0px 0px 20px rgba(0,0,0,0.3);
+ text-align: center;
}
</style>
</head>
@@ -65,10 +97,17 @@
<!--</li>-->
</ul>
<ul id="cool-header-right" class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
-
+ <li class="layui-nav-item" lay-unselect id="licenseShow" style="display: none;user-select: none;">
+ <div style="color: red;">浠撳偍绯荤粺璁稿彲鏈夋晥鏈燂細<span id="licenseDays">29</span>澶�</div>
+ </li>
<li class="layui-nav-item layui-hide-xs" lay-unselect>
<a href="javascript:;" layadmin-event="theme">
<i class="layui-icon layui-icon-theme"></i>
+ </a>
+ </li>
+ <li class="layui-nav-item layui-hide-xs" lay-unselect>
+ <a id="activation-icon" href="javascript:;" layadmin-event="note">
+ <i class="layui-icon layui-icon-note"></i>
</a>
</li>
<li class="layui-nav-item layui-hide-xs" lay-unselect>
@@ -84,7 +123,7 @@
<dd><a lay-href="detail.html">鍩烘湰璧勬枡</a></dd>
<!--<dd><a lay-href="set/user/password.html">淇敼瀵嗙爜</a></dd>-->
<hr>
- <dd style="text-align: center;"><a id="logout" href="/asrs">閫�鍑�</a></dd>
+ <dd style="text-align: center;"><a id="logout" href="/">閫�鍑�</a></dd>
</dl>
</li>
</ul>
@@ -94,8 +133,8 @@
<div class="layui-side layui-side-menu">
<div class="layui-side-scroll">
<div class="layui-logo" lay-href="home/console.html">
- <!--<img src="..../../static/image/logo.jpg">-->
- <span>涓壃鍌ㄥ瓨璁惧</span>
+ <img src="../static/image/logo.png" style="display: inline-block; width: 90%;height: auto">
+<!-- <span style="margin-top: 0; letter-spacing: 10px">涓壃绔嬪簱</span>-->
</div>
<ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
@@ -133,18 +172,48 @@
</div>
<div class="layui-footer">
- Copyright 漏 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">娴欐睙涓壃鐗╂祦瑁呭鏈夐檺鍏徃</a> 淇濈暀鎵�鏈夋潈鍒�
+ Copyright 漏 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒�
</div>
<!-- 杈呭姪鍏冪礌锛屼竴鑸敤浜庣Щ鍔ㄨ澶囦笅閬僵 -->
<div class="layadmin-body-shade" layadmin-event="shade"></div>
</div>
</div>
-
- <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../static/js/common.js"></script>
- <script src="../static/layuiadmin/layui/layui.js"></script>
+ <!-- 寮圭獥鍐呭 -->
+ <div class="popup" id="popup">
+ <div class="popup-content">
+ <h2 style="font-size: 28px;margin-bottom: 10px;">璁稿彲璇佸嵆灏嗚繃鏈�</h2>
+ <div id="popup-text" style="font-size: 28px;color: red"></div>
+ <button style="background-color: #007bff;color: #fff;border: none;padding: 10px 20px;border-radius: 5px;cursor: pointer;font-size: 16px;" onclick="hidePopup()">鍏抽棴</button>
+ </div>
+ </div>
<script>
- layui.config({
+
+ // 鏄剧ず寮圭獥
+ function showPopup(res) {
+ console.log(res)
+ document.getElementById('popup').style.display = 'block';
+ // 鑾峰彇寮瑰嚭绐楀彛鍐呭鐨勫鍣ㄥ厓绱�
+ var popupText = document.getElementById('popup-text');
+ // 鍋囪鍚庡彴杩斿洖鐨勫瓧绗︿覆涓� responseString
+ if (res!==""){
+ // 鑾峰彇褰撳墠鏃ユ湡
+ const currentDate = new Date();
+ // 鍒涘缓鏂版棩鏈熷璞″苟娣诲姞澶╂暟
+ const newDate = new Date();
+ newDate.setDate(currentDate.getDate() + res + 1);
+ // 灏嗗瓧绗︿覆璁剧疆涓哄脊绐楀唴瀹圭殑鏂囨湰
+ popupText.textContent = "璁稿彲璇佸皢浜�" + new Intl.DateTimeFormat('zh-CN').format(newDate) + "杩囨湡锛屽墿浣欐湁鏁堟湡:" + res + "澶╋紒";
+ }else {
+ document.getElementById('popup').style.display = 'none';
+ }
+ }
+
+ // 闅愯棌寮圭獥
+ function hidePopup() {
+ document.getElementById('popup').style.display = 'none';
+ }
+
+ layui.config({
base: '../static/layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
@@ -152,43 +221,34 @@
var element = layui.element;
var $ = layui.jquery;
+ // 鏇挎崲閫�鍑烘寜閽彉閲�
+ var logout = document.getElementById('logout');
+ var url = logout.getAttribute('href');
+ logout.setAttribute('href', baseUrl + url);
+
$('#person-username').text(localStorage.getItem('username'));
$(function () {
if ("" === localStorage.getItem('token')){
top.location.href = baseUrl+"/login";
}
+
+ // 婵�娲荤爜楠岃瘉
$.ajax({
- url: baseUrl+ "/menu/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- var menuHtml = "";
- if (res.data != null){
- for (var i = 0; i < res.data.length; i++) {
- menuHtml += '<li data-name="' + res.data[i].menuCode +'" class="layui-nav-item">\n';
- menuHtml += '<a href="javascript:;" lay-tips=' +res.data[i].menu+ ' lay-direction="2">\n';
- menuHtml += '<i class="layui-icon '+ res.data[i].menuIcon +'"></i>\n';
- menuHtml += ' <cite>' +res.data[i].menu+ '</cite>\n';
- menuHtml += '</a>\n';
- menuHtml += '<dl class="layui-nav-child">\n';
- for (var j = 0; j < res.data[i].subMenu.length; j++) {
- menuHtml += '<dd><a lay-href="' +res.data[i].subMenu[j].code+ '?resourceId='+ res.data[i].subMenu[j].id + '">' + res.data[i].subMenu[j].name + '</a></dd>\n';
- }
- menuHtml += '</dl>\n';
- menuHtml += '</li>\n';
- }
- }
- $('#LAY-system-side-menu').append(menuHtml);
- element.init();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/login";
- }else {
- layer.alert(res.msg)
- }
+ url: baseUrl+"/system/activation/auth",
+ dataType:'json',
+ method: 'GET',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ $("#activation-icon").hide();
+ } else {
+ $("#activation-icon").click();
}
+ }
});
+
+ getMenu()
// 娉ㄩ攢
$(document).on('click','#logout',function () {
@@ -196,6 +256,62 @@
});
});
+
+ // 鍔犺浇鑿滃崟
+ function getMenu() {
+ $.ajax({
+ url: baseUrl+ "/menu/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ var menuHtml = "";
+ if (res.data != null){
+ for (var i = 0; i < res.data.length; i++) {
+ menuHtml += '<li data-name="' + res.data[i].menuCode +'" class="layui-nav-item">\n';
+ menuHtml += '<a href="javascript:;" lay-tips=' +res.data[i].menu+ ' lay-direction="2">\n';
+ menuHtml += '<i class="layui-icon '+ res.data[i].menuIcon +'"></i>\n';
+ menuHtml += ' <cite>' +res.data[i].menu+ '</cite>\n';
+ menuHtml += '</a>\n';
+ menuHtml += '<dl class="layui-nav-child">\n';
+ for (var j = 0; j < res.data[i].subMenu.length; j++) {
+ menuHtml += '<dd><a lay-href="' +res.data[i].subMenu[j].code+ '?resourceId='+ res.data[i].subMenu[j].id + '">' + res.data[i].subMenu[j].name + '</a></dd>\n';
+ }
+ menuHtml += '</dl>\n';
+ menuHtml += '</li>\n';
+ }
+ }
+ $('#LAY-system-side-menu').append(menuHtml);
+ element.init();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/login";
+ }else {
+ layer.alert(res.msg)
+ }
+ }
+ });
+ }
+ $.ajax({
+ url: baseUrl + "/license/getLicenseDays",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code == 200) {
+ let days = res.data
+ if (days <= 30) {
+ $("#licenseShow").show()
+ $("#licenseDays").html(days)
+ }
+
+ if (days <= 15) {
+ showPopup(days)
+ }
+ }else {
+ top.location.href = baseUrl + "/login";
+ }
+ }
+ });
+
});
</script>
</body>
--
Gitblit v1.9.1