From c7e17f74474198316a39b9bf7afde5d403a49c56 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 26 二月 2026 14:00:35 +0800
Subject: [PATCH] 增加称重页面3-调整页面布局UI
---
fzzy-igdss-web/src/main/resources/templates/index-topnav.html | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/templates/index-topnav.html b/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
index 1eadfcd..2906f13 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
@@ -272,11 +272,13 @@
<!-- 鍙充晶鏍� -->
<ul class="nav navbar-top-links navbar-right welcome-message">
<li style="background-color: #03703a;"><a onclick="showDepotAreaSelect()" data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="搴撳尯閫夋嫨"
- href="javascript:;"><i class="fa fa-refresh"></i> [[${#strings.defaultString(dept.deptName,
+ href="javascript:;"><i class="fa fa-refresh"></i> [[${#strings.defaultString(dept.deptName,
'-')}]]</a></li>
- <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="寮�鍙戞枃妗�"
- href="https://fzzygf-company.feishu.cn/wiki/ZgS5wQuyMi2uDKk9xN6cx8jlnuf" target="_blank"><i
- class="fa fa-question-circle"></i> 鏂囨。</a></li>
+<!-- <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="寮�鍙戞枃妗�"-->
+<!-- href="https://fzzygf-company.feishu.cn/wiki/ZgS5wQuyMi2uDKk9xN6cx8jlnuf" target="_blank"><i-->
+<!-- class="fa fa-question-circle"></i> 鏂囨。</a></li>-->
+ <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="澶у睆"
+ href="/index-gateway" id="index-gateway"><i class="fa fa-laptop"></i> 澶у睆</a></li>
<li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="閿佸畾灞忓箷"
href="javascript:;" id="lockScreen"><i class="fa fa-lock"></i> 閿佸睆</a></li>
<li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="鍏ㄥ睆鏄剧ず"
@@ -351,7 +353,7 @@
<script th:src="@{/js/plugins/slimscroll/jquery.slimscroll.min.js}"></script>
<script th:src="@{/js/jquery.contextMenu.min.js}"></script>
<script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
-<script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
+<script th:src="@{/ajax/libs/layer-ruoyi/layer.min.js}"></script>
<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.8}"></script>
<script th:src="@{/ruoyi/js/common.js?v=4.7.8}"></script>
<script th:src="@{/ruoyi/index.js?v=20201208}"></script>
@@ -364,6 +366,7 @@
var dept = [[${dept}]];
var deptId = [[${deptId}]];
var showDeptList = [[${showDeptList}]];
+var showDeptListTag = false;
if(lockscreen){window.top.location=ctx+"lockscreen";}
// 鐨偆缂撳瓨
var skin = storage.get("skin");
@@ -402,24 +405,6 @@
}
/**
- * 寮瑰嚭鍒囨崲搴撳尯鍒楄〃
- */
-function showDepotAreaSelect() {
- if(showDeptList === "N"){
- return false;
- }
- layer.open({
- type: 2,
- title: '閫夋嫨搴撳尯',
- area: ['400px', '650px'],
- offset: ['50px', '1350px'],
- shade: 0,
- content: "com.fzzy.igds.SelectDept.d",
- closeBtn: 1
- });
-}
-
-/**
* 閲嶆柊鍒囨崲椤甸潰
*/
function onDeptChange() {
@@ -430,6 +415,30 @@
return true;
}
+/**
+ * 寮瑰嚭鍒囨崲搴撳尯鍒楄〃
+ */
+function showDepotAreaSelect() {
+ if(showDeptListTag){
+ return false;
+ }
+ if(showDeptList === "N"){
+ return false;
+ }
+ showDeptListTag = true;
+ layer.open({
+ type: 2,
+ title: '閫夋嫨搴撳尯',
+ area: ['400px', '650px'],
+ offset: ['50px', '1350px'],
+ shade: 0,
+ content: "com.fzzy.igds.SelectDept.d",
+ end: function(){ // 鍏抽棴灞傚悗鐨勫洖璋�
+ showDeptListTag = false;
+ }
+ });
+}
+
/* 鍒囨崲鑿滃崟 */
function toggleMenu() {
$.modal.confirm("纭瑕佸垏鎹㈡垚宸︿晶鑿滃崟鍚楋紵", function() {
--
Gitblit v1.9.3