From 1f455e5cda9016054c531bbae6b1639fe646628f Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 27 十一月 2025 19:36:37 +0800
Subject: [PATCH] 框架调整，及库区切换
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java | 29 +
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java | 59 +++
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java | 27 +
fzzy-igdss-web/src/main/resources/static/ruoyi/login.js | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java | 28 +
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java | 22 +
fzzy-igdss-web/src/main/resources/templates/index-topnav.html | 552 ++++++++++++++++++++----------------
fzzy-igdss-web/src/main/resources/static/axui/loginAndRegister.js | 2
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java | 40 ++
fzzy-igdss-view/src/main/java/com/fzzy/igds/CompanyPR.java | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotRepository.java | 9
fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java | 1
fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeptRepository.java | 13
fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/CompanyRepository.java | 19 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml | 67 ++++
fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java | 7
17 files changed, 618 insertions(+), 265 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java
index f252fe8..08bfe24 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java
@@ -97,11 +97,11 @@
@TableField("bulk_weight")
private Double bulkWeight;
- @Column(name = "store_keeper", columnDefinition = "varchar(4) COMMENT '淇濈鍛�'")
+ @Column(name = "store_keeper", columnDefinition = "varchar(40) COMMENT '淇濈鍛�'")
@TableField("store_keeper")
private String storeKeeper;
- @Column(name = "store_keeper_name", columnDefinition = "varchar(4) COMMENT '淇濈鍛�'")
+ @Column(name = "store_keeper_name", columnDefinition = "varchar(40) COMMENT '淇濈鍛�'")
@TableField("store_keeper_name")
private String storeKeeperName;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/CompanyRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/CompanyRepository.java
index c8d6855..b023463 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/CompanyRepository.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/CompanyRepository.java
@@ -17,6 +17,25 @@
public interface CompanyRepository extends JpaRepository<Company, String> {
/**
+ * 鏍规嵁id鑾峰彇淇℃伅
+ *
+ * @param id
+ * @return
+ */
+ @Query("from Company where id =:id order by id")
+ List<Company> getDataById(@Param("id") String id);
+
+
+ /**
+ * 鏍规嵁companyId鑾峰彇淇℃伅
+ *
+ * @param parentId
+ * @return
+ */
+ @Query("from Company where id like:parentId order by id")
+ List<Company> getDataByParentId(@Param("parentId") String parentId);
+
+ /**
* 鏍规嵁companyId鑾峰彇淇℃伅
*
* @param companyId
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotRepository.java
index a11388e..1d06005 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotRepository.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DepotRepository.java
@@ -75,4 +75,13 @@
@Modifying
@Query("update Depot set storageReal =:weight where id =:depotId")
void updateDepotStorage(@Param("weight") Double weight, @Param("depotId") String depotId);
+
+ /**
+ * 鑾峰彇搴撳尯涓嬫渶澶т粨搴撶紪鐮�
+ *
+ * @param deptId
+ * @return
+ */
+ @Query("from Depot where deptId =:deptId order by id")
+ List<Depot> getDepotMaxId(@Param("deptId") String deptId);
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeptRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeptRepository.java
index 6fdb937..39ff99e 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeptRepository.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeptRepository.java
@@ -19,11 +19,20 @@
/**
* 鏍规嵁id鑾峰彇淇℃伅
*
- * @param id
+ * @param parentId
+ * @return
+ */
+ @Query("from Dept where id like:parentId order by id")
+ List<Dept> getDataByParentId(@Param("parentId") String parentId);
+
+ /**
+ * 鏍规嵁companyId鑾峰彇淇℃伅
+ *
+ * @param companyId
* @return
*/
@Query("from Dept where id =:id order by id")
- Dept getDataById(@Param("id") String id);
+ List<Dept> getDataById(@Param("id") String id);
/**
* 鏍规嵁companyId鑾峰彇淇℃伅
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
index 84b2ecb..965f11c 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
@@ -4,6 +4,7 @@
import com.fzzy.igds.repository.CompanyRepository;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -23,7 +24,16 @@
/**
* jpa鏌ヨ鍏徃淇℃伅
- * @param companyId
+ * @param id
+ * @return
+ */
+ public List<Company> getDataById(String id) {
+
+ return companyRepository.getDataById(id);
+ }
+
+ /**
+ * jpa鏌ヨ鍏徃淇℃伅
* @return
*/
public List<Company> getAllData(String companyId) {
@@ -35,6 +45,16 @@
}
/**
+ * jpa鏌ヨ鍏徃淇℃伅
+ * @return
+ */
+ public List<Company> getDataByParentId() {
+
+ SysUser user = ContextUtil.getLoginUser();
+ return companyRepository.getDataByParentId(user.getDeptId() + "%");
+ }
+
+ /**
* jpa鏂板鍏徃淇℃伅
* @param sysDept
* @return
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
index d376ebb..ad5fde1 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
@@ -1,10 +1,13 @@
package com.fzzy.igds.service;
+import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.repository.DeptRepository;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysDeptService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
@@ -19,19 +22,33 @@
public class CoreDeptService {
@Resource
+ private ISysDeptService iSysDeptService;
+ @Resource
private DeptRepository deptRepository;
+
/**
* jpa鏌ヨ淇℃伅
- * @param companyId
+ * @param parentId
* @return
*/
- public List<Dept> getAllData(String companyId) {
+ public List<Dept> getDataByParentId(String parentId) {
+ return deptRepository.getDataByParentId(parentId + "%");
+ }
- if (StringUtils.isEmpty(companyId)) {
- companyId = ContextUtil.getCompanyId();
+
+ /**
+ * jpa鏌ヨ淇℃伅
+ * @return
+ */
+ public List<Dept> getDeptData() {
+ SysUser user = ContextUtil.getLoginUser();
+ SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
+ if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
+ return deptRepository.getDataById(ContextUtil.subDeptId(user));
+ }else {
+ return deptRepository.getDataByParentId(user.getDeptId() + "%");
}
- return deptRepository.getAllData(companyId);
}
/**
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
index aa162a1..36fbb15 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
@@ -26,11 +26,6 @@
private DepotRepository depotRepository;
@Resource
private RedisCache redisCache;
- @Resource
- private SysDeptMapper deptMapper;
- @Resource
- private DepotStoreService depotStoreService;
-
/**
* jpa鏌ヨ浠撳簱鍒楄〃
@@ -72,14 +67,37 @@
if (StringUtils.isEmpty(depot.getDeptId())) {
depot.setDeptId(ContextUtil.subDeptId(null));
}
+ //涓婚敭ID
+ if (StringUtils.isEmpty(depot.getId())) {
+ depot.setId(getStrId(depot.getDeptId()));
+ depot.setCreateBy(ContextUtil.getLoginUserName());
+ depot.setCreateTime(new Date());
+ }
+ //榛樿椤哄簭鍙�
if(null == depot.getOrderNum()){
depot.setOrderNum(1);
}
+ depot.setUpdateBy(ContextUtil.getLoginUserName());
+ depot.setUpdateTime(new Date());
depotRepository.save(depot);
flushCache(depot.getCompanyId());
}
/**
+ * 鑾峰彇涓婚敭ID
+ * @param deptId
+ * @param deptId
+ */
+ public String getStrId(String deptId) {
+ List<Depot> depots = depotRepository.getDepotMaxId(deptId);
+ String oldOrderId = null;
+ if(null != depots && depots.size() > 0){
+ oldOrderId = depots.get(0).getId().substring(deptId.length());
+ }
+ return deptId + ContextUtil.getOrderId(oldOrderId, 3);
+ }
+
+ /**
* jpa鏇存柊浠撳簱鐘舵��
* @param depotId
* @param status
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
index 3bd99fd..7134167 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
@@ -3,8 +3,8 @@
import com.ruoyi.common.config.FrameworkConfig;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.common.utils.StringUtils;
import org.apache.commons.lang3.RandomUtils;
-import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import java.time.LocalDateTime;
@@ -95,4 +95,31 @@
if (null == deptId) return;
contextUserDept.put(userId, deptId);
}
+
+ /**
+ * 鑾峰彇椤哄簭鍙�
+ * @param oldOrderId 鍘熸湁椤哄簭鍙�
+ * @param num 浣嶆暟
+ * @return
+ */
+ public static String getOrderId(String oldOrderId, Integer num) {
+ Integer index3 = 1001;
+ Integer index4 = 10001;
+ Integer index5 = 100001;
+ Integer index = 0;
+ String orderId = "001";
+ if(StringUtils.isNotEmpty(oldOrderId)){
+ index = Integer.valueOf(oldOrderId);
+ }
+ if(3 == num){
+ orderId = ((index3 + index) + "").substring(1);
+ }
+ if(4 == num){
+ orderId = ((index4 + index) + "").substring(1);
+ }
+ if(5 == num){
+ orderId = ((index5 + index) + "").substring(1);
+ }
+ return orderId;
+ }
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/CompanyPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/CompanyPR.java
index 9ae2259..a21af61 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/CompanyPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/CompanyPR.java
@@ -30,7 +30,7 @@
@DataProvider
public List<Company> getData() {
- return coreCompanyService.getAllData(null);
+ return coreCompanyService.getDataByParentId();
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
index 3e6650b..2f15b40 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
@@ -46,7 +46,6 @@
Depot depot = new Depot();
BeanUtils.copyProperties(data, depot);
depotService.saveDepot(depot);
- depotService.flushCache(null);
return null;
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
index 3e16a32..2e0b8b3 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
@@ -4,6 +4,10 @@
import com.bstek.dorado.annotation.DataResolver;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.service.CoreDeptService;
+import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -20,6 +24,7 @@
@Resource
private CoreDeptService coreDeptService;
+
/**
* 鏌ヨ璁惧,灏嗘搷浣滀俊鎭皟鏁翠负绌猴紝榛樿鍖呮嫭鍒嗗簱鍙傛暟
*
@@ -30,7 +35,7 @@
@DataProvider
public List<Dept> getData() {
- return coreDeptService.getAllData(null);
+ return coreDeptService.getDeptData();
}
/**
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
new file mode 100644
index 0000000..faa9827
--- /dev/null
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtCompany">
+ <Property name="creationType">com.fzzy.igds.domain.Company</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">鍏徃缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="dwmc">
+ <Property></Property>
+ <Property name="label">鍗曚綅鍚嶇О</Property>
+ </PropertyDef>
+ <Reference name="listArea">
+ <Property name="dataType">[dtArea]</Property>
+ <Property name="parameter">$${this.id}</Property>
+ <Property name="dataProvider">selectDeptPR#listArea</Property>
+ </Reference>
+ </DataType>
+ <DataType name="dtArea">
+ <Property name="creationType">com.fzzy.igds.domain.Dept</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="kqmc">
+ <Property></Property>
+ <Property name="label">搴撳尯鍚嶇О</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View>
+ <Property name="packages">font-awesome</Property>
+ <DataSet id="dsCompany">
+ <Property name="dataType">[dtCompany]</Property>
+ <Property name="dataProvider">selectDeptPR#listCompany</Property>
+ </DataSet>
+ <DataTree>
+ <ClientEvent name="onDataRowDoubleClick">var curNode = self.get("currentNode");
+if(curNode.get("hasChild")){
+ curNode.expand();
+ $notify("璇烽�夋嫨搴撳尯鈥︹��");
+}else{
+ var curData = self.get("currentEntity");
+ window.parent.onDeptAreaChange(curData.get("id"));
+}</ClientEvent>
+ <Property name="dataSet">dsCompany</Property>
+ <Property name="highlightCurrentRow">false</Property>
+ <BindingConfigs>
+ <BindingConfig>
+ <Property name="name">dwmc</Property>
+ <Property name="hasChild">true</Property>
+ <Property name="labelProperty">dwmc</Property>
+ <Property name="iconClass">fa fa-university</Property>
+ <BindingConfig>
+ <Property name="name">name</Property>
+ <Property name="childrenProperty">listArea</Property>
+ <Property name="labelProperty">kqmc</Property>
+ <Property name="iconClass">fa fa-home</Property>
+ </BindingConfig>
+ </BindingConfig>
+ </BindingConfigs>
+ </DataTree>
+ </View>
+</ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java
new file mode 100644
index 0000000..da45a32
--- /dev/null
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java
@@ -0,0 +1,59 @@
+package com.fzzy.igds;
+
+import com.bstek.dorado.annotation.DataProvider;
+import com.fzzy.igds.domain.Company;
+import com.fzzy.igds.domain.Dept;
+import com.fzzy.igds.service.CoreCompanyService;
+import com.fzzy.igds.service.CoreDeptService;
+import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.config.FrameworkConfig;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Description 搴撳尯鍒囨崲
+ * @Author CZT
+ * @Date 2025/11/27 16:46
+ */
+@Component
+public class SelectDeptPR {
+
+ @Resource
+ private CoreCompanyService companyService;
+ @Resource
+ private CoreDeptService deptService;
+ /**
+ * selectDeptPR#listCompany
+ * 鏍规嵁琛屾斂鍖哄垝浠ｇ爜鑾峰彇 浼佷笟淇℃伅鍒楄〃
+ * @param id
+ * @return
+ */
+ @DataProvider
+ public List<Company> listCompany(String id){
+ //鑾峰彇褰撳墠鐧诲綍浜�
+ SysUser user = ContextUtil.getLoginUser();
+
+ if(FrameworkConfig.getCompanyId().equals(user.getCompanyId())){
+ //绯荤粺鐩戠璐﹀彿
+ return companyService.getAllData(user.getCompanyId());
+ }else {
+ //鏀跺偍鍏徃璐﹀彿
+ return companyService.getDataById(user.getCompanyId());
+ }
+ }
+
+
+ /**
+ * 鑾峰彇鍏徃涓嬪睘搴撳尯鍒楄〃
+ * selectDeptPR#listArea
+ * @param id
+ * @return
+ */
+ @DataProvider
+ public List<Dept> listArea(String id){
+ return deptService.getDataByParentId(id);
+ }
+}
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 fbfabc2..9717fe1 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
@@ -1,9 +1,12 @@
package com.fzzy.sys.controller;
+import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.config.FrameworkConfig;
import com.ruoyi.common.constant.ShiroConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert;
@@ -13,6 +16,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.shiro.service.SysPasswordService;
import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysMenuService;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
@@ -37,16 +41,50 @@
private ISysConfigService configService;
@Resource
private SysPasswordService passwordService;
+ @Resource
+ private ISysDeptService iSysDeptService;
+
+ /**
+ * 椤甸潰璺敱
+ *
+ * @param mmap
+ * @return
+ */
+ @GetMapping("/index-gateway")
+ public String indexGateway(ModelMap mmap) {
+ //鑾峰彇鐧诲綍浜轰俊鎭�
+ SysUser user = getSysUser();
+
+ //鍗曞簱鍖轰富椤�
+ return "redirect:index?deptId=" + user.getDeptId();
+ }
// 绯荤粺棣栭〉
@GetMapping("/index")
- public String index(@RequestParam(value = "bizType", required = false) String bizType,
+ public String index(@RequestParam(value = "deptId", required = true) String deptId,
ModelMap mmap) {
// 鍙栬韩浠戒俊鎭�
SysUser user = getSysUser();
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);
+
+ ContextUtil.updateSubDept(user.getLoginName(), deptId);
+ SysDept dept = iSysDeptService.selectDeptById(Long.valueOf(deptId));
+ mmap.put("dept", dept);
+ mmap.put("deptId", deptId);
+
+ //鍚庡彴榛樿椤甸潰
+ String welcomeUrl = "/group/gis";
+ mmap.put("welcomeUrl", welcomeUrl);
+
// 鏍规嵁鐢ㄦ埛id鍙栧嚭鑿滃崟
List<SysMenu> menus = menuService.selectMenusByUser(user);
mmap.put("menus", menus);
diff --git a/fzzy-igdss-web/src/main/resources/static/axui/loginAndRegister.js b/fzzy-igdss-web/src/main/resources/static/axui/loginAndRegister.js
index ccba295..0122767 100644
--- a/fzzy-igdss-web/src/main/resources/static/axui/loginAndRegister.js
+++ b/fzzy-igdss-web/src/main/resources/static/axui/loginAndRegister.js
@@ -39,7 +39,7 @@
},
success: function(r) {
if (r.code == web_status.SUCCESS) {
- location.href = ctx + 'index';
+ location.href = ctx + 'index-gateway';
} else {
$('.imgcode').click();
$(".code").val("");
diff --git a/fzzy-igdss-web/src/main/resources/static/ruoyi/login.js b/fzzy-igdss-web/src/main/resources/static/ruoyi/login.js
index 1191188..785c684 100644
--- a/fzzy-igdss-web/src/main/resources/static/ruoyi/login.js
+++ b/fzzy-igdss-web/src/main/resources/static/ruoyi/login.js
@@ -31,7 +31,7 @@
},
success: function(r) {
if (r.code == web_status.SUCCESS) {
- location.href = ctx + 'index';
+ location.href = ctx + 'index-gateway';
} else {
$('.imgcode').click();
$(".code").val("");
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 b89e00d..1eadfcd 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
@@ -1,12 +1,12 @@
<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit">
- <title th:text="${sysName}">鏅烘収绮簱绠＄悊绯荤粺</title>
+ <title th:text="${sysName}">鏅烘収绮簱绠＄悊绯荤粺</title>
<!-- 閬垮厤IE浣跨敤鍏煎妯″紡 -->
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
<link th:href="@{favicon.ico}" rel="shortcut icon"/>
<link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
<link th:href="@{/css/jquery.contextMenu.min.css}" rel="stylesheet"/>
@@ -15,9 +15,12 @@
<link th:href="@{/css/style.min.css}" rel="stylesheet"/>
<link th:href="@{/css/skins.css?v=20200902}" rel="stylesheet"/>
<link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.8}" rel="stylesheet"/>
- <style type="text/css">.fixed-sidebar .nav:not(.navbar-toolbar)>li.active{border-left:0px!important;}</style>
+ <style type="text/css">.fixed-sidebar .nav:not(.navbar-toolbar) > li.active {
+ border-left: 0px !important;
+ }</style>
</head>
-<body class="fixed-sidebar full-height-layout skin-zcl" th:classappend="${isMobile} ? 'canvas-menu'" style="overflow: hidden">
+<body class="fixed-sidebar full-height-layout skin-zcl" th:classappend="${isMobile} ? 'canvas-menu'"
+ style="overflow: hidden">
<div id="wrapper">
<!--宸︿晶瀵艰埅寮�濮�-->
@@ -25,183 +28,200 @@
<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>
- </a>
+ </a>
<div class="sidebar-collapse tab-content" id="side-menu">
- <div class="user-panel">
- <a class="menuItem noactive" title="涓汉涓績" th:href="@{/system/user/profile}">
- <div class="hide" th:text="涓汉涓績"></div>
- <div class="pull-left image">
- <img th:src="(${#strings.isEmpty(user.avatar)}) ? @{/img/profile.jpg} : @{${user.avatar}}" th:onerror="this.src='img/profile.jpg'" class="img-circle" alt="User Image">
- </div>
- </a>
- <div class="pull-left info">
- <p>[[${user.loginName}]]</p>
- <a href="javascript:;"><i class="fa fa-circle text-success"></i> 鍦ㄧ嚎</a>
- <a th:href="@{logout}" style="padding-left:5px;"><i class="fa fa-sign-out text-danger"></i> 娉ㄩ攢</a>
- </div>
- </div>
-
+ <div class="user-panel">
+ <a class="menuItem noactive" title="涓汉涓績" th:href="@{/system/user/profile}">
+ <div class="hide" th:text="涓汉涓績"></div>
+ <div class="pull-left image">
+ <img th:src="(${#strings.isEmpty(user.avatar)}) ? @{/img/profile.jpg} : @{${user.avatar}}"
+ th:onerror="this.src='img/profile.jpg'" class="img-circle" alt="User Image">
+ </div>
+ </a>
+ <div class="pull-left info">
+ <p>[[${user.loginName}]]</p>
+ <a href="javascript:;"><i class="fa fa-circle text-success"></i> 鍦ㄧ嚎</a>
+ <a th:href="@{logout}" style="padding-left:5px;"><i class="fa fa-sign-out text-danger"></i> 娉ㄩ攢</a>
+ </div>
+ </div>
+
<!-- 宸︿晶鑿滃崟 -->
- <th:block th:each="menu : ${menus}">
- <div class="tab-pane fade height-full" th:id="|menu_${menu.menuId}|">
- <ul class="nav">
- <li th:each="cmenu : ${menu.children}">
- <a class="menu-content" th:if="${#lists.isEmpty(cmenu.children)}" th:href="@{${cmenu.url}}" th:classappend="${#strings.isEmpty(cmenu.target)} ? |menuItem| : ${cmenu.target}" th:data-refresh="${cmenu.isRefresh == '0'}">
- <i th:class="${cmenu.icon} + ' fa-fw'"></i> <span class="nav-label">[[${cmenu.menuName}]]</span>
- </a>
- <a class="menu-content" th:if="${not #lists.isEmpty(cmenu.children)}" href="javascript:;">
- <i th:class="${cmenu.icon} + ' fa-fw'"></i>
- <span class="nav-label">[[${cmenu.menuName}]]</span>
- <span class="fa arrow"></span>
- </a>
- <ul th:if="${not #lists.isEmpty(cmenu.children)}" class="nav nav-second-level collapse">
- <li th:each="emenu : ${cmenu.children}">
- <a th:if="${#lists.isEmpty(emenu.children)}" th:href="@{${emenu.url}}" th:class="${#strings.isEmpty(emenu.target)} ? |menuItem| : ${emenu.target}" th:data-refresh="${emenu.isRefresh == '0'}">
- <i th:class="${emenu.icon} + ' fa-fw'"></i>
- [[${emenu.menuName}]]
- </a>
- <a th:if="${not #lists.isEmpty(emenu.children)}" href="javascript:;">
- <i th:class="${emenu.icon} + ' fa-fw'"></i>
- [[${emenu.menuName}]]
- <span class="fa arrow"></span>
- </a>
- <ul th:if="${not #lists.isEmpty(emenu.children)}" class="nav nav-third-level collapse">
- <li th:each="fmenu : ${emenu.children}"><a th:if="${#lists.isEmpty(fmenu.children)}" th:class="${#strings.isEmpty(fmenu.target)} ? |menuItem| : ${fmenu.target}" th:href="@{${fmenu.url}}" th:data-refresh="${fmenu.isRefresh == '0'}">[[${fmenu.menuName}]]</a></li>
- </ul>
- </li>
- </ul>
- </li>
- </ul>
- </div>
- </th:block>
-
- <!-- 棣栭〉鑿滃崟 -->
- <div class="tab-pane fade height-full" id="index">
- <ul class="nav">
- <li>
- <a class="menuItem" th:href="@{/archive/index}">
- <i class="fa fa-home"></i> <span class="nav-label">棣栭〉</span></a>
- </li>
- </ul>
- </div>
-
+ <th:block th:each="menu : ${menus}">
+ <div class="tab-pane fade height-full" th:id="|menu_${menu.menuId}|">
+ <ul class="nav">
+ <li th:each="cmenu : ${menu.children}">
+ <a class="menu-content" th:if="${#lists.isEmpty(cmenu.children)}" th:href="@{${cmenu.url}}"
+ th:classappend="${#strings.isEmpty(cmenu.target)} ? |menuItem| : ${cmenu.target}"
+ th:data-refresh="${cmenu.isRefresh == '0'}">
+ <i th:class="${cmenu.icon} + ' fa-fw'"></i> <span class="nav-label">[[${cmenu.menuName}]]</span>
+ </a>
+ <a class="menu-content" th:if="${not #lists.isEmpty(cmenu.children)}" href="javascript:;">
+ <i th:class="${cmenu.icon} + ' fa-fw'"></i>
+ <span class="nav-label">[[${cmenu.menuName}]]</span>
+ <span class="fa arrow"></span>
+ </a>
+ <ul th:if="${not #lists.isEmpty(cmenu.children)}" class="nav nav-second-level collapse">
+ <li th:each="emenu : ${cmenu.children}">
+ <a th:if="${#lists.isEmpty(emenu.children)}" th:href="@{${emenu.url}}"
+ th:class="${#strings.isEmpty(emenu.target)} ? |menuItem| : ${emenu.target}"
+ th:data-refresh="${emenu.isRefresh == '0'}">
+ <i th:class="${emenu.icon} + ' fa-fw'"></i>
+ [[${emenu.menuName}]]
+ </a>
+ <a th:if="${not #lists.isEmpty(emenu.children)}" href="javascript:;">
+ <i th:class="${emenu.icon} + ' fa-fw'"></i>
+ [[${emenu.menuName}]]
+ <span class="fa arrow"></span>
+ </a>
+ <ul th:if="${not #lists.isEmpty(emenu.children)}"
+ class="nav nav-third-level collapse">
+ <li th:each="fmenu : ${emenu.children}"><a
+ th:if="${#lists.isEmpty(fmenu.children)}"
+ th:class="${#strings.isEmpty(fmenu.target)} ? |menuItem| : ${fmenu.target}"
+ th:href="@{${fmenu.url}}" th:data-refresh="${fmenu.isRefresh == '0'}">[[${fmenu.menuName}]]</a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </div>
+ </th:block>
+
+ <!-- 棣栭〉鑿滃崟 -->
+ <div class="tab-pane fade height-full" id="index">
+ <ul class="nav">
+ <li>
+ <a class="menuItem" th:href="@{/index}">
+ <i class="fa fa-home"></i> <span class="nav-label">棣栭〉</span></a>
+ </li>
+ </ul>
+ </div>
+
<!-- 瀹炰緥婕旂ず鑿滃崟 -->
- <div class="tab-pane fade height-full" id="demo" th:if="${demoEnabled}">
- <ul class="nav">
- <li>
- <a href="javascript:;"><i class="fa fa-edit"></i> <span class="nav-label">琛ㄥ崟</span><span class="fa arrow"></span></a>
- <ul class="nav nav-second-level collapse">
- <li><a class="menuItem" th:href="@{/demo/form/button}">鎸夐挳</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/grid}">鏍呮牸</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/select}">涓嬫媺妗�</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/timeline}">鏃堕棿杞�</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/progress_bars}">杩涘害鏉�</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/basic}">鍩烘湰琛ㄥ崟</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/cards}">鍗＄墖鍒楄〃</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/jasny}">鍔熻兘鎵╁睍</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/sortable}">鎷栧姩鎺掑簭</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/invoice}">鍗曟嵁鎵撳嵃</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/labels_tips}">鏍囩 & 鎻愮ず</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/tabs_panels}">閫夐」鍗� & 闈㈡澘</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/validate}">琛ㄥ崟鏍￠獙</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/wizard}">琛ㄥ崟鍚戝</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/upload}">鏂囦欢涓婁紶</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/datetime}">鏃ユ湡鍜屾椂闂�</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/summernote}">瀵屾枃鏈紪杈戝櫒</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/duallistbox}">宸﹀彸浜掗�夌粍浠�</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/autocomplete}">鎼滅储鑷姩琛ュ叏</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/cxselect}">澶氱骇鑱斿姩涓嬫媺</a></li>
- <li><a class="menuItem" th:href="@{/demo/form/localrefresh}">Ajax灞�閮ㄥ埛鏂�</a></li>
- </ul>
- </li>
- <li>
- <a href="javascript:;"><i class="fa fa-table"></i> <span class="nav-label">琛ㄦ牸</span><span class="fa arrow"></span></a>
- <ul class="nav nav-second-level collapse">
- <li><a class="menuItem" th:href="@{/demo/table/search}">鏌ヨ鏉′欢</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/footer}">鏁版嵁姹囨��</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/groupHeader}">缁勫悎琛ㄥご</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/export}">琛ㄦ牸瀵煎嚭</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/exportSelected}">瀵煎嚭閫夋嫨鍒�</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/remember}">缈婚〉璁颁綇閫夋嫨</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/pageGo}">璺宠浆鑷虫寚瀹氶〉</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/params}">鑷畾涔夋煡璇㈠弬鏁�</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/multi}">鍒濆澶氳〃鏍�</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/button}">鐐瑰嚮鎸夐挳鍔犺浇琛ㄦ牸</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/data}">鐩存帴鍔犺浇琛ㄦ牸鏁版嵁</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/fixedColumns}">琛ㄦ牸鍐荤粨鍒�</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/event}">鑷畾涔夎Е鍙戜簨浠�</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/headerStyle}">琛ㄦ牸鏍囬鏍煎紡鍖�</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/detail}">琛ㄦ牸缁嗚妭瑙嗗浘</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/child}">琛ㄦ牸鐖跺瓙瑙嗗浘</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/image}">琛ㄦ牸鍥剧墖棰勮</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/curd}">鍔ㄦ�佸鍒犳敼鏌�</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/reorderRows}">琛ㄦ牸琛屾嫋鎷芥搷浣�</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/reorderColumns}">琛ㄦ牸鍒楁嫋鎷芥搷浣�</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/resizable}">琛ㄦ牸鍒楀鎷栧姩</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/editable}">琛ㄦ牸琛屽唴缂栬緫</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/subdata}">涓诲瓙琛ㄦ彁浜�</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/refresh}">琛ㄦ牸鑷姩鍒锋柊</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/print}">琛ㄦ牸鎵撳嵃閰嶇疆</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/dynamicColumns}">琛ㄦ牸鍔ㄦ�佸垪</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/customView}">鑷畾涔夎鍥惧垎椤�</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/asynTree}">寮傛鍔犺浇琛ㄦ牸鏍�</a></li>
- <li><a class="menuItem" th:href="@{/demo/table/other}">琛ㄦ牸鍏朵粬鎿嶄綔</a></li>
- </ul>
- </li>
- <li>
- <a href="javascript:;"><i class="fa fa-flask"></i> <span class="nav-label">寮规</span><span class="fa arrow"></span></a>
- <ul class="nav nav-second-level collapse">
- <li><a class="menuItem" th:href="@{/demo/modal/dialog}">妯℃�佺獥鍙�</a></li>
- <li><a class="menuItem" th:href="@{/demo/modal/layer}">寮瑰眰缁勪欢</a></li>
- <li><a class="menuItem" th:href="@{/demo/modal/table}">寮瑰眰琛ㄦ牸</a></li>
- </ul>
- </li>
- <li>
- <a href="javascript:;"><i class="fa fa-wpforms"></i> <span class="nav-label">鎿嶄綔</span><span class="fa arrow"></span></a>
- <ul class="nav nav-second-level collapse">
- <li><a class="menuItem" th:href="@{/demo/operate/table}">琛ㄦ牸</a></li>
- <li><a class="menuItem" th:href="@{/demo/operate/other}">鍏朵粬</a></li>
- </ul>
- </li>
- <li>
- <a href="javascript:;"><i class="fa fa-bar-chart-o"></i> <span class="nav-label">鎶ヨ〃</span><span class="fa arrow"></span></a>
- <ul class="nav nav-second-level collapse">
- <li><a class="menuItem" th:href="@{/demo/report/echarts}">鐧惧害ECharts</a></li>
- <li><a class="menuItem" th:href="@{/demo/report/peity}">peity</a></li>
- <li><a class="menuItem" th:href="@{/demo/report/sparkline}">sparkline</a></li>
- <li><a class="menuItem" th:href="@{/demo/report/metrics}">鍥捐〃缁勫悎</a></li>
- </ul>
- </li>
- <li>
- <a href="javascript:;"><i class="fa fa-book"></i> <span class="nav-label">鍥炬爣</span><span class="fa arrow"></span></a>
- <ul class="nav nav-second-level collapse">
- <li><a class="menuItem" th:href="@{/demo/icon/fontawesome}">Font Awesome</a></li>
- <li><a class="menuItem" th:href="@{/demo/icon/glyphicons}">Glyphicons</a></li>
- </ul>
- </li>
- <li>
- <a href="javascript:;"><i class="fa fa-navicon"></i> <span class="nav-label">鍥涘眰鑿滃崟</span><span class="fa arrow"></span></a>
- <ul class="nav nav-second-level collapse">
- <li>
- <a href="javascript:;" id="damian">涓夌骇鑿滃崟1<span class="fa arrow"></span></a>
- <ul class="nav nav-third-level collapse">
- <li>
- <a href="javascript:;">鍥涚骇鑿滃崟1</a>
- </li>
- <li>
- <a href="javascript:;">鍥涚骇鑿滃崟2</a>
- </li>
- </ul>
- </li>
- <li><a href="javascript:;">涓夌骇鑿滃崟2</a></li>
- </ul>
- </li>
- </ul>
- </div>
+ <div class="tab-pane fade height-full" id="demo" th:if="${demoEnabled}">
+ <ul class="nav">
+ <li>
+ <a href="javascript:;"><i class="fa fa-edit"></i> <span class="nav-label">琛ㄥ崟</span><span
+ class="fa arrow"></span></a>
+ <ul class="nav nav-second-level collapse">
+ <li><a class="menuItem" th:href="@{/demo/form/button}">鎸夐挳</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/grid}">鏍呮牸</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/select}">涓嬫媺妗�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/timeline}">鏃堕棿杞�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/progress_bars}">杩涘害鏉�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/basic}">鍩烘湰琛ㄥ崟</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/cards}">鍗＄墖鍒楄〃</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/jasny}">鍔熻兘鎵╁睍</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/sortable}">鎷栧姩鎺掑簭</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/invoice}">鍗曟嵁鎵撳嵃</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/labels_tips}">鏍囩 & 鎻愮ず</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/tabs_panels}">閫夐」鍗� & 闈㈡澘</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/validate}">琛ㄥ崟鏍￠獙</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/wizard}">琛ㄥ崟鍚戝</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/upload}">鏂囦欢涓婁紶</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/datetime}">鏃ユ湡鍜屾椂闂�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/summernote}">瀵屾枃鏈紪杈戝櫒</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/duallistbox}">宸﹀彸浜掗�夌粍浠�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/autocomplete}">鎼滅储鑷姩琛ュ叏</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/cxselect}">澶氱骇鑱斿姩涓嬫媺</a></li>
+ <li><a class="menuItem" th:href="@{/demo/form/localrefresh}">Ajax灞�閮ㄥ埛鏂�</a></li>
+ </ul>
+ </li>
+ <li>
+ <a href="javascript:;"><i class="fa fa-table"></i> <span class="nav-label">琛ㄦ牸</span><span
+ class="fa arrow"></span></a>
+ <ul class="nav nav-second-level collapse">
+ <li><a class="menuItem" th:href="@{/demo/table/search}">鏌ヨ鏉′欢</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/footer}">鏁版嵁姹囨��</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/groupHeader}">缁勫悎琛ㄥご</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/export}">琛ㄦ牸瀵煎嚭</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/exportSelected}">瀵煎嚭閫夋嫨鍒�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/remember}">缈婚〉璁颁綇閫夋嫨</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/pageGo}">璺宠浆鑷虫寚瀹氶〉</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/params}">鑷畾涔夋煡璇㈠弬鏁�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/multi}">鍒濆澶氳〃鏍�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/button}">鐐瑰嚮鎸夐挳鍔犺浇琛ㄦ牸</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/data}">鐩存帴鍔犺浇琛ㄦ牸鏁版嵁</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/fixedColumns}">琛ㄦ牸鍐荤粨鍒�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/event}">鑷畾涔夎Е鍙戜簨浠�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/headerStyle}">琛ㄦ牸鏍囬鏍煎紡鍖�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/detail}">琛ㄦ牸缁嗚妭瑙嗗浘</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/child}">琛ㄦ牸鐖跺瓙瑙嗗浘</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/image}">琛ㄦ牸鍥剧墖棰勮</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/curd}">鍔ㄦ�佸鍒犳敼鏌�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/reorderRows}">琛ㄦ牸琛屾嫋鎷芥搷浣�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/reorderColumns}">琛ㄦ牸鍒楁嫋鎷芥搷浣�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/resizable}">琛ㄦ牸鍒楀鎷栧姩</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/editable}">琛ㄦ牸琛屽唴缂栬緫</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/subdata}">涓诲瓙琛ㄦ彁浜�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/refresh}">琛ㄦ牸鑷姩鍒锋柊</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/print}">琛ㄦ牸鎵撳嵃閰嶇疆</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/dynamicColumns}">琛ㄦ牸鍔ㄦ�佸垪</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/customView}">鑷畾涔夎鍥惧垎椤�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/asynTree}">寮傛鍔犺浇琛ㄦ牸鏍�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/table/other}">琛ㄦ牸鍏朵粬鎿嶄綔</a></li>
+ </ul>
+ </li>
+ <li>
+ <a href="javascript:;"><i class="fa fa-flask"></i> <span class="nav-label">寮规</span><span
+ class="fa arrow"></span></a>
+ <ul class="nav nav-second-level collapse">
+ <li><a class="menuItem" th:href="@{/demo/modal/dialog}">妯℃�佺獥鍙�</a></li>
+ <li><a class="menuItem" th:href="@{/demo/modal/layer}">寮瑰眰缁勪欢</a></li>
+ <li><a class="menuItem" th:href="@{/demo/modal/table}">寮瑰眰琛ㄦ牸</a></li>
+ </ul>
+ </li>
+ <li>
+ <a href="javascript:;"><i class="fa fa-wpforms"></i> <span class="nav-label">鎿嶄綔</span><span
+ class="fa arrow"></span></a>
+ <ul class="nav nav-second-level collapse">
+ <li><a class="menuItem" th:href="@{/demo/operate/table}">琛ㄦ牸</a></li>
+ <li><a class="menuItem" th:href="@{/demo/operate/other}">鍏朵粬</a></li>
+ </ul>
+ </li>
+ <li>
+ <a href="javascript:;"><i class="fa fa-bar-chart-o"></i> <span
+ class="nav-label">鎶ヨ〃</span><span class="fa arrow"></span></a>
+ <ul class="nav nav-second-level collapse">
+ <li><a class="menuItem" th:href="@{/demo/report/echarts}">鐧惧害ECharts</a></li>
+ <li><a class="menuItem" th:href="@{/demo/report/peity}">peity</a></li>
+ <li><a class="menuItem" th:href="@{/demo/report/sparkline}">sparkline</a></li>
+ <li><a class="menuItem" th:href="@{/demo/report/metrics}">鍥捐〃缁勫悎</a></li>
+ </ul>
+ </li>
+ <li>
+ <a href="javascript:;"><i class="fa fa-book"></i> <span class="nav-label">鍥炬爣</span><span
+ class="fa arrow"></span></a>
+ <ul class="nav nav-second-level collapse">
+ <li><a class="menuItem" th:href="@{/demo/icon/fontawesome}">Font Awesome</a></li>
+ <li><a class="menuItem" th:href="@{/demo/icon/glyphicons}">Glyphicons</a></li>
+ </ul>
+ </li>
+ <li>
+ <a href="javascript:;"><i class="fa fa-navicon"></i> <span
+ class="nav-label">鍥涘眰鑿滃崟</span><span class="fa arrow"></span></a>
+ <ul class="nav nav-second-level collapse">
+ <li>
+ <a href="javascript:;" id="damian">涓夌骇鑿滃崟1<span class="fa arrow"></span></a>
+ <ul class="nav nav-third-level collapse">
+ <li>
+ <a href="javascript:;">鍥涚骇鑿滃崟1</a>
+ </li>
+ <li>
+ <a href="javascript:;">鍥涚骇鑿滃崟2</a>
+ </li>
+ </ul>
+ </li>
+ <li><a href="javascript:;">涓夌骇鑿滃崟2</a></li>
+ </ul>
+ </li>
+ </ul>
+ </div>
</div>
</nav>
<!--宸︿晶瀵艰埅缁撴潫-->
@@ -211,74 +231,87 @@
<div class="row border-bottom">
<nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0">
<div class="navbar-header">
- <a class="navbar-minimalize minimalize-styl-2" style="color:#FFF;" href="javascript:;" title="鏀惰捣鑿滃崟">
- <i class="fa fa-bars"></i>
+ <a class="navbar-minimalize minimalize-styl-2" style="color:#FFF;" href="javascript:;"
+ title="鏀惰捣鑿滃崟">
+ <i class="fa fa-bars"></i>
</a>
</div>
<!-- 椤堕儴鏍� -->
<div id="navMenu">
- <ul class="nav navbar-toolbar nav-tabs navbar-left hidden-xs">
-
- <!-- 椤堕儴鑿滃崟鍒楄〃 -->
- <th:block th:each="menu : ${menus}">
- <li role="presentation" th:id="|tab_${menu.menuId}|">
- <a th:if="${#lists.isEmpty(menu.children)}" data-toggle="tab" th:class="@{${!#strings.isEmpty(menu.target) && menu.target == 'menuBlank'} ? 'menuBlank' : 'menuItem noactive'}" th:href="@{${menu.url}}">
- <i th:class="${menu.icon}"></i> <span>[[${menu.menuName}]]</span>
- </a>
- <a th:if="${not #lists.isEmpty(menu.children)}" data-toggle="tab" th:class="@{${!#strings.isEmpty(menu.target) && menu.target == 'menuBlank'} ? 'menuBlank'}" th:href="@{${!#strings.isEmpty(menu.target) && menu.target == 'menuBlank'} ? @{${menu.url}} : |#menu_${menu.menuId}|}">
- <i th:class="${menu.icon}"></i> <span>[[${menu.menuName}]]</span>
- </a>
- </li>
- </th:block>
-
-<!-- <li role="presentation" id="tab_index">-->
-<!-- <a data-toggle="tab" href="#index">-->
-<!-- <i class="fa fa-area-chart"></i> <span>缁熻鎶ヨ〃</span>-->
-<!-- </a>-->
-<!-- </li>-->
-
-<!-- <li role="presentation" id="tab_demo" th:if="${demoEnabled}">-->
-<!-- <a data-toggle="tab" href="#demo">-->
-<!-- <i class="fa fa-desktop"></i> <span>瀹炰緥婕旂ず</span>-->
-<!-- </a>-->
-<!-- </li>-->
- </ul>
- </div>
+ <ul class="nav navbar-toolbar nav-tabs navbar-left hidden-xs">
+
+ <!-- 椤堕儴鑿滃崟鍒楄〃 -->
+ <th:block th:each="menu : ${menus}">
+ <li role="presentation" th:id="|tab_${menu.menuId}|">
+ <a th:if="${#lists.isEmpty(menu.children)}" data-toggle="tab"
+ th:class="@{${!#strings.isEmpty(menu.target) && menu.target == 'menuBlank'} ? 'menuBlank' : 'menuItem noactive'}"
+ th:href="@{${menu.url}}">
+ <i th:class="${menu.icon}"></i> <span>[[${menu.menuName}]]</span>
+ </a>
+ <a th:if="${not #lists.isEmpty(menu.children)}" data-toggle="tab"
+ th:class="@{${!#strings.isEmpty(menu.target) && menu.target == 'menuBlank'} ? 'menuBlank'}"
+ th:href="@{${!#strings.isEmpty(menu.target) && menu.target == 'menuBlank'} ? @{${menu.url}} : |#menu_${menu.menuId}|}">
+ <i th:class="${menu.icon}"></i> <span>[[${menu.menuName}]]</span>
+ </a>
+ </li>
+ </th:block>
+
+ <!-- <li role="presentation" id="tab_index">-->
+ <!-- <a data-toggle="tab" href="#index">-->
+ <!-- <i class="fa fa-area-chart"></i> <span>缁熻鎶ヨ〃</span>-->
+ <!-- </a>-->
+ <!-- </li>-->
+
+ <!-- <li role="presentation" id="tab_demo" th:if="${demoEnabled}">-->
+ <!-- <a data-toggle="tab" href="#demo">-->
+ <!-- <i class="fa fa-desktop"></i> <span>瀹炰緥婕旂ず</span>-->
+ <!-- </a>-->
+ <!-- </li>-->
+ </ul>
+ </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><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="鍏ㄥ睆鏄剧ず" href="javascript:;" id="fullScreen"><i class="fa fa-arrows-alt"></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><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="鍏ㄥ睆鏄剧ず"
+ href="javascript:;" id="fullScreen"><i class="fa fa-arrows-alt"></i> 鍏ㄥ睆</a></li>
+
<li class="dropdown user-menu">
- <a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown">
- <img th:src="(${#strings.isEmpty(user.avatar)}) ? @{/img/profile.jpg} : @{${user.avatar}}" th:onerror="this.src='img/profile.jpg'" class="user-image">
- <span class="hidden-xs">[[${#strings.defaultString(user.userName, '-')}]]</span>
- </a>
- <ul class="dropdown-menu">
- <li class="mt5">
- <a th:href="@{/system/user/profile}" class="menuItem noactive">
- <i class="fa fa-user"></i> 涓汉涓績</a>
- </li>
- <li>
- <a onclick="resetPwd()">
- <i class="fa fa-key"></i> 淇敼瀵嗙爜</a>
- </li>
- <li>
- <a onclick="switchSkin()">
- <i class="fa fa-dashboard"></i> 鍒囨崲涓婚</a>
- </li>
- <li>
- <a onclick="toggleMenu()">
- <i class="fa fa-toggle-off"></i> 宸︿晶鑿滃崟</a>
- </li>
- <li class="divider"></li>
- <li>
- <a th:href="@{logout}">
- <i class="fa fa-sign-out"></i> 閫�鍑虹櫥褰�</a>
- </li>
- </ul>
- </li>
+ <a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown">
+ <img th:src="(${#strings.isEmpty(user.avatar)}) ? @{/img/profile.jpg} : @{${user.avatar}}"
+ th:onerror="this.src='img/profile.jpg'" class="user-image">
+ <span class="hidden-xs">[[${#strings.defaultString(user.userName, '-')}]]</span>
+ </a>
+ <ul class="dropdown-menu">
+ <li class="mt5">
+ <a th:href="@{/system/user/profile}" class="menuItem noactive">
+ <i class="fa fa-user"></i> 涓汉涓績</a>
+ </li>
+ <li>
+ <a onclick="resetPwd()">
+ <i class="fa fa-key"></i> 淇敼瀵嗙爜</a>
+ </li>
+ <li>
+ <a onclick="switchSkin()">
+ <i class="fa fa-dashboard"></i> 鍒囨崲涓婚</a>
+ </li>
+ <li>
+ <a onclick="toggleMenu()">
+ <i class="fa fa-toggle-off"></i> 宸︿晶鑿滃崟</a>
+ </li>
+ <li class="divider"></li>
+ <li>
+ <a th:href="@{logout}">
+ <i class="fa fa-sign-out"></i> 閫�鍑虹櫥褰�</a>
+ </li>
+ </ul>
+ </li>
</ul>
</nav>
</div>
@@ -288,7 +321,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:;" class="active menuTab" th:data-id="${welcomeUrl}">娆㈣繋</a>
</div>
</nav>
<button class="roll-nav roll-right tabRight">
@@ -297,15 +330,16 @@
<a href="javascript:void(0);" class="roll-nav roll-right tabReload"><i class="fa fa-refresh"></i> 鍒锋柊</a>
</div>
- <a id="ax_close_max" class="ax_close_max" href="javascript:;" title="鍏抽棴鍏ㄥ睆"> <i class="fa fa-times-circle-o"></i> </a>
+ <a id="ax_close_max" class="ax_close_max" href="javascript:;" title="鍏抽棴鍏ㄥ睆"> <i
+ class="fa fa-times-circle-o"></i> </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">
- <div class="pull-right">漏 [[${copyrightYear}]] RuoYi Copyright </div>
+ <div class="pull-right">漏 [[${copyrightYear}]] RuoYi Copyright</div>
</div>
</div>
<!--鍙充晶閮ㄥ垎缁撴潫-->
@@ -327,6 +361,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";}
// 鐨偆缂撳瓨
var skin = storage.get("skin");
@@ -364,6 +401,35 @@
})
}
+/**
+ * 寮瑰嚭鍒囨崲搴撳尯鍒楄〃
+ */
+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() {
+ onDeptAreaChange(deptId);
+}
+function onDeptAreaChange(id) {
+ window.location.href = "./index?deptId=" + id;
+ return true;
+}
+
/* 鍒囨崲鑿滃崟 */
function toggleMenu() {
$.modal.confirm("纭瑕佸垏鎹㈡垚宸︿晶鑿滃崟鍚楋紵", function() {
--
Gitblit v1.9.3