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 | 86 +++++++++++++++++++++++++++++++++++-------
1 files changed, 71 insertions(+), 15 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/templates/index.html b/fzzy-igdss-web/src/main/resources/templates/index.html
index e346145..c673d44 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit">
- <title>鏅烘収绮簱-璁惧鍔ㄦ�佹劅鐭ヨ繍缁寸鐞嗙郴缁�</title>
+ <title th:text="${sysName}">鏅烘収绮簱绠＄悊绯荤粺</title>
<!-- 閬垮厤IE浣跨敤鍏煎妯″紡 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link th:href="@{favicon.ico}" rel="shortcut icon"/>
@@ -15,19 +15,26 @@
<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>
- <a th:href="@{/index}">
+ <a onclick="onDeptChange()" href="javascript:;">
<li class="logo hidden-xs">
- <span class="logo-lg">璁惧鍔ㄦ�佹劅鐭ヨ繍缁寸鐞嗙郴缁�</span>
+ <span class="logo-lg" th:text="${sysName}">鏅烘収绮簱绠＄悊绯荤粺</span>
</li>
</a>
<div class="sidebar-collapse">
@@ -49,10 +56,7 @@
</div>
</div>
</li>
- <li>
- <a class="menuItem" th:href="@{/eoms/index}"><i class="fa fa-home"></i> <span
- class="nav-label">棣栭〉</span> </a>
- </li>
+
<li th:each="menu : ${menus}">
<a th:class="@{${!#strings.isEmpty(menu.url) && menu.url != '#'} ? ${menu.target}}"
th:href="@{${#strings.isEmpty(menu.url)} ? |#| : ${menu.url}}"
@@ -91,6 +95,9 @@
</li>
</ul>
</div>
+ <div style="text-align: center;">
+ <p style="color: #FFFFFF">鏂癐CP澶�2024007717鍙�-2</p>
+ </div>
</nav>
<!--宸︿晶瀵艰埅缁撴潫-->
@@ -104,9 +111,14 @@
</a>
</div>
<ul class="nav navbar-top-links navbar-right welcome-message">
- <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 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 class="fa fa-question-circle"></i>-->
+<!-- 鏂囨。</a></li>-->
+ <li id="screenBtn"><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="鍏ㄥ睆鏄剧ず"
@@ -150,7 +162,7 @@
</button>
<nav class="page-tabs menuTabs">
<div class="page-tabs-content">
- <a href="javascript:;" class="active menuTab" th:data-id="@{/eoms/index}">棣栭〉</a>
+ <a href="javascript:void(0);" class="active menuTab" th:data-id="${welcomeUrl}">娆㈣繋</a>
</div>
</nav>
<button class="roll-nav roll-right tabRight">
@@ -163,8 +175,8 @@
</a>
<div class="row mainContent" id="content-main" th:classappend="${mainClass}">
- <iframe class="RuoYi_iframe" name="iframe0" width="100%" height="100%" th:data-id="@{/eoms/index}"
- th:src="@{/eoms/index}" frameborder="0" seamless></iframe>
+ <iframe class="RuoYi_iframe" name="iframe0" width="100%" height="100%" th:data-id="${welcomeUrl}"
+ th:src="${welcomeUrl}" frameborder="0" seamless></iframe>
</div>
<div th:if="${footer}" class="footer">
@@ -180,7 +192,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>
@@ -189,6 +201,10 @@
window.history.forward(1);
var ctx = [[@{/}]];
var lockscreen = [[${session.lockscreen}]];
+ var dept = [[${dept}]];
+ var deptId = [[${deptId}]];
+ var showDeptList = [[${showDeptList}]];
+ var showDeptListTag = false;
if (lockscreen) {
window.top.location = ctx + "lockscreen";
}
@@ -240,6 +256,41 @@
})
}
+ /**
+ * 閲嶆柊鍒囨崲椤甸潰
+ */
+ function onDeptChange() {
+ onDeptAreaChange(deptId);
+ }
+ function onDeptAreaChange(id) {
+ window.location.href = "./index?deptId=" + id;
+ 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 applyPath(url) {
$('a[href$="' + decodeURI(url) + '"]').click();
@@ -270,6 +321,11 @@
}
}
+ if(showDeptList === "N"){
+ //搴撳尯鐢ㄦ埛锛岄殣钘忓ぇ灞忔寜閽�
+ $("#screenBtn").css('display', 'none');
+ }
+
/* 鍒濆瀵嗙爜鎻愮ず */
if ([[${isDefaultModifyPwd}]]) {
layer.confirm("鎮ㄧ殑瀵嗙爜杩樻槸鍒濆瀵嗙爜锛岃淇敼瀵嗙爜锛�", {
--
Gitblit v1.9.3