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-topnav.html | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 9fc2d76..2906f13 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
@@ -271,8 +271,8 @@
</div>
<!-- 鍙充晶鏍� -->
<ul class="nav navbar-top-links navbar-right welcome-message">
- <li style="background-color: #03703a;"><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" th:title="${dept.deptName}"
- href="javascript:;"><i class="fa fa-map-o"></i> [[${#strings.defaultString(dept.deptName,
+ <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,
'-')}]]</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-->
@@ -366,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");
@@ -414,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