From 18127822f3cdb4778fb62ba0304bb8372dada516 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 17 十二月 2025 09:11:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/resources/static/img/web/security/qh.png | 0
fzzy-igdss-web/src/main/resources/templates/demo_v1.html | 173 +++++++++++++++++++++
fzzy-igdss-web/src/main/resources/static/img/deptImg.jpg | 0
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java | 73 ++------
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/DemoController.java | 34 ++++
fzzy-igdss-web/src/main/resources/templates/security/video-list-dept.html | 13 +
fzzy-igdss-web/src/main/resources/static/security/video-list-dept.js | 40 +++++
fzzy-igdss-web/src/main/resources/templates/group/index.html | 6
fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java | 34 +++
fzzy-igdss-web/src/main/resources/templates/index-topnav.html | 30 --
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/SysIndexController.java | 8 -
fzzy-igdss-web/src/main/resources/templates/skin.html | 3
fzzy-igdss-web/src/main/resources/templates/group/video.html | 6
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml | 19 ++
fzzy-igdss-web/src/main/resources/templates/group/gis.html | 6
fzzy-igdss-web/src/main/resources/static/common/igds-common.js | 4
16 files changed, 352 insertions(+), 97 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
index dbbd46e..b857adc 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
@@ -159,7 +159,7 @@
</PropertyDef>
<PropertyDef name="deptId">
<Property></Property>
- <Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="label">鎵�鍦ㄥ簱鍖�</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
<Property name="keyProperty">id</Property>
@@ -628,12 +628,19 @@
<Property name="align">center</Property>
<Property name="width">150</Property>
</DataColumn>
+ <DataColumn name="deptId">
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+ arg.processDefault = true;</ClientEvent>
+ <Property name="property">deptId</Property>
+ <Property name="align">center</Property>
+ <Property name="width">250</Property>
+ </DataColumn>
<DataColumn name="plateNum">
<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
arg.processDefault = true;</ClientEvent>
<Property name="property">plateNum</Property>
<Property name="align">center</Property>
- <Property name="width">130</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn>
<Property name="property">customerName</Property>
@@ -763,6 +770,12 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
<Property name="label">瑁呭嵏浠撳簱</Property>
@@ -823,7 +836,7 @@
<Property name="trigger">ddNotice</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<Property name="name">noticeId</Property>
<Property name="property">noticeId</Property>
<Editor/>
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/DemoController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/DemoController.java
new file mode 100644
index 0000000..d7b75cc
--- /dev/null
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/DemoController.java
@@ -0,0 +1,34 @@
+package com.fzzy.sys.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @Desc:
+ * @Author: Andy.jia
+ * @Date: 2025/12/15
+ */
+@Controller
+public class DemoController {
+
+ /**
+ * DEMO椤甸潰鎺у埗
+ * @param request
+ * @param response
+ * @param tag
+ * @return
+ */
+ @GetMapping("/demo")
+ public String demo(HttpServletRequest request, HttpServletResponse response,
+ @RequestParam("t") String tag, @RequestParam("r") String r) {
+
+ if (null == tag) tag = "1";
+
+ return "demo_v" + tag;
+ }
+}
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 35ae58c..3b775eb 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
@@ -82,14 +82,6 @@
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);
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java
index 4e36fa2..05160e9 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java
@@ -10,7 +10,9 @@
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.SystemUtil;
+import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.sys.manager.security.SecManager;
+import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.extern.slf4j.Slf4j;
import com.ruoyi.common.utils.StringUtils;
@@ -39,17 +41,21 @@
@Resource
private SecManager secManager;
@Resource
+ private CommonManager commonManager;
+ @Resource
private CoreDeptService deptService;
/**
* 搴撳尯瀹夐槻椤甸潰
- * @param type 1.琛ㄧず2.5D楦熺灠鍥鹃〉闈㈤瑙堬紱2.琛ㄧず鍒楄〃棰勮椤甸潰
+ * @param type 1.琛ㄧず2.5D楦熺灠鍥鹃〉闈㈤瑙堬紱2.琛ㄧず鍒楄〃棰勮椤甸潰
+ * @param deptId
* @param view
* @return
*/
@RequestMapping("/video-dept")
public String videoDept(@RequestParam(value = "type", required = false) String type,
- ModelMap view) {
+ @RequestParam(value = "deptId", required = false) String deptId,
+ ModelMap view) {
if (StringUtils.isBlank(type)) {
type = "2";
@@ -58,11 +64,24 @@
SysUser user = ContextUtil.getLoginUser();
view.put(Constant.MODEL_KEY_LOGIN_USER, user);
- String deptId = ContextUtil.subDeptId(user);
+ if(StringUtils.isBlank(deptId)){
+ deptId = ContextUtil.subDeptId(user);
+ }
view.put("deptId", deptId);
List<Camera> listCamera = secManager.listCamera(deptId, user.getCompanyId());
view.put("listCamera", listCamera);
+
+ SysDept sysDept = commonManager.getDeptById(deptId);
+ view.put("dept", sysDept);
+ view.put("type", type);
+
+ //鍒ゆ柇鏄惁鏄剧ず搴撳尯閫夋嫨寮圭獥
+ String showDeptList = "Y";
+ if (Constant.USER_TYPE_30.equals(user.getUserType())) {
+ showDeptList = "N";
+ }
+ view.put("showDeptList", showDeptList);
//榛樿鐩戞帶鍒楄〃椤甸潰
String viewUrl = prefix + "/video-list-dept";
@@ -70,53 +89,7 @@
if("1".equals(type)){
viewUrl = prefix + "/video-aerial-dept";
- //楦熺灠鍥�
- Dept dept = deptService.getDeptById(deptId);
- if (dept != null && StringUtils.isNotEmpty(dept.getImgPath())) {
- view.put("backgroundImg", dept.getImgPath());
- }
- }
- if("2".equals(type)){
- viewUrl = prefix + "/video-list-dept";
- }
-
- return viewUrl;
- }
-
- /**
- * 鐩戠瀹夐槻椤甸潰
- * @param type 1.琛ㄧず2.5D楦熺灠鍥鹃〉闈㈤瑙堬紱2.琛ㄧず鍒楄〃棰勮椤甸潰
- * @param view
- * @return
- */
- @RequestMapping("/video-super")
- public String videoSuper(@RequestParam(value = "type", required = false) String type,
- ModelMap view) {
-
- if (StringUtils.isBlank(type)) {
- type = "2";
- }
-
- SysUser user = ContextUtil.getLoginUser();
- view.put(Constant.MODEL_KEY_LOGIN_USER, user);
-
- String deptId = ContextUtil.subDeptId(user);
- view.put("deptId", deptId);
-
- List<Camera> listCamera = secManager.listCamera(deptId, user.getCompanyId());
- view.put("listCamera", listCamera);
-
- //榛樿鐩戞帶鍒楄〃椤甸潰
- String viewUrl = prefix + "/video-list-dept";
-
- if("1".equals(type)){
- viewUrl = prefix + "/video-aerial-dept";
-
- //楦熺灠鍥�
- Dept dept = deptService.getDeptById(deptId);
- if (dept != null && StringUtils.isNotEmpty(dept.getImgPath())) {
- view.put("backgroundImg", dept.getImgPath());
- }
+ view.put("backgroundImg", commonManager.getDeptImg(deptId));
}
if("2".equals(type)){
viewUrl = prefix + "/video-list-dept";
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
index e472c5b..ec7ca40 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/common/CommonManager.java
@@ -9,9 +9,11 @@
import com.fzzy.igds.service.DicService;
import com.fzzy.igds.service.SecCameraService;
import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,12 +37,38 @@
private DicService dicService;
@Resource
private CoreDeptService coreDeptService;
-
@Autowired
private SecCameraService secCameraService;
-
- @Autowired
+ @Resource
private ISysUserService userService;
+ @Resource
+ private ISysDeptService iSysDeptService;
+
+ /**
+ * 鏍规嵁搴撳尯缂栫爜鑾峰彇搴撳尯涓嬫墍鏈変粨搴撳垪琛�
+ *
+ * @param id
+ * @return
+ */
+ public SysDept getDeptById(String id) {
+
+ return iSysDeptService.selectDeptById(Long.valueOf(id));
+ }
+
+ /**
+ * 鑾峰彇搴撳尯楦熺灠鍥�
+ * @param deptId
+ * @return
+ */
+ public String getDeptImg(String deptId) {
+
+ String imgPath = "/img/deptImg.jpg"; //榛樿鍥�
+ Dept dept = coreDeptService.getDeptById(deptId);
+ if(null != dept && StringUtils.isNotEmpty(dept.getImgPath())){
+ imgPath = dept.getImgPath();
+ }
+ return imgPath;
+ }
/**
* 鏍规嵁瀛楀吀绫诲瀷鑾峰彇瀛楀吀鍒楄〃
diff --git a/fzzy-igdss-web/src/main/resources/static/common/igds-common.js b/fzzy-igdss-web/src/main/resources/static/common/igds-common.js
index 882a8db..206f4d7 100644
--- a/fzzy-igdss-web/src/main/resources/static/common/igds-common.js
+++ b/fzzy-igdss-web/src/main/resources/static/common/igds-common.js
@@ -232,7 +232,9 @@
if ("video" == pageTag) {
url = "/group/video";
}
-
+ if ("sys" == pageTag) {
+ url = "/index?deptId=" + deptId;
+ }
window.location.href = url;
}
diff --git a/fzzy-igdss-web/src/main/resources/static/img/deptImg.jpg b/fzzy-igdss-web/src/main/resources/static/img/deptImg.jpg
new file mode 100644
index 0000000..c9a18e6
--- /dev/null
+++ b/fzzy-igdss-web/src/main/resources/static/img/deptImg.jpg
Binary files differ
diff --git a/fzzy-igdss-web/src/main/resources/static/img/web/security/qh.png b/fzzy-igdss-web/src/main/resources/static/img/web/security/qh.png
new file mode 100644
index 0000000..780cf89
--- /dev/null
+++ b/fzzy-igdss-web/src/main/resources/static/img/web/security/qh.png
Binary files differ
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 2ad4c1b..784ca79 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,10 +50,50 @@
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/demo_v1.html b/fzzy-igdss-web/src/main/resources/templates/demo_v1.html
new file mode 100644
index 0000000..a389451
--- /dev/null
+++ b/fzzy-igdss-web/src/main/resources/templates/demo_v1.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org">
+<head>
+ <meta charset="utf-8"/>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <title>鏅烘収绮簱绠＄悊绯荤粺-棣栭〉</title>
+ <link rel="stylesheet" th:href="@{/ajax/libs/layui-ruoyi/css/layui.css}"/>
+ <!-- 鑷畾涔夋牱寮� -->
+ <style>
+ body {
+ background-color: #f8f9fa;
+ font-family: 'Microsoft YaHei', 'Helvetica Neue', Arial, sans-serif;
+ }
+
+ .container {
+ min-height: 100vh;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ padding: 20px;
+ box-sizing: border-box;
+ }
+
+ .notification-card {
+ background: #fff;
+ border-radius: 12px;
+ box-shadow: 0 10px 30px rgba(0, 0, 0, 0.08);
+ padding: 40px 30px;
+ max-width: 500px;
+ width: 100%;
+ text-align: center;
+ transform: translateY(20px);
+ opacity: 0;
+ animation: fadeInUp 0.8s ease forwards;
+ }
+
+ @keyframes fadeInUp {
+ to {
+ transform: translateY(0);
+ opacity: 1;
+ }
+ }
+
+ .icon-container {
+ width: 120px;
+ height: 120px;
+ margin: 0 auto 30px;
+ background: linear-gradient(135deg, #e8f4f8 0%, #f0f8fb 100%);
+ border-radius: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: relative;
+ overflow: hidden;
+ }
+
+ .icon-container::before {
+ content: '';
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: rgba(66, 153, 225, 0.1);
+ transform: scale(0);
+ border-radius: 50%;
+ animation: pulse 2s infinite;
+ }
+
+ @keyframes pulse {
+ 0% {
+ transform: scale(0.5);
+ opacity: 0.8;
+ }
+ 100% {
+ transform: scale(1.2);
+ opacity: 0;
+ }
+ }
+
+ .notification-icon {
+ font-size: 50px;
+ color: #4299e1;
+ position: relative;
+ z-index: 1;
+ }
+
+ .notification-title {
+ font-size: 24px;
+ font-weight: 600;
+ color: #2d3748;
+ margin-bottom: 15px;
+ }
+
+ .notification-desc {
+ font-size: 16px;
+ color: #718096;
+ line-height: 1.6;
+ margin-bottom: 30px;
+ }
+
+ .back-btn {
+ background-color: #4299e1;
+ color: #fff;
+ border-radius: 8px;
+/* padding: 12px 30px;*/
+ font-size: 16px;
+ transition: all 0.3s ease;
+ border: none;
+ }
+
+ .back-btn:hover {
+ background-color: #3182ce;
+ transform: translateY(-2px);
+ box-shadow: 0 4px 12px rgba(66, 153, 225, 0.3);
+ color: #fff;
+ }
+
+ .footer {
+ margin-top: 40px;
+ color: #a0aec0;
+ font-size: 14px;
+ text-align: center;
+ }
+
+ @media (max-width: 768px) {
+ .notification-card {
+ padding: 30px 20px;
+ }
+
+ .icon-container {
+ width: 100px;
+ height: 100px;
+ }
+
+ .notification-icon {
+ font-size: 40px;
+ }
+
+ .notification-title {
+ font-size: 20px;
+ }
+
+ .notification-desc {
+ font-size: 15px;
+ }
+ }
+ </style>
+</head>
+<body>
+<div class="container">
+ <!-- 鎻愰啋鍗＄墖 -->
+ <div class="notification-card">
+ <div class="icon-container">
+ <i class="fas fa-flask notification-icon"></i>
+ </div>
+
+ <h2 class="notification-title">鍔熻兘璋冭瘯涓�︹��</h2>
+
+ <p class="notification-desc">
+ 鎮ㄥソ锛佸綋鍓嶅姛鑳芥鍦ㄧ揣寮犳祴璇曚腑锛屼负浜嗙粰鎮ㄥ甫鏉ユ洿绋冲畾銆佷紭璐ㄧ殑浣撻獙锛�
+ 鎴戜滑姝ｅ湪杩涜鏈�鍚庣殑浼樺寲璋冩暣銆傛暚璇锋湡寰呮寮忓紑鏀撅紒
+ </p>
+
+ <button class="layui-btn back-btn">
+ <i class="fas fa-arrow-left mr-2"></i>绋嶅悗涓婄嚎鈥︹��
+ </button>
+ </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/fzzy-igdss-web/src/main/resources/templates/group/gis.html b/fzzy-igdss-web/src/main/resources/templates/group/gis.html
index a8f6e2b..6db5a86 100644
--- a/fzzy-igdss-web/src/main/resources/templates/group/gis.html
+++ b/fzzy-igdss-web/src/main/resources/templates/group/gis.html
@@ -56,12 +56,14 @@
<div class="container">
<div class="i-top">
- <h1 ondblclick="changeScreen()" class="i-top-tit"><span th:text="${sysName}">鐪佺骇鍌ㄥ绮洃绠″钩鍙�</span></h1>
+ <h1 ondblclick="changeScreen()" class="i-top-tit"><span th:text="${sysName}">鏅烘収绮簱璐ㄦ娂鐩戠澶у睆</span></h1>
+ <p ondblclick="changeScreen()" class="i-top-p" id="sloganText">鏂扮枂浼婂畞鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃鈥斺�旀櫤鎱х洃绠″钩鍙�</p>
<div class="i-navBar">
<a href="javaScript:;" onclick="changePage('index')" class="i-nav3">棣栭〉</a>
<a href="javaScript:;" onclick="changePage('gis')" class="i-nav4 active">GIS鐩戠</a>
<a href="javaScript:;" onclick="changePage('video')" class="i-nav5">瑙嗛鐩戠</a>
- <a href="javaScript:;" onclick="changePage('logout')" class="i-nav6">閫�鍑虹郴缁�</a>
+ <a href="javaScript:;" onclick="changePage('sys')" class="i-nav6">鍚庡彴绠＄悊</a>
+ <a href="javaScript:;" onclick="changePage('logout')" class="i-nav7">閫�鍑虹郴缁�</a>
</div>
<div class="date-time-module">
<span id="navBarTime"></span>
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 caee3ca..15d3014 100644
--- a/fzzy-igdss-web/src/main/resources/templates/group/index.html
+++ b/fzzy-igdss-web/src/main/resources/templates/group/index.html
@@ -23,12 +23,14 @@
<div class="container">
<div class="i-top">
- <h1 ondblclick="changeScreen()" class="i-top-tit"><span th:text="${sysName}">鏀跨瓥鎬у偍澶囩伯娌圭洃绠″钩鍙�</span></h1>
+ <h1 ondblclick="changeScreen()" class="i-top-tit"><span th:text="${sysName}">鏅烘収绮簱璐ㄦ娂鐩戠澶у睆</span></h1>
+ <p ondblclick="changeScreen()" class="i-top-p" id="sloganText">鏂扮枂浼婂畞鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃鈥斺�旀櫤鎱х洃绠″钩鍙�</p>
<div class="i-navBar">
<a href="javaScript:;" onclick="changePage('index')" class="i-nav3 active">棣栭〉</a>
<a href="javaScript:;" onclick="changePage('gis')" class="i-nav4">GIS鐩戠</a>
<a href="javaScript:;" onclick="changePage('video')" class="i-nav5">瑙嗛鐩戠</a>
- <a href="javaScript:;" onclick="changePage('logout')" class="i-nav6">閫�鍑虹郴缁�</a>
+ <a href="javaScript:;" onclick="changePage('sys')" class="i-nav6">鍚庡彴绠＄悊</a>
+ <a href="javaScript:;" onclick="changePage('logout')" class="i-nav7">閫�鍑虹郴缁�</a>
</div>
<div class="date-time-module">
<span id="navBarTime"></span>
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 2398719..f85edf6 100644
--- a/fzzy-igdss-web/src/main/resources/templates/group/video.html
+++ b/fzzy-igdss-web/src/main/resources/templates/group/video.html
@@ -135,12 +135,14 @@
<div class="container row-main">
<div class="i-top">
- <h1 ondblclick="changeScreen()" class="i-top-tit"><span th:text="${sysName}">鏀跨瓥鎬у偍澶囩伯娌圭洃绠″钩鍙�</span></h1>
+ <h1 ondblclick="changeScreen()" class="i-top-tit"><span th:text="${sysName}">鏅烘収绮簱璐ㄦ娂鐩戠澶у睆</span></h1>
+ <p ondblclick="changeScreen()" class="i-top-p" id="sloganText">鏂扮枂浼婂畞鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃鈥斺�旀櫤鎱х洃绠″钩鍙�</p>
<div class="i-navBar">
<a href="javaScript:;" onclick="changePage('index')" class="i-nav3">棣栭〉</a>
<a href="javaScript:;" onclick="changePage('gis')" class="i-nav4">GIS鐩戠</a>
<a href="javaScript:;" onclick="changePage('video')" class="i-nav5 active">瑙嗛鐩戠</a>
- <a href="javaScript:;" onclick="changePage('logout')" class="i-nav6">閫�鍑虹郴缁�</a>
+ <a href="javaScript:;" onclick="changePage('sys')" class="i-nav6">鍚庡彴绠＄悊</a>
+ <a href="javaScript:;" onclick="changePage('logout')" class="i-nav7">閫�鍑虹郴缁�</a>
</div>
<div class="date-time-module">
<span id="navBarTime"></span>
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 e5ba74e..9fc2d76 100644
--- a/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
+++ b/fzzy-igdss-web/src/main/resources/templates/index-topnav.html
@@ -271,12 +271,14 @@
</div>
<!-- 鍙充晶鏍� -->
<ul class="nav navbar-top-links navbar-right welcome-message">
- <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,
+ <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="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="鍏ㄥ睆鏄剧ず"
@@ -399,24 +401,6 @@
area : ["530px", "386px"],
content : [ctx + "system/switchSkin", 'no']
})
-}
-
-/**
- * 寮瑰嚭鍒囨崲搴撳尯鍒楄〃
- */
-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
- });
}
/**
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 72e6de3..d91d35c 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,6 +223,13 @@
width: 100%;
height: 100%;
}
+ .dept{
+ margin-left: 150px;
+ font-size: 16px;
+ color: #FFFFFF;
+ width: 400px;
+ padding-top: 8px;
+ }
</style>
</head>
@@ -238,6 +245,10 @@
<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}"/>
@@ -419,6 +430,8 @@
<script th:inline="javascript">
var listCamera = [[${listCamera}]];
+ var showDeptList = [[${showDeptList}]];
+ var type = [[${type}]];
</script>
<script th:src="@{/js/jquery.min.js}"></script>
<script th:src="@{/ajax/libs/layui/layui.js}"></script>
diff --git a/fzzy-igdss-web/src/main/resources/templates/skin.html b/fzzy-igdss-web/src/main/resources/templates/skin.html
index c25f24e..1c0fd28 100644
--- a/fzzy-igdss-web/src/main/resources/templates/skin.html
+++ b/fzzy-igdss-web/src/main/resources/templates/skin.html
@@ -5,9 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit">
<title>涓婚閫夋嫨</title>
- <!--[if lt IE 9]>
- <meta http-equiv="refresh" content="0;ie.html"/>
- <![endif]-->
<link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
<link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
<link th:href="@{/css/style.min.css}" rel="stylesheet"/>
--
Gitblit v1.9.3