恢复前端路由配置: FrontLayout+Layout 完整路由

gw-admin/pom.xml

@@ -41,6 +41,12 @@
             <artifactId>gw-framework</artifactId>
         </dependency>
 
+        <!-- hzz-->
+        <dependency>
+            <groupId>com.goldenwater</groupId>
+            <artifactId>gw-hzz</artifactId>
+        </dependency>
+
         <!-- 定时任务-->
         <dependency>
             <groupId>com.goldenwater</groupId>
@@ -83,4 +89,4 @@
         <finalName>${project.artifactId}</finalName>
     </build>
 
-</project>
+</project>

gw-admin/src/main/resources/application-dev.yml

@@ -7,7 +7,7 @@ goldenwater:
   # 版权年份
   copyrightYear: 2026
   # 文件路径 示例（ Windows配置D:/goldenwater/uploadPath，Linux配置 /home/goldenwater/uploadPath）
-  profile: D:/gw/uploadPath
+  profile: D:/tmp/hzz/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -20,10 +20,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:dm://39.98.38.2:30236/GW_BASIC
-        #url: jdbc:dm://192.168.0.145:30236/WEPL
-        username: GW_BASIC
-        password: Gw./16001
+        url: jdbc:dm://39.98.38.2:30236/TBA_HZZ
+        username: TBA_HZZ
+        password: TBA_HZZ_123
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

gw-hzz/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.goldenwater</groupId>
+        <artifactId>tba-sbh</artifactId>
+        <version>3.9.2</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>gw-hzz</artifactId>
+
+    <description>
+        河湖管理
+    </description>
+
+    <dependencies>
+
+        <!-- 系统模块 -->
+        <dependency>
+            <groupId>com.goldenwater</groupId>
+            <artifactId>gw-framework</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

gw-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -29,10 +29,10 @@
 	</resultMap>
 
 	<sql id="selectMenuVo">
-        select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time 
+        select menu_id, menu_name, parent_id, order_num, path, component, query, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
 		from sys_menu
     </sql>
-    
+
     <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		<where>
@@ -48,13 +48,13 @@
 		</where>
 		order by parent_id, order_num
 	</select>
-	
+
 	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
 		order by m.parent_id, m.order_num
 	</select>
-	
+
 	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
@@ -73,7 +73,7 @@
 		</if>
 		order by m.parent_id, m.order_num
 	</select>
-    
+
     <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
@@ -84,7 +84,7 @@
 		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
 		order by m.parent_id, m.order_num
 	</select>
-	
+
 	<select id="selectMenuListByRoleId" resultType="Long">
 		select m.menu_id
 		from sys_menu m
@@ -95,7 +95,7 @@
             </if>
 		order by m.parent_id, m.order_num
 	</select>
-	
+
 	<select id="selectMenuPerms" resultType="String">
 		select distinct m.perms
 		from sys_menu m
@@ -111,33 +111,33 @@
 			 left join sys_role r on r.role_id = ur.role_id
 		where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
 	</select>
-	
+
 	<select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
 		select distinct m.perms
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
 		where m.status = '0' and rm.role_id = #{roleId}
 	</select>
-	
+
 	<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		where menu_id = #{menuId}
 	</select>
-	
+
 	<select id="hasChildByMenuId" resultType="Integer">
-	    select count(1) from sys_menu where parent_id = #{menuId}  
+	    select count(1) from sys_menu where parent_id = #{menuId}
 	</select>
-	
+
 	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		where menu_name= #{menuName} and parent_id = #{parentId} limit 1
 	</select>
-	
+
 	<select id="selectMenusByPathOrRouteName" parameterType="SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		where menu_type in ('M', 'C') and (path = #{path} or path = #{routeName} or route_name = #{path} or route_name = #{routeName})
 	</select>
-	
+
 	<update id="updateMenu" parameterType="SysMenu">
 		update sys_menu
 		<set>
@@ -146,7 +146,7 @@
 			<if test="orderNum != null">order_num = #{orderNum},</if>
 			<if test="path != null and path != ''">path = #{path},</if>
 			<if test="component != null">component = #{component},</if>
-			<if test="query != null">`query` = #{query},</if>
+			<if test="query != null">query = #{query},</if>
 			<if test="routeName != null">route_name = #{routeName},</if>
 			<if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
 			<if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
@@ -170,7 +170,7 @@
 		<if test="orderNum != null">order_num,</if>
 		<if test="path != null and path != ''">path,</if>
 		<if test="component != null and component != ''">component,</if>
-		<if test="query != null and query != ''">`query`,</if>
+		<if test="query != null and query != ''">query,</if>
 		<if test="routeName != null">route_name,</if>
 		<if test="isFrame != null and isFrame != ''">is_frame,</if>
 		<if test="isCache != null and isCache != ''">is_cache,</if>
