From 7f02fc7e9c0d40d8a6086f898f07e3ff6126dffd Mon Sep 17 00:00:00 2001
From: hebo <hebo@git123.com>
Date: Mon, 23 Feb 2026 17:29:36 +0800
Subject: [PATCH] =?UTF-8?q?SAAS=E6=A8=A1=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |    1 +
 src/api/analysis/xs.ts                        |   14 +-
 src/api/base/jfApi.ts                         |    8 +
 src/api/base/jzApi.ts                         |   14 +
 src/api/routine/jz.ts                         |   16 +
 src/api/system/config/index.ts                |   15 +
 src/api/system/login/index.ts                 |    5 -
 src/api/system/menu.ts                        |   17 +
 src/components/Tinymce/TinymceEditorH5.vue    |  178 ++
 src/components/Tinymce/TinymceOrEditor.vue    |   45 +
 src/pages.json                                |   93 +-
 src/pages/base/mine/index.vue                 |  608 +++--
 src/pages/base/service/index copy.vue         | 1984 +++++++++++++++++
 src/pages/base/service/index.vue              |  182 +-
 src/pages/system/launchPage/launchPage.vue    |   81 +-
 src/pages/view/analysis/xs/studentArchive.vue |  583 -----
 .../view/routine/JiFenPingJia/jftj/detail.vue |   91 +-
 .../view/routine/JiFenPingJia/jftj/index.vue  |  328 ++-
 .../view/routine/JiFenPingJia/jftj/yjpm.vue   |  633 +++---
 .../view/routine/RengJiaoRengZhi/index.vue    |    3 +-
 src/pages/view/routine/da/jsda/index.vue      |  660 ++++++
 src/pages/view/routine/da/jzda/index.vue      |  312 +++
 .../view/routine/da/xsda/studentArchive.vue   |  450 ++++
 src/pages/view/routine/tz/publish.vue         |    4 +-
 src/pages/view/routine/xk/xkkcDetail.vue      |   45 +-
 src/static/base/home/grda.png                 |  Bin 0 -> 6154 bytes
 src/static/base/home/jsda.png                 |  Bin 6154 -> 5658 bytes
 src/static/base/home/jzda.png                 |  Bin 0 -> 8317 bytes
 src/static/tinymce/langs/zh_CN.js             |   31 +
 src/store/modules/menu.ts                     |   34 +
 src/store/modules/user.ts                     |   33 +-
 src/utils/permission.ts                       |  336 +--
 32 files changed, 4917 insertions(+), 1887 deletions(-)
 create mode 100644 src/api/base/jzApi.ts
 create mode 100644 src/api/routine/jz.ts
 create mode 100644 src/api/system/menu.ts
 create mode 100644 src/components/Tinymce/TinymceEditorH5.vue
 create mode 100644 src/components/Tinymce/TinymceOrEditor.vue
 create mode 100644 src/pages/base/service/index copy.vue
 delete mode 100644 src/pages/view/analysis/xs/studentArchive.vue
 create mode 100644 src/pages/view/routine/da/jsda/index.vue
 create mode 100644 src/pages/view/routine/da/jzda/index.vue
 create mode 100644 src/pages/view/routine/da/xsda/studentArchive.vue
 create mode 100644 src/static/base/home/grda.png
 create mode 100644 src/static/base/home/jzda.png
 create mode 100644 src/static/tinymce/langs/zh_CN.js
 create mode 100644 src/store/modules/menu.ts

diff --git a/package.json b/package.json
index 57329af..8393edb 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
 		"pinia-plugin-persist-uni": "1.2.0",
 		"pinyin-pro": "^3.27.0",
 		"qrcode": "^1.5.3",
+		"tinymce": "^5.10.7",
 		"uview-plus": "3.1.20",
 		"vconsole": "3.15.1",
 		"vue": "3.2.45",
diff --git a/src/api/analysis/xs.ts b/src/api/analysis/xs.ts
index 08943ef..67f21a8 100644
--- a/src/api/analysis/xs.ts
+++ b/src/api/analysis/xs.ts
@@ -1,4 +1,4 @@
-import { get, post } from "@/utils/request";
+import { get } from "@/utils/request";
 
 // 学生档案相关API接口
 
@@ -8,3 +8,15 @@ import { get, post } from "@/utils/request";
 export function findStudentInfoByNjAndBjSimpleApi(njId: string, bjId: string) {
   return get('/api/xs/findStudentInfoByNjAndBjSimple', { njId, bjId });
 }
+
+/**
+ * 学生档案查询：支持多年级、多班级、学生、姓名
+ */
+export function findStudentArchiveApi(params: {
+  njIds?: string;
+  bjIds?: string;
+  xsIds?: string;
+  xsxm?: string;
+}) {
+  return get('/api/xs/findStudentArchive', params);
+}
diff --git a/src/api/base/jfApi.ts b/src/api/base/jfApi.ts
index 5ce6437..89f1501 100644
--- a/src/api/base/jfApi.ts
+++ b/src/api/base/jfApi.ts
@@ -1,5 +1,13 @@
 import { get, post } from "@/utils/request";
 
+/**
+ * 按教师统计积分（已审批、待审批、已驳回、暂存），按大类分组
+ * 返回数据结构：{ jsId, jsName, topTypeId, topTypeName, approvedCount, calculatedScore, pendingCount, rejectedCount, draftCount }
+ */
+export function jfStatisticsByTeacherApi(params: any) {
+    return get('/api/jf/statisticsByTeacher', params);
+}
+
 /**
  * 教师积分类型汇总
  */
diff --git a/src/api/base/jzApi.ts b/src/api/base/jzApi.ts
new file mode 100644
index 0000000..ca161f5
--- /dev/null
+++ b/src/api/base/jzApi.ts
@@ -0,0 +1,14 @@
+import { get } from "@/utils/request";
+
+/**
+ * 家长档案分页查询（按年级班级、家长姓名模糊查询，支持分页滚动加载）
+ */
+export function findParentArchivePageApi(params: {
+  njId: string;
+  bjId: string;
+  jzxm?: string;
+  page?: number;
+  rows?: number;
+}) {
+  return get('/api/jz/findParentArchivePage', params);
+}
diff --git a/src/api/routine/jz.ts b/src/api/routine/jz.ts
new file mode 100644
index 0000000..7c62f3e
--- /dev/null
+++ b/src/api/routine/jz.ts
@@ -0,0 +1,16 @@
+import { get } from "@/utils/request";
+
+/**
+ * 家长档案分页查询
+ * 支持多年级、多班级、学生筛选，按家长姓名模糊查询，分页滚动加载
+ */
+export function findParentArchivePageApi(params: {
+  njIds?: string;
+  bjIds?: string;
+  xsIds?: string;
+  jzxm?: string;
+  page?: number;
+  rows?: number;
+}) {
+  return get('/api/jz/findParentArchivePage', params);
+}
diff --git a/src/api/system/config/index.ts b/src/api/system/config/index.ts
index 41c9363..b078eb8 100644
--- a/src/api/system/config/index.ts
+++ b/src/api/system/config/index.ts
@@ -1,5 +1,20 @@
 import { get } from "@/utils/request";
 
+/** 短时缓存，避免 launchPage → service 连续跳转时重复调用 */
+let _changeTimeCache: { promise: Promise<any>; ts: number } | null = null;
+const CACHE_MS = 10000; // 10 秒内复用
+
+/** 获取权限变更时间戳，用于判断本地缓存的菜单是否需重新拉取 */
+export const getPermissionChangeTimeApi = () => {
+  const now = Date.now();
+  if (_changeTimeCache && now - _changeTimeCache.ts < CACHE_MS) {
+    return _changeTimeCache.promise;
+  }
+  const promise = get("/api/comConfig/getPermissionChangeTime");
+  _changeTimeCache = { promise, ts: now };
+  return promise;
+};
+
 //配置参数接口
 export const dmBeforeMinuteApi = async () => {
   return await get("/api/comConfig/getDmBeforeMinute");
diff --git a/src/api/system/login/index.ts b/src/api/system/login/index.ts
index cc26b92..1b895af 100644
--- a/src/api/system/login/index.ts
+++ b/src/api/system/login/index.ts
@@ -44,11 +44,6 @@ export const weChatLogin = async (param: any) => {
   return await get("/userlogin/weloginByCode", param);
 };
 
-//获取用户按钮权限
-export const authenticationApi = async (param: { userId: string }) => {
-  return await get("/api/authentication/find-by-user", param);
-};
-
 //获取公众号票据
 export const wxConfigApi = async (param: any) => {
   return await post("/userlogin/wxConfig", param);
diff --git a/src/api/system/menu.ts b/src/api/system/menu.ts
new file mode 100644
index 0000000..3823de7
--- /dev/null
+++ b/src/api/system/menu.ts
@@ -0,0 +1,17 @@
+import { get } from "@/utils/request";
+
+/** 手机端菜单树节点 */
+export interface MobileMenuTreeNode {
+  id: number;
+  parentId: number | null;
+  screenName: string;
+  normalCss?: string;
+  pagePath?: string;
+  sortNum: number;
+  authCode?: string;
+  children: MobileMenuTreeNode[];
+}
+
+/** 获取手机端菜单 */
+export const getMobileMenuApi = () =>
+  get<{ result: MobileMenuTreeNode[] }>("/api/screen/find-mobile-menu");
diff --git a/src/components/Tinymce/TinymceEditorH5.vue b/src/components/Tinymce/TinymceEditorH5.vue
new file mode 100644
index 0000000..c93ba80
--- /dev/null
+++ b/src/components/Tinymce/TinymceEditorH5.vue
@@ -0,0 +1,178 @@
+<!-- H5 专用 TinyMCE 富文本编辑器，与 zhxy-vue 接龙描述一致 -->
+<template>
+  <!-- #ifdef H5 -->
+  <view class="tinymce-editor-h5" :style="{ width: containerWidth }">
+    <textarea :id="tinymceId" ref="elRef" class="tinymce-textarea"></textarea>
+  </view>
+  <!-- #endif -->
+</template>
+
+<script lang="ts" setup>
+// #ifdef H5
+import { ref, computed, watch, onMounted, onBeforeUnmount, nextTick } from 'vue';
+import tinymce from 'tinymce/tinymce';
+import 'tinymce/themes/silver';
+import 'tinymce/icons/default/icons';
+import 'tinymce/plugins/advlist';
+import 'tinymce/plugins/link';
+import 'tinymce/plugins/lists';
+import 'tinymce/plugins/paste';
+import 'tinymce/plugins/code';
+import 'tinymce/plugins/image';
+import { config } from '@/utils/request';
+import { useUserStore } from '@/store/modules/user';
+import { AUTH_KEY } from '@/config';
+import { imagUrl } from '@/utils';
+
+const props = defineProps<{
+  modelValue?: string;
+  placeholder?: string;
+  height?: number | string;
+  width?: number | string;
+}>();
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: string): void;
+  (e: 'change', value: string): void;
+}>();
+
+const userStore = useUserStore();
+const tinymceId = ref(`tinymce-${Date.now()}`);
+let initRetryCount = 0;
+const elRef = ref<HTMLElement | null>(null);
+const editorRef = ref<any>(null);
+
+const containerWidth = computed(() => {
+  const w = props.width;
+  if (typeof w === 'number') return `${w}px`;
+  return w || '100%';
+});
+
+const uploadUrl = computed(() => `${config.baseUrl}/api/attachment/upload`);
+
+const getInitOptions = (targetEl: HTMLElement) => ({
+  target: targetEl,
+  height: props.height || 320,
+  menubar: false,
+  branding: false,
+  // 暂不加载语言包，避免 404 导致初始化失败
+  // 使用 unpkg CDN，兼容性更好
+  skin_url: 'https://unpkg.com/tinymce@5.10.7/skins/ui/oxide',
+  content_css: 'https://unpkg.com/tinymce@5.10.7/skins/ui/oxide/content.min.css',
+  plugins: 'advlist link lists paste code image',
+  toolbar: 'undo redo | formatselect | bold italic underline | alignleft aligncenter alignright | bullist numlist | link image | removeformat',
+  placeholder: props.placeholder || '请输入内容，支持插入图片',
+  default_link_target: '_blank',
+  paste_data_images: true,
+  automatic_uploads: true,
+  images_upload_handler: async (blobInfo: any, success: (url: string) => void, failure: (err: string) => void) => {
+    try {
+      const formData = new FormData();
+      formData.append('files', blobInfo.blob(), blobInfo.filename());
+      const token = userStore.getToken;
+      const headers: Record<string, string> = {};
+      if (token) headers[AUTH_KEY] = token;
+
+      const resp = await fetch(uploadUrl.value, {
+        method: 'POST',
+        headers,
+        body: formData,
+      });
+      const res = await resp.json();
+      if (res && res.resultCode === 1 && res.result && res.result.length > 0) {
+        const filePath = res.result[0].filePath || res.result[0].url;
+        success(imagUrl(filePath));
+      } else {
+        failure(res?.message || '图片上传失败');
+      }
+    } catch (e: any) {
+      failure(e?.message || '图片上传失败');
+    }
+  },
+  setup: (editor: any) => {
+    editorRef.value = editor;
+    editor.on('init', () => {
+      editor.setContent(props.modelValue || '');
+    });
+  },
+});
+
+function initEditor() {
+  const el = elRef.value as HTMLElement | null;
+  if (el?.style) el.style.visibility = '';
+  const targetEl = document.getElementById(tinymceId.value);
+  if (!targetEl) {
+    initRetryCount++;
+    if (initRetryCount < 5) {
+      setTimeout(initEditor, 150);
+    } else {
+      console.error('[TinymceEditorH5] 目标元素未找到，已放弃');
+    }
+    return;
+  }
+  tinymce.init(getInitOptions(targetEl)).then((editors: any[]) => {
+    const editor = editors[0];
+    if (editor) {
+      editor.on('change keyup', () => {
+        const content = editor.getContent();
+        emit('update:modelValue', content);
+        emit('change', content);
+      });
+    }
+  }).catch((err) => {
+    console.error('[TinymceEditorH5] TinyMCE 初始化失败:', err);
+  });
+}
+
+function destroyEditor() {
+  try {
+    tinymce?.remove?.(`#${tinymceId.value}` as any);
+  } catch (_) {}
+}
+
+watch(
+  () => props.modelValue,
+  (val) => {
+    const editor = editorRef.value;
+    if (editor && val !== editor.getContent()) {
+      editor.setContent(val || '');
+    }
+  }
+);
+
+onMounted(() => {
+  nextTick(() => {
+    setTimeout(initEditor, 100);
+  });
+});
+
+onBeforeUnmount(() => {
+  destroyEditor();
+});
+// #endif
+</script>
+
+<style scoped>
+.tinymce-editor-h5 {
+  min-height: 320px;
+  position: relative;
+}
+
+/* 初始隐藏 textarea，TinyMCE 会替换它 */
+.tinymce-textarea {
+  position: absolute;
+  left: -9999px;
+  width: 1px;
+  height: 1px;
+  opacity: 0;
+}
+
+.tinymce-editor-h5 :deep(.tox-tinymce) {
+  border-radius: 6px;
+  border: 1px solid #e0e0e0;
+}
+
+.tinymce-editor-h5 :deep(.tox .tox-edit-area__iframe) {
+  min-height: 280px;
+}
+</style>
diff --git a/src/components/Tinymce/TinymceOrEditor.vue b/src/components/Tinymce/TinymceOrEditor.vue
new file mode 100644
index 0000000..4f44955
--- /dev/null
+++ b/src/components/Tinymce/TinymceOrEditor.vue
@@ -0,0 +1,45 @@
+<!-- 通知内容富文本：H5 用 TinyMCE（与 zhxy-vue 接龙描述一致），小程序/App 用 BasicEditor -->
+<template>
+  <!-- #ifdef H5 -->
+  <TinymceEditorH5
+    :modelValue="modelValue"
+    @update:modelValue="$emit('update:modelValue', $event)"
+    @change="$emit('change', $event)"
+    :placeholder="placeholder"
+    :height="height"
+    :width="width"
+  />
+  <!-- #endif -->
+  <!-- #ifndef H5 -->
+  <BasicEditor
+    :modelValue="modelValue"
+    @update:modelValue="$emit('update:modelValue', $event)"
+    :placeholder="placeholder"
+    v-bind="$attrs"
+  />
+  <!-- #endif -->
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue';
+// #ifdef H5
+import TinymceEditorH5 from './TinymceEditorH5.vue';
+// #endif
+// #ifndef H5
+import BasicEditor from '@/components/BasicForm/components/BasicEditor.vue';
+// #endif
+
+const props = defineProps<{
+  modelValue?: string;
+  placeholder?: string;
+  height?: number | string;
+  width?: number | string;
+}>();
+
+defineEmits<{
+  (e: 'update:modelValue', value: string): void;
+  (e: 'change', value: string): void;
+}>();
+
+const modelValue = computed(() => props.modelValue ?? '');
+</script>
diff --git a/src/pages.json b/src/pages.json
index 8b17f2e..b77b5f3 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -861,6 +861,69 @@
         "enablePullDownRefresh": false
       }
     },
