Tenlion/crpm-proj-code-set
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

冲突解决

Browse Source
This commit is contained in:
itgaojian163 2025-07-04 18:16:37 +08:00
commit e8b9f70d4e
11 changed files with 805 additions and 959 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
cjscdsjkbpt/db/aimzdb.mv.db
View File

Binary file not shown.

216
cjscdsjkbpt/db/aimzdb.trace.db
View File

@ -1,216 +0,0 @@
2025-07-04 14:18:32 database: flush
org.h2.message.DbException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.get(DbException.java:212)
at org.h2.message.DbException.convert(DbException.java:407)
at org.h2.mvstore.db.Store.lambda$new$0(Store.java:122)
at org.h2.mvstore.MVStore.handleException(MVStore.java:1547)
at org.h2.mvstore.MVStore.panic(MVStore.java:371)
at org.h2.mvstore.MVStore.<init>(MVStore.java:291)
at org.h2.mvstore.MVStore$Builder.open(MVStore.java:2036)
at org.h2.mvstore.db.Store.<init>(Store.java:133)
at org.h2.engine.Database.<init>(Database.java:324)
at org.h2.engine.Engine.openSession(Engine.java:92)
at org.h2.engine.Engine.openSession(Engine.java:222)
at org.h2.engine.Engine.createSession(Engine.java:201)
at org.h2.server.TcpServerThread.run(TcpServerThread.java:175)
at java.lang.Thread.run(Thread.java:748)
Caused by: org.h2.jdbc.JdbcSQLNonTransientException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.getJdbcSQLException(DbException.java:566)
at org.h2.message.DbException.getJdbcSQLException(DbException.java:489)
... 14 more
Caused by: org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]
at org.h2.mvstore.DataUtils.newMVStoreException(DataUtils.java:996)
at org.h2.mvstore.SingleFileStore.lockFileChannel(SingleFileStore.java:143)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:117)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:81)
at org.h2.mvstore.MVStore.<init>(MVStore.java:286)
... 8 more
2025-07-04 14:18:34 database: flush
org.h2.message.DbException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.get(DbException.java:212)
at org.h2.message.DbException.convert(DbException.java:407)
at org.h2.mvstore.db.Store.lambda$new$0(Store.java:122)
at org.h2.mvstore.MVStore.handleException(MVStore.java:1547)
at org.h2.mvstore.MVStore.panic(MVStore.java:371)
at org.h2.mvstore.MVStore.<init>(MVStore.java:291)
at org.h2.mvstore.MVStore$Builder.open(MVStore.java:2036)
at org.h2.mvstore.db.Store.<init>(Store.java:133)
at org.h2.engine.Database.<init>(Database.java:324)
at org.h2.engine.Engine.openSession(Engine.java:92)
at org.h2.engine.Engine.openSession(Engine.java:222)
at org.h2.engine.Engine.createSession(Engine.java:201)
at org.h2.server.TcpServerThread.run(TcpServerThread.java:175)
at java.lang.Thread.run(Thread.java:748)
Caused by: org.h2.jdbc.JdbcSQLNonTransientException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.getJdbcSQLException(DbException.java:566)
at org.h2.message.DbException.getJdbcSQLException(DbException.java:489)
... 14 more
Caused by: org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]
at org.h2.mvstore.DataUtils.newMVStoreException(DataUtils.java:996)
at org.h2.mvstore.SingleFileStore.lockFileChannel(SingleFileStore.java:143)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:117)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:81)
at org.h2.mvstore.MVStore.<init>(MVStore.java:286)
... 8 more
2025-07-04 14:19:00 database: flush
org.h2.message.DbException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.get(DbException.java:212)
at org.h2.message.DbException.convert(DbException.java:407)
at org.h2.mvstore.db.Store.lambda$new$0(Store.java:122)
at org.h2.mvstore.MVStore.handleException(MVStore.java:1547)
at org.h2.mvstore.MVStore.panic(MVStore.java:371)
at org.h2.mvstore.MVStore.<init>(MVStore.java:291)
at org.h2.mvstore.MVStore$Builder.open(MVStore.java:2036)
at org.h2.mvstore.db.Store.<init>(Store.java:133)
at org.h2.engine.Database.<init>(Database.java:324)
at org.h2.engine.Engine.openSession(Engine.java:92)
at org.h2.engine.Engine.openSession(Engine.java:222)
at org.h2.engine.Engine.createSession(Engine.java:201)
at org.h2.server.TcpServerThread.run(TcpServerThread.java:175)
at java.lang.Thread.run(Thread.java:748)
Caused by: org.h2.jdbc.JdbcSQLNonTransientException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.getJdbcSQLException(DbException.java:566)
at org.h2.message.DbException.getJdbcSQLException(DbException.java:489)
... 14 more
Caused by: org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]
at org.h2.mvstore.DataUtils.newMVStoreException(DataUtils.java:996)
at org.h2.mvstore.SingleFileStore.lockFileChannel(SingleFileStore.java:143)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:117)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:81)
at org.h2.mvstore.MVStore.<init>(MVStore.java:286)
... 8 more
2025-07-04 14:19:01 database: flush
org.h2.message.DbException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.get(DbException.java:212)
at org.h2.message.DbException.convert(DbException.java:407)
at org.h2.mvstore.db.Store.lambda$new$0(Store.java:122)
at org.h2.mvstore.MVStore.handleException(MVStore.java:1547)
at org.h2.mvstore.MVStore.panic(MVStore.java:371)
at org.h2.mvstore.MVStore.<init>(MVStore.java:291)
at org.h2.mvstore.MVStore$Builder.open(MVStore.java:2036)
at org.h2.mvstore.db.Store.<init>(Store.java:133)
at org.h2.engine.Database.<init>(Database.java:324)
at org.h2.engine.Engine.openSession(Engine.java:92)
at org.h2.engine.Engine.openSession(Engine.java:222)
at org.h2.engine.Engine.createSession(Engine.java:201)
at org.h2.server.TcpServerThread.run(TcpServerThread.java:175)
at java.lang.Thread.run(Thread.java:748)
Caused by: org.h2.jdbc.JdbcSQLNonTransientException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.getJdbcSQLException(DbException.java:566)
at org.h2.message.DbException.getJdbcSQLException(DbException.java:489)
... 14 more
Caused by: org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]
at org.h2.mvstore.DataUtils.newMVStoreException(DataUtils.java:996)
at org.h2.mvstore.SingleFileStore.lockFileChannel(SingleFileStore.java:143)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:117)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:81)
at org.h2.mvstore.MVStore.<init>(MVStore.java:286)
... 8 more
2025-07-04 14:19:43 database: flush
org.h2.message.DbException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.get(DbException.java:212)
at org.h2.message.DbException.convert(DbException.java:407)
at org.h2.mvstore.db.Store.lambda$new$0(Store.java:122)
at org.h2.mvstore.MVStore.handleException(MVStore.java:1547)
at org.h2.mvstore.MVStore.panic(MVStore.java:371)
at org.h2.mvstore.MVStore.<init>(MVStore.java:291)
at org.h2.mvstore.MVStore$Builder.open(MVStore.java:2036)
at org.h2.mvstore.db.Store.<init>(Store.java:133)
at org.h2.engine.Database.<init>(Database.java:324)
at org.h2.engine.Engine.openSession(Engine.java:92)
at org.h2.engine.Engine.openSession(Engine.java:222)
at org.h2.engine.Engine.createSession(Engine.java:201)
at org.h2.server.TcpServerThread.run(TcpServerThread.java:175)
at java.lang.Thread.run(Thread.java:748)
Caused by: org.h2.jdbc.JdbcSQLNonTransientException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.getJdbcSQLException(DbException.java:566)
at org.h2.message.DbException.getJdbcSQLException(DbException.java:489)
... 14 more
Caused by: org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]
at org.h2.mvstore.DataUtils.newMVStoreException(DataUtils.java:996)
at org.h2.mvstore.SingleFileStore.lockFileChannel(SingleFileStore.java:143)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:117)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:81)
at org.h2.mvstore.MVStore.<init>(MVStore.java:286)
... 8 more
2025-07-04 14:19:45 database: flush
org.h2.message.DbException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.get(DbException.java:212)
at org.h2.message.DbException.convert(DbException.java:407)
at org.h2.mvstore.db.Store.lambda$new$0(Store.java:122)
at org.h2.mvstore.MVStore.handleException(MVStore.java:1547)
at org.h2.mvstore.MVStore.panic(MVStore.java:371)
at org.h2.mvstore.MVStore.<init>(MVStore.java:291)
at org.h2.mvstore.MVStore$Builder.open(MVStore.java:2036)
at org.h2.mvstore.db.Store.<init>(Store.java:133)
at org.h2.engine.Database.<init>(Database.java:324)
at org.h2.engine.Engine.openSession(Engine.java:92)
at org.h2.engine.Engine.openSession(Engine.java:222)
at org.h2.engine.Engine.createSession(Engine.java:201)
at org.h2.server.TcpServerThread.run(TcpServerThread.java:175)
at java.lang.Thread.run(Thread.java:748)
Caused by: org.h2.jdbc.JdbcSQLNonTransientException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.getJdbcSQLException(DbException.java:566)
at org.h2.message.DbException.getJdbcSQLException(DbException.java:489)
... 14 more
Caused by: org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]
at org.h2.mvstore.DataUtils.newMVStoreException(DataUtils.java:996)
at org.h2.mvstore.SingleFileStore.lockFileChannel(SingleFileStore.java:143)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:117)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:81)
at org.h2.mvstore.MVStore.<init>(MVStore.java:286)
... 8 more
2025-07-04 14:20:48 database: flush
org.h2.message.DbException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.get(DbException.java:212)
at org.h2.message.DbException.convert(DbException.java:407)
at org.h2.mvstore.db.Store.lambda$new$0(Store.java:122)
at org.h2.mvstore.MVStore.handleException(MVStore.java:1547)
at org.h2.mvstore.MVStore.panic(MVStore.java:371)
at org.h2.mvstore.MVStore.<init>(MVStore.java:291)
at org.h2.mvstore.MVStore$Builder.open(MVStore.java:2036)
at org.h2.mvstore.db.Store.<init>(Store.java:133)
at org.h2.engine.Database.<init>(Database.java:324)
at org.h2.engine.Engine.openSession(Engine.java:92)
at org.h2.engine.Engine.openSession(Engine.java:222)
at org.h2.engine.Engine.createSession(Engine.java:201)
at org.h2.server.TcpServerThread.run(TcpServerThread.java:175)
at java.lang.Thread.run(Thread.java:748)
Caused by: org.h2.jdbc.JdbcSQLNonTransientException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.getJdbcSQLException(DbException.java:566)
at org.h2.message.DbException.getJdbcSQLException(DbException.java:489)
... 14 more
Caused by: org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]
at org.h2.mvstore.DataUtils.newMVStoreException(DataUtils.java:996)
at org.h2.mvstore.SingleFileStore.lockFileChannel(SingleFileStore.java:143)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:117)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:81)
at org.h2.mvstore.MVStore.<init>(MVStore.java:286)
... 8 more
2025-07-04 14:20:50 database: flush
org.h2.message.DbException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.get(DbException.java:212)
at org.h2.message.DbException.convert(DbException.java:407)
at org.h2.mvstore.db.Store.lambda$new$0(Store.java:122)
at org.h2.mvstore.MVStore.handleException(MVStore.java:1547)
at org.h2.mvstore.MVStore.panic(MVStore.java:371)
at org.h2.mvstore.MVStore.<init>(MVStore.java:291)
at org.h2.mvstore.MVStore$Builder.open(MVStore.java:2036)
at org.h2.mvstore.db.Store.<init>(Store.java:133)
at org.h2.engine.Database.<init>(Database.java:324)
at org.h2.engine.Engine.openSession(Engine.java:92)
at org.h2.engine.Engine.openSession(Engine.java:222)
at org.h2.engine.Engine.createSession(Engine.java:201)
at org.h2.server.TcpServerThread.run(TcpServerThread.java:175)
at java.lang.Thread.run(Thread.java:748)
Caused by: org.h2.jdbc.JdbcSQLNonTransientException: General error: "org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]" [50000-220]
at org.h2.message.DbException.getJdbcSQLException(DbException.java:566)
at org.h2.message.DbException.getJdbcSQLException(DbException.java:489)
... 14 more
Caused by: org.h2.mvstore.MVStoreException: The file is locked: D:/crpm-proj-code-set/cjscdsjkbpt/db/aimzdb.mv.db [2.2.220/7]
at org.h2.mvstore.DataUtils.newMVStoreException(DataUtils.java:996)
at org.h2.mvstore.SingleFileStore.lockFileChannel(SingleFileStore.java:143)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:117)
at org.h2.mvstore.SingleFileStore.open(SingleFileStore.java:81)
at org.h2.mvstore.MVStore.<init>(MVStore.java:286)
... 8 more

