commit

src/main/resources/views/layouts/platform.html

@@ -243,6 +243,7 @@ layout("/layouts/v4/baseLayout.html"){
 
 
         try {
+			debugger
             const app = JSON.parse(window.sessionStorage.getItem("zhgh_sub_app"))
             $("#sub-app-container #sidebar-menu .menu-header .menu-title").text(app?.name)
         } catch (e) {
@@ -323,16 +324,53 @@ layout("/layouts/v4/baseLayout.html"){
                     if (res.code === 0) {
                         this.menus = res.data
                         window.sessionStorage.setItem("zhgh_sub_app_menus", JSON.stringify(res.data))
+	                    this.echoMenus()
+	                    this.matchUrlToMenu()
                     } else {
                         this.menus = []
                     }
-                    this.echoMenus()
                 })
             },
-
+	        
+	        // 按 URL 精准激活
+	        matchUrlToMenu() {
+		        // 跳转带过来的地址
+		        const pathname = window.location.pathname
+		        const find = (list, parentIds = []) => {
+			        for (const m of list) {
+				        if (m.href && pathname.includes(m.href.split('?')[0])) {
+					        return { menu: m, parentIds }
+				        }
+				        if (m.children?.length) {
+					        const hit = find(m.children, [...parentIds, m.id])
+					        if (hit) return hit
+				        }
+			        }
+			        return null
+		        }
+		        
+		        const hit = find(this.menus)
+		        if (hit) {
+			        // 激活跳转菜单
+			        this.activeMenuIndex = hit.menu.id
+			        this.openedMenus = hit.parentIds
+			        const app = JSON.parse(window.sessionStorage.getItem("zhgh_sub_app"))
+			        $("#sub-app-container #sidebar-menu .menu-header .menu-title").text(app?.name)
+			        this.$nextTick(() => {
+				        this.menuSelect(hit.menu.id, hit.parentIds)
+				        // 保证内容区对应
+				        commonUtil.pjaxPush(hit.menu.href)
+			        })
+		        } else if (!this.activeMenuIndex) {
+			        // 没命中且缓存也没有 → 再降级到第一个
+			        this.defaultSelect()
+		        }
+	        },
+	        
             // 设置应用信息
             setAppInfo(app) {
                 if (app) {
+					debugger
                     // 储存到缓存
                     window.sessionStorage.setItem("zhgh_sub_app", JSON.stringify(app))
                     // 储存到div中

src/main/resources/views/layouts/v4/apps.html

@@ -326,7 +326,7 @@ layout("/layouts/v4/baseLayout.html"){
 
 <div class="apps-wrapper" id="app">
     <div class="apps-hero">
-        <img src="https://i.cug.edu.cn/data/sys-attach/download/1i8hmpaq7wmewu9c7w3pt9qhu3gb8bkcvow0" alt="应用中心" />
+        <img src="/assets/platform/img/v4/yyzx.png" alt="应用中心" />
     </div>
 
     <div class="apps-container">

src/main/resources/views/layouts/v4/serv.html

@@ -322,7 +322,7 @@ layout("/layouts/v4/baseLayout.html"){
 
 <div class="apps-wrapper" id="app">
     <div class="apps-hero">
-        <img src="https://i.cug.edu.cn/data/sys-attach/download/1i8hmpaqdwmvwajjvw2c8isi61jj0gkmosw0" alt="应用中心"/>
+        <img src="/assets/platform/img/v4/lczx.png" alt="流程中心"/>
     </div>
 
     <div class="apps-container">

src/main/resources/views/platform/sys/unit/index.html

@@ -13,11 +13,11 @@ layout("/layouts/platform.html"){
                         ref="treeRef"
                         :expand-on-click-node="false"
                         :props="{
-                        children: 'children',
-                        label: 'name'
-                     }"
+	                        children: 'children',
+	                        label: 'name'
+	                     }"
                         node-key="id"
-                        :default-expanded-keys="['1']"
+                        default-expand-all
                         @node-click="treeNodeClick"
                         :filter-node-method="filterNode"
                         highlight-current

src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html

@@ -27,14 +27,14 @@ layout("/layouts/platform.html"){
                         <dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch"
                                      code="USER_STATE"></dict-select>
                     </search-item>
+	                <search-item label="教职工类别">
+		                <dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
+		                             code="USER_PERSON_TYPE"></dict-select>
+	                </search-item>
                     <search-item label="编制类别">
                         <dict-select v-model="pageForm.preparedBy" placeholder="编制类别" @change="doSearch"
                                      code="USER_PREPARED_BY_TYPE"></dict-select>
                     </search-item>
-                    <search-item label="教职工类别">
-                        <dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
-                                     code="USER_PERSON_TYPE"></dict-select>
-                    </search-item>
                     <search-item label="变更类型">
                         <dict-select v-model="pageForm.changeType" placeholder="变更类型" @change="doSearch"
                                      code="MEMBER_CHANGE_TYPE"></dict-select>
@@ -155,8 +155,8 @@ layout("/layouts/platform.html"){
                     { prop: "username", label: "姓名", sortable: true },
                     { prop: "sex", label: "性别", sortable: true, width: "100px" },
                     { prop: "userState", label: "在职状态", sortable: true },
+	                { prop: "personType", label: "教职工类别", sortable: true },
                     { prop: "preparedBy", label: "编制类别", sortable: true },
-                    { prop: "personType", label: "教职工类别", sortable: true },
                     { prop: "unionName", label: "所属工会", sortable: true },
                     { prop: "unitName", label: "所属单位", sortable: true },
                     { prop: "changeTypes", label: "变更类型", sortable: true },