From 4529da5a2710d53a6268125c1a38d8eaf82f4a03 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 22 十二月 2025 12:06:04 +0800
Subject: [PATCH] 调整左侧菜单首页，及锁屏功能
---
fzzy-igdss-web/src/main/resources/static/inout/inout-handle.js | 6 +-
fzzy-igdss-web/src/main/resources/templates/group/video.html | 3 +
fzzy-igdss-web/src/main/resources/templates/group/index.html | 6 +-
fzzy-igdss-web/src/main/resources/templates/index.html | 38 +++++++++++++-----
fzzy-igdss-web/src/main/resources/application-dev.yml | 2
fzzy-igdss-web/src/main/resources/templates/lock.html | 3 +
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java | 4 ++
7 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java
index 3b775eb..12ae836 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java
@@ -150,6 +150,10 @@
public String lockscreen(ModelMap mmap) {
mmap.put("user", getSysUser());
ServletUtils.getSession().setAttribute(ShiroConstants.LOCK_SCREEN, true);
+ // 鍙栬韩浠戒俊鎭�
+ SysUser user = getSysUser();
+
+ mmap.put("deptId", user.getDeptId());
return "lock";
}
diff --git a/fzzy-igdss-web/src/main/resources/application-dev.yml b/fzzy-igdss-web/src/main/resources/application-dev.yml
index 6afddee..6325150 100644
--- a/fzzy-igdss-web/src/main/resources/application-dev.yml
+++ b/fzzy-igdss-web/src/main/resources/application-dev.yml
@@ -87,7 +87,7 @@
#绯荤粺鏋舵瀯閰嶇疆
framework:
- companyId: "1000"
+ companyId: "5372"
doradoMode: debug
# 鍚嶇О
name: 鏅烘収绮簱鐩戠绯荤粺
diff --git a/fzzy-igdss-web/src/main/resources/static/inout/inout-handle.js b/fzzy-igdss-web/src/main/resources/static/inout/inout-handle.js
index 07f088f..f1be14b 100644
--- a/fzzy-igdss-web/src/main/resources/static/inout/inout-handle.js
+++ b/fzzy-igdss-web/src/main/resources/static/inout/inout-handle.js
@@ -28,7 +28,7 @@
//涓婁紶
upload.render({
elem: '#kccz-r-btn1',
- url: '/basic/file/update-file', //涓婁紶鎺ュ彛
+ url: '/file/update-file', //涓婁紶鎺ュ彛
size: 4 * 1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
accept: 'images',
before: function (obj) {
@@ -52,7 +52,7 @@
});
upload.render({
elem: '#kccz-r-btn2',
- url: '/basic/file/update-file', //涓婁紶鎺ュ彛
+ url: '/file/update-file', //涓婁紶鎺ュ彛
size: 4 * 1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
accept: 'images',
before: function (obj) {
@@ -76,7 +76,7 @@
});
upload.render({
elem: '#kccz-r-btn3',
- url: '/basic/file/update-file', //涓婁紶鎺ュ彛
+ url: '/file/update-file', //涓婁紶鎺ュ彛
size: 4 * 1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
accept: 'images',
before: function (obj) {
diff --git a/fzzy-igdss-web/src/main/resources/templates/group/index.html b/fzzy-igdss-web/src/main/resources/templates/group/index.html
index b986355..bc3b361 100644
--- a/fzzy-igdss-web/src/main/resources/templates/group/index.html
+++ b/fzzy-igdss-web/src/main/resources/templates/group/index.html
@@ -436,9 +436,9 @@
<script th:src="@{/common/igds-common.js}"></script>
<script th:src="@{/group/mapList.js}"></script>
<script th:src="@{/group/index.js}"></script>
-<script th:inline="javascript">
- var userId = [[${loginUser.loginName}]];
- var companyId = [[${loginUser.companyId}]];
+<script th:inline="javascript"> var userId = [[${loginUser.loginName}]];
+var companyId = [[${loginUser.companyId}]];
+
var deptId = [[${deptId}]];
var dicSlogan = [[${dicSlogan}]];
var deptList = [[${deptList}]];
diff --git a/fzzy-igdss-web/src/main/resources/templates/group/video.html b/fzzy-igdss-web/src/main/resources/templates/group/video.html
index 12fb614..6eabe10 100644
--- a/fzzy-igdss-web/src/main/resources/templates/group/video.html
+++ b/fzzy-igdss-web/src/main/resources/templates/group/video.html
@@ -401,7 +401,8 @@
<script th:src="@{/common/igds-common.js}"></script>
<script th:src="@{/group/video.js}"></script>
<script th:inline="javascript">
-
+ var userId = [[${loginUser.loginName}]];
+ var companyId = [[${loginUser.companyId}]];
var bizType = [[${bizType}]];
var bizTag = [[${bizTag}]];
var deptCur = [[${deptInfo}]]
diff --git a/fzzy-igdss-web/src/main/resources/templates/index.html b/fzzy-igdss-web/src/main/resources/templates/index.html
index 6d73843..ef4180d 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index.html
@@ -25,7 +25,7 @@
<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" th:text="${sysName}">鏅烘収绮簱绠＄悊绯荤粺</span>
</li>
@@ -49,10 +49,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}}"
@@ -104,9 +101,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 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,
+ '-')}]]</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="鍏ㄥ睆鏄剧ず"
@@ -150,7 +152,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 th:href="@{/index}" class="active menuTab" th:data-id="${welcomeUrl}">娆㈣繋</a>
</div>
</nav>
<button class="roll-nav roll-right tabRight">
@@ -163,8 +165,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">
@@ -189,6 +191,9 @@
window.history.forward(1);
var ctx = [[@{/}]];
var lockscreen = [[${session.lockscreen}]];
+ var dept = [[${dept}]];
+ var deptId = [[${deptId}]];
+ var showDeptList = [[${showDeptList}]];
if (lockscreen) {
window.top.location = ctx + "lockscreen";
}
@@ -240,6 +245,17 @@
})
}
+ /**
+ * 閲嶆柊鍒囨崲椤甸潰
+ */
+ function onDeptChange() {
+ onDeptAreaChange(deptId);
+ }
+ function onDeptAreaChange(id) {
+ window.location.href = "./index?deptId=" + id;
+ return true;
+ }
+
/** 鍒锋柊鏃惰闂矾寰勯〉绛� */
function applyPath(url) {
$('a[href$="' + decodeURI(url) + '"]').click();
diff --git a/fzzy-igdss-web/src/main/resources/templates/lock.html b/fzzy-igdss-web/src/main/resources/templates/lock.html
index 243fbf2..da3732d 100644
--- a/fzzy-igdss-web/src/main/resources/templates/lock.html
+++ b/fzzy-igdss-web/src/main/resources/templates/lock.html
@@ -42,6 +42,7 @@
</body>
<script th:inline="javascript">
var ctx = [[@{/}]];
+ var deptId = [[${deptId}]];
Date.prototype.format = function(fmt) {
var o = {
"M+" : this.getMonth()+1, //鏈堜唤
@@ -99,7 +100,7 @@
},
success: function(result) {
if (result.code == web_status.SUCCESS) {
- location.href = ctx + 'index';
+ location.href = ctx + 'index' + "?deptId=" + deptId;
} else {
$.modal.msg(result.msg);
$("input[name='password']").val("");
--
Gitblit v1.9.3