23
cjscdsjkbpt/src/main/resources/static/route/pages/index.html
View File

@ -411,15 +411,15 @@
<h5>欢迎使用车间生产大数据看板平台</h5>
</div>
<ul class="layui-nav layui-layout-right quiteBox">
<li class="layui-nav-item ">
<div >
<div class="topTitle"><i class="layui-icon layui-icon-set-fill topicon"></i>资源配置</div>
<!-- <li class="layui-nav-item ">-->
<!-- <div >-->
<!-- <div class="topTitle"><i class="layui-icon layui-icon-set-fill topicon"></i>资源配置</div>-->
</div>
</li>
<li class="layui-nav-item topTitlec">
<!-- </div>-->
<!-- </li>-->
<li class="layui-nav-item topTitlec" id="accountManageBtn">
<div>
<div class="topTitle "><i class="layui-icon layui-icon-user topicon"></i>角色管理</div>
<div class="topTitle "><i class="layui-icon layui-icon-user topicon"></i>账号管理</div>
</div>
</li>
<li class="layui-nav-item layui-hide layui-show-sm-inline-block">
@ -817,10 +817,19 @@
homepage.style.display = 'none';
});
// $('#signoutBtn').click(function() {
// window.open('sign/signout', '_self')
// })
$('#signoutBtn').click(function() {
window.open('sign/signout', '_self')
})
$('#accountManageBtn').click(function() {
var pageIframe = $('#pageIframe');
pageIframe.attr('src', 'route/pages/user/list.html');
pageIframe.show();
homepage.style.display = 'none';
})
});