@@ -212,4 +212,4 @@
 	    delete from sys_menu where menu_id = #{menuId}
 	</delete>
 
-</mapper> 
+</mapper>

gw-ui/src/router/index.js

@@ -1,6 +1,7 @@
 import { createWebHistory, createRouter } from 'vue-router'
 /* Layout */
 import Layout from '@/layout'
+import FrontLayout from '@/frontLayout'
 
 /**
  * Note: 路由配置项
@@ -70,6 +71,52 @@ export const constantRoutes = [
       }
     ]
   },
+  // ==================== 一张图（FrontLayout） ====================
+  {
+    path: '/hlgl/onemap', component: FrontLayout, name: 'HzzOnemap',
+    meta: { title: '一张图', icon: 'map' }, permissions: ['hzz:onemap:list'],
+    children: [{ path: '', component: () => import('@/views/hlgl/onemap/index') }]
+  },
+  // ==================== 后台页面（Layout） ====================
+  {
+    path: '/hlgl', component: Layout, redirect: '/hlgl/bankline', name: 'Hzz',
+    meta: { title: '河湖管理', icon: 'tree' },
+    children: [
+      { path: 'bankline', component: () => import('@/views/hlgl/bankline/index'), meta: { title: '水域岸线管理' }, permissions: ['hzz:bankline:list'] },
+      { path: 'riverproject', component: () => import('@/views/hlgl/riverproject/index'), meta: { title: '涉河项目查询' }, permissions: ['hzz:riverproject:list'] },
+      { path: 'shoreline', component: () => import('@/views/hlgl/shoreline/index'), meta: { title: '岸线功能区统计' }, permissions: ['hzz:shoreline:list'] },
+      { path: 'assess', component: () => import('@/views/hlgl/assess/index'), meta: { title: '考核评估' }, permissions: ['hzz:assess:list'] },
+      { path: 'supervision', component: () => import('@/views/hlgl/supervision/index'), meta: { title: '督导检查' }, permissions: ['hzz:supervision:list'] },
+      { path: 'wps', component: () => import('@/views/hlgl/wps/index'), meta: { title: '涉河项目督查' }, permissions: ['hzz:wps:list'] },
+      { path: 'eventclear', component: () => import('@/views/hlgl/eventclear/index'), meta: { title: '一湖两河清四乱' }, permissions: ['hzz:eventclear:list'] },
+    ]
+  },
+  // ==================== 旧页面迁移（FrontLayout） ====================
+  {
+    path: '/gzfa', component: FrontLayout, children: [{ path: '', component: () => import('@/views/hlgl/gzfa/index'), meta: { title: '工作制度' } }]
+  },
+  {
+    path: '/shjsxm', component: FrontLayout, children: [{ path: '', component: () => import('@/views/hlgl/riverproject/index'), meta: { title: '涉河项目' } }]
+  },
+  {
+    path: '/syaxgl', component: FrontLayout, children: [{ path: '', component: () => import('@/views/hlgl/syaxgl/index'), meta: { title: '水域岸线' } }]
+  },
+  {
+    path: '/khpg', component: FrontLayout, children: [{ path: '', component: () => import('@/views/hlgl/assess/index'), meta: { title: '考核结果' } }]
+  },
+  {
+    path: '/khwj', component: FrontLayout, children: [{ path: '', component: () => import('@/views/hlgl/khwj/index'), meta: { title: '相关文件' } }]
+  },
+  {
+    path: '/ddlb', component: FrontLayout, children: [{ path: '', component: () => import('@/views/hlgl/wps/index'), meta: { title: '涉河项目督察' } }]
+  },
+  {
+    path: '/ddsh', component: FrontLayout, children: [{ path: '', component: () => import('@/views/hlgl/supervision/index'), meta: { title: '河湖管理督察' } }]
+  },
+  {
+    path: '/sjml', component: FrontLayout, children: [{ path: '', component: () => import('@/views/hlgl/eventclear/index'), meta: { title: '一湖两河清四乱' } }]
+  },
+
   {
     path: '/lock',
     component: () => import('@/views/lock'),

pom.xml

@@ -160,6 +160,12 @@
                 <artifactId>gw-common</artifactId>
                 <version>${goldenwater.version}</version>
             </dependency>
+            <!-- 河湖管理-->
+            <dependency>
+                <groupId>com.goldenwater</groupId>
+                <artifactId>gw-hzz</artifactId>
+                <version>${goldenwater.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -169,6 +175,7 @@
         <module>gw-system</module>
         <module>gw-quartz</module>
         <module>gw-common</module>
+        <module>gw-hzz</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -218,4 +225,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
+</project>