冲突解决
This commit is contained in:
commit
e8b9f70d4e
Binary file not shown.
@ -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
|
@ -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';
|
||||
})
|
||||
|
||||
});
|
||||
|
||||
|
@ -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;}
|
||||
|
@ -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;}
|
||||
|
@ -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;}
|
||||
|
Binary file not shown.
@ -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');
|
||||
|
||||
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@ -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({
|
||||
|
Loading…
Reference in New Issue
Block a user