1
cjscdsjkbpt/src/main/resources/static/route/pages/user/list.html
View File

@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>车间生产大数据看板平台</title>
<link rel="stylesheet" href="assets/crpm/js/layui/css/layui.css" />
<link rel="stylesheet" href="assets/crpm/index/index13/index13.css" />
<style>
.layui-input-block {margin-left: 0;}
.list-page-container {padding: 15px;}

1
cjscdsjkbpt/src/main/resources/static/route/pages/user/save.html
View File

@ -5,6 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>车间生产大数据看板平台</title>
<link rel="stylesheet" href="assets/crpm/js/layui/css/layui.css" />
<link rel="stylesheet" href="assets/crpm/index/index13/index13.css" />
<style>
.form-container {padding: 15px;}
.form-header {margin-bottom: 15px;}

1
cjscdsjkbpt/src/main/resources/static/route/pages/user/update.html
View File

@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>车间生产大数据看板平台</title>
<link rel="stylesheet" href="assets/crpm/js/layui/css/layui.css" />
<link rel="stylesheet" href="assets/crpm/index/index13/index13.css" />
<style>
.form-container {padding: 15px;}
.form-header {margin-bottom: 15px;}

BIN
gcckglxt/db/aimzdb.mv.db
View File

Binary file not shown.