+    {
+      "path": "pages/view/routine/xszp/kc/kclx",
+      "style": {
+        "navigationBarTitleText": "课程任务类型",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/routine/xszp/tj/index",
+      "style": {
+        "navigationBarTitleText": "学业统计",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/routine/xszp/tj/kclx",
+      "style": {
+        "navigationBarTitleText": "课程任务类型",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/routine/xszp/tj/statistics",
+      "style": {
+        "navigationBarTitleText": "学业统计",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/routine/xszp/tj/personnelList",
+      "style": {
+        "navigationBarTitleText": "人员名单",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/routine/xszp/tj/groupDetail",
+      "style": {
+        "navigationBarTitleText": "分组情况明细",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/routine/xszp/kclx/index",
+      "style": {
+        "navigationBarTitleText": "作品课程类型",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/routine/xszp/kclx/add",
+      "style": {
+        "navigationBarTitleText": "新增课程类型",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/routine/xszp/kclx/edit",
+      "style": {
+        "navigationBarTitleText": "编辑课程类型",
+        "enablePullDownRefresh": false
+      }
+    },
     {
       "path": "pages/view/routine/xszp/pj/index",
       "style": {
@@ -1317,6 +1380,20 @@
         "enablePullDownRefresh": false
       }
     },
+    {
+      "path": "pages/view/homeSchool/kspj/index",
+      "style": {
+        "navigationBarTitleText": "成绩评价",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/homeSchool/kspj/detail",
+      "style": {
+        "navigationBarTitleText": "评价详情",
+        "enablePullDownRefresh": false
+      }
+    },
     {
       "path": "pages/view/hr/jsQj/index",
       "style": {
@@ -1722,12 +1799,26 @@
       }
     },
     {
-      "path": "pages/view/analysis/xs/studentArchive",
+      "path": "pages/view/routine/da/xsda/studentArchive",
       "style": {
         "navigationBarTitleText": "学生档案",
         "enablePullDownRefresh": false
       }
     },
+    {
+      "path": "pages/view/routine/da/jzda/index",
+      "style": {
+        "navigationBarTitleText": "家长档案",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/view/routine/da/jsda/index",
+      "style": {
+        "navigationBarTitleText": "教师档案",
+        "enablePullDownRefresh": false
+      }
+    },
     {
       "path": "pages/view/analysis/xk/xkCourse",
       "style": {
diff --git a/src/pages/base/mine/index.vue b/src/pages/base/mine/index.vue
index 9cec9fe..0dcf4b9 100644
--- a/src/pages/base/mine/index.vue
+++ b/src/pages/base/mine/index.vue
@@ -1,58 +1,62 @@
 <template>
   <view class="mine-page">
-    <!-- 1. 顶部 Header - 复制自service页面 -->
+    <!-- 1. 顶部 Header（与自助服务一致） -->
     <view class="header-section">
       <view class="header-gradient"></view>
 
-      <!-- 退出按钮 -->
-      <view class="logout-btn" @click="handleLogout">
-        <text class="logout-text">退出</text>
-      </view>
-
       <!-- 老师信息 -->
       <view class="teacher-info">
         <view class="teacher-avatar">
           <image
             class="avatar-image"
-            :src="teacherData.avatar || '/static/base/default-avatar.png'"
+            :src="jsTx || '/static/base/default-avatar.png'"
             mode="aspectFill"
           ></image>
         </view>
 
         <view class="teacher-details">
-          <view class="teacher-name">{{ teacherData.name }}</view>
-          <view class="teacher-position">{{ teacherPosition }}</view>
-          <view class="teacher-class">{{ teacherData.className }}</view>
+          <view class="teacher-name">{{ js.jsxm }}</view>
+          <view class="teacher-position">{{ dzZwLabel }}</view>
+          <view class="teacher-position">{{ qtZwLabel }}</view>
+          <view class="teacher-class">{{ js.njz }}</view>
         </view>
       </view>
 
-      <!-- 统计信息 - 暂时隐藏 -->
-      <!-- <view class="stats-info">
-        <view class="stat-item">
-          <text class="stat-label">积分：</text>
-          <text class="stat-value">{{ teacherData.score }}分</text>
-        </view>
-        <view class="stat-divider">|</view>
-        <view class="stat-item">
-          <text class="stat-label">工作量：</text>
-          <text class="stat-value">{{ teacherData.workload }}课时</text>
-        </view>
-      </view> -->
-
       <!-- 介绍文字 -->
       <view class="teacher-intro">
-        {{ teacherData.introduction }}
+        {{ js.introduction || "守正出新，求真务实\n让每一棵新苗拔节生长" }}
       </view>
     </view>
 
-    <!-- 2. 日程管理区域 -->
+    <!-- 2. 主要内容区域 -->
     <view class="main-content">
-      <!-- 近期日程标题 -->
-      <view class="schedule-header">
-        <text class="schedule-title">近期日程</text>
-        <view class="schedule-link" @click="goToSchedule">
-          <text class="link-text">查看日程</text>
-          <text class="link-arrow">></text>
+      <!-- 快捷入口卡片 -->
+      <view class="quick-entry-card">
+        <view class="entry-item" @click="goToTeacherProfile">
+          <view class="entry-icon icon-profile">档</view>
+          <text class="entry-title">个人档案</text>
+          <text class="entry-arrow">›</text>
+        </view>
+        <view class="entry-divider"></view>
+        <view class="entry-item" @click="goToRengJiaoRengZhi">
+          <view class="entry-icon icon-position">职</view>
+          <text class="entry-title">任职任教</text>
+          <text class="entry-arrow">›</text>
+        </view>
+        <view class="entry-divider"></view>
+        <view class="entry-item" @click="goToSchedule">
+          <view class="entry-icon icon-schedule">程</view>
+          <text class="entry-title">近期日程</text>
+          <text class="entry-arrow">›</text>
+        </view>
+      </view>
+
+      <!-- 近期日程 -->
+      <view class="section-header">
+        <text class="section-title">近期日程</text>
+        <view class="section-link" @click="goToSchedule">
+          <text>查看全部</text>
+          <text class="link-arrow">›</text>
         </view>
       </view>
 
@@ -127,17 +131,6 @@ import { useCommonStore } from "@/store/modules/common";
 import { imagUrl } from "@/utils";
 import { reactive, ref, computed, onMounted } from "vue";
 
-// 定义老师数据接口
-interface TeacherData {
-  name: string;
-  position: string;
-  className: string;
-  score: number;
-  workload: number;
-  introduction: string;
-  avatar?: string;
-}
-
 // 日程数据接口
 interface ScheduleItem {
   startTime: string;
@@ -158,48 +151,19 @@ interface DateItem {
   date: string;
 }
 
-const { logout, getUser, getJs } = useUserStore();
+const { getUser, getJs } = useUserStore();
 const { getZwListByLx } = useCommonStore();
 
+// 头像（与自助服务一致）
+const jsTx = computed(() => imagUrl(getUser.profilePhoto));
+
+// 教师信息
+const js = computed(() => getJs);
+
 // 职务标签
 const dzZwLabel = ref<string>("");
 const qtZwLabel = ref<string>("");
 
-// 老师数据
-const teacherData = reactive<TeacherData>({
-  name: getJs.jsxm || getUser.loginName,
-  position: "", // 将在初始化时设置
-  className: getJs.njz || "",
-  score: 88, // 默认值，后续可以从接口获取
-  workload: 40, // 默认值，后续可以从接口获取
-  introduction: getJs.introduction || "北冥有鱼，其名为鲲。鲲之大，不知其几千里也。",
-  avatar: imagUrl(getUser.profilePhoto),
-});
-
-// 计算属性：动态获取职务信息
-const teacherPosition = computed(() => {
-  const positions = [];
-  if (dzZwLabel.value) positions.push(dzZwLabel.value);
-  if (qtZwLabel.value) positions.push(qtZwLabel.value);
-  return positions.join('、') || '暂无职务信息';
-});
-
-// 退出登录
-const handleLogout = () => {
-  uni.showModal({
-    title: "确认退出",
-    content: "确定要退出登录吗？",
-    success: (res) => {
-      if (res.confirm) {
-        logout();
-        uni.reLaunch({
-          url: "/pages/system/login/login",
-        });
-      }
-    },
-  });
-};
-
 // 日程相关数据
 const selectedDateIndex = ref(0); // 默认选中第一天
 
@@ -325,6 +289,20 @@ const goToSchedule = () => {
   });
 };
 
+// 跳转到任职任教
+const goToRengJiaoRengZhi = () => {
+  uni.navigateTo({
+    url: '/pages/view/routine/RengJiaoRengZhi/index'
+  });
+};
+
+// 跳转到个人档案
+const goToTeacherProfile = () => {
+  uni.navigateTo({
+    url: '/pages/view/hr/teacherProfile/index'
+  });
+};
+
 onMounted(async () => {
   // 初始化职务信息
   await initPositionInfo();
@@ -347,7 +325,7 @@ onMounted(async () => {
   position: relative;
 }
 
-// 顶部 Header - 复制自service页面
+// 顶部 Header（与自助服务一致）
 .header-section {
   position: relative;
   background: linear-gradient(135deg, #4f46e5 0%, #7c3aed 50%, #ec4899 100%);
@@ -371,24 +349,6 @@ onMounted(async () => {
     z-index: 1;
   }
 
-  .logout-btn {
-    position: absolute;
-    top: 40rpx;
-    right: 30rpx;
-    z-index: 3;
-    background: rgba(255, 255, 255, 0.2);
-    border-radius: 20rpx;
-    padding: 10rpx 20rpx;
-    border: 1px solid rgba(255, 255, 255, 0.3);
-    backdrop-filter: blur(10px);
-
-    .logout-text {
-      color: #ffffff;
-      font-size: 14px;
-      font-weight: 500;
-    }
-  }
-
   .teacher-info {
     display: flex;
     align-items: center;
@@ -434,52 +394,24 @@ onMounted(async () => {
     }
   }
 
-  .stats-info {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-top: 20rpx;
-    z-index: 2;
-    position: relative;
-
-    .stat-item {
-      display: flex;
-      align-items: center;
-
-      .stat-label {
-        font-size: 14px;
-        color: rgba(255, 255, 255, 0.9);
-      }
-
-      .stat-value {
-        font-size: 14px;
-        color: #ffffff;
-        font-weight: 600;
-      }
-    }
-
-    .stat-divider {
-      margin: 0 30rpx;
-      color: rgba(255, 255, 255, 0.6);
-      font-size: 14px;
-    }
-  }
-
   .teacher-intro {
     text-align: center;
-    font-size: 12px;
-    color: rgba(255, 255, 255, 0.8);
-    margin-top: 20rpx;
-    line-height: 1.4;
+    font-size: 15px;
+    color: rgba(255, 255, 255, 0.95);
+    margin-top: -10rpx;
+    line-height: 1.8;
     z-index: 2;
     position: relative;
+    white-space: pre-line;
+    font-weight: 500;
+    letter-spacing: 1px;
   }
 }
 
-// 主要内容区域
+// 主要内容区域（与自助服务一致）
 .main-content {
   box-sizing: border-box;
-  padding: 20px 12px 0px 12px; // 减少左右padding
+  padding: 20px 15px 40px 15px;
   position: relative;
   background: linear-gradient(
     to bottom,
@@ -490,59 +422,118 @@ onMounted(async () => {
   margin-top: -20px;
   z-index: 3;
   box-shadow: 0 -4px 20px rgba(0, 0, 0, 0.1);
-  height: calc(100vh - 340rpx); // 固定高度
+  min-height: calc(100vh - 340rpx);
   display: flex;
   flex-direction: column;
-  overflow: hidden; // 防止内容溢出
+  overflow: hidden;
 }
 
-// 日程标题
-.schedule-header {
+// 快捷入口卡片
+.quick-entry-card {
+  background: #fff;
+  border-radius: 20rpx;
+  overflow: hidden;
+  margin-bottom: 28rpx;
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04);
+
+  .entry-item {
+    display: flex;
+    align-items: center;
+    padding: 28rpx 24rpx;
+    transition: background 0.2s;
+
+    &:active {
+      background: #f8fafc;
+    }
+  }
+
+  .entry-icon {
+    width: 56rpx;
+    height: 56rpx;
+    border-radius: 16rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #fff;
+    margin-right: 24rpx;
+  }
+
+  .icon-profile {
+    background: linear-gradient(135deg, #6366f1 0%, #8b5cf6 100%);
+  }
+
+  .icon-position {
+    background: linear-gradient(135deg, #0ea5e9 0%, #06b6d4 100%);
+  }
+
+  .icon-schedule {
+    background: linear-gradient(135deg, #10b981 0%, #059669 100%);
+  }
+
+  .entry-title {
+    flex: 1;
+    font-size: 30rpx;
+    font-weight: 500;
+    color: #1e293b;
+  }
+
+  .entry-arrow {
+    font-size: 36rpx;
+    color: #94a3b8;
+    font-weight: 300;
+  }
+
+  .entry-divider {
+    height: 1rpx;
+    background: #f1f5f9;
+    margin-left: 104rpx;
+  }
+}
+
+// 区块标题
+.section-header {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 15px;
-  flex-shrink: 0; // 不压缩
+  margin-bottom: 20rpx;
+  padding: 0 4rpx;
+  flex-shrink: 0;
 
-  .schedule-title {
-    font-size: 17px;
+  .section-title {
+    font-size: 32rpx;
     font-weight: 600;
-    color: #1f2937;
+    color: #1e293b;
   }
 
-  .schedule-link {
+  .section-link {
     display: flex;
     align-items: center;
-    cursor: pointer;
-
-    .link-text {
-      font-size: 13px;
-      color: #6b7280;
-      margin-right: 4px;
-    }
+    font-size: 26rpx;
+    color: #64748b;
 
     .link-arrow {
-      font-size: 13px;
-      color: #6b7280;
+      margin-left: 4rpx;
+      font-size: 28rpx;
+      font-weight: 300;
     }
   }
 }
 
 // 日期选择器
 .date-selector {
-  margin-bottom: 15px;
-  background: #ffffff;
-  border-radius: 12px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-  flex-shrink: 0; // 不压缩
-  margin-left: 0;
-  margin-right: 0;
+  margin-bottom: 24rpx;
+  background: #fff;
+  border-radius: 20rpx;
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04);
+  flex-shrink: 0;
+  padding: 16rpx 8rpx;
 
   .date-container {
     display: flex;
-    padding: 8px 4px;
-    justify-content: space-around; // 使用space-around确保更好的分布
-    width: 100%; // 占满宽度
+    justify-content: space-between;
+    width: 100%;
     box-sizing: border-box;
   }
 
@@ -550,54 +541,44 @@ onMounted(async () => {
     display: flex;
     flex-direction: column;
     align-items: center;
-    padding: 6px 2px;
-    border-radius: 8px;
-    cursor: pointer;
-    transition: all 0.3s ease;
+    padding: 16rpx 8rpx;
+    border-radius: 16rpx;
+    flex: 1;
+    max-width: calc((100% - 48rpx) / 7);
+    min-width: 0;
     position: relative;
-    flex: 1; // 平均分配空间
-    max-width: calc((100% - 32px) / 7); // 减去padding后平均分配
-    min-width: 0; // 允许压缩
 
     .date-day {
-      font-size: 10px;
-      color: #6b7280;
-      margin-bottom: 2px;
-      white-space: nowrap; // 防止换行
-      text-align: center;
+      font-size: 22rpx;
+      color: #64748b;
+      margin-bottom: 8rpx;
     }
 
     .date-number {
-      font-size: 14px;
+      font-size: 28rpx;
       font-weight: 600;
-      color: #374151;
-      white-space: nowrap; // 防止换行
-      text-align: center;
+      color: #334155;
     }
 
     .date-dot {
       position: absolute;
-      bottom: 1px;
-      width: 3px;
-      height: 3px;
+      bottom: 4rpx;
+      width: 8rpx;
+      height: 8rpx;
       background: #10b981;
       border-radius: 50%;
     }
 
     &.active {
-      background: #10b981;
-      color: #ffffff;
-      transform: scale(1.02); // 减少放大倍数，避免超出
-      z-index: 1; // 确保选中项在最上层
-      margin: 0 -1px; // 轻微负边距补偿放大效果
+      background: linear-gradient(135deg, #10b981 0%, #059669 100%);
 
       .date-day,
       .date-number {
-        color: #ffffff;
+        color: #fff;
       }
 
       .date-dot {
-        background: #ffffff;
+        background: #fff;
       }
     }
   }
@@ -605,183 +586,130 @@ onMounted(async () => {
 
 // 日程列表
 .schedule-list {
-  flex: 1; // 占据剩余空间
-  height: 0; // 配合flex使用，确保滚动正常
-  padding-bottom: 20px;
-  
+  flex: 1;
+  height: 0;
+  background: #fff;
+  border-radius: 20rpx;
+  box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04);
+  overflow: hidden;
+
   .schedule-content {
-    padding-bottom: 35px; // 底部留白
+    padding: 0 24rpx 40rpx;
   }
-  
+
   .schedule-item {
-      display: flex;
-      padding: 14px 0;
-      border-bottom: 1px solid #f3f4f6;
+    display: flex;
+    padding: 28rpx 0;
+    border-bottom: 1rpx solid #f1f5f9;
 
-      &:last-child {
-        border-bottom: none;
+    &:last-child {
+      border-bottom: none;
+    }
+
+    .time-column {
+      width: 100rpx;
+      flex-shrink: 0;
+      margin-right: 24rpx;
+
+      .start-time {
+        display: block;
+        font-size: 28rpx;
+        font-weight: 600;
+        color: #334155;
+        line-height: 1.3;
       }
 
-      .time-column {
-        width: 60px;
-        flex-shrink: 0;
-        margin-right: 15px;
+      .end-time {
+        display: block;
+        font-size: 24rpx;
+        color: #64748b;
+        margin-top: 4rpx;
+        line-height: 1.3;
+      }
+    }
 
-        .start-time {
-          display: block;
-          font-size: 15px;
-          font-weight: 600;
-          color: #374151;
-          line-height: 1.2;
+    .content-column {
+      flex: 1;
+      min-width: 0;
+
+      .event-header {
+        display: flex;
+        align-items: center;
+        margin-bottom: 12rpx;
+
+        .event-tag {
+          display: inline-flex;
+          align-items: center;
+          padding: 6rpx 16rpx;
+          border-radius: 12rpx;
+          margin-right: 12rpx;
+          flex-shrink: 0;
+
+          &.meeting { background: #10b981; }
+          &.class { background: #3b82f6; }
+          &.tutoring { background: #f59e0b; }
+          &.preparation { background: #8b5cf6; }
+          &.counseling { background: #ef4444; }
+
+          .tag-text {
+            font-size: 22rpx;
+            color: #fff;
+            font-weight: 500;
+          }
         }
 
-        .end-time {
-          display: block;
-          font-size: 13px;
-          color: #6b7280;
-          margin-top: 2px;
-          line-height: 1.2;
+        .event-title {
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #1e293b;
+          flex: 1;
+          line-height: 1.4;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
       }
 
-      .content-column {
-        flex: 1;
-        min-width: 0; // 允许内容压缩
-
-        .event-header {
+      .event-details {
+        .event-location,
+        .event-description {
           display: flex;
           align-items: center;
-          margin-bottom: 8px;
+          margin-bottom: 8rpx;
 
-          .event-tag {
-            display: inline-flex;
-            align-items: center;
-            padding: 3px 8px;
-            border-radius: 12px;
-            margin-right: 8px;
-            flex-shrink: 0; // 标签不压缩
-
-            &.meeting {
-              background: #10b981;
-            }
-
-            &.class {
-              background: #3b82f6;
-            }
-
-            &.tutoring {
-              background: #f59e0b;
-            }
-
-            &.preparation {
-              background: #8b5cf6;
-            }
-
-            &.counseling {
-              background: #ef4444;
-            }
-
-            .tag-text {
-              font-size: 11px;
-              color: #ffffff;
-              font-weight: 500;
-              white-space: nowrap;
-            }
+          .location-icon,
+          .description-icon {
+            font-size: 24rpx;
+            margin-right: 8rpx;
           }
 
-          .event-title {
-            font-size: 15px;
-            font-weight: 500;
-            color: #1f2937;
-            flex: 1;
-            line-height: 1.3;
+          .location-text,
+          .description-text {
+            font-size: 24rpx;
+            color: #64748b;
+            line-height: 1.4;
             overflow: hidden;
             text-overflow: ellipsis;
-            white-space: nowrap; // 单行显示，超出省略
-          }
-        }
-
-        .event-details {
-          .event-location,
-          .event-description {
-            display: flex;
-            align-items: center;
-            margin-bottom: 4px;
-
-            .location-icon,
-            .description-icon {
-              font-size: 13px;
-              margin-right: 4px;
-              flex-shrink: 0;
-            }
-
-            .location-text,
-            .description-text {
-              font-size: 13px;
-              color: #6b7280;
-              line-height: 1.3;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              white-space: nowrap; // 单行显示，超出省略
-            }
+            white-space: nowrap;
           }
         }
       }
     }
-
-      .no-schedule {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      height: 100%;
-      min-height: 200px;
-
-      .no-schedule-text {
-        font-size: 15px;
-        color: #9ca3af;
-      }
-    }
-}
-
-// 动画定义
-@keyframes fadeInUp {
-  from {
-    opacity: 0;
-    transform: translateY(30px);
   }
-  to {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
 
-// 小屏幕适配
-@media (max-width: 375px) {
-  .main-content {
-    padding: 20px 8px 0px 8px; // 进一步减少padding
-  }
-  
-  .date-selector {
-    .date-container {
-      padding: 8px 2px; // 减少内边距
-    }
-    
-    .date-item {
-      padding: 5px 1px; // 减少项目内边距
-      
-      .date-day {
-        font-size: 9px; // 稍微减小字体
-      }
-      
-      .date-number {
-        font-size: 13px; // 稍微减小字体
-      }
-      
-      &.active {
-        transform: scale(1.01); // 进一步减少放大倍数
-        margin: 0; // 移除负边距
-      }
+  .no-schedule {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-height: 280rpx;
+    padding: 60rpx 0;
+
+    .no-schedule-text {
+      font-size: 28rpx;
+      color: #94a3b8;
     }
   }
 }
+
+
 </style> 
\ No newline at end of file
diff --git a/src/pages/base/service/index copy.vue b/src/pages/base/service/index copy.vue
new file mode 100644
index 0000000..811bc4a
--- /dev/null
+++ b/src/pages/base/service/index copy.vue	
@@ -0,0 +1,1984 @@
+<template>
+  <view class="service-page">
+    <!-- 1. 顶部 Header -->
+    <view class="header-section">
+      <view class="header-gradient"></view>
+
+      <!-- 老师信息 -->
+      <view class="teacher-info">
+        <view class="teacher-avatar">
+          <image
+              class="avatar-image"
+              :src="jsTx || '/static/base/default-avatar.png'"
+              mode="aspectFill"
+          ></image>
+        </view>
+
+        <view class="teacher-details">
+          <view class="teacher-name">{{ js.jsxm }}</view>
+          <view class="teacher-position">{{ dzZwLabel }}</view>
+          <view class="teacher-position">{{ qtZwLabel }}</view>
+          <view class="teacher-class">{{ js.njz }}</view>
+        </view>
+      </view>
+
+      <!--      &lt;!&ndash; 统计信息 &ndash;&gt;
+            <view class="stats-info">
+              <view class="stat-item">
+                <text class="stat-label">积分：</text>
+                <text class="stat-value">{{ jsWork.jf }}分</text>
+              </view>
+              <view class="stat-divider">|</view>
+              <view class="stat-item">
+                <text class="stat-label">工作量：</text>
+                <text class="stat-value">{{ jsWork.ks }}课时</text>
+              </view>
+            </view>-->
+
+      <!-- 介绍文字 -->
+      <view class="teacher-intro">
+        {{ js.introduction || "守正出新，求真务实\n让每一棵新苗拔节生长" }}
+      </view>
+    </view>
+
+    <!-- 2. 主要内容区域 -->
+    <view class="main-content">
+      <!-- 循环渲染功能分区 -->
+      <view
+          class="section-block"
+          v-for="(section, index) in sections"
+          :key="section.id"
+      >
+        <view class="section-title">
+          <view
+              class="title-decorator"
+              :style="{ backgroundColor: getSectionColor(index) }"
+          ></view>
+          <text>{{ section.title }}</text>
+          <view class="title-line"></view>
+        </view>
+        <view class="section-grid-card">
+          <template v-for="(item, itemIdx) in section.items" :key="item.id">
+            <view
+                v-if="item.show"
+                class="grid-item"
+                @click="handleGridItemClick(item)"
+            >
+              <!-- 角标 -->
+              <view
+                  v-if="getBadgeCount(item) > 0"
+                  class="grid-item-badge"
+              >
+                {{ formatBadgeText(getBadgeCount(item)) }}
+              </view>
+              <view
+                  class="grid-icon-container"
+                  :style="{ backgroundColor: getIconBgColor(index) }"
+              >
+                <!-- 文件夹类型的图标 -->
+                <view v-if="item.isFolder" class="folder-icon">
+                  <view class="folder-background">
+                    <view class="folder-items-grid">
+                      <view
+                          v-for="(folderItem, folderIdx) in getVisibleFolderItems(item.folderItems).slice(0, 9)"
+                          :key="folderItem.id"
+                          class="folder-item-icon"
+                      >
+                        <image
+                            class="folder-sub-icon"
+                            :src="`/static/base/home/${folderItem.icon}.png`"
+                            mode="aspectFit"
+                        ></image>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+                <!-- 普通图标 -->
+                <image
+                    v-else
+                    class="grid-icon"
+                    :src="`/static/base/home/${item.icon}.png`"
+                    mode="aspectFit"
+                ></image>
+              </view>
+              <text class="grid-text">{{ item.text }}</text>
+            </view>
+          </template>
+        </view>
+      </view>
+    </view>
+
+    <!-- 一师一策应用聚合弹窗 -->
+    <view v-if="showCourseManagementModal" class="modal-overlay" @click="closeCourseManagementModal">
+      <view class="modal-content" @click.stop>
+        <view class="modal-header">
+          <text class="modal-title">{{ currentFolderItem?.text || '应用聚合' }}</text>
+          <view class="modal-close" @click="closeCourseManagementModal">
+            <text class="close-icon">×</text>
+          </view>
+        </view>
+        <view class="modal-body">
+          <view class="course-options">
+            <template v-for="option in courseManagementOptions" :key="option.id">
+              <view
+                  v-if="option.show"
+                  class="course-option"
+                  @click="handleCourseOptionClick(option)"
+              >
+                <view class="option-icon-container">
+                  <image
+                      class="option-icon"
+                      :src="`/static/base/home/${option.icon}.png`"
+                      mode="aspectFit"
+                  ></image>
+                </view>
+                <text class="option-text">{{ option.text }}</text>
+              </view>
+            </template>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import {getMobileMenuApi, MobileMenuTreeNode} from "@/api/system/menu";
+import {jsdfindJsByPhoneApi, clearUserOpenIdApi} from "@/api/base/server";
+import {useCommonStore} from "@/store/modules/common";
+import {useUserStore} from "@/store/modules/user";
+import {useDataStore} from "@/store/modules/data";
+import {imagUrl} from "@/utils";
+import {hideLoading, showLoading} from "@/utils/uniapp";
+import {set} from "lodash";
+import {reactive, ref, computed, watch, onMounted} from "vue";
+import { onShow } from "@dcloudio/uni-app";
+
+const {logout, getUser, getJs, setJs} = useUserStore();
+const {getZwListByLx} = useCommonStore();
+const dataStore = useDataStore();
+
+const jsTx = computed(() => imagUrl(getUser.profilePhoto));
+
+const js = computed(() => getJs);
+const messageTotal = computed(() => dataStore.getMessageTotal);
+const messageSummary = computed(() => dataStore.getMessageSummary);
+
+const dzZwLabel = ref<any>("");
+const qtZwLabel = ref<any>("");
+
+// 加载状态
+const isLoading = ref(true);
+
+// 教师工作信息
+const jsWork = ref<any>({
+  jf: 88,
+  ks: 40,
+});
+
+// 应用聚合弹窗状态
+const showCourseManagementModal = ref(false);
+const currentFolderItem = ref<GridItem | null>(null);
+const shouldKeepModalOpen = ref(false); // 是否应该保持弹窗打开
+
+// 获取当前文件夹的选项数据
+const courseManagementOptions = computed(() => {
+  return currentFolderItem.value?.folderItems || [];
+});
+
+const getPageStack = () => {
+  const globalGetter = (globalThis as any)?.getCurrentPages;
+  if (typeof globalGetter === "function") {
+    return globalGetter();
+  }
+  return [];
+};
+
+const isTabBarContext = () => {
+  // 方法1: 检查页面栈中的meta信息
+  const pages = getPageStack();
+  if (pages && pages.length) {
+    const currentPage = pages[pages.length - 1] as any;
+    if (currentPage?.$page?.meta?.isTabBar === true) {
+      return true;
+    }
+    
+    // 方法2: 检查当前页面路径是否在 tabBar 列表中（H5兼容）
+    const route = currentPage?.route || currentPage?.$page?.path;
+    if (route) {
+      const tabBarPages = [
+        'pages/base/message/index',
+        'pages/base/service/index',
+        'pages/base/mine/index'
+      ];
+      const isTabBarPage = tabBarPages.some(page => route.includes(page));
+      if (isTabBarPage) {
+        return true;
+      }
+    }
+  }
+  
+  // 方法3: 作为后备，检查当前是否在 service 页面（本页面就是 tabBar 页面）
+  try {
+    const currentRoute = (window as any).__uniRoutes?.__uniRoutes?.pages?.find((p: any) => p.path === 'pages/base/service/index');
+    if (currentRoute) {
+      return true;
+    }
+  } catch (e) {
+    // 忽略错误
+  }
+  
+  // 最后，由于这个代码就在 service/index.vue 中，而这个页面本身就是 TabBar 页面
+  // 所以直接返回 true
+  return true;
+};
+
+const handleMaybePromise = (maybePromise: any) => {
+  if (maybePromise && typeof maybePromise.then === "function") {
+    maybePromise.catch(() => undefined);
+  }
+};
+
+const safeSetTabBarBadge = (options: Record<string, any>) => {
+  if (typeof uni.setTabBarBadge !== "function") {
+    return;
+  }
+  const result = (uni.setTabBarBadge as any)(options);
+  handleMaybePromise(result);
+};
+
+const safeRemoveTabBarBadge = (options: Record<string, any>) => {
+  if (typeof uni.removeTabBarBadge !== "function") {
+    return;
+  }
+  const result = (uni.removeTabBarBadge as any)(options);
+  handleMaybePromise(result);
+};
+
+const updateTabBadge = () => {
+  if (!isTabBarContext()) {
+    return;
+  }
+  
+  // 微信浏览器兼容性：延迟执行
+  setTimeout(() => {
+    try {
+      const total = messageTotal.value || 0;
+      if (total > 0) {
+        const badgeText = total > 99 ? "99+" : String(total);
+        safeSetTabBarBadge({ index: 0, text: badgeText });
+      } else {
+        safeRemoveTabBarBadge({ index: 0 });
+      }
+    } catch (e) {
+      console.warn('设置TabBar角标失败:', e);
+    }
+  }, 50);
+};
+
+const refreshMessageBadge = async () => {
+  try {
+    const jsInfo = js.value;
+    await dataStore.refreshMessageBadge(jsInfo?.id);
+    updateTabBadge();
+  } catch (error) {
+    console.error("刷新消息角标失败:", error);
+  }
+};
+
+const getBadgeCount = (item: GridItem): number => {
+  if (item?.text === "公文流转") {
+    const target = messageSummary.value.find((summary: any) => summary?.xxlx === "公文");
+    const total = Number(target?.total ?? 0);
+    return isNaN(total) ? 0 : total;
+  }
+  return 0;
+};
+
+const formatBadgeText = (count: number): string => {
+  if (count <= 0) {
+    return "";
+  }
+  return count > 99 ? "99+" : String(count);
+};
+
+onShow(() => {
+  refreshMessageBadge();
+  if (shouldKeepModalOpen.value && currentFolderItem.value) {
+    setTimeout(() => {
+      showCourseManagementModal.value = true;
+    }, 100);
+  }
+});
+
+watch(messageTotal, () => {
+  updateTabBadge();
+}, { immediate: true });
+
+interface GridItem {
+  id: number | string;
+  icon: string; // 图标文件名 (不含扩展名)
+  text: string;
+  show: boolean; // 是否显示
+  permissionKey: string; // 权限键
+  path?: string; // 页面路径
+  isModal?: boolean; // 是否为弹窗类型
+  isFolder?: boolean; // 是否为文件夹类型（聚合图标）
+  folderItems?: GridItem[]; // 文件夹内的子图标
+}
+
+interface Section {
+  id: number | string;
+  title: string;
+  permissionKey?: string; // 整个区域的权限编码
+  items: GridItem[];
+}
+
+// 退出登录
+const handleLogout = () => {
+  uni.showModal({
+    title: "确认退出",
+    content: "确定要退出登录吗？",
+    success: async (res) => {
+      if (res.confirm) {
+        try {
+          // 从userdata中获取用户ID
+          const userDataStr = uni.getStorageSync("app-user");
+          let userData = null;
+
+          if (userDataStr) {
+            try {
+              userData =
+                  typeof userDataStr === "string"
+                      ? JSON.parse(userDataStr)
+                      : userDataStr;
+            } catch (e) {
+              // 静默处理错误
+            }
+          }
+
+          // 清空用户open_id
+          const userId = userData?.userdata?.id || userData?.id;
+          if (userId) {
+            await clearUserOpenIdApi({userId: userId});
+          }
+        } catch (error) {
+          // 静默处理错误
+        }
+
+        // 清除用户数据
+        logout();
+        // 跳转到登录页面
+        uni.reLaunch({
+          url: "/pages/system/login/login",
+        });
+      }
+    },
+  });
+};
+
+// 定义功能分区数据
+const sections = reactive<Section[]>([
+  {
+    id: "gnyy",
+    title: "功能应用",
+    permissionKey: "gnyycommon", // 整个功能区域的权限编码
+    items: [
+
+      {
+        id: "gnyy1",
+        icon: "kctb",
+        text: "一师一策",
+        show: true,
+        permissionKey: "gnyycommon-ysyc", // 课程规划权限编码
+        isFolder: true, // 标记为文件夹类型
+        folderItems: [
+          {
+            id: "gnyy2",
+            icon: "ysyc",
+            text: "课程规划",
+            show: true,
+            permissionKey: "ysyc-kcgh",
+            path: "/pages/view/routine/yishiyice/index",
+          },
+          {
+            id: "gnyy2",
+            icon: "kcbm",
+            text: "课程报名",
+            show: true,
+            permissionKey: "ysyc-kcbm",
+            path: "/pages/view/routine/yishiyice/bm/index",
+          },
+          {
+            id: "gnyy3",
+            icon: "xxrw",
+            text: "学习任务",
+            show: true,
+            permissionKey: "ysyc-xxrw",
+            path: "/pages/view/routine/yishiyice/rw/index?type=ysyc",
+          },
+          {
+            id: "gnyy4",
+            icon: "xxqd",
+            text: "学习签到",
+            show: true,
+            permissionKey: "ysyc-xxqd",
+            path: "/pages/view/routine/qd/index?qdlx=ysyc",
+          },
+          {
+            id: "gnyy5",
+            icon: "kczy",
+            text: "课程资源",
+            show: true,
+            permissionKey: "ysyc-kczy",
+            path: "/pages/view/routine/yishiyice/zy/index?zylx=ysyc",
+          },
+          {
+            id: "gnyy6",
+            icon: "jltl",
+            text: "交流讨论",
+            show: true,
+            permissionKey: "ysyc-jltl",
+            path: "/pages/view/routine/lt/index?ltlx=ysyc",
+          },
+          {
+            id: "gnyy7",
+            icon: "xxjf",
+            text: "学习积分",
+            show: true,
+            permissionKey: "ysyc-xxjf",
+            path: "/pages/view/routine/yishiyice/jf/index",
+          },
+          {
+            id: "gnyy8",
+            icon: "xxjf",
+            text: "积分统计",
+            show: true,
+            permissionKey: "ysyc-pjtj",
+            path: "/pages/view/routine/yishiyice/jf/pjtj",
+          },
+        ],
+      },
+      {
+        id: "gnyy9",
+        icon: "kctb",
+        text: "学科教研",
+        show: true,
+        permissionKey: "gnyycommon-xkjy", // 学科教研权限编码
+        isFolder: true, // 标记为文件夹类型
+        folderItems: [
+          {
+            id: "gnyy10",
+            icon: "ysyc",
+            text: "教研规划",
+            show: true,
+            permissionKey: "xkjy-jygh",
+            path: "/pages/view/routine/jiaoyan/index",
+          },
+          {
+            id: "gnyy11",
+            icon: "xxrw",
+            text: "教研任务",
+            show: true,
+            permissionKey: "xkjy-jyrw",
+            path: "/pages/view/routine/yishiyice/rw/index?type=xkjy",
+          },
+          {
+            id: "gnyy12",
+            icon: "xxqd",
+            text: "教研签到",
+            show: true,
+            permissionKey: "xkjy-jyqd",
+            path: "/pages/view/routine/qd/index?qdlx=xkjy",
+          },
+          {
+            id: "gnyy13",
+            icon: "kczy",
+            text: "教研资源",
+            show: true,
+            permissionKey: "xkjy-jyzy",
+            path: "/pages/view/routine/yishiyice/zy/index?zylx=xkjy",
+          },
+          {
+            id: "gnyy14",
+            icon: "jltl",
+            text: "交流讨论",
+            show: true,
+            permissionKey: "xkjy-jltl",
+            path: "/pages/view/routine/lt/index?ltlx=xkjy",
+          },
+          {
+            id: "gnyy15",
+            icon: "jycg",
+            text: "教研成果",
+            show: true,
+            permissionKey: "xkjy-jycg",
+            path: "/pages/view/routine/jiaoyan/cg/achievementList",
+          },
+        ],
+      },
+      {
+        id: "Analysis",
+        icon: "szll",
+        text: "统计分析",
+        show: true,
+        permissionKey: "Analysis-tjfx",
+        isFolder: true,
+        folderItems: [
+          {
+            id: "analysis1",
+            icon: "szll",
+            text: "师资力量",
+            show: true,
+            permissionKey: "analysis-szll",
+            path: "/pages/statistics/teacher/index",
+          },
+          {
+            id: "analysis2",
+            icon: "xsgm",
+            text: "学生规模",
+            show: true,
+            permissionKey: "analysis-xsgm",
+            path: "/pages/statistics/xs/index",
+          },
+          {
+            id: "analysis3",
+            icon: "jctj",
+            text: "就餐统计",
+            show: true,
+            permissionKey: "analysis-jctj",
+            path: "/pages/statistics/jc/index",
+          },
+          {
+            id: "analysis4",
+            icon: "jlb",
+            text: "俱乐部统计",
+            show: true,
+            permissionKey: "analysis-jlb",
+            path: "/pages/statistics/jlb/index",
+          },
+          {
+            id: "analysis5",
+            icon: "xqk",
+            text: "兴趣课统计",
+            show: true,
+            permissionKey: "analysis-xqk",
+            path: "/pages/statistics/xqk/index",
+          },
+          {
+            id: "analysis6",
+            icon: "ky",
+            text: "课业统计",
+            show: true,
+            permissionKey: "analysis-ky",
+            path: "/pages/statistics/ky/index",
+          },
+          {
+            id: "analysis7",
+            icon: "zbtj",
+            text: "值周统计",
+            show: true,
+            permissionKey: "analysis-zbtj",
+            path: "/pages/statistics/zb/index",
+          },
+          {
+            id: "analysis8",
+            icon: "qdtj",
+            text: "签到统计",
+            show: true,
+            permissionKey: "analysis-qdtj",
+            path: "/pages/statistics/qd/index",
+          },
+        ],
+      },
+      {
+        id: "gnyy-vr",
+        icon: "vr",
+        text: "VR制作",
+        show: true,
+        permissionKey: "gnyycommon-vr", // VR制作权限编码
+        isFolder: true, // 标记为文件夹类型
+        folderItems: [
+          {
+            id: "vr-shooting",
+            icon: "vrps",
+            text: "VR拍摄",
+            show: true,
+            permissionKey: "vr-shooting",
+            path: "/pages/vr/shooting/index",
+          },
+          {
+            id: "vr-view",
+            icon: "vrzs",
+            text: "VR展示",
+            show: true,
+            permissionKey: "vr-view",
+            path: "/pages/vr/view/index",
+          },
+        ],
+      },
+      {
+        id: "gnyy-xxfb",
+        icon: "jlfb",
+        text: "信息发布",
+        show: true,
+        permissionKey: "gnyycommon-xxfb", // 信息发布权限编码
+        isFolder: true, // 标记为文件夹类型
+        folderItems: [
+          {
+            id: "xxfb-qdfb",
+            icon: "qdfb",
+            text: "签到发布",
+            show: true,
+            permissionKey: "routine-qdfb",
+            path: "/pages/view/routine/qd/index",
+          },
+          {
+            id: "xxfb-jlfb",
+            icon: "jlfb",
+            text: "发布接龙",
+            show: true,
+            permissionKey: "routine-bjjl",
+            path: "/pages/view/notice/index",
+          },
+          {
+            id: "xxfb-tzfb",
+            icon: "gw",
+            text: "通知发布",
+            show: true,
+            permissionKey: "routine-tzfb",
+            path: "/pages/view/routine/tz/index",
+          },
+          {
+            id: "xxfb-wjfb",
+            icon: "gw",
+            text: "问卷发布",
+            show: true,
+            permissionKey: "routine-wjfb",
+            path: "/pages/view/routine/wj/wjList",
+          },
+          {
+            id: "xxfb-srqd",
+            icon: "srqd",
+            text: "生日清单",
+            show: true,
+            permissionKey: "routine-srqd",
+            path: "/pages/view/routine/sr/list",
+          },
+        ],
+      },
+      {
+        id: "routine-jf",
+        icon: "jfpj",
+        text: "个人积分",
+        show: true,
+        permissionKey: "routine-jf",
+        isFolder: true,
+        folderItems: [
+          {
+            id: "routine-jf-pj",
+            icon: "jfpj",
+            text: "业绩积分",
+            show: true,
+            permissionKey: "routine-jfpj",
+            path: "/pages/view/routine/JiFenPingJia/jfself/JiFenPingJia",
+          },
+          {
+            id: "routine-jf-dj",
+            icon: "jfdj",
+            text: "业绩登记",
+            show: true,
+            permissionKey: "routine-jfdj",
+            path: "/pages/view/routine/JiFenPingJia/jfdj/index",
+          },
+          {
+            id: "routine-jf-sp",
+            icon: "jfsp",
+            text: "积分审批",
+            show: true,
+            permissionKey: "routine-jfsp",
+            path: "/pages/view/routine/JiFenPingJia/jfsp/index",
+          },
+          {
+            id: "routine-jf-pm",
+            icon: "jfpm",
+            text: "业绩排名",
+            show: true,
+            permissionKey: "routine-jfpm",
+            path: "/pages/view/routine/JiFenPingJia/jftj/index",
+          },
+        ],
+      },
+      {
+        id: "routine-inv",
+        icon: "inv",
+        text: "库存管理",
+        show: true,
+        permissionKey: "routine-inv",
+        isFolder: true,
+        folderItems: [
+          {
+            id: "routine-inv-ly",
+            icon: "invly",
+            text: "领用申请",
+            show: true,
+            permissionKey: "routine-invly",
+            path: "/pages/view/routine/inv/invsq/index",
+          },
+          {
+            id: "routine-inv-sp",
+            icon: "invsp",
+            text: "领用审批",
+            show: true,
+            permissionKey: "routine-invsp",
+            path: "/pages/view/routine/inv/invsp/index",
+          },
+          {
+            id: "routine-inv-out",
+            icon: "invout",
+            text: "物品出库",
+            show: true,
+            permissionKey: "routine-invout",
+            path: "/pages/view/routine/inv/invout/index",
+          },
+          {
+            id: "routine-inv-in",
+            icon: "invin",
+            text: "物品入库",
+            show: true,
+            permissionKey: "routine-invin",
+            path: "/pages/view/routine/inv/invin/index",
+          },
+          {
+            id: "routine-inv-tj",
+            icon: "invtj",
+            text: "库存统计",
+            show: true,
+            permissionKey: "routine-invtj",
+            path: "/pages/view/routine/inv/invtj/index",
+          },
+          {
+            id: "routine-inv-base",
+            icon: "invbase",
+            text: "基础数据",
+            show: true,
+            permissionKey: "routine-invbase",
+            path: "/pages/view/routine/inv/invbase/index",
+          },
+        ],
+      },
+      {
+        id: "routine-zp",
+        icon: "zp",
+        text: "新苗成长",
+        show: true,
+        permissionKey: "routine-zp",
+        isFolder: true,
+        folderItems: [
+          {
+            id: "routine-zp-lx",
+            icon: "zplx",
+            text: "任务分类",
+            show: true,
+            permissionKey: "routine-zplx",
+            path: "/pages/view/routine/xszp/kclx/index",
+          },
+          {
+            id: "routine-zp-fb",
+            icon: "zpfb",
+            text: "任务发布",
+            show: true,
+            permissionKey: "routine-zpfb",
+            path: "/pages/view/routine/xszp/kc/kclx",
+          },
+          {
+            id: "routine-zp-pj",
+            icon: "zppj",
+            text: "作品评价",
+            show: true,
+            permissionKey: "routine-zppj",
+            path: "/pages/view/routine/xszp/pj/index",
+          },
+          {
+            id: "routine-zp-tj",
+            icon: "zptj",
+            text: "作品统计",
+            show: true,
+            permissionKey: "routine-zptj",
+            path: "/pages/view/routine/xszp/tj/index",
+          },
+        ],
+      },
+      {
+        id: "routine-ks",
+        icon: "ks",
+        text: "学业监测",
+        show: true,
+        permissionKey: "routine-ks",
+        isFolder: true,
+        folderItems: [
+          {
+            id: "routine-kspj",
+            icon: "kspj",
+            text: "成绩评价",
+            show: true,
+            permissionKey: "routine-kspj",
+            path: "/pages/view/homeSchool/kspj/index",
+          },
+          {
+            id: "routine-cjfx",
+            icon: "cjfx",
+            text: "成绩分析",
+            show: true,
+            permissionKey: "routine-cjfx",
+            path: "/pages/view/homeSchool/ChengJiFenXi",
+          },
+        ],
+      },
+      {
+        id: "routine-da",
+        icon: "da",
+        text: "基础档案",
+        show: true,
+        permissionKey: "routine-da",
+        isFolder: true,
+        folderItems: [
+          {
+            id: "routine-xsda",
+            icon: "xsda",
+            text: "学生档案",
+            show: true,
+            permissionKey: "routine-xsda", // 学生档案权限编码
+            path: "/pages/view/routine/da/xsda/studentArchive",
+          },
+          {
+            id: "routine-jzda",
+            icon: "jzda",
+            text: "家长档案",
+            show: true,
+            permissionKey: "routine-jzda",
+            path: "/pages/view/routine/da/jzda/index",
+          },
+          {
+            id: "routine-jsda",
+            icon: "jsda",
+            text: "教师档案",
+            show: true,
+            permissionKey: "routine-jsda",
+            path: "/pages/view/routine/da/jsda/index",
+          },
+        ],
+      },
+    ],
+  },
+  {
+    id: "routine",
+    title: "教学常规",
+    permissionKey: "routine", // 整个常规区域的权限编码
+    items: [
+      {
+        id: "r3",
+        icon: "gzltj",
+        text: "工作量",
+        show: true,
+        permissionKey: "routine-gzl", // 工作量权限编码
+        path: "/pages/view/routine/GongZuoLiang/index",
+      },
+
+      {
+        id: "r1",
+        icon: "stack-fill",
+        text: "教学资源",
+        show: true,
+        permissionKey: "routine-jszr", // 教学资源权限编码
+        path: "/pages/view/routine/JiaoXueZiYuan/index",
+      },
+      {
+        id: "r10",
+        icon: "qdfb",
+        text: "签到发布",
+        show: true,
+        permissionKey: "routine-qdfb", // 签到发布权限编码
+        path: "/pages/view/routine/qd/index",
+      },
+      {
+        id: "r7",
+        icon: "kctb",
+        text: "课程填报",
+        show: true,
+        permissionKey: "routine-kcjs", // 课程介绍权限编码
+        path: "/pages/view/routine/xk/xkList",
+      },
+      {
+        id: "r6",
+        icon: "kfxc",
+        text: "教学巡查",
+        show: true,
+        permissionKey: "routine-kfxc", // 课服巡查权限编码
+        path: "/pages/view/routine/kefuxuncha/xcPbList",
+      },
+      {
+        id: "r5",
+        icon: "stxc",
+        text: "食堂日志",
+        show: true,
+        permissionKey: "routine-stxc", // 食堂巡查权限编码
+        path: "/pages/view/routine/ShiTangXunCha/index",
+      },
+      {
+        id: "r5",
+        icon: "yrcg",
+        text: "一日常规",
+        show: true,
+        permissionKey: "routine-yrcg", // 一日常规权限编码
+        path: "/pages/view/quantitativeAssessment/index/index",
+      },
+      {
+        id: "r19",
+        icon: "zbxc",
+        text: "值周巡查",
+        show: true,
+        permissionKey: "routine-zbxc", // 课服巡查权限编码
+        path: "/pages/view/routine/zbxc/xcPbList",
+      },
+    ],
+  },
+  {
+    id: "home-school",
+    title: "家校沟通",
+    permissionKey: "home", // 整个家校区域的权限编码
+    items: [
+      {
+        id: "hs1",
+        icon: "jskb",
+        text: "教师课表",
+        show: true,
+        permissionKey: "home-jskb", // 教师课表权限编码
+        path: "/pages/view/homeSchool/JiaoShiKeBiao",
+      },
+      {
+        id: "hs2",
+        icon: "bjkb",
+        text: "班级课表",
+        show: true,
+        permissionKey: "home-bjkb", // 班级课表权限编码
+        path: "/pages/view/homeSchool/BanJiKeBiao",
+      },
+      {
+        id: "hs3",
+        icon: "txl",
+        text: "家长通讯录",
+        show: true,
+        permissionKey: "home-jztxl", // 家长通讯录权限编码
+        path: "/pages/view/homeSchool/parentAddressBook/index",
+      },
+
+      {
+        id: "r8",
+        icon: "xkdm",
+        text: "选课点名",
+        show: true,
+        permissionKey: "routine-kcdm", // 选课点名权限编码
+        path: "/pages/view/routine/xk/dmIndex",
+      },
+      {
+        id: "r11",
+        icon: "jcdm",
+        text: "就餐点名",
+        show: true,
+        permissionKey: "routine-jcdm", // 就餐点名权限编码
+        path: "/pages/view/routine/jc/bzList",
+      },
+      {
+        id: "r11",
+        icon: "jctjqd",
+        text: "就餐统计",
+        show: true,
+        permissionKey: "routine-jctjqd", // 就餐统计权限编码
+        path: "/pages/statistics/jc/jcList",
+      },
+      {
+        id: "r9",
+        icon: "jlfb",
+        text: "发布接龙",
+        show: true,
+        permissionKey: "routine-bjjl", // 发布接龙权限编码
+        path: "/pages/view/notice/index",
+      },
+      {
+        id: "r13",
+        icon: "jltj",
+        text: "接龙统计",
+        show: true,
+        permissionKey: "routine-jltj", // 接龙统计权限编码
+        path: "/pages/view/analysis/jl/index",
+      },
+
+      {
+        id: "hs5",
+        icon: "xkqd",
+        text: "选课清单",
+        show: true,
+        permissionKey: "home-xkqd", // 兴趣课选课权限编码
+        path: "/pages/view/analysis/xk/xkList",
+      },
+      {
+        id: "hs6",
+        icon: "dmtj",
+        text: "点名统计",
+        show: true,
+        permissionKey: "home-dmtj", // 点名统计权限编码
+        path: "/pages/view/analysis/xk/dmXkList",
+      },
+      {
+        id: "hs6",
+        icon: "xsqj",
+        text: "学生请假",
+        show: true,
+        permissionKey: "home-xsqj", // 点名统计权限编码
+        path: "/pages/base/xs/qj/statistics",
+      },
+    ],
+  },
+  {
+    id: "hr",
+    title: "行政办公",
+    permissionKey: "personnel", // 整个人事区域的权限编码
+    items: [
+      {
+        id: "hr1",
+        icon: "qjsq",
+        text: "请假申请",
+        show: true,
+        permissionKey: "personnel-qjsq", // 请假申请权限编码
+        path: "/pages/view/hr/jsQj/index",
+      },
+      {
+        id: "r12",
+        icon: "gw",
+        text: "公文流转",
+        show: true,
+        permissionKey: "routine-gwlz", // 公文流转权限编码
+        path: "/pages/view/routine/gwlz/index",
+      },
+      {
+        id: "hr3",
+        icon: "gz",
+        text: "工资条",
+        show: true,
+        permissionKey: "personnel-gzt", // 工资条权限编码
+        path: "/pages/view/hr/salarySlip/index",
+      },
+      {
+        id: "hr4",
+        icon: "jstxl",
+        text: "教师通讯录",
+        show: true,
+        permissionKey: "personnel-jstxl", // 教师通讯录权限编码
+        path: "/pages/view/routine/jstxl/index",
+      },
+    ],
+  },
+
+]);
+
+// 获取分区颜色
+const getSectionColor = (index: number) => {
+  const colors = ["#4F46E5", "#059669", "#DC2626"];
+  return colors[index % colors.length];
+};
+
+// 获取图标背景颜色
+const getIconBgColor = (index: number) => {
+  const colors = [
+    "rgba(79, 70, 229, 0.1)",
+    "rgba(5, 150, 105, 0.1)",
+    "rgba(220, 38, 38, 0.1)",
+  ];
+  return colors[index % colors.length];
+};
+
+// 处理网格项点击事件
+const handleGridItemClick = async (item: GridItem) => {
+  // 如果是文件夹类型，显示弹窗
+  if (item.isFolder) {
+    currentFolderItem.value = item;
+    showCourseManagementModal.value = true;
+    return;
+  }
+
+  // 如果是弹窗类型，显示弹窗
+  if (item.isModal) {
+    currentFolderItem.value = item;
+    showCourseManagementModal.value = true;
+    return;
+  }
+
+  if (item.text == "教师档案") {
+    showLoading("加载中...");
+    const res = await jsdfindJsByPhoneApi({
+      phone: getJs.lxdh,
+    });
+    if (res.result.headPic && res.result.headPic.length) {
+      res.result.headPic = imagUrl(res.result.headPic);
+    }
+    setJs(res.result);
+    hideLoading();
+  }
+  setTimeout(() => {
+    if (item.path) {
+      uni.navigateTo({url: item.path});
+    } else {
+      uni.showToast({title: `功能 ${item.text} 暂未开放`, icon: "none"});
+    }
+  }, 200);
+};
+
+// 关闭应用聚合弹窗
+const closeCourseManagementModal = () => {
+  showCourseManagementModal.value = false;
+  // 重置保持打开状态，因为用户主动关闭了弹窗
+  shouldKeepModalOpen.value = false;
+  currentFolderItem.value = null;
+};
+
+// 处理一师一策应用选项点击
+const handleCourseOptionClick = (option: GridItem) => {
+  // 设置应该保持弹窗打开的状态
+  shouldKeepModalOpen.value = true;
+
+  setTimeout(() => {
+    if (option.path) {
+      uni.navigateTo({url: option.path});
+    } else {
+      uni.showToast({title: `功能 ${option.text} 暂未开放`, icon: "none"});
+      // 如果功能未开放，则关闭弹窗
+      shouldKeepModalOpen.value = false;
+      closeCourseManagementModal();
+    }
+  }, 200);
+};
+
+const onHide = () => {
+  // 页面隐藏时不需要特殊处理，保持当前状态
+  // 这样可以确保用户从子页面返回时弹窗仍然打开
+};
+
+// 将手机端菜单树转换为 sections 结构
+function transformMobileMenuToSections(nodes: MobileMenuTreeNode[]): Section[] {
+  return nodes.map((node, idx) => {
+    const sectionId = node.id ?? `section-${idx}`;
+    const items: GridItem[] = [];
+
+    (node.children || []).forEach((child) => {
+      if (child.pagePath) {
+        items.push({
+          id: child.id,
+          icon: (child.normalCss && /^[a-zA-Z0-9_-]+$/.test(child.normalCss)) ? child.normalCss : "app",
+          text: child.screenName,
+          show: true,
+          permissionKey: child.authCode || "",
+          path: child.pagePath,
+        });
+      } else if (child.children?.length) {
+        const folderItems: GridItem[] = (child.children || []).map((sub) => ({
+          id: sub.id,
+          icon: (sub.normalCss && /^[a-zA-Z0-9_-]+$/.test(sub.normalCss)) ? sub.normalCss : "app",
+          text: sub.screenName,
+          show: true,
+          permissionKey: sub.authCode || "",
+          path: sub.pagePath,
+        }));
+        items.push({
+          id: child.id,
+          icon: (child.normalCss && /^[a-zA-Z0-9_-]+$/.test(child.normalCss)) ? child.normalCss : "app",
+          text: child.screenName,
+          show: true,
+          permissionKey: child.authCode || "",
+          isFolder: true,
+          folderItems,
+        });
+      }
+    });
+
+    return {
+      id: sectionId,
+      title: node.screenName,
+      permissionKey: node.authCode || undefined,
+      items,
+    };
+  });
+}
+
+// 初始化
+onMounted(async () => {
+  // 初始化职务信息
+  await initPositionInfo();
+
+  // 尝试从后端拉取手机端菜单，若有数据则替代本地配置
+  try {
+    const res = await getMobileMenuApi();
+    const menuList = res?.result;
+    if (menuList && Array.isArray(menuList) && menuList.length > 0) {
+      const apiSections = transformMobileMenuToSections(menuList);
+      sections.splice(0, sections.length, ...apiSections);
+    }
+  } catch (_e) {
+    // 失败时继续使用本地 sections
+  }
+
+  // 完成加载
+  isLoading.value = false;
+
+});
+
+// 初始化职务信息
+async function initPositionInfo() {
+  let dzZw: any = [];
+  let qtZw: any = [];
+  if (getJs.dzzw && typeof getJs.dzzw == "string") {
+    dzZw = getJs.dzzw.split(",");
+  }
+  if (getJs.qtzw && typeof getJs.qtzw == "string") {
+    qtZw = getJs.qtzw.split(",");
+  }
+  if (dzZw && dzZw.length) {
+    const res = await getZwListByLx({zwlx: "党政职务"});
+    dzZwLabel.value = dzZw
+        .map((zwId: string) => {
+          const zw = res.result.find((zw: any) => zwId == zw.id);
+          return zw ? zw.zwmc : "";
+        })
+        .join(", ");
+  }
+  if (qtZw && qtZw.length) {
+    const res = await getZwListByLx({zwlx: "其他职务"});
+    qtZwLabel.value = qtZw
+        .map((zwId: string) => {
+          const zw = res.result.find((zw: any) => zwId == zw.id);
+          return zw ? zw.zwmc : "";
+        })
+        .join(", ");
+  }
+}
+
+// 获取且显示的文件夹子项（菜单由后端 getMobileMenuApi 已按权限过滤）
+const getVisibleFolderItems = (folderItems: GridItem[] | undefined) => {
+  if (!folderItems || !Array.isArray(folderItems)) {
+    return [];
+  }
+  return folderItems.filter(item => item.show);
+};
+
+// 暴露生命周期钩子给uni-app
+defineExpose({
+  onShow,
+  onHide
+});
+</script>
+
+<style scoped lang="scss">
+.service-page {
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  min-height: 100vh;
+  position: relative;
+}
+
+// 加载状态样式
+.loading-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 9999;
+}
+
+.loading-content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  color: #ffffff;
+}
+
+.loading-spinner {
+  width: 40px;
+  height: 40px;
+  border: 3px solid rgba(255, 255, 255, 0.3);
+  border-top: 3px solid #ffffff;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+  margin-bottom: 20px;
+}
+
+.loading-text {
+  font-size: 16px;
+  font-weight: 500;
+}
+
+@keyframes spin {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+// 顶部 Header
+.header-section {
+  position: relative;
+  background: linear-gradient(135deg, #4f46e5 0%, #7c3aed 50%, #ec4899 100%);
+  color: #ffffff;
+  overflow: hidden;
+  padding: 40rpx 30rpx 30rpx;
+  height: auto;
+  min-height: 270rpx;
+
+  .header-gradient {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: linear-gradient(
+            45deg,
+            rgba(255, 255, 255, 0.1) 0%,
+            rgba(255, 255, 255, 0.05) 100%
+    );
+    z-index: 1;
+  }
+
+  // 老师信息
+  .teacher-info {
+    display: flex;
+    align-items: center;
+    margin-top: 20rpx;
+    z-index: 2;
+    position: relative;
+
+    .teacher-avatar {
+      width: 120rpx;
+      height: 120rpx;
+      border-radius: 50%;
+      overflow: hidden;
+      border: 3px solid rgba(255, 255, 255, 0.3);
+      margin-right: 20rpx;
+
+      .avatar-image {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .teacher-details {
+      flex: 1;
+
+      .teacher-name {
+        font-size: 20px;
+        font-weight: bold;
+        color: #ffffff;
+        margin-bottom: 5rpx;
+        text-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+      }
+
+      .teacher-position {
+        font-size: 14px;
+        color: rgba(255, 255, 255, 0.9);
+        margin-bottom: 5rpx;
+      }
+
+      .teacher-class {
+        font-size: 12px;
+        color: rgba(255, 255, 255, 0.8);
+      }
+    }
+  }
+
+  // 统计信息
+  .stats-info {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 20rpx;
+    z-index: 2;
+    position: relative;
+
+    .stat-item {
+      display: flex;
+      align-items: center;
+
+      .stat-label {
+        font-size: 14px;
+        color: rgba(255, 255, 255, 0.9);
+      }
+
+      .stat-value {
+        font-size: 14px;
+        color: #ffffff;
+        font-weight: 600;
+      }
+    }
+
+    .stat-divider {
+      margin: 0 30rpx;
+      color: rgba(255, 255, 255, 0.6);
+      font-size: 14px;
+    }
+  }
+
+  // 介绍文字
+  .teacher-intro {
+    text-align: center;
+    font-size: 15px;
+    color: rgba(255, 255, 255, 0.95);
+    margin-top: -10rpx;
+    line-height: 1.8;
+    z-index: 2;
+    position: relative;
+    white-space: pre-line;
+    font-weight: 500;
+    letter-spacing: 1px;
+    text-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
+  }
+}
+
+// 主要内容区域
+.main-content {
+  padding: 20px 15px 40px 15px;
+  position: relative;
+  background: linear-gradient(
+          to bottom,
+          rgba(255, 255, 255, 0.95) 0%,
+          rgba(248, 250, 252, 0.98) 100%
+  );
+  border-radius: 20px 20px 0 0;
+  margin-top: -20px;
+  z-index: 3;
+  box-shadow: 0 -4px 20px rgba(0, 0, 0, 0.1);
+  overflow: visible !important; /* 确保角标不被裁剪 */
+}
+
+// 功能分区块
+.section-block {
+  margin-bottom: 25px;
+  animation: fadeInUp 0.6s ease-out;
+  overflow: visible !important; /* 确保角标不被裁剪 */
+
+  &:nth-child(1) {
+    animation-delay: 0.1s;
+  }
+
+  &:nth-child(2) {
+    animation-delay: 0.2s;
+  }
+
+  &:nth-child(3) {
+    animation-delay: 0.3s;
+  }
+
+  .section-title {
+    display: flex;
+    align-items: center;
+    margin-bottom: 15px;
+    padding-left: 5px;
+    position: relative;
+
+    .title-decorator {
+      width: 8px;
+      height: 8px;
+      border-radius: 50%;
+      margin-right: 12px;
+      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
+    }
+
+    text {
+      font-size: 20px;
+      font-weight: 600;
+      color: #1f2937;
+      letter-spacing: 0.5px;
+    }
+
+    .title-line {
+      flex: 1;
+      height: 1px;
+      background: linear-gradient(
+              to right,
+              rgba(156, 163, 175, 0.3),
+              transparent
+      );
+      margin-left: 15px;
+    }
+  }
+
+  .section-grid-card {
+    background: #ffffff;
+    border-radius: 16px;
+    padding: 20px 15px;
+    box-shadow: 0 4px 20px rgba(0, 0, 0, 0.08);
+    border: 1px solid rgba(255, 255, 255, 0.8);
+    backdrop-filter: blur(10px);
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 20px 15px;
+    transition: all 0.3s ease;
+    overflow: visible !important; /* 确保角标不被裁剪 */
+
+    &:hover {
+      transform: translateY(-2px);
+      box-shadow: 0 8px 30px rgba(0, 0, 0, 0.12);
+    }
+  }
+}
+
+// 网格项
+.grid-item {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -webkit-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  align-items: center;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  justify-content: center;
+  text-align: center;
+  cursor: pointer;
+  padding: 10px 5px;
+  border-radius: 12px;
+  -webkit-transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  position: relative !important; /* 确保父元素定位 */
+  -webkit-transform: translateZ(0); /* 开启硬件加速，修复微信浏览器层叠问题 */
+  transform: translateZ(0);
+  overflow: visible !important; /* 确保角标不被裁剪 */
+
+  .grid-item-badge {
+    position: absolute !important;
+    top: 4px !important;
+    right: 8px !important;
+    min-width: 20px !important;
+    height: 20px !important;
+    padding: 0 6px !important;
+    background-color: #ef4444 !important; /* 使用纯色，避免渐变兼容性问题 */
+    color: #ffffff !important;
+    border-radius: 10px !important; /* 使用固定值代替999px */
+    font-size: 12px !important;
+    font-weight: 600 !important;
+    text-align: center !important;
+    line-height: 20px !important; /* 与height相同，确保垂直居中 */
+    white-space: nowrap !important;
+    box-sizing: border-box !important;
+    z-index: 999 !important; /* 更大的z-index值 */
+    pointer-events: none !important;
+    -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3) !important;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3) !important;
+    /* 移除flex布局，使用line-height居中 */
+  }
+
+  &:hover {
+    transform: translateY(-3px) scale(1.05);
+    background: rgba(79, 70, 229, 0.05);
+  }
+
+  &:active {
+    transform: translateY(-1px) scale(1.02);
+  }
+
+  .grid-icon-container {
+    width: 48px;
+    height: 48px;
+    border-radius: 12px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 8px;
+    transition: all 0.3s ease;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+
+    .grid-icon {
+      width: 24px;
+      height: 24px;
+      transition: all 0.3s ease;
+    }
+  }
+
+  .grid-text {
+    font-size: 14px;
+    color: #4b5563;
+    font-weight: 500;
+    line-height: 1.3;
+    transition: color 0.3s ease;
+  }
+
+  &:hover .grid-text {
+    color: #1f2937;
+  }
+
+  &:hover .grid-icon-container {
+    transform: scale(1.1);
+    box-shadow: 0 4px 15px rgba(0, 0, 0, 0.15);
+  }
+}
+
+// 文件夹样式图标
+.folder-icon {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  .folder-background {
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(135deg, rgba(255, 255, 255, 0.9) 0%, rgba(248, 250, 252, 0.95) 100%);
+    border-radius: 12px;
+    border: 2px solid rgba(79, 70, 229, 0.2);
+    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1);
+    position: relative;
+    overflow: hidden;
+
+    &::before {
+      content: '';
+      position: absolute;
+      top: -2px;
+      left: -2px;
+      right: -2px;
+      bottom: -2px;
+      background: linear-gradient(135deg, rgba(79, 70, 229, 0.1) 0%, rgba(124, 58, 237, 0.1) 100%);
+      border-radius: 12px;
+      z-index: -1;
+    }
+  }
+
+  .folder-items-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    grid-template-rows: repeat(3, 1fr);
+    gap: 1px;
+    width: 88%;
+    height: 88%;
+    padding: 6px;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    box-sizing: border-box;
+
+    .folder-item-icon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background: rgba(255, 255, 255, 0.9);
+      border-radius: 3px;
+      border: 1px solid rgba(79, 70, 229, 0.15);
+      transition: all 0.2s ease;
+      min-height: 0;
+      min-width: 0;
+
+      .folder-sub-icon {
+        width: 10px;
+        height: 10px;
+        opacity: 0.9;
+        transition: all 0.2s ease;
+        object-fit: contain;
+      }
+
+      &:hover {
+        background: rgba(79, 70, 229, 0.15);
+        transform: scale(1.05);
+        border-color: rgba(79, 70, 229, 0.3);
+
+        .folder-sub-icon {
+          opacity: 1;
+        }
+      }
+    }
+  }
+}
+
+// 文件夹图标悬停效果
+.grid-item:hover .folder-icon .folder-background {
+  border-color: rgba(79, 70, 229, 0.4);
+  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 0 0 2px rgba(79, 70, 229, 0.1);
+
+  &::before {
+    background: linear-gradient(135deg, rgba(79, 70, 229, 0.2) 0%, rgba(124, 58, 237, 0.2) 100%);
+  }
+}
+
+.grid-item:hover .folder-items-grid .folder-item-icon {
+  background: rgba(79, 70, 229, 0.15);
+  border-color: rgba(79, 70, 229, 0.2);
+
+  .folder-sub-icon {
+    opacity: 1;
+  }
+}
+
+// 动画定义
+@keyframes fadeInUp {
+  from {
+    opacity: 0;
+    transform: translateY(30px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+// 一师一策应用聚合弹窗样式
+.modal-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.6);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 9999;
+  backdrop-filter: blur(4px);
+}
+
+.modal-content {
+  background: #ffffff;
+  border-radius: 20px;
+  margin: 20px;
+  max-width: 400px;
+  width: 90%;
+  max-height: 80vh;
+  overflow: hidden;
+  box-shadow: 0 20px 60px rgba(0, 0, 0, 0.3);
+  animation: modalSlideIn 0.3s ease-out;
+}
+
+@keyframes modalSlideIn {
+  from {
+    opacity: 0;
+    transform: translateY(-50px) scale(0.9);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0) scale(1);
+  }
+}
+
+.modal-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20px 25px 15px;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+  background: linear-gradient(135deg, #4f46e5 0%, #7c3aed 100%);
+  color: #ffffff;
+
+  .modal-title {
+    font-size: 18px;
+    font-weight: 600;
+    color: #ffffff;
+  }
+
+  .modal-close {
+    width: 32px;
+    height: 32px;
+    border-radius: 50%;
+    background: rgba(255, 255, 255, 0.2);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    transition: all 0.3s ease;
+
+    &:hover {
+      background: rgba(255, 255, 255, 0.3);
+      transform: scale(1.1);
+    }
+
+    .close-icon {
+      font-size: 20px;
+      color: #ffffff;
+      font-weight: bold;
+    }
+  }
+}
+
+.modal-body {
+  padding: 25px;
+  max-height: 60vh;
+  overflow-y: auto;
+}
+
+.course-options {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 20px;
+}
+
+.course-option {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  padding: 20px 15px;
+  border-radius: 16px;
+  background: linear-gradient(135deg, rgba(79, 70, 229, 0.05) 0%, rgba(124, 58, 237, 0.05) 100%);
+  border: 1px solid rgba(79, 70, 229, 0.1);
+  cursor: pointer;
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  position: relative;
+  overflow: hidden;
+
+  &::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: linear-gradient(135deg, rgba(79, 70, 229, 0.1) 0%, rgba(124, 58, 237, 0.1) 100%);
+    opacity: 0;
+    transition: opacity 0.3s ease;
+  }
+
+  &:hover {
+    transform: translateY(-3px) scale(1.02);
+    box-shadow: 0 10px 30px rgba(79, 70, 229, 0.2);
+    border-color: rgba(79, 70, 229, 0.3);
+
+    &::before {
+      opacity: 1;
+    }
+  }
+
+  &:active {
+    transform: translateY(-1px) scale(1.01);
+  }
+
+  .option-icon-container {
+    width: 48px;
+    height: 48px;
+    border-radius: 12px;
+    background: linear-gradient(135deg, rgba(79, 70, 229, 0.15) 0%, rgba(124, 58, 237, 0.15) 100%);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 12px;
+    transition: all 0.3s ease;
+    box-shadow: 0 4px 15px rgba(79, 70, 229, 0.2);
+
+    .option-icon {
+      width: 24px;
+      height: 24px;
+      transition: all 0.3s ease;
+    }
+  }
+
+  .option-text {
+    font-size: 14px;
+    color: #374151;
+    font-weight: 500;
+    line-height: 1.3;
+    transition: color 0.3s ease;
+  }
+
+  &:hover .option-icon-container {
+    transform: scale(1.1);
+    box-shadow: 0 6px 20px rgba(79, 70, 229, 0.3);
+  }
+
+  &:hover .option-text {
+    color: #1f2937;
+  }
+}
+
+// 响应式优化
+@media (max-width: 375px) {
+  .section-grid-card {
+    gap: 15px 8px;
+    padding: 15px 10px;
+  }
+
+  .grid-item {
+    padding: 8px 3px;
+  }
+
+  .grid-icon-container {
+    width: 42px;
+    height: 42px;
+
+    .grid-icon {
+      width: 20px;
+      height: 20px;
+    }
+  }
+
+  .modal-content {
+    margin: 15px;
+    width: 95%;
+  }
+
+  .modal-header {
+    padding: 15px 20px 12px;
+  }
+
+  .modal-body {
+    padding: 20px;
+  }
+
+  .course-options {
+    gap: 15px;
+  }
+
+  .course-option {
+    padding: 15px 10px;
+
+    .option-icon-container {
+      width: 42px;
+      height: 42px;
+      margin-bottom: 10px;
+
+      .option-icon {
+        width: 20px;
+        height: 20px;
+      }
+    }
+
+    .option-text {
+      font-size: 13px;
+    }
+  }
+
+  // 文件夹图标在小屏幕上的优化
+  .folder-icon {
+    .folder-items-grid {
+      gap: 0.5px;
+      padding: 3px;
+      width: 95%;
+      height: 95%;
+
+      .folder-item-icon {
+        border-radius: 2px;
+
+        .folder-sub-icon {
+          width: 8px;
+          height: 8px;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/pages/base/service/index.vue b/src/pages/base/service/index.vue
index 540c360..431fff4 100644
--- a/src/pages/base/service/index.vue
+++ b/src/pages/base/service/index.vue
@@ -48,7 +48,6 @@
           class="section-block"
           v-for="(section, index) in sections"
           :key="section.id"
-          v-show="hasSectionPermission(section)"
       >
         <view class="section-title">
           <view
@@ -61,7 +60,7 @@
         <view class="section-grid-card">
           <template v-for="(item, itemIdx) in section.items" :key="item.id">
             <view
-                v-if="item.show && hasPermissionDirect(item.permissionKey)"
+                v-if="item.show"
                 class="grid-item"
                 @click="handleGridItemClick(item)"
             >
@@ -122,7 +121,7 @@
           <view class="course-options">
             <template v-for="option in courseManagementOptions" :key="option.id">
               <view
-                  v-if="option.show && hasPermissionDirect(option.permissionKey)"
+                  v-if="option.show"
                   class="course-option"
                   @click="handleCourseOptionClick(option)"
               >
@@ -144,13 +143,14 @@
 </template>
 
 <script lang="ts" setup>
+import {getMobileMenuApi, MobileMenuTreeNode} from "@/api/system/menu";
 import {jsdfindJsByPhoneApi, clearUserOpenIdApi} from "@/api/base/server";
 import {useCommonStore} from "@/store/modules/common";
 import {useUserStore} from "@/store/modules/user";
 import {useDataStore} from "@/store/modules/data";
+import {useMenuStore} from "@/store/modules/menu";
 import {imagUrl} from "@/utils";
 import {hideLoading, showLoading} from "@/utils/uniapp";
-import {hasPermission} from "@/utils/permission";
 import {set} from "lodash";
 import {reactive, ref, computed, watch, onMounted} from "vue";
 import { onShow } from "@dcloudio/uni-app";
@@ -158,6 +158,7 @@ import { onShow } from "@dcloudio/uni-app";
 const {logout, getUser, getJs, setJs} = useUserStore();
 const {getZwListByLx} = useCommonStore();
 const dataStore = useDataStore();
+const menuStore = useMenuStore();
 
 const jsTx = computed(() => imagUrl(getUser.profilePhoto));
 
@@ -379,6 +380,7 @@ const handleLogout = () => {
 };
 
 // 定义功能分区数据
+/*
 const sections = reactive<Section[]>([
   {
     id: "gnyy",
@@ -836,6 +838,40 @@ const sections = reactive<Section[]>([
           },
         ],
       },
+      {
+        id: "routine-da",
+        icon: "da",
+        text: "基础档案",
+        show: true,
+        permissionKey: "routine-da",
+        isFolder: true,
+        folderItems: [
+          {
+            id: "routine-xsda",
+            icon: "xsda",
+            text: "学生档案",
+            show: true,
+            permissionKey: "routine-xsda", // 学生档案权限编码
+            path: "/pages/view/routine/da/xsda/studentArchive",
+          },
+          {
+            id: "routine-jzda",
+            icon: "jzda",
+            text: "家长档案",
+            show: true,
+            permissionKey: "routine-jzda",
+            path: "/pages/view/routine/da/jzda/index",
+          },
+          {
+            id: "routine-jsda",
+            icon: "jsda",
+            text: "教师档案",
+            show: true,
+            permissionKey: "routine-jsda",
+            path: "/pages/view/routine/da/jsda/index",
+          },
+        ],
+      },
     ],
   },
   {
@@ -860,14 +896,6 @@ const sections = reactive<Section[]>([
         permissionKey: "routine-jszr", // 教学资源权限编码
         path: "/pages/view/routine/JiaoXueZiYuan/index",
       },
-      {
-        id: "r4",
-        icon: "rzrj",
-        text: "任教任职",
-        show: true,
-        permissionKey: "routine-rzrj", // 任教任职权限编码
-        path: "/pages/view/routine/RengJiaoRengZhi/index",
-      },
       {
         id: "r10",
         icon: "qdfb",
@@ -988,14 +1016,7 @@ const sections = reactive<Section[]>([
         permissionKey: "routine-jltj", // 接龙统计权限编码
         path: "/pages/view/analysis/jl/index",
       },
-      {
-        id: "hs4",
-        icon: "xsda",
-        text: "学生档案",
-        show: true,
-        permissionKey: "home-xsda", // 学生档案权限编码
-        path: "/pages/view/analysis/xs/studentArchive",
-      },
+
       {
         id: "hs5",
         icon: "xkqd",
@@ -1035,14 +1056,6 @@ const sections = reactive<Section[]>([
         permissionKey: "personnel-qjsq", // 请假申请权限编码
         path: "/pages/view/hr/jsQj/index",
       },
-      {
-        id: "hr2",
-        icon: "jsda",
-        text: "教师档案",
-        show: true,
-        permissionKey: "personnel-jsda", // 教师档案权限编码
-        path: "/pages/view/hr/teacherProfile/index",
-      },
       {
         id: "r12",
         icon: "gw",
@@ -1071,6 +1084,10 @@ const sections = reactive<Section[]>([
   },
 
 ]);
+*/
+
+// 静态配置已注释，改为从 getMobileMenuApi 动态加载；空数组作为初始值，onMounted 时用接口数据填充
+const sections = reactive<Section[]>([]);
 
 // 获取分区颜色
 const getSectionColor = (index: number) => {
@@ -1154,17 +1171,83 @@ const onHide = () => {
   // 这样可以确保用户从子页面返回时弹窗仍然打开
 };
 
-// 初始化
+// 将手机端菜单树转换为 sections 结构
+// 若接口返回单根节点（如"教师端"），则取其 children 作为 sections，否则按节点逐级转换
+function transformMobileMenuToSections(nodes: MobileMenuTreeNode[]): Section[] {
+  let workNodes = nodes;
+  if (nodes.length === 1 && !nodes[0].pagePath && (nodes[0].children?.length ?? 0) > 0) {
+    workNodes = nodes[0].children!;
+  }
+  return workNodes.map((node, idx) => {
+    const sectionId = node.id ?? `section-${idx}`;
+    const items: GridItem[] = [];
+
+    (node.children || []).forEach((child) => {
+      if (child.pagePath) {
+        items.push({
+          id: child.id,
+          icon: (child.normalCss && /^[a-zA-Z0-9_-]+$/.test(child.normalCss)) ? child.normalCss : "app",
+          text: child.screenName,
+          show: true,
+          permissionKey: child.authCode || "",
+          path: child.pagePath,
+        });
+      } else if (child.children?.length) {
+        const folderItems: GridItem[] = (child.children || []).map((sub) => ({
+          id: sub.id,
+          icon: (sub.normalCss && /^[a-zA-Z0-9_-]+$/.test(sub.normalCss)) ? sub.normalCss : "app",
+          text: sub.screenName,
+          show: true,
+          permissionKey: sub.authCode || "",
+          path: sub.pagePath,
+        }));
+        items.push({
+          id: child.id,
+          icon: (child.normalCss && /^[a-zA-Z0-9_-]+$/.test(child.normalCss)) ? child.normalCss : "app",
+          text: child.screenName,
+          show: true,
+          permissionKey: child.authCode || "",
+          isFolder: true,
+          folderItems,
+        });
+      }
+    });
+
+    return {
+      id: sectionId,
+      title: node.screenName,
+      permissionKey: node.authCode || undefined,
+      items,
+    };
+  });
+}
+
+// 初始化（launchPage 已负责 changeTime 校验与菜单预加载，service 直接使用 menuStore 缓存）
 onMounted(async () => {
-  // 初始化职务信息
-  await initPositionInfo();
+  const cachedMenu = menuStore.getMobileMenu;
+  const needFetchMenu = !cachedMenu?.length;
+
+  if (cachedMenu?.length > 0 && !needFetchMenu) {
+    const apiSections = transformMobileMenuToSections(cachedMenu);
+    sections.splice(0, sections.length, ...apiSections);
+  }
+
+  const menuPromise = needFetchMenu
+    ? getMobileMenuApi()
+        .then((res) => {
+          const menuList = res?.result;
+          if (menuList && Array.isArray(menuList) && menuList.length > 0) {
+            menuStore.setMobileMenu(menuList);
+            const apiSections = transformMobileMenuToSections(menuList);
+            sections.splice(0, sections.length, ...apiSections);
+          }
+        })
+        .catch(() => {})
+    : Promise.resolve();
+
+  await Promise.all([initPositionInfo(), menuPromise]);
 
-  // 完成加载
   isLoading.value = false;
-
-  // 强制清除权限缓存，确保数据一致性
-  const {clearPermissionCachePublic} = await import("@/utils/permission");
-  clearPermissionCachePublic();
 });
 
 // 初始化职务信息
@@ -1197,35 +1280,12 @@ async function initPositionInfo() {
   }
 }
 
-// 检查区域权限
-const hasSectionPermission = (section: Section) => {
-  if (!section.permissionKey) {
-    return true; // 没有权限编码的区域默认显示
-  }
-  return hasPermissionDirect(section.permissionKey);
-};
-
-// 直接权限检查函数，避免缓存问题
-const hasPermissionDirect = (permissionKey: string) => {
-  if (!permissionKey) return true;
-  const userStore = useUserStore();
-  const permissions = userStore.getAuth;
-  if (!permissions || permissions.length === 0) return false;
-
-  const uniquePermissions = [...new Set(permissions)];
-  return uniquePermissions.includes(permissionKey);
-};
-
-// 获取有权限且显示的文件夹子项
+// 获取且显示的文件夹子项（菜单由后端 getMobileMenuApi 已按权限过滤）
 const getVisibleFolderItems = (folderItems: GridItem[] | undefined) => {
   if (!folderItems || !Array.isArray(folderItems)) {
     return [];
   }
-  
-  // 过滤出有权限且show为true的子项
-  return folderItems.filter(item => {
-    return item.show && hasPermissionDirect(item.permissionKey);
-  });
+  return folderItems.filter(item => item.show);
 };
 
 // 暴露生命周期钩子给uni-app
diff --git a/src/pages/system/launchPage/launchPage.vue b/src/pages/system/launchPage/launchPage.vue
index 06871e5..65c4d64 100644
--- a/src/pages/system/launchPage/launchPage.vue
+++ b/src/pages/system/launchPage/launchPage.vue
@@ -14,46 +14,19 @@
 <script lang="ts" setup>
 import {onLoad} from "@dcloudio/uni-app";
 import {useDataStore} from "@/store/modules/data";
+import {useMenuStore} from "@/store/modules/menu";
 import {useUserStore} from "@/store/modules/user";
 import {checkOpenId} from "@/api/system/login";
+import {getMobileMenuApi} from "@/api/system/menu";
+import {getPermissionChangeTimeApi} from "@/api/system/config";
 
 const dataStore = useDataStore();
-const { setGlobal, getGlobal, setFile, getFile, refreshMessageBadge } = dataStore;
+const menuStore = useMenuStore();
+const { setGlobal, getFile } = dataStore;
 const userStore = useUserStore();
 const { afterLoginAction } = userStore;
 const isShow = ref(true);
 
-/**
- * 强制刷新权限
- */
-async function forceRefreshPermission(changeTime?: string): Promise<void> {
-  try {
-
-    // 重新获取用户权限
-    const userStore = useUserStore();
-    const currentUser = userStore.getUser;
-
-    if (currentUser && currentUser.id) {
-      // 重新调用权限获取接口
-      const {authenticationApi} = await import('@/api/system/login');
-      const result = await authenticationApi({userId: currentUser.id});
-
-      if (result && result.result) {
-
-        // 直接设置权限并刷新缓存，不调用setAuth避免重复操作
-        userStore.auth = result.result;
-
-        // 手动刷新缓存，传递权限变更时间
-        const {refreshPermissionCache} = await import('@/utils/permission');
-        refreshPermissionCache(result.result, changeTime);
-
-      }
-    }
-  } catch (error) {
-    console.error('强制刷新权限失败:', error);
-  }
-}
-
 function goByqd(data: any) {
   if (data && data.qdId) {
     // 有签到参数，重定向到签到确认页面
@@ -81,9 +54,9 @@ function goByJs(js: any) {
       url: "/pages/base/service/index",
     });
   } else {
-    setFile({
+    dataStore.setFile({
       ...js,
-      ...getFile,
+      ...dataStore.getFile,
     });
     setTimeout(() => {
       uni.reLaunch({
@@ -117,19 +90,35 @@ onLoad(async (data: any) => {
         // 执行登录操作
         afterLoginAction(res.result);
 
-        // 刷新教师待办角标
-        await refreshMessageBadge(res.result?.js?.id);
-
-        // 如果有changeTime参数，更新权限缓存
-        if (data.changeTime) {
-          const {refreshPermissionCache} = await import('@/utils/permission');
-          const userStore = useUserStore();
-          const currentPermissions = userStore.getAuth;
-
-          if (currentPermissions && currentPermissions.length > 0) {
-            refreshPermissionCache(currentPermissions, data.changeTime);
-          }
+        // 判断是否需要拉取菜单：时间戳不一致或本地无菜单则重新请求
+        let needFetchMenu = true;
+        try {
+          const timeRes = await getPermissionChangeTimeApi();
+          console.log('[launchPage] getPermissionChangeTime 原始返回:', JSON.stringify(timeRes));
+          const serverChangeTime = String((timeRes as any)?.result ?? '');
+          const localChangeTime = userStore.getChangeTime || '';
+          const localMenu = menuStore.getMobileMenu || [];
+          needFetchMenu = serverChangeTime !== localChangeTime || !localMenu?.length;
+          console.log('[launchPage] serverChangeTime:', serverChangeTime, 'localChangeTime:', localChangeTime, 'localMenuLength:', localMenu?.length ?? 0, 'needFetchMenu:', needFetchMenu);
+          if (serverChangeTime) userStore.setChangeTime(serverChangeTime);
+        } catch (e) {
+          console.warn('[launchPage] getPermissionChangeTime 失败:', e);
+          needFetchMenu = true;
         }
+
+        if (needFetchMenu) {
+          console.log('[launchPage] 调用 find-mobile-menu');
+          await getMobileMenuApi()
+            .then((r) => {
+              if (r?.result && Array.isArray(r.result) && r.result.length > 0) {
+                menuStore.setMobileMenu(r.result);
+              }
+            })
+            .catch(() => {});
+        } else {
+          console.log('[launchPage] 跳过 find-mobile-menu，使用本地缓存');
+        }
+
         if (data && data.qdId) {
           goByqd(data);
         } else {
diff --git a/src/pages/view/analysis/xs/studentArchive.vue b/src/pages/view/analysis/xs/studentArchive.vue
deleted file mode 100644
index 4924af8..0000000
--- a/src/pages/view/analysis/xs/studentArchive.vue
+++ /dev/null
@@ -1,583 +0,0 @@
-<template>
-  <view class="student-archive-container">
-    <!-- 班级选择器 -->
-    <view class="section">
-      <view class="section-title">选择班级</view>
-        <BasicNjBjPicker 
-          v-model="classInfo"
-          placeholder="请选择年级班级"
-          @change="onClassChange"
-        icon-arrow="right" 
-        :customStyle="{ backgroundColor: '#fff', borderRadius: '0', padding: '12px 15px' }"
-      />
-      
-      <!-- 班级选择提示 -->
-      <view v-if="!classInfo" class="class-tip">
-        <text class="tip-icon">ℹ️</text>
-        <text class="tip-text">请先选择班级</text>
-      </view>
-    </view>
-
-    <!-- 学生档案统计 -->
-    <view class="section" v-if="classInfo">
-      <view class="section-title">
-        学生档案统计
-      </view>
-      
-      <!-- 统计信息 -->
-      <view class="stats-container">
-        <view 
-          class="stat-item" 
-          :class="{ active: selectedStatType === 'all' }"
-          @click="onStatItemClick('all')"
-        >
-          <text class="stat-number">{{ studentList.length }}</text>
-          <text class="stat-label">总人数</text>
-        </view>
-        <view 
-          class="stat-item" 
-          :class="{ active: selectedStatType === 'followed' }"
-          @click="onStatItemClick('followed')"
-        >
-          <text class="stat-number followed">{{ followedCount }}</text>
-          <text class="stat-label">已关注</text>
-        </view>
-        <view 
-          class="stat-item" 
-          :class="{ active: selectedStatType === 'unfollowed' }"
-          @click="onStatItemClick('unfollowed')"
-        >
-          <text class="stat-number unfollowed">{{ unfollowedCount }}</text>
-          <text class="stat-label">未关注</text>
-        </view>
-      </view>
-    </view>
-
-    <!-- 学生档案列表 -->
-    <view class="section" v-if="classInfo && studentList.length > 0">
-      <view class="section-title">
-        {{ getListTitle() }} ({{ filteredStudentList.length }}人)
-      </view>
-      
-      <!-- 学生列表 - 改为card形式 -->
-      <view class="student-list">
-        <view class="student-grid">
-        <view 
-            v-for="student in filteredStudentList"
-          :key="student.xsId"
-            class="student-item bg-white r-md p-12"
-          @click="viewStudentDetail(student)"
-        >
-            <view class="flex-row items-center">
-              <view class="avatar-container mr-8">
-            <image 
-                  class="student-avatar"
-                  :src="imagUrl(student.xstx || '') || '/static/images/default-avatar.png'"
-              mode="aspectFill"
-                ></image>
-              </view>
-              <view class="flex-1 overflow-hidden">
-                <view class="student-name mb-8">
-                  <text class="font-14 cor-333">{{ student.xsxm }}</text>
-                </view>
-                <view class="flex-row">
-                  <!-- 关注状态标签 -->
-                  <view
-                    class="status-tag"
-                    :class="getFollowStatusClass(student.jzxm)"
-                  >
-                    {{ student.jzxm ? '已关注' : '未关注' }}
-                  </view>
-            </view>
-          </view>
-              <!-- 箭头图标 -->
-              <view class="arrow-icon-container" @click.stop="viewStudentDetail(student)">
-                <image
-                  class="arrow-icon"
-                  src="/static/base/view/more.png"
-                  mode="aspectFit"
-                ></image>
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 空状态 -->
-    <view class="empty-state" v-if="!loading && studentList.length === 0 && hasSearched">
-      <view class="empty-icon">📚</view>
-      <view class="empty-text">暂无学生档案数据</view>
-      <view class="empty-tip">请选择年级班级后查询</view>
-    </view>
-
-    <!-- 加载状态 -->
-    <view class="loading-state" v-if="loading">
-      <view class="loading-text">正在加载...</view>
-    </view>
-  </view>
-</template>
-
-<script setup lang="ts">
-import { ref, computed } from 'vue'
-import { BasicNjBjPicker } from '@/components/BasicNjBjPicker'
-import { onLoad } from '@dcloudio/uni-app'
-import { findStudentInfoByNjAndBjSimpleApi } from '@/api/analysis/xs'
-import { imagUrl } from "@/utils"
-import { useDataStore } from '@/store/modules/data'
-
-// 定义类型接口
-interface ClassInfo {
-  njId: string
-  bjId: string
-  nj: any
-  bj: any
-}
-
-interface StudentInfo {
-  xsId: string
-  xsxm: string
-  xstx?: string
-  njId: string
-  njmcId: string
-  njmc: string
-  bc: string
-  bjId: string
-  bjmc: string
-  jzIds?: string
-  jzxm?: string
-  xb?: string  // 性别
-  sfzh?: string  // 身份证号
-  cstime?: string  // 出生日期
-}
-
-interface ApiResponse {
-  code: number
-  data: StudentInfo[]
-  message?: string
-}
-
-// 响应式数据
-const classInfo = ref<ClassInfo | null>(null)
-const studentList = ref<StudentInfo[]>([])
-const loading = ref(false)
-const hasSearched = ref(false)
-const selectedStatType = ref<string>('all') // 当前选中的统计类型
-
-// 使用store
-const { setXs } = useDataStore()
-
-// 计算属性
-const followedCount = computed(() => {
-  return studentList.value.filter(student => student.jzxm).length
-})
-
-const unfollowedCount = computed(() => {
-  return studentList.value.filter(student => !student.jzxm).length
-})
-
-// 根据选中的统计类型过滤学生列表
-const filteredStudentList = computed(() => {
-  if (selectedStatType.value === 'all') {
-    return studentList.value
-  } else if (selectedStatType.value === 'followed') {
-    return studentList.value.filter(student => student.jzxm)
-  } else if (selectedStatType.value === 'unfollowed') {
-    return studentList.value.filter(student => !student.jzxm)
-  }
-  return studentList.value
-})
-
-// 年级班级选择变化 - 自动触发查询
-const onClassChange = async (nj: any, bj: any) => {
-  console.log('年级班级选择变化:', nj, bj)
-  classInfo.value = {
-    njId: nj.key,
-    bjId: bj.key,
-    nj: nj,
-    bj: bj
-  }
-  
-  // 自动触发查询
-  await searchStudents()
-}
-
-// 查询学生档案
-const searchStudents = async () => {
-  if (!classInfo.value || !classInfo.value.njId || !classInfo.value.bjId) {
-    return
-  }
-
-  loading.value = true
-  hasSearched.value = true
-
-  try {
-    // 调用后端接口查询学生档案
-    const response = await findStudentInfoByNjAndBjSimpleApi(classInfo.value!.njId, classInfo.value!.bjId)
-    
-    console.log('API返回结果:', response)
-    
-    if (response && response.resultCode === 1) {
-      studentList.value = response.result || []
-      uni.showToast({
-        title: `查询到${studentList.value.length}名学生`,
-        icon: 'success'
-      })
-    } else {
-      throw new Error(response?.message || '查询失败')
-    }
-  } catch (error) {
-    console.error('查询学生档案失败:', error)
-    uni.showToast({
-      title: '查询失败，请重试',
-      icon: 'none'
-    })
-    studentList.value = []
-  } finally {
-    loading.value = false
-  }
-}
-
-// 刷新学生列表
-const refreshStudentList = () => {
-  searchStudents()
-}
-
-// 点击统计项
-const onStatItemClick = (statType: string) => {
-  selectedStatType.value = statType
-  console.log('选中统计类型:', statType)
-}
-
-// 获取列表标题
-const getListTitle = () => {
-  switch (selectedStatType.value) {
-    case 'followed':
-      return '已关注学生'
-    case 'unfollowed':
-      return '未关注学生'
-    default:
-      return '学生档案列表'
-  }
-}
-
-
-
-// 获取关注状态样式类
-const getFollowStatusClass = (jzxm?: string) => {
-  return jzxm ? 'status-followed' : 'status-unfollowed'
-}
-
-// 查看学生详情
-const viewStudentDetail = (student: StudentInfo) => {
-  console.log('查看学生详情:', student)
-  
-  // 将学生信息存储到store中
-  setXs({
-    xsId: student.xsId,
-    id: student.xsId, // 兼容字段
-    xsxm: student.xsxm,
-    xm: student.xsxm, // 兼容字段
-    xstx: student.xstx,
-    avatar: student.xstx, // 兼容字段
-    njId: student.njId,
-    njmc: student.njmc,
-    njmcName: student.njmc, // 兼容字段
-    bjId: student.bjId,
-    bjmc: student.bjmc,
-    jzIds: student.jzIds,
-    jzxm: student.jzxm,
-    xb: student.xb, // 性别
-    sfzh: student.sfzh, // 身份证号
-    cstime: student.cstime // 出生日期
-  })
-  
-  // 跳转到学生详情页面
-  uni.navigateTo({
-    url: '/pages/view/homeSchool/parentAddressBook/detail'
-  })
-}
-
-// 页面加载
-onLoad(() => {
-  console.log('学生档案页面加载')
-})
-</script>
-
-<style lang="scss" scoped>
-.student-archive-container {
-  min-height: 100vh;
-  background-color: #f5f5f5;
-  padding: 20rpx;
-}
-
-.section {
-  background-color: #fff;
-  border-radius: 16rpx;
-  padding: 30rpx;
-  margin-bottom: 20rpx;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
-}
-  
-.section-title {
-    font-size: 32rpx;
-    font-weight: bold;
-    color: #333;
-    margin-bottom: 20rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.refresh-btn {
-  font-size: 24rpx;
-  color: #007aff;
-  font-weight: normal;
-}
-
-.stats-container {
-  display: flex;
-  justify-content: space-around;
-  margin-bottom: 30rpx;
-  padding: 20rpx;
-  background-color: #f8f9fa;
-  border-radius: 12rpx;
-  flex-wrap: wrap;
-  gap: 60rpx;
-}
-
-.stat-item {
-    display: flex;
-    flex-direction: column;
-  align-items: center;
-  min-width: 120rpx;
-  padding: 20rpx 10rpx;
-  border-radius: 12rpx;
-  transition: all 0.2s ease;
-  cursor: pointer;
-  
-  &.active {
-    background-color: #e6f7ff;
-    border: 2rpx solid #007aff;
-    transform: scale(1.05);
-  }
-  
-  &:hover {
-    background-color: #f0f9ff;
-    transform: scale(1.02);
-  }
-}
-
-.stat-number {
-  font-size: 36rpx;
-    font-weight: bold;
-    color: #333;
-  margin-bottom: 8rpx;
-  
-  &.followed {
-    color: #52c41a;
-  }
-  
-  &.unfollowed {
-    color: #ff4d4f;
-  }
-}
-
-.stat-label {
-  font-size: 24rpx;
-  color: #666;
-}
-
-.student-list {
-  margin-bottom: 30rpx;
-}
-
-.student-grid {
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  gap: 20rpx;
-}
-
-.student-item {
-  position: relative;
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
-  transition: all 0.2s;
-  min-height: 120rpx; // 确保最小高度
-}
-
-.student-item:hover {
-  transform: translateY(-2rpx);
-  box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.15);
-}
-
-.avatar-container {
-  width: 80rpx;
-  height: 80rpx;
-  border-radius: 50%;
-  padding: 4rpx;
-  background-color: #fff;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.05);
-  flex-shrink: 0; // 防止被压缩
-}
-
-.student-avatar {
-  width: 72rpx;
-  height: 72rpx;
-  border-radius: 50%;
-  background-color: #f5f5f5;
-}
-
-.status-tag {
-  font-size: 20rpx;
-  padding: 6rpx 16rpx;
-  border-radius: 8rpx;
-    display: flex;
-    align-items: center;
-  gap: 4rpx;
-}
-
-.status-followed {
-  background-color: #e6f7ff;
-  color: #52c41a;
-}
-
-.status-unfollowed {
-  background-color: #fff2f0;
-  color: #ff4d4f;
-}
-
-.flex-row {
-  display: flex;
-  flex-direction: row;
-}
-
-.flex-1 {
-  flex: 1;
-}
-
-.items-center {
-  align-items: center;
-}
-
-.overflow-hidden {
-  overflow: hidden;
-}
-
-.mr-8 {
-  margin-right: 12rpx;
-}
-
-.mb-8 {
-  margin-bottom: 16rpx;
-}
-
-.font-14 {
-  font-size: 28rpx;
-}
-
-.cor-333 {
-    color: #333;
-}
-
-.bg-white {
-  background-color: #fff;
-}
-
-.r-md {
-  border-radius: 16rpx;
-}
-
-.p-12 {
-  padding: 24rpx;
-}
-
-.arrow-icon-container {
-  width: 40rpx;
-  height: 40rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-left: 8rpx;
-  border-radius: 50%;
-  transition: all 0.2s ease;
-  flex-shrink: 0; // 防止被压缩
-  
-  &:hover {
-    background-color: #f0f0f0;
-  }
-  
-  &:active {
-    background-color: #e0e0e0;
-    transform: scale(0.95);
-  }
-}
-
-.arrow-icon {
-  width: 35rpx;
-  height: 35rpx;
-  opacity: 0.6;
-  transition: opacity 0.2s ease;
-}
-
-.arrow-icon-container:hover .arrow-icon {
-  opacity: 1;
-}
-
-.class-tip {
-  display: flex;
-  align-items: center;
-  margin-top: 20rpx;
-  padding: 15rpx 20rpx;
-  background-color: #fffbe6;
-  border: 1rpx solid #ffe58f;
-  border-radius: 12rpx;
-  color: #faad14;
-  font-size: 28rpx;
-  font-weight: bold;
-
-  .tip-icon {
-    margin-right: 10rpx;
-    font-size: 32rpx;
-  }
-}
-
-.empty-state {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 100rpx 40rpx;
-  
-  .empty-icon {
-    font-size: 120rpx;
-    margin-bottom: 20rpx;
-  }
-  
-  .empty-text {
-    font-size: 32rpx;
-    color: #666;
-    margin-bottom: 10rpx;
-  }
-  
-  .empty-tip {
-    font-size: 28rpx;
-    color: #999;
-  }
-}
-
-.loading-state {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 100rpx;
-  
-  .loading-text {
-    font-size: 32rpx;
-    color: #666;
-  }
-}
-</style>
diff --git a/src/pages/view/routine/JiFenPingJia/jftj/detail.vue b/src/pages/view/routine/JiFenPingJia/jftj/detail.vue
index c1c3c5b..94fcb89 100644
--- a/src/pages/view/routine/JiFenPingJia/jftj/detail.vue
+++ b/src/pages/view/routine/JiFenPingJia/jftj/detail.vue
@@ -79,7 +79,7 @@ import { ref } from "vue";
 import { onLoad, onShow } from "@dcloudio/uni-app";
 import dayjs from "dayjs";
 import BasicSearch from "@/components/BasicSearch/Search.vue";
-import { jfFindPageApi } from "@/api/base/jfApi";
+import { jfFindPageApi, jfTypeStructureApi } from "@/api/base/jfApi";
 import { navigateTo } from "@/utils/uniapp";
 import { useUserStore } from "@/store/modules/user";
 
@@ -90,6 +90,11 @@ const userStore = useUserStore();
 const targetJsId = ref<string | null>(null); // 目标教师ID（从参数传入）
 const targetNjId = ref<string | null>(null); // 目标年级ID（从参数传入）
 const targetNjmc = ref<string>(""); // 年级名称（从参数传入）
+const targetTopTypeId = ref<string | null>(null); // 大类ID（从参数传入）
+const targetColumnType = ref<string>("approvedCount"); // 列类型（从参数传入）
+const targetStartTime = ref<string | null>(null); // 开始时间
+const targetEndTime = ref<string | null>(null); // 结束时间
+const allJfTypeIds = ref<string>(""); // 大类及其所有子类的ID（逗号分隔）
 
 const handleSearch = (keyword: string) => {
   searchKeyword.value = keyword;
@@ -134,6 +139,19 @@ const queryData = async (pageNo: number, pageSize: number) => {
     } else if (jsId) {
       params.jsId = jsId; // 按教师
     }
+    
+    // 如果传入了大类ID，需要查询该大类及其所有子类的积分
+    if (allJfTypeIds.value) {
+      params.jfTypeIds = allJfTypeIds.value;
+    }
+    
+    // 如果传入了时间范围
+    if (targetStartTime.value) {
+      params.startTime = targetStartTime.value;
+    }
+    if (targetEndTime.value) {
+      params.endTime = targetEndTime.value;
+    }
 
     console.log('请求参数:', params);
     const res: any = await jfFindPageApi(params);
@@ -153,18 +171,36 @@ const queryData = async (pageNo: number, pageSize: number) => {
     console.log('result.total:', result?.total);
     console.log('result.records:', result?.records);
 
-    // 先过滤已完结的数据：spJd === "Z" || spResult === "B"，且排除驳回状态（spResult === "C"）
-    const completedRows = rows.filter((it) => {
+    // 根据 columnType 过滤数据
+    const filteredByType = rows.filter((it) => {
       const spJd = it.spJd;
       const spResult = it.spResult;
-      // 已完结：spJd === "Z" || spResult === "B"，且不是驳回状态
+      const columnType = targetColumnType.value;
+      
+      if (columnType === 'approvedCount') {
+        // 已审批积分：sp_jd = 'Z' AND sp_result = 'B'
+        return spJd === 'Z' && spResult === 'B';
+      } else if (columnType === 'pendingCount') {
+        // 待审批积分：sp_jd = 'A' OR sp_result = 'A'
+        return spJd === 'A' || spResult === 'A';
+      } else if (columnType === 'rejectedCount') {
+        // 已驳回：sp_result = 'C'
+        return spResult === 'C';
+      } else if (columnType === 'draftCount') {
+        // 暂存：sp_jd 和 sp_result 均为空
+        const isSpJdEmpty = spJd === null || spJd === undefined || spJd === '';
+        const isSpResultEmpty = spResult === null || spResult === undefined || spResult === '';
+        return isSpJdEmpty && isSpResultEmpty;
+      }
+      
+      // 默认显示已完结
       return (spJd === "Z" || spResult === "B") && spResult !== "C";
     });
     
-    console.log('已完结数据数量:', completedRows.length);
+    console.log('按类型过滤后数量:', filteredByType.length);
     
     // 再过滤关键词
-    const filtered = completedRows.filter((it) => matchKeyword(it));
+    const filtered = filteredByType.filter((it) => matchKeyword(it));
     console.log('过滤后数量:', filtered.length);
     console.log('是否还有更多数据（根据数据量判断）:', filtered.length === pageSize);
     
@@ -229,8 +265,31 @@ const goEdit = (item: any) => {
   navigateTo(`/pages/view/routine/JiFenPingJia/jfsp/JfFlow?id=${item.id}`);
 };
 
+// 加载大类及其所有子类的ID
+const loadJfTypeIds = async (topTypeId: string) => {
+  try {
+    const res: any = await jfTypeStructureApi({ topTypeId });
+    const structureList = res?.result || res || [];
+    
+    // 提取所有节点 ID（包括顶级节点本身）
+    const ids: string[] = [topTypeId];
+    structureList.forEach((item: any) => {
+      if (item.jfTypeId && !ids.includes(item.jfTypeId)) {
+        ids.push(item.jfTypeId);
+      }
+    });
+    
+    allJfTypeIds.value = ids.join(',');
+    console.log('大类及子类ID:', allJfTypeIds.value);
+  } catch (error) {
+    console.error('获取大类结构失败:', error);
+    // 如果获取失败，至少用顶级ID
+    allJfTypeIds.value = topTypeId;
+  }
+};
+
 // 页面加载时接收参数
-onLoad((options: any) => {
+onLoad(async (options: any) => {
   if (options?.jsId) {
     targetJsId.value = options.jsId;
     console.log('接收到的教师ID:', targetJsId.value);
@@ -240,6 +299,24 @@ onLoad((options: any) => {
     targetNjmc.value = options?.njmc || "";
     console.log('接收到的年级ID:', targetNjId.value, '年级名称:', targetNjmc.value);
   }
+  if (options?.topTypeId) {
+    targetTopTypeId.value = options.topTypeId;
+    console.log('接收到的大类ID:', targetTopTypeId.value);
+    // 加载大类及其所有子类的ID
+    await loadJfTypeIds(options.topTypeId);
+  }
+  if (options?.columnType) {
+    targetColumnType.value = options.columnType;
+    console.log('接收到的列类型:', targetColumnType.value);
+  }
+  if (options?.startTime) {
+    targetStartTime.value = decodeURIComponent(options.startTime);
+    console.log('接收到的开始时间:', targetStartTime.value);
+  }
+  if (options?.endTime) {
+    targetEndTime.value = decodeURIComponent(options.endTime);
+    console.log('接收到的结束时间:', targetEndTime.value);
+  }
 });
 
 onShow(() => {
diff --git a/src/pages/view/routine/JiFenPingJia/jftj/index.vue b/src/pages/view/routine/JiFenPingJia/jftj/index.vue
index 68fa41c..5d1bca4 100644
--- a/src/pages/view/routine/JiFenPingJia/jftj/index.vue
+++ b/src/pages/view/routine/JiFenPingJia/jftj/index.vue
@@ -11,7 +11,7 @@
           </view>
         </view>
         <view class="total-score">
-          <text class="score-number">{{ totalScore }}</text>
+          <text class="score-number">{{ totalApprovedScore }}</text>
           <text class="score-label">总积分</text>
         </view>
       </view>
@@ -46,30 +46,30 @@
               <text class="picker-value">{{ endTime || '请选择' }}</text>
             </view>
           </picker>
-          <button class="query-btn-inline" @click="loadPerformanceRanking">查询</button>
+          <button class="query-btn-inline" @click="loadStatistics">查询</button>
         </view>
       </view>
     </view>
 
-    <!-- 统计摘要（暂时隐藏） -->
-    <!-- <view class="summary-section">
+    <!-- 统计摘要 -->
+    <view class="summary-section">
       <view class="summary-item">
         <text class="summary-number">{{ teacherCount }}</text>
         <text class="summary-label">教师数</text>
       </view>
       <view class="summary-item">
-        <text class="summary-number">{{ totalRecords }}</text>
-        <text class="summary-label">记录总数</text>
+        <text class="summary-number">{{ totalApproved }}</text>
+        <text class="summary-label">已审批</text>
       </view>
       <view class="summary-item">
-        <text class="summary-number">{{ completedCount }}</text>
-        <text class="summary-label">已完结</text>
+        <text class="summary-number">{{ totalPending }}</text>
+        <text class="summary-label">待审批</text>
       </view>
       <view class="summary-item">
-        <text class="summary-number">{{ pendingCount }}</text>
-        <text class="summary-label">待审核</text>
+        <text class="summary-number">{{ totalRejected }}</text>
+        <text class="summary-label">已驳回</text>
       </view>
-    </view> -->
+    </view>
 
     <!-- 教师排名列表 -->
     <view class="teacher-list">
@@ -80,29 +80,56 @@
         lower-threshold="100"
       >
         <!-- 加载状态 -->
-        <view v-if="isLoading && gradeList.length === 0" class="loading-indicator">
+        <view v-if="isLoading && teacherList.length === 0" class="loading-indicator">
           <text class="loading-icon">⏳</text>
           <text class="loading-text">加载中...</text>
         </view>
 
         <!-- 排名列表 -->
-        <template v-else-if="gradeList.length > 0">
+        <template v-else-if="teacherList.length > 0">
           <view 
-            v-for="(grade, index) in gradeList" 
-            :key="grade.njId || index" 
+            v-for="(teacher, index) in teacherList" 
+            :key="teacher.jsId || index" 
             class="teacher-card"
+            @click="goToDetail(teacher)"
           >
             <view class="card-main">
-              <view class="teacher-name">{{ grade.njmc || '未知年级' }}</view>
+              <!-- 排名标识 -->
+              <view class="rank-badge" :class="getRankClass(index)">
+                <text class="rank-number">{{ index + 1 }}</text>
+              </view>
+              
+              <!-- 教师姓名 -->
+              <text class="teacher-name">{{ teacher.jsName || '未知' }}</text>
+              
+              <!-- 积分徽章 -->
               <view class="score-badge">
-                <text class="score-value">{{ grade.totalScore || 0 }}</text>
+                <text class="score-value">{{ teacher.approvedScore || 0 }}</text>
                 <text class="score-unit">分</text>
               </view>
             </view>
             
             <view class="teacher-info">
-              <view class="record-info" @click="goToDetail(grade.njId, grade.njmc)">
-                <text class="record-text">教师 {{ grade.teacherCount || 0 }} 人，记录 {{ grade.recordCount || 0 }} 条</text>
+              <view class="stats-row">
+                <view class="stat-item">
+                  <text class="stat-label">已审批</text>
+                  <text class="stat-value approved">{{ teacher.approvedScore || 0 }}</text>
+                </view>
+                <view class="stat-item">
+                  <text class="stat-label">待审批</text>
+                  <text class="stat-value pending">{{ teacher.pendingCount || 0 }}</text>
+                </view>
+                <view class="stat-item">
+                  <text class="stat-label">已驳回</text>
+                  <text class="stat-value rejected">{{ teacher.rejectedCount || 0 }}</text>
+                </view>
+                <view class="stat-item">
+                  <text class="stat-label">暂存</text>
+                  <text class="stat-value draft">{{ teacher.draftCount || 0 }}</text>
+                </view>
+              </view>
+              <view class="record-info">
+                <text class="record-text">查看大类明细</text>
                 <text class="record-arrow">></text>
               </view>
             </view>
@@ -117,7 +144,7 @@
         </view>
 
         <!-- 加载更多 -->
-        <view v-if="isLoading && gradeList.length > 0" class="loading-more">
+        <view v-if="isLoading && teacherList.length > 0" class="loading-more">
           <text class="loading-more-icon">⏳</text>
           <text class="loading-more-text">加载中...</text>
         </view>
@@ -129,20 +156,28 @@
 <script lang="ts" setup>
 import { ref, computed, onMounted } from "vue";
 import { onShow } from "@dcloudio/uni-app";
-import { getPerformanceRankingByGradeApi } from "@/api/base/jfApi";
+import { jfStatisticsByTeacherApi } from "@/api/base/jfApi";
 import { navigateTo } from "@/utils/uniapp";
-import dayjs from "dayjs";
 
-// 年级汇总接口
-interface GradeRanking {
-  njId: string;         // 年级ID
-  njmc: string;         // 年级名称
-  totalScore: number;   // 总积分
-  recordCount: number;  // 记录数
-  teacherCount: number; // 教师数
+interface TeacherStatistics {
+  jsId: string;
+  jsName: string;
+  approvedScore: number;
+  calculatedScore: number;
+  pendingCount: number;
+  rejectedCount: number;
+  draftCount: number;
+  categories: Array<{
+    topTypeId: string;
+    topTypeName: string;
+    approvedCount: number;
+    calculatedScore: number;
+    pendingCount: number;
+    rejectedCount: number;
+    draftCount: number;
+  }>;
 }
 
-// 获取当年开始和结束时间
 const getCurrentYearRange = () => {
   const year = new Date().getFullYear();
   return {
@@ -151,36 +186,41 @@ const getCurrentYearRange = () => {
   };
 };
 
-// 响应式数据
 const yearRange = getCurrentYearRange();
 const startTime = ref(yearRange.start);
 const endTime = ref(yearRange.end);
-const gradeList = ref<GradeRanking[]>([]);
+const teacherList = ref<TeacherStatistics[]>([]);
 const isLoading = ref(false);
 
-// 计算属性 - 统计数据
-const totalScore = computed(() => {
-  return gradeList.value.reduce((sum, g) => sum + (Number(g.totalScore) || 0), 0);
+const teacherCount = computed(() => teacherList.value.length);
+
+const totalApprovedScore = computed(() => {
+  return teacherList.value.reduce((sum, t) => sum + (Number(t.approvedScore) || 0), 0);
+});
+
+const totalApproved = computed(() => {
+  return teacherList.value.reduce((sum, t) => sum + (Number(t.approvedScore) || 0), 0);
+});
+
+const totalPending = computed(() => {
+  return teacherList.value.reduce((sum, t) => sum + (Number(t.pendingCount) || 0), 0);
+});
+
+const totalRejected = computed(() => {
+  return teacherList.value.reduce((sum, t) => sum + (Number(t.rejectedCount) || 0), 0);
 });
 
-// 处理开始时间变化
 const handleStartTimeChange = (e: any) => {
   startTime.value = e.detail.value;
-  console.log('选择的开始时间:', startTime.value);
 };
 
-// 处理结束时间变化
 const handleEndTimeChange = (e: any) => {
   endTime.value = e.detail.value;
-  console.log('选择的结束时间:', endTime.value);
 };
 
-
-// 加载年级汇总排名
-const loadPerformanceRanking = async () => {
+const loadStatistics = async () => {
   if (isLoading.value) return;
   
-  // 验证时间范围
   if (startTime.value && endTime.value && startTime.value > endTime.value) {
     uni.showToast({
       title: '开始时间不能大于结束时间',
@@ -191,8 +231,6 @@ const loadPerformanceRanking = async () => {
   
   isLoading.value = true;
   try {
-    console.log('加载业绩排名，时间范围:', startTime.value, '至', endTime.value);
-    
     const params: any = {};
     if (startTime.value) {
       params.startTime = startTime.value;
@@ -201,39 +239,82 @@ const loadPerformanceRanking = async () => {
       params.endTime = endTime.value;
     }
     
-    const response = await getPerformanceRankingByGradeApi(params);
-    console.log('年级排名API响应:', response);
+    const response = await jfStatisticsByTeacherApi(params);
+    console.log('统计API响应:', response);
     
     if (response && response.resultCode === 1) {
-      gradeList.value = response.result || [];
-      console.log('年级排名数据:', gradeList.value);
+      const rawData = response.result || [];
+      teacherList.value = processStatisticsData(rawData);
       
-      if (gradeList.value.length === 0) {
+      if (teacherList.value.length === 0) {
         uni.showToast({
           title: '暂无数据',
           icon: 'none'
         });
       }
     } else {
-      gradeList.value = [];
+      teacherList.value = [];
       uni.showToast({
         title: response?.message || '查询失败',
         icon: 'none'
       });
     }
   } catch (error) {
-    console.error('加载业绩排名失败:', error);
+    console.error('加载统计数据失败:', error);
     uni.showToast({
       title: '加载失败',
       icon: 'error'
     });
-    gradeList.value = [];
+    teacherList.value = [];
   } finally {
     isLoading.value = false;
   }
 };
 
-// 获取排名样式类
+const processStatisticsData = (rawData: any[]): TeacherStatistics[] => {
+  const teacherMap = new Map<string, TeacherStatistics>();
+  
+  rawData.forEach((item: any) => {
+    const jsId = item.jsId;
+    if (!jsId) return;
+    
+    if (!teacherMap.has(jsId)) {
+      teacherMap.set(jsId, {
+        jsId: jsId,
+        jsName: item.jsName || '未知',
+        approvedScore: 0,
+        calculatedScore: 0,
+        pendingCount: 0,
+        rejectedCount: 0,
+        draftCount: 0,
+        categories: []
+      });
+    }
+    
+    const teacher = teacherMap.get(jsId)!;
+    teacher.approvedScore += Number(item.approvedCount || 0);
+    teacher.calculatedScore += Number(item.calculatedScore || 0);
+    teacher.pendingCount += Number(item.pendingCount || 0);
+    teacher.rejectedCount += Number(item.rejectedCount || 0);
+    teacher.draftCount += Number(item.draftCount || 0);
+    
+    teacher.categories.push({
+      topTypeId: item.topTypeId,
+      topTypeName: item.topTypeName || '未分类',
+      approvedCount: Number(item.approvedCount || 0),
+      calculatedScore: Number(item.calculatedScore || 0),
+      pendingCount: Number(item.pendingCount || 0),
+      rejectedCount: Number(item.rejectedCount || 0),
+      draftCount: Number(item.draftCount || 0)
+    });
+  });
+  
+  const result = Array.from(teacherMap.values());
+  result.sort((a, b) => b.approvedScore - a.approvedScore);
+  
+  return result;
+};
+
 const getRankClass = (index: number) => {
   if (index === 0) return 'rank-gold';
   if (index === 1) return 'rank-silver';
@@ -241,38 +322,34 @@ const getRankClass = (index: number) => {
   return 'rank-normal';
 };
 
-// 加载更多（暂不需要，因为一次性加载所有数据）
 const loadMore = () => {
   // 预留接口
 };
 
-// 跳转到年级教师排名页 yjpm.vue
-const goToDetail = (njId?: string, njmc?: string) => {
-  if (!njId) {
+const goToDetail = (teacher: TeacherStatistics) => {
+  if (!teacher.jsId) {
     uni.showToast({
-      title: '缺少年级ID',
+      title: '缺少教师ID',
       icon: 'none'
     });
     return;
   }
   const start = startTime.value ? encodeURIComponent(startTime.value) : '';
   const end = endTime.value ? encodeURIComponent(endTime.value) : '';
-  const name = njmc ? encodeURIComponent(njmc) : '';
+  const name = teacher.jsName ? encodeURIComponent(teacher.jsName) : '';
+  const categories = encodeURIComponent(JSON.stringify(teacher.categories));
+  
   navigateTo(
-    `/pages/view/routine/JiFenPingJia/jftj/yjpm?njId=${njId}&njmc=${name}&startTime=${start}&endTime=${end}`
+    `/pages/view/routine/JiFenPingJia/jftj/yjpm?jsId=${teacher.jsId}&jsName=${name}&startTime=${start}&endTime=${end}&categories=${categories}`
   );
 };
 
-// 页面加载
 onMounted(() => {
-  console.log('业绩排名页面加载');
-  // 默认加载当年数据
-  loadPerformanceRanking();
+  loadStatistics();
 });
 
-// 页面显示时
 onShow(() => {
-  console.log('页面显示');
+  // 页面显示时可以刷新数据
 });
 </script>
 
@@ -284,7 +361,6 @@ onShow(() => {
   background: linear-gradient(180deg, #f0f5ff 0%, #f5f7fa 100%);
 }
 
-// 页面横幅样式
 .page-banner {
   background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
   padding: 20px 16px;
@@ -352,7 +428,6 @@ onShow(() => {
   }
 }
 
-// 时间筛选栏
 .filter-bar {
   display: flex;
   flex-direction: column;
@@ -382,52 +457,45 @@ onShow(() => {
   .filter-right {
     width: 100%;
     
-      .date-picker-wrapper {
-        display: flex;
-        align-items: center;
-        gap: 8px;
-        width: 100%;
+    .date-picker-wrapper {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      width: 100%;
+      
+      .date-picker {
+        flex: 1;
+        min-width: 0;
         
-        .date-picker {
-          flex: 1;
-          min-width: 0;
+        .picker-view {
+          display: flex;
+          flex-direction: column;
+          padding: 10px 12px;
+          background-color: #f5f7ff;
+          border-radius: 8px;
+          border: 1px solid #d4dbff;
           
-          .picker-view {
-            display: flex;
-            flex-direction: column;
-            padding: 10px 12px;
-            background-color: #f5f7ff;
-            border-radius: 8px;
-            border: 1px solid #d4dbff;
-            
-            .picker-label {
-              font-size: 11px;
-              color: #adb5bd;
-              margin-bottom: 4px;
-            }
-            
-            .picker-value {
-              font-size: 14px;
-              color: #212529;
-              font-weight: 500;
-              white-space: nowrap;
-              overflow: hidden;
-              text-overflow: ellipsis;
-            }
+          .picker-value {
+            font-size: 14px;
+            color: #212529;
+            font-weight: 500;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
           }
         }
-        
-        .date-separator {
-          font-size: 14px;
-          color: #666;
-          padding: 0 4px;
-          flex-shrink: 0;
-        }
       }
+      
+      .date-separator {
+        font-size: 14px;
+        color: #666;
+        padding: 0 4px;
+        flex-shrink: 0;
+      }
+    }
   }
 }
 
-// 内联查询按钮
 .query-btn-inline {
   flex-shrink: 0;
   height: 36px;
@@ -448,7 +516,6 @@ onShow(() => {
   }
 }
 
-// 统计摘要
 .summary-section {
   display: flex;
   justify-content: space-around;
@@ -476,7 +543,6 @@ onShow(() => {
   }
 }
 
-// 教师列表
 .teacher-list {
   flex: 1;
   overflow: hidden;
@@ -491,7 +557,6 @@ onShow(() => {
   }
 }
 
-// 教师卡片
 .teacher-card {
   background: linear-gradient(135deg, #ffffff 0%, #f5f7ff 100%);
   border-radius: 16px;
@@ -510,7 +575,6 @@ onShow(() => {
       0 0 0 1px rgba(102, 126, 234, 0.15);
   }
   
-  // 左侧彩条
   &::before {
     content: '';
     position: absolute;
@@ -597,6 +661,43 @@ onShow(() => {
   .teacher-info {
     padding: 12px 16px 16px 16px;
     
+    .stats-row {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 12px;
+      
+      .stat-item {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        flex: 1;
+        
+        .stat-label {
+          font-size: 11px;
+          color: #999;
+          margin-bottom: 4px;
+        }
+        
+        .stat-value {
+          font-size: 16px;
+          font-weight: 600;
+          
+          &.approved {
+            color: #52c41a;
+          }
+          &.pending {
+            color: #faad14;
+          }
+          &.rejected {
+            color: #ff4d4f;
+          }
+          &.draft {
+            color: #999;
+          }
+        }
+      }
+    }
+    
     .record-info {
       display: flex;
       align-items: center;
@@ -624,7 +725,6 @@ onShow(() => {
   }
 }
 
-// 加载状态
 .loading-indicator {
   display: flex;
   flex-direction: column;
@@ -644,7 +744,6 @@ onShow(() => {
   }
 }
 
-// 空状态
 .empty-state {
   display: flex;
   flex-direction: column;
@@ -671,7 +770,6 @@ onShow(() => {
   }
 }
 
-// 加载更多
 .loading-more {
   display: flex;
   align-items: center;
@@ -691,7 +789,6 @@ onShow(() => {
   }
 }
 
-// 动画
 @keyframes pulse {
   0%, 100% {
     opacity: 1;
@@ -703,4 +800,3 @@ onShow(() => {
   }
 }
 </style>
-
diff --git a/src/pages/view/routine/JiFenPingJia/jftj/yjpm.vue b/src/pages/view/routine/JiFenPingJia/jftj/yjpm.vue
index 40e6526..bb8747e 100644
--- a/src/pages/view/routine/JiFenPingJia/jftj/yjpm.vue
+++ b/src/pages/view/routine/JiFenPingJia/jftj/yjpm.vue
@@ -1,17 +1,17 @@
 <template>
-  <view class="performance-ranking-page">
+  <view class="performance-detail-page">
     <!-- 页面标题横幅 -->
     <view class="page-banner">
       <view class="banner-content">
         <view class="banner-title-wrapper">
-          <text class="banner-icon">🏆</text>
+          <text class="banner-icon">📊</text>
           <view class="banner-text">
-          <text class="banner-title">业绩排名</text>
-          <text class="banner-subtitle">{{ njmc || '教师积分排名统计' }}</text>
+            <text class="banner-title">{{ jsName || '教师' }}</text>
+            <text class="banner-subtitle">积分大类明细</text>
           </view>
         </view>
         <view class="total-score">
-          <text class="score-number">{{ totalScore }}</text>
+          <text class="score-number">{{ totalApprovedScore }}</text>
           <text class="score-label">总积分</text>
         </view>
       </view>
@@ -46,72 +46,80 @@
               <text class="picker-value">{{ endTime || '请选择' }}</text>
             </view>
           </picker>
-          <button class="query-btn-inline" @click="loadPerformanceRanking">查询</button>
+          <button class="query-btn-inline" @click="loadStatistics">查询</button>
         </view>
       </view>
     </view>
 
-    <!-- 统计摘要（暂时隐藏） -->
-    <!-- <view class="summary-section">
+    <!-- 汇总统计 -->
+    <view class="summary-section">
       <view class="summary-item">
-        <text class="summary-number">{{ teacherCount }}</text>
-        <text class="summary-label">教师数</text>
+        <text class="summary-number approved">{{ totalApprovedScore }}</text>
+        <text class="summary-label">已审批积分</text>
       </view>
       <view class="summary-item">
-        <text class="summary-number">{{ totalRecords }}</text>
-        <text class="summary-label">记录总数</text>
+        <text class="summary-number calculated">{{ totalCalculatedScore }}</text>
+        <text class="summary-label">公式计算</text>
       </view>
       <view class="summary-item">
-        <text class="summary-number">{{ completedCount }}</text>
-        <text class="summary-label">已完结</text>
+        <text class="summary-number pending">{{ totalPending }}</text>
+        <text class="summary-label">待审批</text>
       </view>
       <view class="summary-item">
-        <text class="summary-number">{{ pendingCount }}</text>
-        <text class="summary-label">待审核</text>
+        <text class="summary-number rejected">{{ totalRejected }}</text>
+        <text class="summary-label">已驳回</text>
       </view>
-    </view> -->
+    </view>
 
-    <!-- 教师排名列表 -->
-    <view class="teacher-list">
+    <!-- 大类明细列表 -->
+    <view class="category-list">
       <scroll-view 
         scroll-y 
         class="list-scroll-view"
-        @scrolltolower="loadMore"
-        lower-threshold="100"
       >
         <!-- 加载状态 -->
-        <view v-if="isLoading && rankingList.length === 0" class="loading-indicator">
+        <view v-if="isLoading && categoryList.length === 0" class="loading-indicator">
           <text class="loading-icon">⏳</text>
           <text class="loading-text">加载中...</text>
         </view>
 
-        <!-- 排名列表 -->
-        <template v-else-if="rankingList.length > 0">
+        <!-- 大类列表 -->
+        <template v-else-if="categoryList.length > 0">
           <view 
-            v-for="(teacher, index) in rankingList" 
-            :key="teacher.jsId" 
-            class="teacher-card"
+            v-for="(category, index) in categoryList" 
+            :key="category.topTypeId || index" 
+            class="category-card"
           >
-            <view class="card-main">
-              <!-- 排名标识 -->
-              <view class="rank-badge" :class="getRankClass(index)">
-                <text class="rank-number">{{ index + 1 }}</text>
-              </view>
-              
-              <!-- 教师姓名 -->
-              <text class="teacher-name">{{ teacher.jsName || '未知' }}</text>
-              
-              <!-- 积分徽章 -->
-              <view class="score-badge">
-                <text class="score-value">{{ teacher.totalScore || 0 }}</text>
+            <view class="card-header">
+              <view class="category-name">{{ category.topTypeName || '未分类' }}</view>
+              <view class="category-score">
+                <text class="score-value">{{ category.approvedCount || 0 }}</text>
                 <text class="score-unit">分</text>
               </view>
             </view>
             
-            <view class="teacher-info">
-              <view class="record-info" @click="goToDetail(teacher.jsId)">
-                <text class="record-text">记录 {{ teacher.recordCount || 0 }}条</text>
-                <text class="record-arrow">></text>
+            <view class="card-body">
+              <view class="stats-grid">
+                <view class="stat-cell clickable" @click="goToDetail(category, 'approvedCount')">
+                  <text class="stat-label">已审批积分</text>
+                  <text class="stat-value approved">{{ category.approvedCount || 0 }}</text>
+                </view>
+                <view class="stat-cell">
+                  <text class="stat-label">公式计算</text>
+                  <text class="stat-value calculated">{{ category.calculatedScore || 0 }}</text>
+                </view>
+                <view class="stat-cell clickable" @click="goToDetail(category, 'pendingCount')">
+                  <text class="stat-label">待审批</text>
+                  <text class="stat-value pending">{{ category.pendingCount || 0 }}</text>
+                </view>
+                <view class="stat-cell clickable" @click="goToDetail(category, 'rejectedCount')">
+                  <text class="stat-label">已驳回</text>
+                  <text class="stat-value rejected">{{ category.rejectedCount || 0 }}</text>
+                </view>
+                <view class="stat-cell clickable" @click="goToDetail(category, 'draftCount')">
+                  <text class="stat-label">暂存</text>
+                  <text class="stat-value draft">{{ category.draftCount || 0 }}</text>
+                </view>
               </view>
             </view>
           </view>
@@ -120,14 +128,8 @@
         <!-- 空状态 -->
         <view v-else class="empty-state">
           <text class="empty-icon">📊</text>
-          <text class="empty-text">暂无排名数据</text>
-          <text class="empty-hint">请选择时间范围进行查询</text>
-        </view>
-
-        <!-- 加载更多 -->
-        <view v-if="isLoading && rankingList.length > 0" class="loading-more">
-          <text class="loading-more-icon">⏳</text>
-          <text class="loading-more-text">加载中...</text>
+          <text class="empty-text">暂无数据</text>
+          <text class="empty-hint">该教师在此时间范围内没有积分记录</text>
         </view>
       </scroll-view>
     </view>
@@ -136,23 +138,20 @@
 
 <script lang="ts" setup>
 import { ref, computed, onMounted } from "vue";
-import { onShow, onLoad } from "@dcloudio/uni-app";
-import { getPerformanceRankingApi } from "@/api/base/jfApi";
+import { onLoad } from "@dcloudio/uni-app";
+import { jfStatisticsByTeacherApi } from "@/api/base/jfApi";
 import { navigateTo } from "@/utils/uniapp";
-import dayjs from "dayjs";
 
-// 教师排名数据接口
-interface TeacherRanking {
-  jsId: string;              // 教师ID
-  jsName: string;            // 教师姓名
-  totalScore: number;        // 总积分
-  recordCount: number;       // 记录数
-  completedCount: number;    // 已完结数量
-  pendingCount: number;      // 待审核数量
-  rejectedCount: number;     // 驳回数量
+interface CategoryStatistics {
+  topTypeId: string;
+  topTypeName: string;
+  approvedCount: number;
+  calculatedScore: number;
+  pendingCount: number;
+  rejectedCount: number;
+  draftCount: number;
 }
 
-// 获取当年开始和结束时间
 const getCurrentYearRange = () => {
   const year = new Date().getFullYear();
   return {
@@ -161,52 +160,45 @@ const getCurrentYearRange = () => {
   };
 };
 
-// 响应式数据
 const yearRange = getCurrentYearRange();
 const startTime = ref(yearRange.start);
 const endTime = ref(yearRange.end);
-const njId = ref<string>("");
-const njmc = ref<string>("");
-const rankingList = ref<TeacherRanking[]>([]);
+const jsId = ref<string>("");
+const jsName = ref<string>("");
+const categoryList = ref<CategoryStatistics[]>([]);
 const isLoading = ref(false);
 
-// 计算属性 - 统计数据
-const teacherCount = computed(() => rankingList.value.length);
-
-const totalScore = computed(() => {
-  return rankingList.value.reduce((sum, teacher) => sum + (Number(teacher.totalScore) || 0), 0);
+const totalApprovedScore = computed(() => {
+  return categoryList.value.reduce((sum, c) => sum + (Number(c.approvedCount) || 0), 0);
 });
 
-const totalRecords = computed(() => {
-  return rankingList.value.reduce((sum, teacher) => sum + (Number(teacher.recordCount) || 0), 0);
+const totalCalculatedScore = computed(() => {
+  return categoryList.value.reduce((sum, c) => sum + (Number(c.calculatedScore) || 0), 0);
 });
 
-const completedCount = computed(() => {
-  return rankingList.value.reduce((sum, teacher) => sum + (Number(teacher.completedCount) || 0), 0);
+const totalPending = computed(() => {
+  return categoryList.value.reduce((sum, c) => sum + (Number(c.pendingCount) || 0), 0);
 });
 
-const pendingCount = computed(() => {
-  return rankingList.value.reduce((sum, teacher) => sum + (Number(teacher.pendingCount) || 0), 0);
+const totalRejected = computed(() => {
+  return categoryList.value.reduce((sum, c) => sum + (Number(c.rejectedCount) || 0), 0);
+});
+
+const totalDraft = computed(() => {
+  return categoryList.value.reduce((sum, c) => sum + (Number(c.draftCount) || 0), 0);
 });
 
-// 处理开始时间变化
 const handleStartTimeChange = (e: any) => {
   startTime.value = e.detail.value;
-  console.log('选择的开始时间:', startTime.value);
 };
 
-// 处理结束时间变化
 const handleEndTimeChange = (e: any) => {
   endTime.value = e.detail.value;
-  console.log('选择的结束时间:', endTime.value);
 };
 
-
-// 加载业绩排名数据
-const loadPerformanceRanking = async () => {
-  if (isLoading.value) return;
+const loadStatistics = async () => {
+  if (isLoading.value || !jsId.value) return;
   
-  // 验证时间范围
   if (startTime.value && endTime.value && startTime.value > endTime.value) {
     uni.showToast({
       title: '开始时间不能大于结束时间',
@@ -217,113 +209,116 @@ const loadPerformanceRanking = async () => {
   
   isLoading.value = true;
   try {
-    console.log('加载业绩排名，时间范围:', startTime.value, '至', endTime.value);
-    
-    const params: any = {};
+    const params: any = {
+      jsId: jsId.value
+    };
     if (startTime.value) {
       params.startTime = startTime.value;
     }
     if (endTime.value) {
       params.endTime = endTime.value;
     }
-    if (njId.value) {
-      params.njId = njId.value;
-    }
     
-    const response = await getPerformanceRankingApi(params);
-    console.log('业绩排名API响应:', response);
+    const response = await jfStatisticsByTeacherApi(params);
+    console.log('教师大类统计API响应:', response);
     
     if (response && response.resultCode === 1) {
-      rankingList.value = response.result || [];
-      console.log('业绩排名数据:', rankingList.value);
+      const rawData = response.result || [];
+      categoryList.value = rawData.map((item: any) => ({
+        topTypeId: item.topTypeId,
+        topTypeName: item.topTypeName || '未分类',
+        approvedCount: Number(item.approvedCount || 0),
+        calculatedScore: Number(item.calculatedScore || 0),
+        pendingCount: Number(item.pendingCount || 0),
+        rejectedCount: Number(item.rejectedCount || 0),
+        draftCount: Number(item.draftCount || 0)
+      }));
       
-      if (rankingList.value.length === 0) {
+      if (categoryList.value.length === 0) {
         uni.showToast({
           title: '暂无数据',
           icon: 'none'
         });
       }
     } else {
-      rankingList.value = [];
+      categoryList.value = [];
       uni.showToast({
         title: response?.message || '查询失败',
         icon: 'none'
       });
     }
   } catch (error) {
-    console.error('加载业绩排名失败:', error);
+    console.error('加载教师大类统计失败:', error);
     uni.showToast({
       title: '加载失败',
       icon: 'error'
     });
-    rankingList.value = [];
+    categoryList.value = [];
   } finally {
     isLoading.value = false;
   }
 };
 
-// 获取排名样式类
-const getRankClass = (index: number) => {
-  if (index === 0) return 'rank-gold';
-  if (index === 1) return 'rank-silver';
-  if (index === 2) return 'rank-bronze';
-  return 'rank-normal';
-};
-
-// 加载更多（暂不需要，因为一次性加载所有数据）
-const loadMore = () => {
-  // 预留接口
-};
-
-// 跳转到详情页
-const goToDetail = (jsId: string) => {
-  if (!jsId) {
-    uni.showToast({
-      title: '缺少教师ID',
-      icon: 'none'
-    });
-    return;
-  }
-  navigateTo(`/pages/view/routine/JiFenPingJia/jftj/detail?jsId=${jsId}`);
-};
-
-// 页面加载
 onLoad((options) => {
-  if (options?.njId) {
-    njId.value = options.njId;
+  if (options?.jsId) {
+    jsId.value = options.jsId;
   }
-  if (options?.njmc) {
-    njmc.value = decodeURIComponent(options.njmc);
+  if (options?.jsName) {
+    jsName.value = decodeURIComponent(options.jsName);
   }
   if (options?.startTime) {
-    startTime.value = options.startTime;
+    startTime.value = decodeURIComponent(options.startTime);
   }
   if (options?.endTime) {
-    endTime.value = options.endTime;
+    endTime.value = decodeURIComponent(options.endTime);
+  }
+  
+  // 如果传入了 categories 参数，直接使用，否则重新请求
+  if (options?.categories) {
+    try {
+      const categories = JSON.parse(decodeURIComponent(options.categories));
+      if (Array.isArray(categories) && categories.length > 0) {
+        categoryList.value = categories;
+        return;
+      }
+    } catch (e) {
+      console.error('解析 categories 失败:', e);
+    }
   }
 });
 
 onMounted(() => {
-  console.log('业绩排名页面加载');
-  // 默认加载当年数据
-  loadPerformanceRanking();
+  // 如果没有从参数获取到数据，则从接口获取
+  if (categoryList.value.length === 0 && jsId.value) {
+    loadStatistics();
+  }
 });
 
-// 页面显示时
-onShow(() => {
-  console.log('页面显示');
-});
+const goToDetail = (category: CategoryStatistics, columnType: string) => {
+  const params = new URLSearchParams();
+  params.append('jsId', jsId.value);
+  params.append('topTypeId', category.topTypeId || '');
+  params.append('topTypeName', encodeURIComponent(category.topTypeName || ''));
+  params.append('columnType', columnType);
+  if (startTime.value) {
+    params.append('startTime', startTime.value);
+  }
+  if (endTime.value) {
+    params.append('endTime', endTime.value);
+  }
+  
+  navigateTo(`/pages/view/routine/JiFenPingJia/jftj/detail?${params.toString()}`);
+};
 </script>
 
 <style lang="scss" scoped>
-.performance-ranking-page {
+.performance-detail-page {
   display: flex;
   flex-direction: column;
   height: 100vh;
   background: linear-gradient(180deg, #f0f5ff 0%, #f5f7fa 100%);
 }
 
-// 页面横幅样式
 .page-banner {
   background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
   padding: 20px 16px;
@@ -391,7 +386,6 @@ onShow(() => {
   }
 }
 
-// 时间筛选栏
 .filter-bar {
   display: flex;
   flex-direction: column;
@@ -421,52 +415,45 @@ onShow(() => {
   .filter-right {
     width: 100%;
     
-      .date-picker-wrapper {
-        display: flex;
-        align-items: center;
-        gap: 8px;
-        width: 100%;
+    .date-picker-wrapper {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      width: 100%;
+      
+      .date-picker {
+        flex: 1;
+        min-width: 0;
         
-        .date-picker {
-          flex: 1;
-          min-width: 0;
+        .picker-view {
+          display: flex;
+          flex-direction: column;
+          padding: 10px 12px;
+          background-color: #f5f7ff;
+          border-radius: 8px;
+          border: 1px solid #d4dbff;
           
-          .picker-view {
-            display: flex;
-            flex-direction: column;
-            padding: 10px 12px;
-            background-color: #f5f7ff;
-            border-radius: 8px;
-            border: 1px solid #d4dbff;
-            
-            .picker-label {
-              font-size: 11px;
-              color: #adb5bd;
-              margin-bottom: 4px;
-            }
-            
-            .picker-value {
-              font-size: 14px;
-              color: #212529;
-              font-weight: 500;
-              white-space: nowrap;
-              overflow: hidden;
-              text-overflow: ellipsis;
-            }
+          .picker-value {
+            font-size: 14px;
+            color: #212529;
+            font-weight: 500;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
           }
         }
-        
-        .date-separator {
-          font-size: 14px;
-          color: #666;
-          padding: 0 4px;
-          flex-shrink: 0;
-        }
       }
+      
+      .date-separator {
+        font-size: 14px;
+        color: #666;
+        padding: 0 4px;
+        flex-shrink: 0;
+      }
+    }
   }
 }
 
-// 内联查询按钮
 .query-btn-inline {
   flex-shrink: 0;
   height: 36px;
@@ -487,7 +474,6 @@ onShow(() => {
   }
 }
 
-// 统计摘要
 .summary-section {
   display: flex;
   justify-content: space-around;
@@ -504,19 +490,30 @@ onShow(() => {
   gap: 6px;
   
   .summary-number {
-    font-size: 22px;
+    font-size: 20px;
     font-weight: bold;
-    color: #667eea;
+    
+    &.approved {
+      color: #52c41a;
+    }
+    &.calculated {
+      color: #1890ff;
+    }
+    &.pending {
+      color: #faad14;
+    }
+    &.rejected {
+      color: #ff4d4f;
+    }
   }
   
   .summary-label {
-    font-size: 12px;
+    font-size: 11px;
     color: #666;
   }
 }
 
-// 教师列表
-.teacher-list {
+.category-list {
   flex: 1;
   overflow: hidden;
   display: flex;
@@ -530,140 +527,145 @@ onShow(() => {
   }
 }
 
-// 教师卡片
-.teacher-card {
-  background: linear-gradient(135deg, #ffffff 0%, #f5f7ff 100%);
-  border-radius: 16px;
-  margin-bottom: 16px;
-  box-shadow: 
-    0 2px 16px rgba(0, 0, 0, 0.08),
-    0 0 0 1px rgba(102, 126, 234, 0.1);
-  position: relative;
+.category-card {
+  background: #ffffff;
+  border-radius: 12px;
+  margin-bottom: 12px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
   overflow: hidden;
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
   
-  &:active {
-    transform: translateY(2px) scale(0.98);
-    box-shadow: 
-      0 1px 8px rgba(0, 0, 0, 0.12),
-      0 0 0 1px rgba(102, 126, 234, 0.15);
-  }
-  
-  // 左侧彩条
-  &::before {
-    content: '';
-    position: absolute;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    width: 5px;
-    background: linear-gradient(180deg, #667eea 0%, #764ba2 100%);
-    border-radius: 16px 0 0 16px;
-  }
-  
-  .card-main {
-    display: flex;
-    align-items: center;
-    gap: 12px;
-    padding: 16px;
-    padding-left: 20px;
-    border-bottom: 1px solid #f0f0f0;
-  }
-  
-  .rank-badge {
-    width: 36px;
-    height: 36px;
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
-    flex-shrink: 0;
-    border: 2px solid #ffffff;
-    
-    .rank-number {
-      font-size: 14px;
-      font-weight: bold;
-      color: #ffffff;
-    }
-    
-    &.rank-gold {
-      background: linear-gradient(135deg, #ffd700 0%, #ffb300 100%);
-    }
-    
-    &.rank-silver {
-      background: linear-gradient(135deg, #c0c0c0 0%, #a8a8a8 100%);
-    }
-    
-    &.rank-bronze {
-      background: linear-gradient(135deg, #cd7f32 0%, #b87333 100%);
-    }
-    
-    &.rank-normal {
-      background: linear-gradient(135deg, #78909c 0%, #607d8b 100%);
-    }
-  }
-  
-  .teacher-name {
-    font-size: 18px;
-    font-weight: 700;
-    color: #1a202c;
-    flex: 1;
-  }
-  
-  .score-badge {
-    display: flex;
-    align-items: baseline;
-    gap: 2px;
+  &.total-card {
     background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    padding: 8px 14px;
-    border-radius: 20px;
-    box-shadow: 0 2px 8px rgba(102, 126, 234, 0.3);
-    flex-shrink: 0;
     
-    .score-value {
-      font-size: 20px;
-      font-weight: bold;
-      color: #ffffff;
+    .card-header {
+      border-bottom-color: rgba(255, 255, 255, 0.2);
+      
+      .category-name {
+        color: #ffffff;
+        
+        &.total {
+          font-size: 18px;
+        }
+      }
+      
+      .category-score {
+        background: rgba(255, 255, 255, 0.2);
+        
+        .score-value, .score-unit {
+          color: #ffffff;
+        }
+      }
     }
     
-    .score-unit {
-      font-size: 12px;
-      color: rgba(255, 255, 255, 0.9);
+    .card-body {
+      .stat-label {
+        color: rgba(255, 255, 255, 0.8) !important;
+      }
+      
+      .stat-value {
+        color: #ffffff !important;
+      }
     }
   }
   
-  .teacher-info {
-    padding: 12px 16px 16px 16px;
+  .card-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 14px 16px;
+    border-bottom: 1px solid #f0f0f0;
     
-    .record-info {
+    .category-name {
+      font-size: 16px;
+      font-weight: 600;
+      color: #1a202c;
+      flex: 1;
+    }
+    
+    .category-score {
       display: flex;
-      align-items: center;
-      justify-content: flex-end;
-      gap: 4px;
-      cursor: pointer;
-      user-select: none;
+      align-items: baseline;
+      gap: 2px;
+      background: linear-gradient(135deg, #52c41a 0%, #73d13d 100%);
+      padding: 6px 12px;
+      border-radius: 16px;
       
-      &:active {
-        opacity: 0.7;
-      }
-      
-      .record-text {
-        font-size: 14px;
-        color: #667eea;
-        font-weight: 500;
-      }
-      
-      .record-arrow {
+      .score-value {
         font-size: 16px;
-        color: #667eea;
-        font-weight: 600;
+        font-weight: bold;
+        color: #ffffff;
+      }
+      
+      .score-unit {
+        font-size: 11px;
+        color: rgba(255, 255, 255, 0.9);
+      }
+    }
+  }
+  
+  .card-body {
+    padding: 12px 16px;
+    
+    .stats-grid {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 8px;
+      
+      .stat-cell {
+        flex: 1;
+        min-width: 60px;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        padding: 8px 4px;
+        background: #f8f9fa;
+        border-radius: 8px;
+        
+        &.clickable {
+          cursor: pointer;
+          
+          &:active {
+            background: #e9ecef;
+            transform: scale(0.96);
+          }
+          
+          .stat-value {
+            text-decoration: underline;
+          }
+        }
+        
+        .stat-label {
+          font-size: 10px;
+          color: #999;
+          margin-bottom: 4px;
+          white-space: nowrap;
+        }
+        
+        .stat-value {
+          font-size: 14px;
+          font-weight: 600;
+          
+          &.approved {
+            color: #52c41a;
+          }
+          &.calculated {
+            color: #1890ff;
+          }
+          &.pending {
+            color: #faad14;
+          }
+          &.rejected {
+            color: #ff4d4f;
+          }
+          &.draft {
+            color: #999;
+          }
+        }
       }
     }
   }
 }
 
-// 加载状态
 .loading-indicator {
   display: flex;
   flex-direction: column;
@@ -683,7 +685,6 @@ onShow(() => {
   }
 }
 
-// 空状态
 .empty-state {
   display: flex;
   flex-direction: column;
@@ -710,27 +711,6 @@ onShow(() => {
   }
 }
 
-// 加载更多
-.loading-more {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 8px;
-  padding: 20px;
-  
-  .loading-more-icon {
-    font-size: 18px;
-    animation: pulse 1.5s ease-in-out infinite;
-  }
-  
-  .loading-more-text {
-    color: #667eea;
-    font-size: 14px;
-    font-weight: 500;
-  }
-}
-
-// 动画
 @keyframes pulse {
   0%, 100% {
     opacity: 1;
@@ -742,4 +722,3 @@ onShow(() => {
   }
 }
 </style>
-
diff --git a/src/pages/view/routine/RengJiaoRengZhi/index.vue b/src/pages/view/routine/RengJiaoRengZhi/index.vue
index 61e7ff3..46d0636 100644
--- a/src/pages/view/routine/RengJiaoRengZhi/index.vue
+++ b/src/pages/view/routine/RengJiaoRengZhi/index.vue
@@ -200,9 +200,8 @@ const setTeachInfo = (index: number, value: string) => {
 // 信息列表
 .info-list {
   background-color: #ffffff;
-  border-radius: 16rpx;
   overflow: hidden;
-  margin: 0 30rpx;
+  margin: 0;
 }
 
 .info-item {
diff --git a/src/pages/view/routine/da/jsda/index.vue b/src/pages/view/routine/da/jsda/index.vue
new file mode 100644
index 0000000..ba3c77e
--- /dev/null
+++ b/src/pages/view/routine/da/jsda/index.vue
@@ -0,0 +1,660 @@
+<template>
+  <view class="teacher-detail-page">
+    <!-- 顶部查询：教师类型 + 教师姓名 -->
+    <view class="top-query">
+      <view class="query-row">
+        <view class="query-type" @click="openJsTypePicker">
+          <text :class="{ placeholder: !queryJsType }">{{ queryJsType || '教师类型' }}</text>
+          <uni-icons type="right" size="14" color="#666"></uni-icons>
+        </view>
+        <view class="query-name">
+          <input
+            v-model="queryName"
+            class="name-input"
+            placeholder="教师姓名"
+            @confirm="onSearch"
+          />
+          <u-button text="搜索" type="primary" size="small" class="search-btn" @click="onSearch" />
+        </view>
+      </view>
+      <uni-popup ref="jsTypePopup" type="bottom" @change="onJsTypePopupChange">
+        <view class="js-type-picker">
+          <view
+            v-for="opt in jsTypeOptions"
+            :key="opt.value"
+            :class="['type-item', { active: queryJsType === opt.value }]"
+            @click="selectJsType(opt.value)"
+          >
+            {{ opt.label }}
+          </view>
+        </view>
+      </uni-popup>
+    </view>
+
+    <view class="page-header">
+      <view class="header-content">
+        <text class="page-title">{{ pageTitle }}</text>
+        <text class="total-count">共 {{ totalCount }} 人</text>
+      </view>
+    </view>
+
+    <scroll-view scroll-y class="list-scroll">
+      <view v-if="loading" class="loading-container">
+        <text class="loading-text">加载中...</text>
+      </view>
+      
+      <view v-else-if="!filteredTeachers.length" class="empty-container">
+        <text class="empty-text">暂无数据</text>
+      </view>
+
+      <view v-else class="teacher-list">
+        <view
+          class="teacher-item"
+          v-for="(teacher, index) in filteredTeachers"
+          :key="teacher.id"
+          @click="handleTeacherClick(teacher)"
+        >
+          <view class="item-left">
+            <view class="teacher-avatar">
+              <text class="avatar-text">{{ teacher.jsxm?.charAt(0) || '?' }}</text>
+            </view>
+            <view class="teacher-info">
+              <text class="teacher-name">{{ teacher.jsxm }}</text>
+              <text class="teacher-meta" v-if="teacher.jsdah">档案号：{{ teacher.jsdah }}</text>
+              <!-- 请假信息展示 -->
+              <view v-if="filterType === 'zdqk' && filterValue === '请假' && teacher.qjlx" class="leave-info">
+                <text class="leave-item">请假类型：{{ teacher.qjlx }}</text>
+                <text class="leave-item" v-if="teacher.qjkstime">开始时间：{{ formatDate(teacher.qjkstime) }}</text>
+                <text class="leave-item" v-if="teacher.qjjstime">结束时间：{{ formatDate(teacher.qjjstime) }}</text>
+                <text class="leave-item" v-if="teacher.qjsy">请假事由：{{ teacher.qjsy }}</text>
+              </view>
+              <!-- 调出原因展示 -->
+              <view v-if="filterType === 'zdqk' && filterValue === '调出' && teacher.dcyy" class="leave-info">
+                <text class="leave-item">调出原因：{{ teacher.dcyy }}</text>
+              </view>
+            </view>
+          </view>
+          <view class="item-right">
+            <text class="detail-arrow">›</text>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+    
+    <!-- 固定在底部的返回按钮 -->
+    <view v-if="filteredTeachers.length > 0" class="fixed-bottom">
+      <button class="back-btn" @click="handleBack">
+        返回
+      </button>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
+import { useCommonStore } from "@/store/modules/common";
+import { get } from "@/utils/request";
+import { dicFindByPidApi } from "@/api/base/server";
+
+interface Teacher {
+  id: string;
+  jsxm: string;
+  jsdah: string;
+  jsxbId?: string;
+  age?: number;
+  zhxlId?: string;
+  latestZcdjId?: string;
+  latestGwjbId?: string;
+  lxdh?: string;
+  jsType?: string;
+  zzmmId?: string;
+  jsgl?: number;
+  qjlx?: string; // 请假类型
+  qjkstime?: string; // 请假开始时间
+  qjjstime?: string; // 请假结束时间
+  qjsy?: string; // 请假事由
+  dcyy?: string; // 调出原因
+}
+
+const commonStore = useCommonStore();
+const filterType = ref(""); // 过滤类型：type/age/education/title/position/political/workingYears
+const filterValue = ref(""); // 过滤值
+const source = ref("");
+const xkIdParam = ref("");
+const teacherTypeParam = ref("all");
+
+// 顶部查询：教师类型（从字典获取）、教师姓名
+const queryJsType = ref(""); // 字典 dictionaryValue，空表示全部
+const queryName = ref("");
+const jsTypePopup = ref<any>(null);
+const jsTypeOptions = ref<{ label: string; value: string }[]>([]);
+const JS_TYPE_DICT_PID = "1472384467"; // 教师类型字典 pid（参考 zhxy-vue jsAccount）
+
+const pageTitle = computed(() => {
+  if (source.value === "club") {
+    if (teacherTypeParam.value === "inside") return "校内教师";
+    if (teacherTypeParam.value === "outside") return "校外教师";
+    return "课程教师";
+  }
+  let title = filterValue.value || "教师档案";
+  if (effectiveJsTypes.value.length > 0 && effectiveJsTypes.value.length < 2) {
+    title = `${effectiveJsTypes.value[0]} - ${title}`;
+  }
+  return title;
+});
+
+const totalCount = computed(() => filteredTeachers.value.length);
+
+const allTeachers = ref<Teacher[]>([]);
+const loading = ref(false);
+
+// 根据年龄范围过滤
+const filterByAge = (teacher: Teacher, ageRange: string) => {
+  const age = teacher.age;
+  if (!age) return false;
+  
+  switch (ageRange) {
+    case '25岁以下': return age < 25;
+    case '25-30岁': return age >= 25 && age <= 30;
+    case '31-35岁': return age >= 31 && age <= 35;
+    case '36-40岁': return age >= 36 && age <= 40;
+    case '41-45岁': return age >= 41 && age <= 45;
+    case '46-50岁': return age >= 46 && age <= 50;
+    case '51-54岁': return age >= 51 && age <= 54;
+    case '55岁以上': return age >= 55;
+    default: return false;
+  }
+};
+
+// 根据工龄范围过滤
+const filterByWorkingYears = (teacher: Teacher, yearsRange: string) => {
+  const years = teacher.jsgl;
+  if (!years) return false;
+  
+  switch (yearsRange) {
+    case '5年以下': return years < 5;
+    case '6-10年': return years >= 6 && years <= 10;
+    case '11-15年': return years >= 11 && years <= 15;
+    case '16-20年': return years >= 16 && years <= 20;
+    case '21-25年': return years >= 21 && years <= 25;
+    case '26-30年': return years >= 26 && years <= 30;
+    case '31-35年': return years >= 31 && years <= 35;
+    case '36-40年': return years >= 36 && years <= 40;
+    case '41年以上': return years >= 41;
+    default: return false;
+  }
+};
+
+const effectiveJsTypes = computed(() => {
+  return queryJsType.value ? [queryJsType.value] : [];
+});
+
+const filteredTeachers = computed(() => {
+  let result = allTeachers.value;
+  
+  if (source.value !== 'club' && effectiveJsTypes.value.length > 0) {
+    result = result.filter((teacher) => {
+      return effectiveJsTypes.value.includes(teacher.jsType || '');
+    });
+  }
+  
+  if (queryName.value.trim()) {
+    const kw = queryName.value.trim().toLowerCase();
+    result = result.filter((t) => (t.jsxm || '').toLowerCase().includes(kw));
+  }
+  
+  if (source.value === 'club' || !filterType.value || !filterValue.value) {
+    return result;
+  }
+  
+  return result.filter((teacher) => {
+    switch (filterType.value) {
+      case 'type':
+        return teacher.jsType === filterValue.value;
+      case 'age':
+        return filterByAge(teacher, filterValue.value);
+      case 'education':
+        return teacher.zhxlId === filterValue.value;
+      case 'title':
+        return teacher.latestZcdjId === filterValue.value;
+      case 'position':
+        return teacher.latestGwjbId === filterValue.value;
+      case 'political':
+        return teacher.zzmmId === filterValue.value;
+      case 'workingYears':
+        return filterByWorkingYears(teacher, filterValue.value);
+      case 'zdqk':
+        // 在岗情况过滤已在 fetchList 中处理，这里不需要再次过滤
+        return true;
+      default:
+        return true;
+    }
+  });
+});
+
+const fetchList = async () => {
+  loading.value = true;
+  try {
+    if (source.value === "club" && xkIdParam.value) {
+      const res = await get("/api/xkkc/statistics/clubTeacherDetail", {
+        xkId: xkIdParam.value,
+        teacherType: teacherTypeParam.value,
+      });
+      const list = res?.result || [];
+      allTeachers.value = list.map((item: any) => ({
+        id: item.id,
+        jsxm: item.name,
+        jsdah: item.archiveCode,
+        jsType: item.teacherType,
+        lxdh: item.phone,
+        deptName: item.deptName,
+      }));
+      return;
+    }
+    
+    // 如果在岗情况过滤，调用专门的接口
+    if (filterType.value === 'zdqk' && filterValue.value) {
+      const params: any = {
+        zdqkValue: filterValue.value,
+      };
+      if (queryJsType.value) {
+        params.jsTypes = queryJsType.value;
+      }
+      const res = await get("/api/js/statistics/zdqk/list", params);
+      const list = res?.result || res || [];
+      allTeachers.value = list.map((item: any) => ({
+        id: item.id,
+        jsxm: item.jsxm,
+        jsdah: item.jsdah,
+        jsType: item.jsType,
+        lxdh: item.lxdh,
+        jsxbId: item.jsxbId,
+        age: item.age,
+        zhxlId: item.zhxlId,
+        latestZcdjId: item.latestZcdjId,
+        latestGwjbId: item.latestGwjbId,
+        zzmmId: item.zzmmId,
+        jsgl: item.jsgl,
+        qjlx: item.qjlx,
+        qjkstime: item.qjkstime,
+        qjjstime: item.qjjstime,
+        qjsy: item.qjsy,
+        dcyy: item.dcyy,
+      }));
+      return;
+    }
+    
+    const res = await commonStore.getAllJs();
+    if (res?.resultCode === 1 && Array.isArray(res.result)) {
+      allTeachers.value = res.result;
+    } else if (Array.isArray(res)) {
+      allTeachers.value = res;
+    } else {
+      allTeachers.value = [];
+    }
+  } catch (error) {
+    console.error("获取教师列表失败", error);
+    allTeachers.value = [];
+    uni.showToast({
+      title: "加载失败",
+      icon: "none",
+    });
+  } finally {
+    loading.value = false;
+  }
+};
+
+const openJsTypePicker = () => {
+  jsTypePopup.value?.open();
+};
+
+const selectJsType = (value: string) => {
+  queryJsType.value = value;
+  jsTypePopup.value?.close();
+};
+
+const onJsTypePopupChange = () => {};
+
+// 加载教师类型字典，默认选中第一项
+const loadJsTypeDict = async () => {
+  try {
+    const res: any = await dicFindByPidApi({ pid: JS_TYPE_DICT_PID });
+    const data = Array.isArray(res) ? res : (res?.result || res?.data || res?.rows || []);
+    const options: { label: string; value: string }[] = [{ label: "全部", value: "" }];
+    data.forEach((d: any) => {
+      const val = d.dictionaryValue ?? d.dictionaryCode ?? d.dictValue ?? d.value ?? "";
+      const label = d.dictionaryValue ?? d.dictLabel ?? d.label ?? d.name ?? val;
+      if (val) options.push({ label: String(label), value: String(val) });
+    });
+    jsTypeOptions.value = options;
+    if (options.length > 1 && !queryJsType.value) {
+      queryJsType.value = options[1].value;
+    }
+  } catch (e) {
+    console.error("加载教师类型字典失败:", e);
+    jsTypeOptions.value = [{ label: "全部", value: "" }];
+  }
+};
+
+const onSearch = () => {
+  // 筛选由 computed 自动响应，此处可做键盘收起等
+  uni.hideKeyboard();
+};
+
+// 返回上一页
+const handleBack = () => {
+  uni.navigateBack();
+};
+
+// 点击教师名称跳转到教师档案查看页面
+const handleTeacherClick = (teacher: Teacher) => {
+  uni.navigateTo({
+    url: `/pages/statistics/teacher/jsdtal?id=${teacher.id}`,
+  });
+};
+
+// 性别解析
+const parseGender = (jsxbId?: string) => {
+  if (!jsxbId) return '-';
+  if (jsxbId === '1' || jsxbId === '男') return '男';
+  if (jsxbId === '2' || jsxbId === '女') return '女';
+  return jsxbId;
+};
+
+// 格式化日期
+const formatDate = (dateStr?: string) => {
+  if (!dateStr) return '-';
+  try {
+    const date = new Date(dateStr);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
+  } catch (e) {
+    return dateStr;
+  }
+};
+
+onLoad(async (options: any) => {
+  if (options.filterType) {
+    filterType.value = decodeURIComponent(options.filterType);
+  }
+  if (options.filterValue) {
+    filterValue.value = decodeURIComponent(options.filterValue);
+  }
+  if (options.source) {
+    source.value = options.source;
+  }
+  if (options.xkId) {
+    xkIdParam.value = options.xkId;
+  }
+  if (options.teacherType) {
+    teacherTypeParam.value = options.teacherType;
+  }
+  if (options.type && !options.filterType) {
+    filterType.value = "type";
+    filterValue.value = decodeURIComponent(options.type);
+  }
+  await loadJsTypeDict();
+  fetchList();
+});
+</script>
+
+<style scoped lang="scss">
+.teacher-detail-page {
+  min-height: 100vh;
+  background: #f4f6fb;
+  display: flex;
+  flex-direction: column;
+}
+
+.page-header {
+  flex-shrink: 0;
+  background: #ffffff;
+  padding: 24rpx 30rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06);
+}
+
+.header-content {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.page-title {
+  font-size: 36rpx;
+  font-weight: 600;
+  color: #1f2933;
+}
+
+.total-count {
+  font-size: 26rpx;
+  color: #6b7280;
+}
+
+.top-query {
+  margin-top: 0;
+  padding: 24rpx;
+  background: #fff;
+  border-bottom: 1rpx solid #eee;
+}
+.query-row {
+  display: flex;
+  gap: 20rpx;
+  align-items: center;
+}
+.query-type {
+  flex-shrink: 0;
+  width: 200rpx;
+  padding: 20rpx 24rpx;
+  background: #f5f5f5;
+  border-radius: 12rpx;
+  font-size: 28rpx;
+  color: #333;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  &.placeholder { color: #999; }
+}
+.query-name {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  gap: 16rpx;
+  align-items: center;
+  .name-input {
+    flex: 1;
+    height: 72rpx;
+    padding: 0 24rpx;
+    font-size: 28rpx;
+    background: #f5f5f5;
+    border-radius: 12rpx;
+  }
+  .search-btn { flex-shrink: 0; width: 140rpx !important; }
+}
+.js-type-picker {
+  padding: 32rpx;
+  background: #fff;
+  border-radius: 24rpx 24rpx 0 0;
+}
+.type-item {
+  padding: 28rpx;
+  font-size: 30rpx;
+  color: #333;
+  border-bottom: 1rpx solid #eee;
+  &:last-child { border-bottom: none; }
+  &.active { color: #3b82f6; font-weight: 600; }
+}
+
+.list-scroll {
+  flex: 1;
+  margin-top: 0;
+  padding: 24rpx 0 160rpx 0;
+  background-color: #f4f6fb;
+}
+
+.loading-container,
+.empty-container {
+  min-height: 400rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 0 30rpx;
+}
+
+.loading-text,
+.empty-text {
+  font-size: 28rpx;
+  color: #9ca3af;
+}
+
+.teacher-list {
+  display: flex;
+  flex-direction: column;
+  gap: 0;  // 移除gap，使用margin控制间距
+  padding: 0 30rpx;  // 左右padding
+}
+
+.teacher-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx;
+  margin-bottom: 24rpx;
+  background: linear-gradient(135deg, #ffffff 0%, #f7f9fc 100%);
+  border-radius: 20rpx;
+  border: 1px solid rgba(59, 130, 246, 0.15);
+  box-shadow: 0 2rpx 8rpx rgba(59, 130, 246, 0.08);
+  transition: all 0.3s ease;
+  cursor: pointer;
+  
+  &:last-child {
+    margin-bottom: 0;
+  }
+  
+  &:hover {
+    transform: translateY(-2rpx);
+    box-shadow: 0 4rpx 16rpx rgba(59, 130, 246, 0.15);
+    border-color: rgba(59, 130, 246, 0.3);
+  }
+  
+  &:active {
+    transform: translateY(0);
+    box-shadow: 0 2rpx 12rpx rgba(59, 130, 246, 0.12);
+  }
+}
+
+.item-left {
+  display: flex;
+  align-items: center;
+  gap: 24rpx;
+  flex: 1;
+  min-width: 0;
+}
+
+.teacher-avatar {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  box-shadow: 0 4rpx 12rpx rgba(102, 126, 234, 0.3);
+}
+
+.avatar-text {
+  color: #ffffff;
+  font-size: 32rpx;
+  font-weight: 600;
+}
+
+.teacher-info {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 8rpx;
+  min-width: 0;
+}
+
+.teacher-name {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #1f2933;
+  line-height: 1.3;
+}
+
+.teacher-meta {
+  font-size: 24rpx;
+  color: #6b7280;
+  line-height: 1.2;
+}
+
+.leave-info {
+  margin-top: 12rpx;
+  padding: 16rpx;
+  background: #fef3c7;
+  border-radius: 8rpx;
+  border-left: 4rpx solid #f59e0b;
+  display: flex;
+  flex-direction: column;
+  gap: 8rpx;
+}
+
+.leave-item {
+  font-size: 24rpx;
+  color: #92400e;
+  line-height: 1.4;
+}
+
+.item-right {
+  flex-shrink: 0;
+  padding-left: 16rpx;
+}
+
+.detail-arrow {
+  font-size: 48rpx;
+  color: #9ca3af;
+  font-weight: 300;
+  line-height: 1;
+}
+
+// 固定在底部的返回按钮
+.fixed-bottom {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: #ffffff;
+  padding: 24rpx;
+  box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.08);
+  z-index: 100;
+}
+
+.back-btn {
+  width: 100%;
+  height: 88rpx;
+  line-height: 88rpx;
+  background: #3b82f6;
+  color: #ffffff;
+  border: none;
+  border-radius: 16rpx;
+  font-size: 32rpx;
+  font-weight: 600;
+  box-shadow: 0 4rpx 16rpx rgba(59, 130, 246, 0.3);
+  transition: all 0.3s;
+  
+  &:hover {
+    background: #2563eb;
+    box-shadow: 0 6rpx 20rpx rgba(59, 130, 246, 0.4);
+  }
+  
+  &:active {
+    transform: scale(0.98);
+    background: #1d4ed8;
+  }
+}
+</style>
+
diff --git a/src/pages/view/routine/da/jzda/index.vue b/src/pages/view/routine/da/jzda/index.vue
new file mode 100644
index 0000000..f6d34df
--- /dev/null
+++ b/src/pages/view/routine/da/jzda/index.vue
@@ -0,0 +1,312 @@
+<template>
+  <view class="parent-archive-page">
+    <!-- 顶部区域：可选范围 + 按家长姓名搜索 -->
+    <view class="top-section">
+      <view class="selector-picker" @click="openStudentPicker">
+        <text :class="{ placeholder: !pickerDisplayText }">{{ pickerDisplayText || '可选年级、班级或学生筛选' }}</text>
+        <view class="selector-actions">
+          <view v-if="queryScope" class="clear-btn" @click.stop="clearQueryScope">×</view>
+          <uni-icons type="right" size="16" color="#666"></uni-icons>
+        </view>
+      </view>
+      <view class="search-section">
+        <view class="search-box">
+          <BasicSearch
+            placeholder="按家长姓名搜索"
+            v-model="searchKeyword"
+            @search="onSearch"
+          />
+          <u-button text="搜索" type="primary" size="small" class="search-btn" @click="onSearch" />
+        </view>
+      </view>
+    </view>
+
+    <!-- 家长档案列表（z-paging 滚动加载） -->
+    <view class="list-section">
+      <z-paging
+        ref="pagingRef"
+        v-model="parentList"
+        @query="queryData"
+        :auto="true"
+        :refresher-enabled="true"
+        :loading-more-enabled="true"
+        :default-page-size="20"
+        :show-loading-more-no-more-view="true"
+        :fixed="false"
+        class="paging-container"
+      >
+        <template #top>
+          <view class="list-header">家长档案 (共 {{ totalCount }} 人)</view>
+        </template>
+        <view
+          v-for="parent in parentList"
+          :key="parent.jzId"
+          class="parent-item"
+          @click="viewParentDetail(parent)"
+        >
+          <view class="parent-row">
+            <text class="label">家长姓名：</text>
+            <text class="value">{{ parent.jzxm || '-' }}</text>
+          </view>
+          <view class="parent-row">
+            <text class="label">联系方式：</text>
+            <text class="value link" @click.stop="contactParent(parent)">{{ parent.jzsj || '-' }}</text>
+          </view>
+          <view class="parent-row">
+            <text class="label">单位：</text>
+            <text class="value">{{ parent.gzdw || '-' }}</text>
+          </view>
+          <view class="parent-row">
+            <text class="label">与学生关系：</text>
+            <text class="value">{{ parent.jzxsgxId || '-' }}</text>
+          </view>
+          <view class="parent-row">
+            <text class="label">学生姓名：</text>
+            <text class="value">{{ parent.xsxm || '-' }}</text>
+          </view>
+          <view class="parent-row">
+            <text class="label">所在年级班级：</text>
+            <text class="value">{{ (parent.njmc || '') + (parent.bjmc || '') || '-' }}</text>
+          </view>
+        </view>
+      </z-paging>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed } from 'vue'
+import BasicSearch from '@/components/BasicSearch/Search.vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { findParentArchivePageApi } from '@/api/routine/jz'
+
+interface QueryScope {
+  njIds?: string
+  bjIds?: string
+  xsIds?: string
+  displayText: string
+}
+
+interface ParentInfo {
+  jzId: string
+  jzxm: string
+  jzsj?: string
+  gzdw?: string
+  jzxsgxId?: string
+  njmc?: string
+  bjmc?: string
+  xsIds?: string
+  xsxm?: string
+}
+
+const queryScope = ref<QueryScope | null>(null)
+const pickerDisplayText = computed(() => queryScope.value?.displayText || '')
+const parentList = ref<ParentInfo[]>([])
+const searchKeyword = ref('')
+const pagingRef = ref<any>(null)
+const totalCount = ref(0)
+
+// 打开学生选择器：统一传递 njIds、bjIds、xsIds 供后端多条件查询
+const openStudentPicker = () => {
+  uni.$once('studentPickerConfirm', (students: any[]) => {
+    if (students && students.length > 0) {
+      const njIdSet = [...new Set(students.map((s: any) => s.njId).filter(Boolean))]
+      const bjIdSet = [...new Set(students.map((s: any) => s.bjId).filter(Boolean))]
+      const xsIdList = students.map((s: any) => s.xsId || s.id).filter(Boolean)
+      let displayText: string
+      if (bjIdSet.length === 1 && njIdSet.length === 1) {
+        displayText = students[0]?.bc || [students[0]?.njmc, students[0]?.bjmc].filter(Boolean).join('') || '已选班级'
+      } else if (njIdSet.length === 1) {
+        displayText = bjIdSet.length > 1 ? `已选 ${bjIdSet.length} 个班级` : (students[0]?.njmc || '已选年级')
+      } else if (students.length <= 5) {
+        displayText = students.map((s: any) => s.xsxm || s.xm).join('、')
+      } else {
+        displayText = `已选 ${students.length} 人`
+      }
+      queryScope.value = {
+        njIds: njIdSet.length > 0 ? njIdSet.join(',') : undefined,
+        bjIds: bjIdSet.length > 0 ? bjIdSet.join(',') : undefined,
+        xsIds: xsIdList.length > 0 ? xsIdList.join(',') : undefined,
+        displayText
+      }
+      searchKeyword.value = ''
+      pagingRef.value?.reload()
+    }
+  })
+  uni.navigateTo({
+    url: '/pages/components/StudentPicker/index?showGrade=true&showClass=true&showStudent=true&multiple=true'
+  })
+}
+
+const clearQueryScope = () => {
+  queryScope.value = null
+  pagingRef.value?.reload()
+}
+
+const onSearch = (_keyword?: string) => {
+  pagingRef.value?.reload()
+}
+
+const queryData = async (pageNo: number, pageSize: number) => {
+  const scope = queryScope.value
+  const njIds = scope?.njIds
+  const bjIds = scope?.bjIds
+  const xsIds = scope?.xsIds
+  const jzxm = searchKeyword.value?.trim() || undefined
+  if (!njIds && !bjIds && !xsIds && !jzxm) {
+    pagingRef.value?.complete([])
+    return
+  }
+  try {
+    const res = await findParentArchivePageApi({
+      njIds,
+      bjIds,
+      xsIds,
+      jzxm,
+      page: pageNo,
+      rows: pageSize
+    })
+    const result = (res as any)?.data || res
+    let rows: ParentInfo[] = []
+    if (result?.rows && Array.isArray(result.rows)) {
+      rows = result.rows
+      totalCount.value = result.records ?? 0
+    }
+    pagingRef.value?.complete(rows)
+  } catch (error) {
+    console.error('查询家长档案失败:', error)
+    uni.showToast({ title: '查询失败', icon: 'none' })
+    pagingRef.value?.complete([])
+  }
+}
+
+const viewParentDetail = (parent: ParentInfo) => {
+  const info = [
+    parent.jzxm ? `家长：${parent.jzxm}` : '',
+    parent.jzsj ? `电话：${parent.jzsj}` : '',
+    parent.gzdw ? `单位：${parent.gzdw}` : '',
+    parent.jzxsgxId ? `关系：${parent.jzxsgxId}` : '',
+    parent.xsxm ? `子女：${parent.xsxm}` : '',
+    (parent.njmc || parent.bjmc) ? `班级：${parent.njmc || ''}${parent.bjmc || ''}` : ''
+  ]
+    .filter(Boolean)
+    .join('\n')
+  if (info) {
+    uni.showModal({
+      title: '家长档案',
+      content: info,
+      showCancel: true,
+      cancelText: '关闭',
+      confirmText: '拨打电话',
+      success: (res) => {
+        if (res.confirm && parent.jzsj) uni.makePhoneCall({ phoneNumber: parent.jzsj })
+      }
+    })
+  }
+}
+
+const contactParent = (parent: ParentInfo) => {
+  if (parent.jzsj) {
+    uni.makePhoneCall({ phoneNumber: parent.jzsj })
+  } else {
+    uni.showToast({ title: '暂无联系电话', icon: 'none' })
+  }
+}
+
+onLoad(() => {})
+</script>
+
+<style lang="scss" scoped>
+.parent-archive-page {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  background-color: #f5f5f5;
+}
+
+.top-section {
+  flex-shrink: 0;
+  background-color: #fff;
+  padding: 24rpx;
+  border-bottom: 1rpx solid #eee;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06);
+}
+
+.search-section {
+  margin-top: 20rpx;
+}
+
+.search-section .search-box {
+  display: flex;
+  gap: 20rpx;
+  align-items: center;
+  & > *:first-child { flex: 1; min-width: 0; }
+  .search-btn { flex-shrink: 0; width: 140rpx !important; }
+}
+
+.selector-picker {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 24rpx 20rpx;
+  background-color: #fff;
+  border: 1rpx solid #eee;
+  border-radius: 12rpx;
+  font-size: 28rpx;
+  color: #333;
+  &.placeholder { color: #999; }
+  .selector-actions {
+    display: flex;
+    align-items: center;
+    gap: 16rpx;
+  }
+  .clear-btn {
+    font-size: 36rpx;
+    color: #999;
+    width: 48rpx;
+    height: 48rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #f5f5f5;
+    border-radius: 50%;
+  }
+}
+
+/* 列表区域：必须明确高度，z-paging 的 scroll-view 才能正常滚动 */
+.list-section {
+  flex: 1;
+  min-height: 0;
+  overflow: hidden;
+  background-color: #f5f5f5;
+}
+
+.list-header {
+  font-size: 30rpx;
+  font-weight: bold;
+  color: #333;
+  padding: 20rpx 0;
+}
+
+.paging-container {
+  height: 100%;
+  padding: 20rpx;
+  box-sizing: border-box;
+}
+
+.parent-item {
+  background: #fff;
+  border-radius: 16rpx;
+  padding: 24rpx;
+  margin-bottom: 20rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
+}
+
+.parent-row {
+  font-size: 28rpx;
+  line-height: 48rpx;
+  color: #333;
+  .label { color: #999; margin-right: 8rpx; }
+  .value.link { color: #007aff; }
+}
+</style>
diff --git a/src/pages/view/routine/da/xsda/studentArchive.vue b/src/pages/view/routine/da/xsda/studentArchive.vue
new file mode 100644
index 0000000..afb5a0f
--- /dev/null
+++ b/src/pages/view/routine/da/xsda/studentArchive.vue
@@ -0,0 +1,450 @@
+<template>
+  <view class="student-archive-page">
+    <!-- 顶部区域：可选年级班级学生 + 按学生姓名搜索（与 jzda 一致） -->
+    <view class="top-section">
+      <view class="selector-picker" @click="openStudentPicker">
+        <text :class="{ placeholder: !pickerDisplayText }">{{ pickerDisplayText || '可选年级、班级或学生筛选' }}</text>
+        <view class="selector-actions">
+          <view v-if="queryScope" class="clear-btn" @click.stop="clearQueryScope">×</view>
+          <uni-icons type="right" size="16" color="#666"></uni-icons>
+        </view>
+      </view>
+      <view class="search-section">
+        <view class="search-box">
+          <BasicSearch
+            placeholder="按学生姓名搜索"
+            v-model="searchKeyword"
+            @search="onSearch"
+          />
+          <u-button text="搜索" type="primary" size="small" class="search-btn" @click="onSearch" />
+        </view>
+      </view>
+    </view>
+
+    <!-- 学生档案统计 -->
+    <view class="section" v-if="queryScope || searchKeyword.trim()">
+      <view class="section-title">学生档案统计</view>
+      <view class="stats-container">
+        <view
+          class="stat-item"
+          :class="{ active: selectedStatType === 'all' }"
+          @click="onStatItemClick('all')"
+        >
+          <text class="stat-number">{{ studentList.length }}</text>
+          <text class="stat-label">总人数</text>
+        </view>
+        <view
+          class="stat-item"
+          :class="{ active: selectedStatType === 'followed' }"
+          @click="onStatItemClick('followed')"
+        >
+          <text class="stat-number followed">{{ followedCount }}</text>
+          <text class="stat-label">已关注</text>
+        </view>
+        <view
+          class="stat-item"
+          :class="{ active: selectedStatType === 'unfollowed' }"
+          @click="onStatItemClick('unfollowed')"
+        >
+          <text class="stat-number unfollowed">{{ unfollowedCount }}</text>
+          <text class="stat-label">未关注</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 学生档案列表 -->
+    <view class="section" v-if="queryScope || searchKeyword.trim()">
+      <view class="section-title">{{ getListTitle() }} ({{ filteredStudentList.length }}人)</view>
+      <view v-if="loading" class="loading-text">加载中...</view>
+      <view v-else-if="!filteredStudentList.length" class="empty-text">暂无学生档案数据</view>
+      <view v-else class="student-list">
+        <view class="student-grid">
+          <view
+            v-for="student in filteredStudentList"
+            :key="student.xsId"
+            class="student-item bg-white r-md p-12"
+            @click="viewStudentDetail(student)"
+          >
+            <view class="flex-row items-center">
+              <view class="avatar-container mr-8">
+                <image
+                  class="student-avatar"
+                  :src="imagUrl(student.xstx || '') || '/static/images/default-avatar.png'"
+                  mode="aspectFill"
+                />
+              </view>
+              <view class="flex-1 overflow-hidden">
+                <view class="student-name mb-8">
+                  <text class="font-14 cor-333">{{ student.xsxm }}</text>
+                </view>
+                <view class="flex-row">
+                  <view
+                    class="status-tag"
+                    :class="getFollowStatusClass(student.jzxm)"
+                  >
+                    {{ student.jzxm ? '已关注' : '未关注' }}
+                  </view>
+                </view>
+              </view>
+              <view class="arrow-icon-container" @click.stop="viewStudentDetail(student)">
+                <image class="arrow-icon" src="/static/base/view/more.png" mode="aspectFit" />
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 空状态：未选择未搜索 -->
+    <view class="empty-state" v-if="!queryScope && !searchKeyword.trim()">
+      <view class="empty-icon">📚</view>
+      <view class="empty-text">请输入学生姓名搜索或选择年级、班级、学生</view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed } from 'vue'
+import BasicSearch from '@/components/BasicSearch/Search.vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { findStudentArchiveApi } from '@/api/analysis/xs'
+import { imagUrl } from '@/utils'
+import { useDataStore } from '@/store/modules/data'
+
+interface QueryScope {
+  njIds?: string
+  bjIds?: string
+  xsIds?: string
+  displayText: string
+}
+
+interface StudentInfo {
+  xsId: string
+  xsxm: string
+  xstx?: string
+  njId: string
+  njmcId: string
+  njmc: string
+  bc: string
+  bjId: string
+  bjmc: string
+  jzIds?: string
+  jzxm?: string
+  xb?: string
+  sfzh?: string
+  cstime?: string
+}
+
+const queryScope = ref<QueryScope | null>(null)
+const pickerDisplayText = computed(() => queryScope.value?.displayText || '')
+const studentList = ref<StudentInfo[]>([])
+const searchKeyword = ref('')
+const loading = ref(false)
+const selectedStatType = ref<string>('all')
+
+const { setXs } = useDataStore()
+
+const followedCount = computed(() => studentList.value.filter((s) => s.jzxm).length)
+const unfollowedCount = computed(() => studentList.value.filter((s) => !s.jzxm).length)
+
+const filteredStudentList = computed(() => {
+  let list = studentList.value
+  if (selectedStatType.value === 'followed') list = list.filter((s) => s.jzxm)
+  else if (selectedStatType.value === 'unfollowed') list = list.filter((s) => !s.jzxm)
+  return list
+})
+
+// 打开学生选择器：统一传递 njIds、bjIds、xsIds 供后端多条件查询
+const openStudentPicker = () => {
+  uni.$once('studentPickerConfirm', (students: any[]) => {
+    if (students && students.length > 0) {
+      const njIdSet = [...new Set(students.map((s: any) => s.njId).filter(Boolean))]
+      const bjIdSet = [...new Set(students.map((s: any) => s.bjId).filter(Boolean))]
+      const xsIdList = students.map((s: any) => s.xsId || s.id).filter(Boolean)
+      let displayText: string
+      if (bjIdSet.length === 1 && njIdSet.length === 1) {
+        displayText = students[0]?.bc || [students[0]?.njmc, students[0]?.bjmc].filter(Boolean).join('') || '已选班级'
+      } else if (njIdSet.length === 1) {
+        displayText = bjIdSet.length > 1 ? `已选 ${bjIdSet.length} 个班级` : (students[0]?.njmc || '已选年级')
+      } else if (students.length <= 5) {
+        displayText = students.map((s: any) => s.xsxm || s.xm).join('、')
+      } else {
+        displayText = `已选 ${students.length} 人`
+      }
+      queryScope.value = {
+        njIds: njIdSet.length > 0 ? njIdSet.join(',') : undefined,
+        bjIds: bjIdSet.length > 0 ? bjIdSet.join(',') : undefined,
+        xsIds: xsIdList.length > 0 ? xsIdList.join(',') : undefined,
+        displayText
+      }
+      searchKeyword.value = ''
+      loadStudents()
+    }
+  })
+  uni.navigateTo({
+    url: '/pages/components/StudentPicker/index?showGrade=true&showClass=true&showStudent=true&multiple=true'
+  })
+}
+
+const clearQueryScope = () => {
+  queryScope.value = null
+  studentList.value = []
+}
+
+const onSearch = () => {
+  loadStudents()
+}
+
+const loadStudents = async () => {
+  const scope = queryScope.value
+  const njIds = scope?.njIds
+  const bjIds = scope?.bjIds
+  const xsIds = scope?.xsIds
+  const xsxm = searchKeyword.value?.trim() || undefined
+  if (!njIds && !bjIds && !xsIds && !xsxm) {
+    studentList.value = []
+    return
+  }
+  loading.value = true
+  try {
+    const res: any = await findStudentArchiveApi({ njIds, bjIds, xsIds, xsxm })
+    const list = res?.result || res?.data || []
+    studentList.value = Array.isArray(list) ? list : []
+  } catch (error) {
+    console.error('查询学生档案失败:', error)
+    uni.showToast({ title: '查询失败', icon: 'none' })
+    studentList.value = []
+  } finally {
+    loading.value = false
+  }
+}
+
+const onStatItemClick = (statType: string) => {
+  selectedStatType.value = statType
+}
+
+const getListTitle = () => {
+  switch (selectedStatType.value) {
+    case 'followed': return '已关注学生'
+    case 'unfollowed': return '未关注学生'
+    default: return '学生档案列表'
+  }
+}
+
+const getFollowStatusClass = (jzxm?: string) => (jzxm ? 'status-followed' : 'status-unfollowed')
+
+const viewStudentDetail = (student: StudentInfo) => {
+  setXs({
+    xsId: student.xsId,
+    id: student.xsId,
+    xsxm: student.xsxm,
+    xm: student.xsxm,
+    xstx: student.xstx,
+    avatar: student.xstx,
+    njId: student.njId,
+    njmc: student.njmc,
+    njmcName: student.njmc,
+    bjId: student.bjId,
+    bjmc: student.bjmc,
+    jzIds: student.jzIds,
+    jzxm: student.jzxm,
+    xb: student.xb,
+    sfzh: student.sfzh,
+    cstime: student.cstime
+  })
+  uni.navigateTo({ url: '/pages/view/homeSchool/parentAddressBook/detail' })
+}
+
+onLoad(() => {})
+</script>
+
+<style lang="scss" scoped>
+.student-archive-page {
+  min-height: 100vh;
+  background-color: #f5f5f5;
+  padding: 20rpx;
+}
+
+.top-section {
+  background-color: #fff;
+  padding: 24rpx;
+  border-radius: 16rpx;
+  margin-bottom: 20rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06);
+}
+
+.search-section {
+  margin-top: 20rpx;
+}
+
+.search-section .search-box {
+  display: flex;
+  gap: 20rpx;
+  align-items: center;
+  & > *:first-child { flex: 1; min-width: 0; }
+  .search-btn { flex-shrink: 0; width: 140rpx !important; }
+}
+
+.selector-picker {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 24rpx 20rpx;
+  background-color: #f5f5f5;
+  border-radius: 12rpx;
+  font-size: 28rpx;
+  color: #333;
+  &.placeholder { color: #999; }
+  .selector-actions {
+    display: flex;
+    align-items: center;
+    gap: 16rpx;
+  }
+  .clear-btn {
+    font-size: 36rpx;
+    color: #999;
+    width: 48rpx;
+    height: 48rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #eee;
+    border-radius: 50%;
+  }
+}
+
+.section {
+  background-color: #fff;
+  border-radius: 16rpx;
+  padding: 30rpx;
+  margin-bottom: 20rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+}
+
+.section-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 20rpx;
+}
+
+.stats-container {
+  display: flex;
+  justify-content: space-around;
+  margin-bottom: 20rpx;
+  padding: 20rpx;
+  background-color: #f8f9fa;
+  border-radius: 12rpx;
+  gap: 60rpx;
+}
+
+.stat-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  min-width: 120rpx;
+  padding: 20rpx 10rpx;
+  border-radius: 12rpx;
+  &.active {
+    background-color: #e6f7ff;
+    border: 2rpx solid #007aff;
+  }
+}
+
+.stat-number {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 8rpx;
+  &.followed { color: #52c41a; }
+  &.unfollowed { color: #ff4d4f; }
+}
+
+.stat-label {
+  font-size: 24rpx;
+  color: #666;
+}
+
+.student-grid {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 20rpx;
+}
+
+.student-item {
+  border-radius: 16rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+}
+
+.avatar-container {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
+  flex-shrink: 0;
+}
+
+.student-avatar {
+  width: 72rpx;
+  height: 72rpx;
+  border-radius: 50%;
+}
+
+.status-tag {
+  font-size: 20rpx;
+  padding: 6rpx 16rpx;
+  border-radius: 8rpx;
+}
+
+.status-followed {
+  background-color: #e6f7ff;
+  color: #52c41a;
+}
+
+.status-unfollowed {
+  background-color: #fff2f0;
+  color: #ff4d4f;
+}
+
+.flex-row { display: flex; flex-direction: row; }
+.flex-1 { flex: 1; }
+.items-center { align-items: center; }
+.overflow-hidden { overflow: hidden; }
+.mr-8 { margin-right: 12rpx; }
+.mb-8 { margin-bottom: 16rpx; }
+.font-14 { font-size: 28rpx; }
+.cor-333 { color: #333; }
+.bg-white { background-color: #fff; }
+.r-md { border-radius: 16rpx; }
+.p-12 { padding: 24rpx; }
+
+.arrow-icon-container {
+  width: 40rpx;
+  height: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
+
+.arrow-icon {
+  width: 35rpx;
+  height: 35rpx;
+  opacity: 0.6;
+}
+
+.loading-text, .empty-text {
+  font-size: 28rpx;
+  color: #999;
+  text-align: center;
+  padding: 40rpx;
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 100rpx 40rpx;
+  .empty-icon { font-size: 120rpx; margin-bottom: 20rpx; }
+  .empty-text { font-size: 32rpx; color: #666; }
+}
+</style>
diff --git a/src/pages/view/routine/tz/publish.vue b/src/pages/view/routine/tz/publish.vue
index 835bb25..37e86b6 100644
--- a/src/pages/view/routine/tz/publish.vue
+++ b/src/pages/view/routine/tz/publish.vue
@@ -19,7 +19,7 @@
 
           <view class="form-item">
             <text class="form-label content-label">通知内容 <text class="required">*</text></text>
-            <BasicEditor
+            <TinymceOrEditor
               v-model="formData.content"
               placeholder="请输入通知内容，支持插入图片"
             />
@@ -177,7 +177,7 @@
 import { ref, reactive, computed } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
 import BasicTeacherSelect from "@/components/BasicTeacherSelect/index.vue";
-import BasicEditor from "@/components/BasicForm/components/BasicEditor.vue";
+import TinymceOrEditor from "@/components/Tinymce/TinymceOrEditor.vue";
 import { attachmentUpload } from "@/api/system/upload";
 import { imagUrl } from "@/utils";
 import { tzSaveApi, tzFindByIdApi } from "@/api/base/tzApi";
diff --git a/src/pages/view/routine/xk/xkkcDetail.vue b/src/pages/view/routine/xk/xkkcDetail.vue
index efd5321..ee15c41 100644
--- a/src/pages/view/routine/xk/xkkcDetail.vue
+++ b/src/pages/view/routine/xk/xkkcDetail.vue
@@ -68,7 +68,7 @@
 				<view class="teacher-input-row">
 					<textarea 
 						v-model="xkkc.kcjsms" 
-						placeholder="请输入教师信息（必填）"
+						placeholder="请输入教师信息，包含姓名、职称（教练级别）等（必填）"
 						class="form-textarea"
 					/>
 				</view>
@@ -198,41 +198,30 @@ const [register, { getValue, setValue }] = useForm({
   ],
 });
 
+// 课次下拉选项：第1次课 ~ 第20次课
+const kecOptions = Array.from({ length: 20 }, (_, i) => ({ name: `第${i + 1}次课` }));
+
 const schema = reactive<FormsSchema[]>([
   {
     field: "jhjd",
-    label: "阶段",
-    component: "BasicInput",
-    componentProps: {},
-  },
-  {
-    field: "jhsj",
-    label: "计划时间",
-    component: "BasicInput",
+    label: "课次",
+    component: "BasicPicker",
     componentProps: {
-      type: "date",
-      placeholder: "请选择计划日期",
-      // 在微信浏览器中强制显示日期选择器
-      style: "position: relative; z-index: 1000;",
+      range: kecOptions,
+      rangeKey: "name",
+      savaKey: "name",
+      placeholder: "请选择课次",
     },
   },
-  {
-    field: "jhdd",
-    label: "地址",
-    component: "BasicInput",
-    componentProps: {},
-  },
   {
     field: "jhnr",
     label: "计划内容",
-    component: "BasicInput",
+    component: "BasicEditor",
     itemProps: {
       labelPosition: "top",
     },
     componentProps: {
-      type: "textarea",
-      maxlength: -1, // 不限字数
-      showCount: false, // 不显示字数统计
+      placeholder: "请输入计划内容，支持插入图片",
     },
   },
 ])
@@ -246,8 +235,6 @@ const education = reactive<any>(
 function addEducation() {
   education.xl.push({ value: {
     jhjd: '',
-    jhsj: '',
-    jhdd: '',
     jhnr: ''
   } })
 }
@@ -356,10 +343,8 @@ const submit = async () => {
   // 验证教学计划是否完整
   for (let i = 0; i < education.xl.length; i++) {
     const item = education.xl[i];
-    if (!item.value.jhjd || item.value.jhjd.trim() === '' ||
-        !item.value.jhsj || item.value.jhsj.trim() === '' ||
-        !item.value.jhdd || item.value.jhdd.trim() === '' ||
-        !item.value.jhnr || item.value.jhnr.trim() === '') {
+    const jhnrStr = String(item.value.jhnr || '').replace(/<[^>]*>/g, '').trim();
+    if (!item.value.jhjd || item.value.jhjd.trim() === '' || !item.value.jhnr || jhnrStr === '') {
       uni.showToast({
         title: `教学计划第${i + 1}项信息不完整`,
         icon: 'none',
@@ -418,8 +403,6 @@ onMounted(() => {
             return {
               value: {
                 jhjd: item.value.jhjd || '',
-                jhsj: item.value.jhsj || '',
-                jhdd: item.value.jhdd || '',
                 jhnr: item.value.jhnr || ''
               }
             };
diff --git a/src/static/base/home/grda.png b/src/static/base/home/grda.png
new file mode 100644
index 0000000000000000000000000000000000000000..2902bce8b2bc1cd8d506202497716024d99011b1
GIT binary patch
literal 6154
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
K)~eEQB>WGiLr*XO

literal 0
HcmV?d00001

diff --git a/src/static/base/home/jsda.png b/src/static/base/home/jsda.png
index 2902bce8b2bc1cd8d506202497716024d99011b1..9d3b7004953ea5c68b653995ab7bb974219738b0 100644
GIT binary patch
literal 5658
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
PM<B|NHRQ|W%mV)hi)56o

literal 6154
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
K)~eEQB>WGiLr*XO

diff --git a/src/static/base/home/jzda.png b/src/static/base/home/jzda.png
new file mode 100644
index 0000000000000000000000000000000000000000..db02806d2784549b606074795add3bbafb2a2f5d
GIT binary patch
literal 8317
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

literal 0
HcmV?d00001

diff --git a/src/static/tinymce/langs/zh_CN.js b/src/static/tinymce/langs/zh_CN.js
new file mode 100644
index 0000000..eb46353
--- /dev/null
+++ b/src/static/tinymce/langs/zh_CN.js
@@ -0,0 +1,31 @@
+tinymce.addI18n('zh_CN',{
+"Redo": "重做",
+"Undo": "撤销",
+"Cut": "剪切",
+"Copy": "复制",
+"Paste": "粘贴",
+"Select all": "全选",
+"New document": "新文件",
+"Ok": "确定",
+"Cancel": "取消",
+"Visual aids": "网格线",
+"Bold": "粗体",
+"Italic": "斜体",
+"Underline": "下划线",
+"Strikethrough": "删除线",
+"Superscript": "上标",
+"Subscript": "下标",
+"Clear formatting": "清除格式",
+"Align left": "左边对齐",
+"Align center": "中间对齐",
+"Align right": "右边对齐",
+"Justify": "两端对齐",
+"Bullet list": "项目符号",
+"Numbered list": "编号列表",
+"Decrease indent": "减少缩进",
+"Increase indent": "增加缩进",
+"Close": "关闭",
+"Formats": "格式",
+"Insert link": "插入链接",
+"Insert image": "插入图片"
+});
diff --git a/src/store/modules/menu.ts b/src/store/modules/menu.ts
new file mode 100644
index 0000000..26e24a2
--- /dev/null
+++ b/src/store/modules/menu.ts
@@ -0,0 +1,34 @@
+import { defineStore } from "pinia";
+import type { MobileMenuTreeNode } from "@/api/system/menu";
+
+export const useMenuStore = defineStore({
+  id: "app-Menu",
+  state: () => ({
+    /** 树形菜单数据，持久化到 localStorage key: app-Menu */
+    mobileMenu: [] as MobileMenuTreeNode[],
+  }),
+  getters: {
+    getMobileMenu(): MobileMenuTreeNode[] {
+      return this.mobileMenu || [];
+    },
+  },
+  actions: {
+    /** 清空菜单 */
+    clearMenu() {
+      this.mobileMenu = [];
+    },
+    /**
+     * 设置菜单：拉取菜单时先清空再写入
+     * @param menu 树形菜单数据
+     */
+    setMobileMenu(menu: MobileMenuTreeNode[]) {
+      this.clearMenu();
+      this.mobileMenu = menu && Array.isArray(menu) ? [...menu] : [];
+    },
+  },
+  persist: {
+    enabled: true,
+    detached: true,
+    H5Storage: localStorage,
+  },
+});
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index c985647..9f44e99 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,6 +1,5 @@
 import { defineStore } from "pinia";
 import {
-  authenticationApi,
   loginCode,
   loginPass,
   weChatLogin,
@@ -9,10 +8,6 @@ import {
 import { AUTH_KEY } from "@/config";
 import { useDicStore } from "@/store/modules/dic";
 import { useCommonStore } from "@/store/modules/common";
-import {
-  refreshPermissionCache,
-  clearPermissionCachePublic,
-} from "@/utils/permission";
 import { useDataStore } from "./data";
 
 interface UserState {
@@ -85,12 +80,6 @@ export const useUserStore = defineStore({
       console.log("设置新的权限数据");
       this.auth = data;
 
-      // 权限数据更新时，自动刷新缓存（可选）
-      if (autoRefreshCache && data && data.length > 0) {
-        console.log("自动刷新权限缓存...");
-        refreshPermissionCache(data);
-      }
-
       console.log("=== setAuth 完成 ===");
     },
     /**
@@ -192,35 +181,15 @@ export const useUserStore = defineStore({
       useDicStore().setData({});
       useCommonStore().setData({});
 
-      // 检查用户数据中是否已经包含权限信息
+      // 权限由后端 getMobileMenuApi 等接口按角色过滤，不再单独拉取 find-by-user
       if (value.auth && Array.isArray(value.auth) && value.auth.length > 0) {
-        console.log("✅ 用户数据中包含权限信息:", value.auth);
-        console.log("权限数量:", value.auth.length);
         this.setAuth(value.auth, false);
-      } else {
-        console.log("用户数据中无权限信息，调用 authenticationApi 获取权限...");
-        authenticationApi({ userId: value.id })
-          .then(({ result }) => {
-            if (result) {
-              console.log("✅ 获取到权限数据:", result);
-              console.log("权限数量:", result.length);
-              this.setAuth(result, false);
-            } else {
-              console.log("❌ authenticationApi 返回空结果");
-            }
-          })
-          .catch((error) => {
-            console.error("❌ authenticationApi 调用失败:", error);
-          });
       }
     },
     /**
      * @description: 注销
      */
     logout() {
-      // 清除权限缓存
-      clearPermissionCachePublic();
-
       this.setToken("");
       this.setUser({});
       this.setJs({});
diff --git a/src/utils/permission.ts b/src/utils/permission.ts
index 2e5d358..7c02d40 100644
--- a/src/utils/permission.ts
+++ b/src/utils/permission.ts
@@ -2,88 +2,9 @@ import {ISROUTERINTERCEPT} from "@/config";
 import {getRouter} from "@/utils/uniapp";
 import {useUserStore} from "@/store/modules/user";
 
-// 权限缓存相关常量
+// 权限缓存 key（getLogin 清除用）
 const PERMISSION_CACHE_KEY = 'user_permissions_cache';
 
-// 权限缓存接口
-interface PermissionCache {
-    permissions: string[];
-    timestamp: number;
-    userId: string;
-    changeTime: string;
-}
-
-// 存储工具函数
-function setStorage(key: string, value: any): void {
-    try {
-        if (typeof localStorage !== 'undefined') {
-            const jsonValue = JSON.stringify(value);
-            localStorage.setItem(key, jsonValue);
-        } else {
-            uni.setStorageSync(key, value);
-        }
-    } catch (error) {
-        // 静默处理错误
-    }
-}
-
-function getStorage(key: string): any {
-    try {
-        if (typeof localStorage !== 'undefined') {
-            const value = localStorage.getItem(key);
-            return value ? JSON.parse(value) : null;
-        } else {
-            const value = uni.getStorageSync(key);
-            return value;
-        }
-    } catch (error) {
-        return null;
-    }
-}
-
-// 从app-user中获取权限变更时间
-function getChangeTimeFromAppUser(): string | null {
-    try {
-        const userStore = useUserStore();
-        if (userStore.getChangeTime && userStore.getChangeTime.trim() !== '') {
-            return userStore.getChangeTime;
-        }
-        
-        if (typeof localStorage !== 'undefined') {
-            const appUser = localStorage.getItem('app-user');
-            if (appUser) {
-                const userData = JSON.parse(appUser);
-                if (userData.changeTime) {
-                    return userData.changeTime;
-                }
-            }
-        }
-        
-        return null;
-    } catch (error) {
-        return null;
-    }
-}
-
-// 将权限变更时间存储到app-user中
-function setChangeTimeToAppUser(changeTime: string): void {
-    try {
-        const userStore = useUserStore();
-        userStore.setChangeTime(changeTime);
-        
-        if (typeof localStorage !== 'undefined') {
-            const appUser = localStorage.getItem('app-user');
-            if (appUser) {
-                const userData = JSON.parse(appUser);
-                userData.changeTime = changeTime;
-                localStorage.setItem('app-user', JSON.stringify(userData));
-            }
-        }
-    } catch (error) {
-        // 静默处理错误
-    }
-}
-
 // 路由拦截器 - 默认导出
 export default function (whitelist: WhiteList) {
     const WHITELIST = ['/', ...whitelist, {pattern: /^\/pages\/system\/.*/}];
@@ -122,55 +43,7 @@ export default function (whitelist: WhiteList) {
 }
 
 /**
- * 获取权限缓存
- */
-function getPermissionCache(): PermissionCache | null {
-    try {
-        const cacheData = getStorage(PERMISSION_CACHE_KEY);
-        const changeTime = getChangeTimeFromAppUser();
-        
-        if (!cacheData || !changeTime) {
-            return null;
-        }
-        
-        return {
-            permissions: cacheData.permissions,
-            timestamp: cacheData.timestamp,
-            userId: cacheData.userId,
-            changeTime: cacheData.changeTime
-        };
-    } catch (error) {
-        return null;
-    }
-}
-
-/**
- * 设置权限缓存
- * @param permissions 权限列表
- * @param userId 用户ID
- * @param changeTime 权限变更时间（可选）
- */
-function setPermissionCache(permissions: string[], userId: string, changeTime?: string): void {
-    try {
-        const defaultChangeTime = '2024-01-01 00:00:00';
-        const finalChangeTime = changeTime || defaultChangeTime;
-        
-        const cacheData: PermissionCache = {
-            permissions,
-            timestamp: Date.now(),
-            userId,
-            changeTime: finalChangeTime
-        };
-        
-        setStorage(PERMISSION_CACHE_KEY, cacheData);
-        setChangeTimeToAppUser(finalChangeTime);
-    } catch (error) {
-        // 静默处理错误
-    }
-}
-
-/**
- * 清除权限缓存
+ * 清除权限缓存（getLogin 用）
  */
 function clearPermissionCache(): void {
     try {
@@ -184,129 +57,6 @@ function clearPermissionCache(): void {
     }
 }
 
-/**
- * 验证缓存是否有效
- */
-function isCacheValid(cache: PermissionCache, currentUserId: string): boolean {
-    return cache.userId === currentUserId;
-}
-
-/**
- * 获取用户权限列表（带缓存）
- * @param currentChangeTime 当前服务器返回的权限变更时间
- * @returns 权限列表
- */
-function getUserPermissionsWithCache(currentChangeTime?: string): string[] {
-    const userStore = useUserStore();
-    const currentUser = userStore.getUser;
-    const currentUserId = currentUser?.id || currentUser?.userdata?.id;
-    
-    if (!currentUserId) {
-        return userStore.getAuth;
-    }
-    
-    const cache = getPermissionCache();
-    if (cache && isCacheValid(cache, currentUserId)) {
-        if (currentChangeTime) {
-            const serverTime = new Date(currentChangeTime).getTime();
-            const cacheTime = new Date(cache.changeTime).getTime();
-            
-            if (serverTime > cacheTime) {
-                const permissions = userStore.getAuth;
-                if (permissions && permissions.length > 0) {
-                    setPermissionCache(permissions, currentUserId, currentChangeTime);
-                }
-                return permissions;
-            } else {
-                return cache.permissions;
-            }
-        } else {
-            return cache.permissions;
-        }
-    }
-    
-    const permissions = userStore.getAuth;
-    if (permissions && permissions.length > 0) {
-        setPermissionCache(permissions, currentUserId, currentChangeTime);
-    }
-    
-    return permissions;
-}
-
-/**
- * 刷新权限缓存
- * @param permissions 新的权限列表
- * @param changeTime 权限变更时间（可选）
- */
-export function refreshPermissionCache(permissions?: string[], changeTime?: string): void {
-    const userStore = useUserStore();
-    const currentUser = userStore.getUser;
-    const currentUserId = currentUser?.id || currentUser?.userdata?.id;
-    
-    if (!currentUserId) {
-        return;
-    }
-    
-    const permissionList = permissions || userStore.getAuth;
-    
-    const currentCache = getPermissionCache();
-    if (currentCache && currentCache.permissions && permissionList) {
-        const isSame = JSON.stringify(currentCache.permissions.sort()) === JSON.stringify(permissionList.sort());
-        if (isSame && currentCache.changeTime === changeTime) {
-            return;
-        }
-    }
-    
-    setPermissionCache(permissionList, currentUserId, changeTime);
-    
-    if (changeTime) {
-        userStore.setChangeTime(changeTime);
-    }
-}
-
-/**
- * 清除权限缓存（供外部调用）
- */
-export function clearPermissionCachePublic(): void {
-    clearPermissionCache();
-}
-
-// 权限检查函数
-export function _auth(autd: string, changeTime?: string) {
-    const permissions = getUserPermissionsWithCache(changeTime);
-    return permissions.includes(autd);
-}
-
-export function hasPermission(permissionKey: string, changeTime?: string): boolean {
-    if (!permissionKey) return true;
-    const permissions = getUserPermissionsWithCache(changeTime);
-    // 去重处理，避免重复权限影响判断
-    const uniquePermissions = [...new Set(permissions)];
-    return uniquePermissions.includes(permissionKey);
-}
-
-export function hasAnyPermission(permissionKeys: string[], changeTime?: string): boolean {
-    if (!permissionKeys || permissionKeys.length === 0) return true;
-    const permissions = getUserPermissionsWithCache(changeTime);
-    // 去重处理，避免重复权限影响判断
-    const uniquePermissions = [...new Set(permissions)];
-    return permissionKeys.some(key => uniquePermissions.includes(key));
-}
-
-export function hasAllPermissions(permissionKeys: string[], changeTime?: string): boolean {
-    if (!permissionKeys || permissionKeys.length === 0) return true;
-    const permissions = getUserPermissionsWithCache(changeTime);
-    // 去重处理，避免重复权限影响判断
-    const uniquePermissions = [...new Set(permissions)];
-    return permissionKeys.every(key => uniquePermissions.includes(key));
-}
-
-export function getUserPermissions(changeTime?: string): string[] {
-    const permissions = getUserPermissionsWithCache(changeTime);
-    // 返回去重后的权限列表
-    return permissions ? [...new Set(permissions)] : [];
-}
-
 export function getLogin(): void {
     clearPermissionCache();
     uni.reLaunch({
@@ -314,88 +64,8 @@ export function getLogin(): void {
     });
 }
 
-export function isLogin(): boolean {
-    if (ISROUTERINTERCEPT) {
-        const store = useUserStore();
-        if (!store.getToken) {
-            let curRoute: string | undefined = getRouter()
-            if (curRoute) {
-                if (!/^\//.test(curRoute)) {
-                    curRoute = '/' + curRoute
-                }
-            }
-            loginPage(curRoute ? curRoute : '')
-            return false
-        }
-        return true
-    }
-    return false
-}
-
 function loginPage(url: string) {
     uni.redirectTo({
         url: "/pages/system/login/login?redirect=" + url,
     });
-}
-
-export const ROUTINE_PERMISSIONS = {
-    JIAO_XUE_ZI_YUAN: 'JiaoXueZiYuan',
-    JI_FEN_PING_JIA: 'JiFenPingJia',
-    GONG_ZUO_LIANG: 'GongZuoLiang',
-    RENG_JIAO_RENG_ZHI: 'RengJiaoRengZhi',
-    SHI_TANG_XUN_CHA: 'ShiTangXunCha',
-    KE_FU_XUN_CHA: 'kefuxuncha',
-    GROUP_TEACHING: 'groupTeaching',
-    NOTICE: 'notice',
-    ROUTINE: 'routine',
-} as const;
-
-export function isTeacherUser(): boolean {
-    const userStore = useUserStore();
-    const user = userStore.getUser;
-    return user && user.userType === 'teacher';
-}
-
-export function isAdminUser(): boolean {
-    const userStore = useUserStore();
-    const user = userStore.getUser;
-    return user && user.userType === 'admin';
-}
-
-export const PermissionCacheManager = {
-    getCacheInfo() {
-        const cache = getPermissionCache();
-        const changeTime = getChangeTimeFromAppUser();
-        
-        return {
-            hasCache: !!cache,
-            changeTime: changeTime ? new Date(changeTime).toLocaleString() : null,
-            isExpired: cache ? Date.now() > cache.timestamp : true,
-            cacheSize: cache ? cache.permissions.length : 0
-        };
-    },
-    
-    /**
-     * 显示详细的缓存信息（调试用）
-     */
-    debugCache() {
-        // 移除所有调试信息
-    },
-    
-    forceRefresh() {
-        const userStore = useUserStore();
-        const permissions = userStore.getAuth;
-        const currentUser = userStore.getUser;
-        const currentUserId = currentUser?.id || currentUser?.userdata?.id;
-        
-        if (currentUserId && permissions) {
-            setPermissionCache(permissions, currentUserId);
-            return true;
-        }
-        return false;
-    },
-    
-    clear() {
-        clearPermissionCache();
-    }
-};
\ No newline at end of file
+}
\ No newline at end of file