From da2d0647babd92e8929a09d4bfaaf413b980fe24 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 02 十二月 2025 20:19:58 +0800
Subject: [PATCH] 登记及称重页面调整,及相关流程逻辑

---
 fzzy-igdss-web/src/main/resources/templates/index-topnav.html |  552 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 309 insertions(+), 243 deletions(-)

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