25
gcckglxt/src/main/resources/static/route/pages/index.html
View File

@ -377,21 +377,21 @@
<div class='photo'>头像</div>
<h5>账号名称</h5>
<ul class="layui-nav layui-layout-right">
<li class="layui-nav-item ">
<div >
<div class="topTitle"><i class="layui-icon layui-icon-set-fill topicon"></i>资源配置</div>
<!-- <li class="layui-nav-item ">-->
<!-- <div >-->
<!-- <div class="topTitle"><i class="layui-icon layui-icon-set-fill topicon"></i>资源配置</div>-->
</div>
</li>
<li class="layui-nav-item topTitlec">
<!-- </div>-->
<!-- </li>-->
<li class="layui-nav-item topTitlec" id="accountManageBtn">
<div>
<div class="topTitle "><i class="layui-icon layui-icon-user topicon"></i>角色管理</div>
<div class="topTitle "><i class="layui-icon layui-icon-user topicon"></i>账号管理</div>
</div>
</li>
<li class="layui-nav-item layui-hide layui-show-sm-inline-block">
<a href="javascript:void(0);">管理员</a>
<dl class="layui-nav-child">
<dd><a href="javascript:void(0);">退出</a></dd>
<dd><a href="javascript:void(0);" id="signoutBtn">退出</a></dd>
</dl>
</li>
</ul>
@ -780,7 +780,16 @@
height: `${$win.height() - 165}px`
})
}
$('#signoutBtn').click(function() {
window.open('sign/signout', '_self')
})
$('#accountManageBtn').click(function() {
var pageIframe = $('#pageIframe');
pageIframe.attr('src', 'route/pages/user/list.html');
pageIframe.show();
homepage.style.display = 'none';
})
init();
var homepage = document.getElementById('homepage');

