From 35b0e1f75db13863e5d0a6c95b5e13a4cec47d14 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 31 十二月 2025 15:01:25 +0800
Subject: [PATCH] 更新框架中库区下拉选择
---
fzzy-igdss-web/src/main/resources/templates/security/video-list-dept.html | 11 -----
fzzy-igdss-web/src/main/resources/static/security/video-list-dept.js | 40 --------------------
fzzy-igdss-web/src/main/resources/templates/index.html | 22 ++++++++++-
fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml | 4 +-
fzzy-igdss-web/src/main/resources/templates/index-topnav.html | 22 ++++++++++-
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java | 9 ++++
6 files changed, 51 insertions(+), 57 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml
index 481a790..0036934 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml
@@ -16,7 +16,7 @@
<Reference name="listArea">
<Property name="dataType">[dtArea]</Property>
<Property name="parameter">$${this.id}</Property>
- <Property name="dataProvider">selectDeptPR#listArea</Property>
+ <Property name="dataProvider">deptPR#getDeptByUserType</Property>
</Reference>
</DataType>
<DataType name="dtArea">
@@ -35,7 +35,7 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsCompany">
<Property name="dataType">[dtCompany]</Property>
- <Property name="dataProvider">selectDeptPR#listCompany</Property>
+ <Property name="dataProvider">companyPR#getCompanyByUserType</Property>
</DataSet>
<DataTree>
<ClientEvent name="onDataRowDoubleClick">var curNode = self.get("currentNode");
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 4e231ff..e30d7b5 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
@@ -93,6 +93,15 @@
mmap.put("user", user);
mmap.put("sysName", FrameworkConfig.getName());
+ //鍒ゆ柇鏄惁鏄剧ず搴撳尯閫夋嫨寮圭獥
+ String showDeptList = "Y";
+ SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
+ if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
+ showDeptList = "N";
+ }
+ mmap.put("showDeptList", showDeptList);
+
+ //鏇存柊缂撳瓨涓敤鎴峰簱鍖篿d
ContextUtil.updateSubDept(user.getLoginName(), deptId);
SysDept dept = iSysDeptService.selectDeptById(Long.valueOf(deptId));
mmap.put("dept", dept);
diff --git a/fzzy-igdss-web/src/main/resources/static/security/video-list-dept.js b/fzzy-igdss-web/src/main/resources/static/security/video-list-dept.js
index 784ca79..2ad4c1b 100644
--- a/fzzy-igdss-web/src/main/resources/static/security/video-list-dept.js
+++ b/fzzy-igdss-web/src/main/resources/static/security/video-list-dept.js
@@ -50,49 +50,9 @@
table = layui.table;
});
- showDeptSelect();
-
//鍒濆鍖栨覆鏌撴挱鏀惧垪琛�
renderList();
});
-
-
-/**
- * 寮瑰嚭鍒囨崲搴撳尯鍒楄〃
- */
-function showDeptSelect() {
- if(showDeptList === "N"){
- $("#deptList").css('display', 'none');
- }
- if(showDeptList === "Y"){
- $("#deptList").css('display', 'block');
- }
-}
-
-/**
- * 寮瑰嚭鍒囨崲搴撳尯鍒楄〃
- */
-function showDepotAreaSelect() {
- layer.open({
- type: 2,
- title: '閫夋嫨搴撳尯',
- area: ['400px', '650px'],
- offset: ['50px', '170px'],
- shade: 0,
- content: "/com.fzzy.igds.SelectDept.d",
- closeBtn: 1
- });
-}
-
-/**
- *
- * @param id
- * @returns {boolean}
- */
-function onDeptAreaChange(id) {
- window.location.href = "./security/video-dept?type=" + type + "&deptId=" + id;
- return true;
-}
/**
* 娓叉煋鐩戞帶鍒楄〃
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..6fa52cc 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-->
@@ -414,6 +414,24 @@
return true;
}
+/**
+ * 寮瑰嚭鍒囨崲搴撳尯鍒楄〃
+ */
+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 toggleMenu() {
$.modal.confirm("纭瑕佸垏鎹㈡垚宸︿晶鑿滃崟鍚楋紵", function() {
diff --git a/fzzy-igdss-web/src/main/resources/templates/index.html b/fzzy-igdss-web/src/main/resources/templates/index.html
index ef4180d..dc7cbdc 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index.html
@@ -101,8 +101,8 @@
</a>
</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 class="fa fa-question-circle"></i>-->
@@ -256,6 +256,24 @@
return true;
}
+ /**
+ * 寮瑰嚭鍒囨崲搴撳尯鍒楄〃
+ */
+ 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 applyPath(url) {
$('a[href$="' + decodeURI(url) + '"]').click();
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/video-list-dept.html b/fzzy-igdss-web/src/main/resources/templates/security/video-list-dept.html
index d91d35c..f684a75 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/video-list-dept.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/video-list-dept.html
@@ -223,13 +223,6 @@
width: 100%;
height: 100%;
}
- .dept{
- margin-left: 150px;
- font-size: 16px;
- color: #FFFFFF;
- width: 400px;
- padding-top: 8px;
- }
</style>
</head>
@@ -245,10 +238,6 @@
<h3>
<i></i>瑙嗛瀹炴椂棰勮
</h3>
- <div id="deptList" class="dept" onclick="showDepotAreaSelect()">
- <img style="width: 18px" th:src="@{/img/web/security/qh.png}"/>
- [[${#strings.defaultString(dept.deptName, '-')}]]
- </div>
<div class="fenping_icon">
<img onclick="fenping(1)" id="f_1" style="width: 30px" th:src="@{/img/web/group/fp_1_active.png}"/>
<img onclick="fenping(4)" id="f_4" style="width: 30px" th:src="@{/img/web/group/fp_4.png}"/>
--
Gitblit v1.9.3