From 72a67eb9ba942e632c11906093c5cd14e364eed7 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 13 二月 2026 14:27:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/resources/templates/index.html | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/templates/index.html b/fzzy-igdss-web/src/main/resources/templates/index.html
index d329d35..c673d44 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index.html
@@ -15,13 +15,20 @@
<link th:href="@{/css/style.min.css}" rel="stylesheet"/>
<link th:href="@{/css/skins.css}" rel="stylesheet"/>
<link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.8}" rel="stylesheet"/>
+ <style>
+ .slimScrollDiv{
+ position: relative;
+ width: auto;
+ height: 92%;
+ }
+ </style>
</head>
<body class="fixed-sidebar full-height-layout gray-bg skin-zcl" th:classappend="${isMobile} ? 'canvas-menu'"
style="overflow: hidden">
<div id="wrapper">
<!--宸︿晶瀵艰埅寮�濮�-->
- <nav class="navbar-default navbar-static-side" role="navigation">
+ <nav class="navbar-default navbar-static-side" role="navigation" style="height: 96%;">
<div class="nav-close">
<i class="fa fa-times-circle"></i>
</div>
@@ -87,6 +94,9 @@
</ul>
</li>
</ul>
+ </div>
+ <div style="text-align: center;">
+ <p style="color: #FFFFFF">鏂癐CP澶�2024007717鍙�-2</p>
</div>
</nav>
<!--宸︿晶瀵艰埅缁撴潫-->
@@ -194,6 +204,7 @@
var dept = [[${dept}]];
var deptId = [[${deptId}]];
var showDeptList = [[${showDeptList}]];
+ var showDeptListTag = false;
if (lockscreen) {
window.top.location = ctx + "lockscreen";
}
@@ -260,9 +271,13 @@
* 寮瑰嚭鍒囨崲搴撳尯鍒楄〃
*/
function showDepotAreaSelect() {
+ if(showDeptListTag){
+ return false;
+ }
if(showDeptList === "N"){
return false;
}
+ showDeptListTag = true;
layer.open({
type: 2,
title: '閫夋嫨搴撳尯',
@@ -270,7 +285,9 @@
offset: ['50px', '1350px'],
shade: 0,
content: "com.fzzy.igds.SelectDept.d",
- closeBtn: 1
+ end: function(){ // 鍏抽棴灞傚悗鐨勫洖璋�
+ showDeptListTag = false;
+ }
});
}
--
Gitblit v1.9.3