BIN
gcjhypcxt/db/aimzdb.mv.db
View File

Binary file not shown.

102
gcjhypcxt/src/main/resources/static/route/pages/index.html
View File

@ -2,13 +2,13 @@
<html lang="en">
<head>
<base href="/"/>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>工厂计划与排程系统</title>
<link rel="stylesheet" href="assets/crpm/js/layui/css/layui.css" />
<link rel="stylesheet" href="assets/crpm/fonts/font-awesome/css/font-awesome.css" />
<link rel="stylesheet" href="assets/crpm/index/index5/index5.css" />
<link rel="stylesheet" href="assets/crpm/index/index.css" />
<link rel="stylesheet" href="assets/crpm/js/layui/css/layui.css"/>
<link rel="stylesheet" href="assets/crpm/fonts/font-awesome/css/font-awesome.css"/>
<link rel="stylesheet" href="assets/crpm/index/index5/index5.css"/>
<link rel="stylesheet" href="assets/crpm/index/index.css"/>
<style>
/* 主内容区 */
main {
@ -86,13 +86,13 @@
background-color: white;
border-radius: 8px;
padding: 20px;
box-shadow: 0 2px 8px rgba(0,0,0,0.08);
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
transition: transform 0.2s, box-shadow 0.2s;
}
.stat-card:hover {
transform: translateY(-3px);
box-shadow: 0 4px 12px rgba(0,0,0,0.12);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12);
}
.stat-header {
@ -150,7 +150,7 @@
background-color: white;
border-radius: 8px;
padding: 15px;
box-shadow: 0 2px 8px rgba(0,0,0,0.08);
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
}
.chart-title {
@ -371,27 +371,27 @@
</style>
</head>
<body>
<div class="system">
<div class="system">
<div class="top">
<div class="title">
<h3>工厂计划与排程系统</h3>
</div>
<ul class="layui-nav layui-layout-right">
<li class="layui-nav-item ">
<div >
<div class="topTitle"><i class="layui-icon layui-icon-set-fill topicon"></i>资源配置</div>
<!-- <li class="layui-nav-item ">-->
<!-- <div>-->
<!-- <div class="topTitle"><i class="layui-icon layui-icon-set-fill topicon"></i>资源配置</div>-->
</div>
</li>
<li class="layui-nav-item topTitlec">
<!-- </div>-->
<!-- </li>-->
<li class="layui-nav-item topTitlec" id="accountManageBtn">
<div>
<div class="topTitle "><i class="layui-icon layui-icon-user topicon"></i>角色管理</div>
<div class="topTitle "><i class="layui-icon layui-icon-user topicon"></i>账号管理</div>
</div>
</li>
<li class="layui-nav-item layui-hide layui-show-sm-inline-block">
<a href="javascript:void(0);">管理员</a>
<dl class="layui-nav-child">
<dd><a href="javascript:void(0);">退出</a></dd>
<dd><a href="javascript:void(0);" id="signoutBtn">退出</a></dd>
</dl>
</li>
</ul>
@ -401,37 +401,59 @@
<!-- 左侧导航区域（可配合layui已有的垂直导航） -->
<ul class="layui-nav layui-nav-tree" lay-filter="test">
<li class="layui-nav-item layui-nav-itemed">
<a href="javascript:void(0);" class="menu-item" id="menu-71258579-bc48-4160-a828-4fcfc4e2c520" data-mod-id="085bf879-d349-4cd5-9b93-bdbe78a5d0de" data-url="route/pages/888158/list.html"><i class="fa fa-archive"></i> 库存管理</a>
<a href="javascript:void(0);" class="menu-item" id="menu-71258579-bc48-4160-a828-4fcfc4e2c520"
data-mod-id="085bf879-d349-4cd5-9b93-bdbe78a5d0de" data-url="route/pages/888158/list.html"><i
class="fa fa-archive"></i> 库存管理</a>
</li>
<li class="layui-nav-item layui-nav-itemed">
<a href="javascript:void(0);" class="menu-item" id="menu-e2aeee01-bdb8-4858-83c0-82a0c23057a8" data-mod-id="8eb6a834-6798-4932-bfa3-3bf256390339" data-url="route/pages/0ca304/list.html"><i class="fa fa-shopping-cart"></i> 订单管理</a>
<a href="javascript:void(0);" class="menu-item" id="menu-e2aeee01-bdb8-4858-83c0-82a0c23057a8"
data-mod-id="8eb6a834-6798-4932-bfa3-3bf256390339" data-url="route/pages/0ca304/list.html"><i
class="fa fa-shopping-cart"></i> 订单管理</a>
</li>
<li class="layui-nav-item layui-nav-itemed">
<a href="javascript:void(0);" class="menu-item" id="menu-5d313505-c45c-4d87-8486-82ef3f544839" data-mod-id="c753448d-9ac1-4ef6-9472-c967dc6e984f" data-url="route/pages/67a64f/list.html"><i class="fa fa-line-chart"></i> 需求预测</a>
<a href="javascript:void(0);" class="menu-item" id="menu-5d313505-c45c-4d87-8486-82ef3f544839"
data-mod-id="c753448d-9ac1-4ef6-9472-c967dc6e984f" data-url="route/pages/67a64f/list.html"><i
class="fa fa-line-chart"></i> 需求预测</a>
</li>
<li class="layui-nav-item layui-nav-itemed">
<a href="javascript:void(0);" class="menu-item" id="menu-9e413446-8c9c-482e-ac74-62aaef1fe53f" data-mod-id="9cf0c913-51ac-4340-b4b3-c13daea6f632" data-url="route/pages/6b8802/list.html"><i class="fa fa-cogs"></i> 物料需求计划</a>
<a href="javascript:void(0);" class="menu-item" id="menu-9e413446-8c9c-482e-ac74-62aaef1fe53f"
data-mod-id="9cf0c913-51ac-4340-b4b3-c13daea6f632" data-url="route/pages/6b8802/list.html"><i
class="fa fa-cogs"></i> 物料需求计划</a>
</li>
<li class="layui-nav-item layui-nav-itemed">
<a href="javascript:void(0);" class="menu-item" id="menu-b279ed58-f80c-43d2-89fc-0afcb1376ca7" data-mod-id="beb7e844-dc03-40f2-ab08-84762ec5eb54" data-url="route/pages/cea335/list.html"><i class="fa fa-industry"></i> 生产能力规划</a>
<a href="javascript:void(0);" class="menu-item" id="menu-b279ed58-f80c-43d2-89fc-0afcb1376ca7"
data-mod-id="beb7e844-dc03-40f2-ab08-84762ec5eb54" data-url="route/pages/cea335/list.html"><i
class="fa fa-industry"></i> 生产能力规划</a>
</li>
<li class="layui-nav-item layui-nav-itemed">
<a href="javascript:void(0);" class="menu-item" id="menu-5271289b-3018-42f6-b0a9-8674ddc1aedf" data-mod-id="b4c66335-522d-4ac2-b4e4-eacb5e5bd77d" data-url="route/pages/524b06/list.html"><i class="fa fa-calendar-check-o"></i> 排程优化</a>
<a href="javascript:void(0);" class="menu-item" id="menu-5271289b-3018-42f6-b0a9-8674ddc1aedf"
data-mod-id="b4c66335-522d-4ac2-b4e4-eacb5e5bd77d" data-url="route/pages/524b06/list.html"><i
class="fa fa-calendar-check-o"></i> 排程优化</a>
</li>
<li class="layui-nav-item layui-nav-itemed">
<a href="javascript:void(0);" class="menu-item" id="menu-de17568c-a098-49e7-8d8a-203b9c97514b" data-mod-id="5fc3be03-15d2-49dc-9114-25b8bfb0c738" data-url="route/pages/e819b9/list.html"><i class="fa fa-sitemap"></i> 多工厂协同</a>
<a href="javascript:void(0);" class="menu-item" id="menu-de17568c-a098-49e7-8d8a-203b9c97514b"
data-mod-id="5fc3be03-15d2-49dc-9114-25b8bfb0c738" data-url="route/pages/e819b9/list.html"><i
class="fa fa-sitemap"></i> 多工厂协同</a>
</li>
<li class="layui-nav-item layui-nav-itemed">
<a href="javascript:void(0);" class="menu-item" id="menu-74ab1f43-8e53-45cf-9434-8c402f470dd2" data-mod-id="36ab0300-9b15-4992-b771-9cf0b816ff51" data-url="route/pages/506488/list.html"><i class="fa fa-truck"></i> 订单追踪</a>
<a href="javascript:void(0);" class="menu-item" id="menu-74ab1f43-8e53-45cf-9434-8c402f470dd2"
data-mod-id="36ab0300-9b15-4992-b771-9cf0b816ff51" data-url="route/pages/506488/list.html"><i
class="fa fa-truck"></i> 订单追踪</a>
</li>
<li class="layui-nav-item layui-nav-itemed">
<a href="javascript:void(0);" class="menu-item" id="menu-250ee74d-8729-4de1-871c-f92f23b6b5b7" data-mod-id="8815d2e1-edee-428b-a583-19aac45fd67d" data-url="route/pages/e014b2/list.html"><i class="fa fa-eye"></i> 实时监控</a>
<a href="javascript:void(0);" class="menu-item" id="menu-250ee74d-8729-4de1-871c-f92f23b6b5b7"
data-mod-id="8815d2e1-edee-428b-a583-19aac45fd67d" data-url="route/pages/e014b2/list.html"><i
class="fa fa-eye"></i> 实时监控</a>
</li>
<li class="layui-nav-item layui-nav-itemed">
<a href="javascript:void(0);" class="menu-item" id="menu-e847509e-6636-4b23-b387-48e2c339b50c" data-mod-id="334d7f6b-b48e-4455-b69f-6e596ac5cd66" data-url="route/pages/1af868/list.html"><i class="fa fa-check-square-o"></i> 合规性检查</a>
<a href="javascript:void(0);" class="menu-item" id="menu-e847509e-6636-4b23-b387-48e2c339b50c"
data-mod-id="334d7f6b-b48e-4455-b69f-6e596ac5cd66" data-url="route/pages/1af868/list.html"><i
class="fa fa-check-square-o"></i> 合规性检查</a>
</li>
<li class="layui-nav-item layui-nav-itemed">
<a href="javascript:void(0);" class="menu-item" id="menu-79f60e32-6e10-409e-b571-b33a0bba24e1" data-mod-id="a792be85-54bb-4bdb-84ab-22d095f19398" data-url="route/pages/66b923/list.html"><i class="fa fa-exclamation-triangle"></i> 异常处理</a>
<a href="javascript:void(0);" class="menu-item" id="menu-79f60e32-6e10-409e-b571-b33a0bba24e1"
data-mod-id="a792be85-54bb-4bdb-84ab-22d095f19398" data-url="route/pages/66b923/list.html"><i
class="fa fa-exclamation-triangle"></i> 异常处理</a>
</li>
</ul>
</div>
@ -757,6 +779,7 @@
</div>
</div>
</div>
</div>
<script src="assets/crpm/js/layui/layui.js"></script>
<script src="assets/crpm/js/echarts/echarts.min.js"></script>
@ -768,8 +791,17 @@
var $ = layui.$;
var $win = $(window);
window['layer'] = layer;
$('#signoutBtn').click(function() {
window.open('sign/signout', '_self')
})
var init = function() {
$('#accountManageBtn').click(function() {
var pageIframe = $('#pageIframe');
pageIframe.attr('src', 'route/pages/user/list.html');
pageIframe.show();
homepage.style.display = 'none';
})
var init = function () {
var $pageIframe = $('#pageIframe');
$pageIframe.css({
height: `${$win.height() - 150}px`
@ -778,7 +810,7 @@
init();
var homepage = document.getElementById('homepage');
$(document).on('click', '.menu-item', function() {
$(document).on('click', '.menu-item', function () {
var url = this.dataset.url;
var pageIframe = $('#pageIframe');
pageIframe.attr('src', url);
@ -787,7 +819,7 @@
});
});
// 初始化图表
document.addEventListener('DOMContentLoaded', function() {
document.addEventListener('DOMContentLoaded', function () {
// 采购趋势图表
const purchaseChart = echarts.init(document.getElementById('purchase-trend'));
purchaseChart.setOption({
@ -822,7 +854,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
data: Array.from({length: 30}, (_, i) => `${i+1}日`)
data: Array.from({length: 30}, (_, i) => `${i + 1}日`)
},
yAxis: [
{
@ -1001,7 +1033,7 @@
});
// 监听窗口大小变化，调整图表
window.addEventListener('resize', function() {
window.addEventListener('resize', function () {
purchaseChart.resize();
inventoryChart.resize();
productionChart.resize();
@ -1009,7 +1041,7 @@
});
// 刷新按钮事件
document.getElementById('refresh-btn').addEventListener('click', function() {
document.getElementById('refresh-btn').addEventListener('click', function () {
// 显示加载状态
this.innerHTML = '<i class="fa fa-spinner fa-spin"></i> 刷新中...';
this.disabled = true;

29
gcsbyxjkglxt/src/main/resources/static/route/pages/index.html
View File

@ -442,23 +442,23 @@
<div class='photo'>头像</div>
<h5>账号名称</h5>
<ul class="layui-nav layui-layout-right">
<li class="layui-nav-item ">
<div class="top-title-box">
<div class="layui-icon layui-icon-set-fill" style="font-size: 20px;margin-right: 10px;"></div>
<div class="topTitle">资源配置
</div>
</div>
</li>
<li class="layui-nav-item topTitlec" style="margin-right: 20px;margin-left: 20px;">
<!-- <li class="layui-nav-item ">-->
<!-- <div class="top-title-box">-->
<!-- <div class="layui-icon layui-icon-set-fill" style="font-size: 20px;margin-right: 10px;"></div>-->
<!-- <div class="topTitle">资源配置-->
<!-- </div>-->
<!-- </div>-->
<!-- </li>-->
<li class="layui-nav-item topTitlec" style="margin-right: 20px;margin-left: 20px;" id="accountManageBtn">
<div class="top-title-box">
<div class="layui-icon layui-icon-template-1" style="font-size: 20px;margin-right: 10px;"></div>
<div class="topTitle">角色管理</div>
<div class="topTitle">账号管理</div>
</div>
</li>
<li class="layui-nav-item layui-hide layui-show-sm-inline-block">
<a href="javascript:void(0);">管理员</a>
<dl class="layui-nav-child">
<dd><a href="javascript:void(0);">退出</a></dd>
<dd><a href="javascript:void(0); " id="signoutBtn">退出</a></dd>
</dl>
</li>
</ul>
@ -1012,7 +1012,16 @@
var $ = layui.$;
var $win = $(window);
window['layer'] = layer;
$('#signoutBtn').click(function() {
window.open('sign/signout', '_self')
})
$('#accountManageBtn').click(function() {
var pageIframe = $('#pageIframe');
pageIframe.attr('src', 'route/pages/user/list.html');
pageIframe.show();
homepage.style.display = 'none';
})
var init = function () {
var $pageIframe = $('#pageIframe');
$pageIframe.css({