From 6161a2fa8d98a0c24071fc9961b47d5ba7d1e1a7 Mon Sep 17 00:00:00 2001
From: hebo <hebo163@163.com>
Date: Tue, 18 Nov 2025 15:49:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/zwApi.ts                         |   3 +
 src/api/statistics/studentScaleApi.ts         | 101 ++
 src/api/statistics/teacherAnalyticsApi.ts     |   1 +
 src/pages.json                                |  35 +
 src/pages/base/service/index.vue              |  20 +-
 src/pages/statistics/teacher/detail.vue       |  83 ++
 src/pages/statistics/teacher/index.vue        | 219 ++++-
 src/pages/statistics/xs/classDetail.vue       | 280 ++++++
 src/pages/statistics/xs/gradeDetail.vue       | 311 ++++++
 src/pages/statistics/xs/index.vue             | 909 ++++++++++++++++++
 src/pages/statistics/xs/parentDetail.vue      | 178 ++++
 src/pages/statistics/xs/studentList.vue       | 316 ++++++
 src/pages/statistics/zb/overview.vue          |   6 +-
 src/pages/view/routine/ShiTangXunCha/add.vue  | 233 +----
 .../view/routine/ShiTangXunCha/detail.vue     | 147 ++-
 src/pages/view/routine/ShiTangXunCha/edit.vue | 270 ++----
 src/pages/view/routine/qd/index.vue           |  29 +-
 src/pages/view/routine/qd/publish.vue         |   7 +-
 src/static/base/home/xsgm.png                 | Bin 0 -> 10262 bytes
 src/store/modules/teacherAnalytics.ts         |   3 +
 20 files changed, 2736 insertions(+), 415 deletions(-)
 create mode 100644 src/api/statistics/studentScaleApi.ts
 create mode 100644 src/pages/statistics/xs/classDetail.vue
 create mode 100644 src/pages/statistics/xs/gradeDetail.vue
 create mode 100644 src/pages/statistics/xs/index.vue
 create mode 100644 src/pages/statistics/xs/parentDetail.vue
 create mode 100644 src/pages/statistics/xs/studentList.vue
 create mode 100644 src/static/base/home/xsgm.png

diff --git a/src/api/base/zwApi.ts b/src/api/base/zwApi.ts
index 62165b6..6ef4d56 100644
--- a/src/api/base/zwApi.ts
+++ b/src/api/base/zwApi.ts
@@ -34,3 +34,6 @@ export const findAllZw = () => {
 
 
 
+
+
+
diff --git a/src/api/statistics/studentScaleApi.ts b/src/api/statistics/studentScaleApi.ts
new file mode 100644
index 0000000..3406139
--- /dev/null
+++ b/src/api/statistics/studentScaleApi.ts
@@ -0,0 +1,101 @@
+import { get } from "@/utils/request";
+
+export interface StudentCountStatistics {
+  totalCount: number;
+  followedCount: number;
+  unfollowedCount: number;
+}
+
+export interface ParentIndustryStatisticsItem {
+  industry: string;
+  count: number;
+}
+
+export interface StudentSourceStatisticsItem {
+  sourceName: string;
+  sourceCode: string;
+  count: number;
+}
+
+export interface StudentStatusStatisticsItem {
+  statusName: string;
+  statusCode: string;
+  count: number;
+}
+
+/**
+ * 学生人数统计（总人数、已关注、未关注）
+ */
+export const getStudentCountStatisticsApi = () => {
+  return get<StudentCountStatistics>("/api/xs/statistics/studentCount");
+};
+
+/**
+ * 家长情况统计（总人数、按行业分类）
+ */
+export const getParentIndustryStatisticsApi = () => {
+  return get<ParentIndustryStatisticsItem[]>("/api/xs/statistics/parentIndustry");
+};
+
+/**
+ * 学生来源统计
+ */
+export const getStudentSourceStatisticsApi = () => {
+  return get<StudentSourceStatisticsItem[]>("/api/xs/statistics/studentSource");
+};
+
+/**
+ * 学生状态统计
+ */
+export const getStudentStatusStatisticsApi = () => {
+  return get<StudentStatusStatisticsItem[]>("/api/xs/statistics/studentStatus");
+};
+
+/**
+ * 学生规模统计仪表盘（统一接口，返回所有统计数据）
+ */
+export interface StudentScaleDashboard {
+  studentCount: StudentCountStatistics;
+  parentIndustry: ParentIndustryStatisticsItem[];
+  studentSource: StudentSourceStatisticsItem[];
+  studentStatus: StudentStatusStatisticsItem[];
+}
+
+export const getStudentScaleDashboardApi = () => {
+  return get<StudentScaleDashboard>("/api/xs/statistics/dashboard");
+};
+
+/**
+ * 年级统计（学生人数、来源、状态）
+ */
+export const getGradeStatisticsApi = (params: { type: string; code: string }) => {
+  return get("/api/xs/gradeStatistics", params);
+};
+
+/**
+ * 班级统计（学生人数、来源、状态）
+ */
+export const getClassStatisticsApi = (params: { type: string; code: string; njId: string }) => {
+  return get("/api/xs/classStatistics", params);
+};
+
+/**
+ * 学生明细列表
+ */
+export const getStudentListApi = (params: { 
+  type: string; 
+  code: string; 
+  subType?: string; 
+  njId?: string; 
+  bjId?: string; 
+}) => {
+  return get("/api/xs/studentList", params);
+};
+
+/**
+ * 家长明细列表（按行业）
+ */
+export const getParentListApi = (params: { industry: string }) => {
+  return get("/api/xs/parentList", params);
+};
+
diff --git a/src/api/statistics/teacherAnalyticsApi.ts b/src/api/statistics/teacherAnalyticsApi.ts
index 7512e21..35daa2f 100644
--- a/src/api/statistics/teacherAnalyticsApi.ts
+++ b/src/api/statistics/teacherAnalyticsApi.ts
@@ -48,6 +48,7 @@ export interface TeacherAnalyticsDashboardResponse {
   position?: TeacherDistributionItem[];
   political?: TeacherDistributionItem[];
   workingYears?: TeacherDistributionItem[];
+  zdqk?: TeacherDistributionItem[];
 }
 
 export interface TeacherAnalyticsListRequest extends TeacherAnalyticsFilter {
diff --git a/src/pages.json b/src/pages.json
index d346650..a79346b 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -297,6 +297,41 @@
         "enablePullDownRefresh": false
       }
     },
+    {
+      "path": "pages/statistics/xs/index",
+      "style": {
+        "navigationBarTitleText": "学生规模",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/statistics/xs/gradeDetail",
+      "style": {
+        "navigationBarTitleText": "年级统计",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/statistics/xs/classDetail",
+      "style": {
+        "navigationBarTitleText": "班级统计",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/statistics/xs/studentList",
+      "style": {
+        "navigationBarTitleText": "学生明细",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/statistics/xs/parentDetail",
+      "style": {
+        "navigationBarTitleText": "家长明细",
+        "enablePullDownRefresh": false
+      }
+    },
     {
       "path": "pages/statistics/zb/pdfPreview",
       "style": {
diff --git a/src/pages/base/service/index.vue b/src/pages/base/service/index.vue
index 3325e95..31b04dd 100644
--- a/src/pages/base/service/index.vue
+++ b/src/pages/base/service/index.vue
@@ -527,6 +527,14 @@ const sections = reactive<Section[]>([
           },
           {
             id: "analysis2",
+            icon: "xsgm",
+            text: "学生规模",
+            show: true,
+            permissionKey: "analysis-xsgm",
+            path: "/pages/statistics/xs/index",
+          },
+          {
+            id: "analysis3",
             icon: "jctj",
             text: "就餐统计",
             show: true,
@@ -534,7 +542,7 @@ const sections = reactive<Section[]>([
             path: "/pages/statistics/jc/index",
           },
           {
-            id: "analysis3",
+            id: "analysis4",
             icon: "jlb",
             text: "俱乐部统计",
             show: true,
@@ -542,7 +550,7 @@ const sections = reactive<Section[]>([
             path: "/pages/statistics/jlb/index",
           },
           {
-            id: "analysis4",
+            id: "analysis5",
             icon: "xqk",
             text: "兴趣课统计",
             show: true,
@@ -550,7 +558,7 @@ const sections = reactive<Section[]>([
             path: "/pages/statistics/xqk/index",
           },
           {
-            id: "analysis5",
+            id: "analysis6",
             icon: "ky",
             text: "课业统计",
             show: true,
@@ -558,15 +566,15 @@ const sections = reactive<Section[]>([
             path: "/pages/statistics/ky/index",
           },
           {
-            id: "analysis6",
+            id: "analysis7",
             icon: "zbtj",
-            text: "值班统计",
+            text: "值周统计",
             show: true,
             permissionKey: "analysis-zbtj",
             path: "/pages/statistics/zb/index",
           },
           {
-            id: "analysis7",
+            id: "analysis8",
             icon: "qdtj",
             text: "签到统计",
             show: true,
diff --git a/src/pages/statistics/teacher/detail.vue b/src/pages/statistics/teacher/detail.vue
index 56f1146..f68b3f4 100644
--- a/src/pages/statistics/teacher/detail.vue
+++ b/src/pages/statistics/teacher/detail.vue
@@ -30,6 +30,17 @@
             <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">
@@ -67,6 +78,11 @@ interface Teacher {
   jsType?: string;
   zzmmId?: string;
   jsgl?: number;
+  qjlx?: string; // 请假类型
+  qjkstime?: string; // 请假开始时间
+  qjjstime?: string; // 请假结束时间
+  qjsy?: string; // 请假事由
+  dcyy?: string; // 调出原因
 }
 
 const commonStore = useCommonStore();
@@ -165,6 +181,9 @@ const filteredTeachers = computed(() => {
         return teacher.zzmmId === filterValue.value;
       case 'workingYears':
         return filterByWorkingYears(teacher, filterValue.value);
+      case 'zdqk':
+        // 在岗情况过滤已在 fetchList 中处理，这里不需要再次过滤
+        return true;
       default:
         return true;
     }
@@ -190,6 +209,39 @@ const fetchList = async () => {
       }));
       return;
     }
+    
+    // 如果在岗情况过滤，调用专门的接口
+    if (filterType.value === 'zdqk' && filterValue.value) {
+      const params: any = {
+        zdqkValue: filterValue.value,
+      };
+      if (jsTypes.value.length > 0) {
+        params.jsTypes = jsTypes.value.join(',');
+      }
+      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;
@@ -230,6 +282,20 @@ const parseGender = (jsxbId?: string) => {
   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((options: any) => {
   if (options.filterType) {
     filterType.value = decodeURIComponent(options.filterType);
@@ -409,6 +475,23 @@ onLoad((options: any) => {
   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;
diff --git a/src/pages/statistics/teacher/index.vue b/src/pages/statistics/teacher/index.vue
index 6c17608..2118b9f 100644
--- a/src/pages/statistics/teacher/index.vue
+++ b/src/pages/statistics/teacher/index.vue
@@ -66,6 +66,47 @@
         </view>
       </view>
 
+      <view class="section">
+        <view class="section-header">
+          <text class="section-title">在岗情况</text>
+        </view>
+        <view class="personnel-content">
+          <view class="composition-chart-wrapper">
+            <QiunDataCharts
+              class="composition-chart"
+              canvas-id="zdqk-ring"
+              type="ring"
+              :chart-data="zdqkCompositionChart"
+              :opts="zdqkCompositionOpts"
+              :animation="false"
+              :in-scroll-view="true"
+            />
+          </view>
+          <view class="composition-side">
+            <view v-if="compositionLoading" class="composition-placeholder">加载中...</view>
+            <view v-else-if="!zdqkCompositionLegend.length" class="composition-placeholder">暂无数据</view>
+            <view v-else class="composition-legend">
+              <view class="legend-item" v-for="item in zdqkCompositionLegend" :key="item.key" @click="handleZdqkCompositionClick(item)">
+                <view class="legend-info">
+                  <view class="legend-left">
+                    <view class="legend-dot" :style="{ backgroundColor: item.color }" />
+                    <text class="legend-name-large">{{ item.label }}</text>
+                  </view>
+                  <view class="legend-right">
+                    <view class="legend-value-group">
+                      <text class="legend-count">{{ item.count }}人</text>
+                      <text class="legend-divider">|</text>
+                      <text class="legend-percent">{{ item.percent }}</text>
+                    </view>
+                    <text class="legend-arrow">></text>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+
       <template v-for="(section, index) in chartSections" :key="section.key">
         <view class="section">
           <view class="section-header">
@@ -180,7 +221,7 @@ interface DistributionItem {
   averageAge?: number; // 平均年龄（后端计算，保留一位小数，仅年龄统计时返回）
 }
 
-type DistributionKey = "age" | "education" | "title" | "position" | "political" | "workingYears";
+type DistributionKey = "age" | "education" | "title" | "position" | "political" | "workingYears" | "zdqk";
 
 type DistributionMap = Record<DistributionKey, DistributionItem[]>;
 
@@ -231,6 +272,14 @@ const workingYearsColors = [
   "#EA580C",
 ];
 
+const zdqkColors = [
+  "#22C55E", // 在岗 - 绿色
+  "#F59E0B", // 请假 - 橙色
+  "#EF4444", // 辞职 - 红色
+  "#8B5CF6", // 退休 - 紫色
+  "#6B7280", // 其他 - 灰色
+];
+
 const analyticsStore = useTeacherAnalyticsStore();
 const { composition, distributions } = storeToRefs(analyticsStore);
 
@@ -415,6 +464,75 @@ const staffCompositionLegend = computed(() =>
   }))
 );
 
+const zdqkCompositionLegend = computed(() =>
+  zdqkDetails.value.map((item) => ({
+    key: item.key,
+    label: item.label,
+    count: item.count,
+    percent: zdqkTotal.value > 0 
+      ? `${((item.count / zdqkTotal.value) * 100).toFixed(1)}%`
+      : "-",
+    color: item.color,
+  }))
+);
+
+const zdqkCompositionChart = computed(() => {
+  const total = zdqkTotal.value;
+  return {
+    series: [
+      {
+        name: "在岗情况",
+        data: zdqkDetails.value.map((item) => {
+          const percent = total > 0 ? ((item.count / total) * 100).toFixed(1) : "0.0";
+          return {
+            name: item.label,
+            value: item.count,
+            color: item.color,
+            labelText: `${percent}%`,
+          };
+        }),
+      },
+    ],
+  };
+});
+
+const zdqkCompositionOpts = computed(() => ({
+  height: 420,
+  rotate: false,
+  rotateLock: false,
+  color: zdqkColors,
+  padding: [15, 20, 15, 15],
+  dataLabel: true,
+  enableScroll: false,
+  legend: {
+    show: false,
+  },
+  title: {
+    name: String(zdqkTotal.value || 0),
+    fontSize: 30,
+    color: "#3b82f6",
+  },
+  subtitle: {
+    name: "总人数",
+    fontSize: 12,
+    color: "#666666",
+  },
+  dataPointShape: false,
+  extra: {
+    ring: {
+      ringWidth: 15,
+      activeOpacity: 0.5,
+      activeRadius: 10,
+      offsetAngle: 0,
+      labelWidth: 22,
+      border: true,
+      borderWidth: 3,
+      borderColor: "#FFFFFF",
+      customLabel: true,
+    },
+  },
+}));
+
 const educationDetails = computed(() => {
   const eduList = distributions.value?.education || [];
   return eduList.map((item, index) => ({
@@ -507,6 +625,72 @@ const workingYearsTotal = computed(() =>
   workingYearsDetails.value.reduce((sum, item) => sum + (item.count ?? 0), 0)
 );
 
+const zdqkDetails = computed(() => {
+  const zdqkList = distributions.value?.zdqk || [];
+  return zdqkList.map((item, index) => ({
+    key: item.name || `zdqk-${index}`,
+    label: item.name || "其他",
+    count: item.count ?? 0,
+    color: zdqkColors[index % zdqkColors.length],
+  }));
+});
+
+const zdqkTotal = computed(() =>
+  zdqkDetails.value.reduce((sum, item) => sum + (item.count ?? 0), 0)
+);
+
+const zdqkChart = computed(() => {
+  const total = zdqkTotal.value;
+  return {
+    series: [
+      {
+        name: "在岗情况",
+        data: zdqkDetails.value.map((item) => {
+          const percent = total > 0 ? Math.round((item.count / total) * 100) : 0;
+          return {
+            name: `${item.label}：${item.count}人`,
+            value: item.count,
+            color: item.color,
+            labelText: `${item.label}${percent}%`,
+          };
+        }),
+      },
+    ],
+  };
+});
+
+const zdqkChartOpts = {
+  height: 500,
+  color: zdqkColors,
+  padding: [20, 20, 0, 15],
+  enableScroll: false,
+  legend: {
+    show: true,
+    position: "bottom",
+    lineHeight: 25,
+  },
+  dataLabel: true,
+  title: {
+    name: "",
+  },
+  subtitle: {
+    name: "",
+  },
+  extra: {
+    pie: {
+      activeOpacity: 0.5,
+      activeRadius: 10,
+      offsetAngle: 0,
+      labelWidth: 25,
+      border: true,
+      borderWidth: 2,
+      borderColor: "#FFFFFF",
+      linearType: "none",
+      radius: 140,
+    },
+  },
+};
+
 const workingYearsChart = computed(() => {
   return {
     series: [
@@ -528,6 +712,7 @@ const emptyDistributions: DistributionMap = {
   position: [],
   political: [],
   workingYears: [],
+  zdqk: [],
 };
 
 const CHART_HEIGHT = 320;
@@ -955,7 +1140,7 @@ const chartSections = computed<ChartSectionConfig[]>(() => {
   },
   {
     key: "position",
-    title: "岗位情况",
+    title: "专业技术岗位",
     type: "bar",
     chartData: {
       categories: (dist.position || []).map((item) => item.name),
@@ -995,6 +1180,14 @@ const handleCompositionClick = (item: any) => {
   });
 };
 
+const handleZdqkCompositionClick = (item: any) => {
+  // 将教师类型数组转换为逗号分隔的字符串
+  const jsTypes = selectedJsTypes.value.join(',');
+  uni.navigateTo({
+    url: `/pages/statistics/teacher/detail?filterType=zdqk&filterValue=${encodeURIComponent(item.label)}&jsTypes=${encodeURIComponent(jsTypes)}`,
+  });
+};
+
 // 处理图表点击事件（带教师类型过滤）
 const handleChartClick = (filterType: string, filterValue: string) => {
   // 将教师类型数组转换为逗号分隔的字符串
@@ -1048,6 +1241,28 @@ const handleWorkingYearsClick = (e: any) => {
   }
 };
 
+// 处理在岗情况图表点击
+const handleZdqkClick = (e: any) => {
+  console.log('在岗情况图表点击事件:', e);
+  
+  if (!e || !zdqkDetails.value.length) return;
+  
+  let index = -1;
+  if (e.currentIndex !== undefined) {
+    if (typeof e.currentIndex === 'object' && e.currentIndex.index !== undefined) {
+      index = e.currentIndex.index;
+    } else if (typeof e.currentIndex === 'number') {
+      index = e.currentIndex;
+    }
+  }
+  
+  if (index >= 0 && index < zdqkDetails.value.length) {
+    const item = zdqkDetails.value[index];
+    console.log('点击在岗情况项:', item);
+    handleChartClick('zdqk', item.label);
+  }
+};
+
 // 处理其他图表点击
 const handleSectionChartClick = (sectionKey: string, e: any) => {
   console.log('图表点击事件:', sectionKey, e);
diff --git a/src/pages/statistics/xs/classDetail.vue b/src/pages/statistics/xs/classDetail.vue
new file mode 100644
index 0000000..f96ab80
--- /dev/null
+++ b/src/pages/statistics/xs/classDetail.vue
@@ -0,0 +1,280 @@
+<!-- src/pages/statistics/xs/classDetail.vue -->
+<template>
+  <view class="class-detail-page">
+    <!-- 顶部标题 -->
+    <view class="page-header">
+      <text class="page-title">{{ njmc }} - {{ pageTitle }}</text>
+      <text class="refresh-btn" @click="refreshData">刷新</text>
+    </view>
+
+    <!-- 班级统计列表 -->
+    <view class="class-list">
+      <view 
+        class="class-item" 
+        v-for="classItem in classStats" 
+        :key="classItem.bj_id"
+      >
+        <view class="class-header">
+          <text class="class-name">{{ classItem.bjmc }}</text>
+        </view>
+        <view class="class-stats">
+          <view class="stat-item">
+            <text class="stat-label">总人数</text>
+            <text class="stat-value">{{ classItem.totalCount }}</text>
+          </view>
+          <view 
+            class="stat-item clickable" 
+            v-for="(item, index) in getClassDetailItems(classItem)" 
+            :key="index"
+            @click="goToStudentList(classItem, item.type, item.label)"
+          >
+            <text class="stat-label">{{ item.label }}</text>
+            <text class="stat-value" :class="item.valueClass">{{ item.value }}</text>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 空状态 -->
+    <view class="empty-state" v-if="classStats.length === 0 && !loading">
+      <text class="empty-text">暂无班级数据</text>
+    </view>
+
+    <!-- 加载状态 -->
+    <view class="loading-state" v-if="loading">
+      <text class="loading-text">加载中...</text>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { getClassStatisticsApi } from '@/api/statistics/studentScaleApi'
+
+interface ClassStats {
+  nj_id: string;
+  njmc: string;
+  bj_id: string;
+  bjmc: string;
+  totalCount: number;
+  [key: string]: any;
+}
+
+const pageTitle = ref('')
+const statType = ref('')
+const statCode = ref('')
+const njId = ref('')
+const njmc = ref('')
+const classStats = ref<ClassStats[]>([])
+const loading = ref(false)
+
+// 获取班级详情项
+const getClassDetailItems = (classItem: ClassStats) => {
+  const items: any[] = []
+  
+  if (statType.value === 'count') {
+    if (statCode.value === 'all') {
+      items.push(
+        { label: '已关注', value: classItem.followedCount || 0, type: 'followed', valueClass: 'success' },
+        { label: '未关注', value: classItem.unfollowedCount || 0, type: 'unfollowed', valueClass: 'danger' }
+      )
+    } else if (statCode.value === 'followed') {
+      items.push({ label: '已关注', value: classItem.followedCount || 0, type: 'followed', valueClass: 'success' })
+    } else if (statCode.value === 'unfollowed') {
+      items.push({ label: '未关注', value: classItem.unfollowedCount || 0, type: 'unfollowed', valueClass: 'danger' })
+    }
+  } else if (statType.value === 'source') {
+    const sourceMap: Record<string, string> = {
+      'A': '正常入学',
+      'B': '转入',
+      'C': '复学'
+    }
+    const label = sourceMap[statCode.value] || '未知'
+    items.push({ label, value: classItem.totalCount || 0, type: statCode.value, valueClass: 'info' })
+  } else if (statType.value === 'status') {
+    const statusMap: Record<string, string> = {
+      'A': '正常',
+      'B': '转出',
+      'C': '休学',
+      'D': '删除',
+      'E': '辍学',
+      'G': '死亡'
+    }
+    const label = statusMap[statCode.value] || '未知'
+    items.push({ label, value: classItem.totalCount || 0, type: statCode.value, valueClass: 'info' })
+  }
+  
+  return items
+}
+
+// 刷新数据
+const refreshData = async () => {
+  await loadClassDetailData()
+}
+
+// 跳转到学生列表页面
+const goToStudentList = (classItem: ClassStats, type: string, label: string) => {
+  uni.navigateTo({
+    url: `/pages/statistics/xs/studentList?type=${statType.value}&code=${statCode.value}&subType=${type}&njId=${njId.value}&bjId=${classItem.bj_id}&njmc=${encodeURIComponent(njmc.value)}&bjmc=${encodeURIComponent(classItem.bjmc)}&title=${encodeURIComponent(label)}`
+  })
+}
+
+// 加载班级详情数据
+const loadClassDetailData = async () => {
+  try {
+    loading.value = true
+    
+    const result = await getClassStatisticsApi({
+      type: statType.value,
+      code: statCode.value,
+      njId: njId.value
+    })
+    
+    if (result.resultCode === 1 && result.result) {
+      classStats.value = result.result
+    }
+    
+  } catch (error) {
+    console.error('加载班级详情数据失败:', error)
+    uni.showToast({
+      title: '加载失败',
+      icon: 'error'
+    })
+  } finally {
+    loading.value = false
+  }
+}
+
+onLoad((options) => {
+  if (options.type && options.code && options.njId && options.njmc && options.title) {
+    statType.value = options.type
+    statCode.value = options.code
+    njId.value = options.njId
+    njmc.value = decodeURIComponent(options.njmc)
+    pageTitle.value = decodeURIComponent(options.title)
+    loadClassDetailData()
+  }
+})
+</script>
+
+<style scoped lang="scss">
+.class-detail-page {
+  min-height: 100vh;
+  background-color: #f5f7fa;
+  padding: 12px;
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 12px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.page-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+}
+
+.refresh-btn {
+  font-size: 14px;
+  color: #1890ff;
+  padding: 4px 8px;
+  border: 1px solid #1890ff;
+  border-radius: 4px;
+}
+
+.class-list {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.class-item {
+  background-color: #fff;
+  border-radius: 12px;
+  padding: 16px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.class-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 12px;
+  padding-bottom: 12px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.class-name {
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+}
+
+.class-stats {
+  display: flex;
+  justify-content: space-around;
+}
+
+.stat-item {
+  text-align: center;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  
+  &.clickable {
+    &:active {
+      transform: scale(0.95);
+    }
+  }
+}
+
+.stat-label {
+  display: block;
+  font-size: 12px;
+  color: #666;
+  margin-bottom: 4px;
+}
+
+.stat-value {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+  
+  &.success {
+    color: #52c41a;
+  }
+  
+  &.danger {
+    color: #ff4d4f;
+  }
+  
+  &.info {
+    color: #1890ff;
+  }
+}
+
+.empty-state,
+.loading-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200px;
+  background-color: #fff;
+  border-radius: 12px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.empty-text,
+.loading-text {
+  font-size: 14px;
+  color: #999;
+}
+</style>
+
diff --git a/src/pages/statistics/xs/gradeDetail.vue b/src/pages/statistics/xs/gradeDetail.vue
new file mode 100644
index 0000000..29e76f7
--- /dev/null
+++ b/src/pages/statistics/xs/gradeDetail.vue
@@ -0,0 +1,311 @@
+<!-- src/pages/statistics/xs/gradeDetail.vue -->
+<template>
+  <view class="grade-detail-page">
+    <!-- 顶部标题 -->
+    <view class="page-header">
+      <text class="page-title">{{ pageTitle }}</text>
+      <text class="refresh-btn" @click="refreshData">刷新</text>
+    </view>
+
+    <!-- 各年级统计 -->
+    <view class="grade-stats" v-for="grade in gradeStats" :key="grade.nj_id">
+      <view class="grade-header">
+        <text class="grade-name">{{ grade.njmc }}</text>
+        <view class="grade-right">
+          <text class="detail-arrow" @click="goToClassDetail(grade.nj_id, grade.njmc)">></text>
+        </view>
+      </view>
+      <view class="grade-details">
+        <view class="detail-item">
+          <text class="detail-label">总人数</text>
+          <text class="detail-value">{{ grade.totalCount }}</text>
+        </view>
+        <view 
+          class="detail-item clickable" 
+          v-for="(item, index) in getGradeDetailItems(grade)" 
+          :key="index"
+          @click="goToStudentList(grade.nj_id, grade.njmc, item.type, item.label)"
+        >
+          <text class="detail-label">{{ item.label }}</text>
+          <text class="detail-value" :class="item.valueClass">{{ item.value }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 空状态 -->
+    <view class="empty-state" v-if="gradeStats.length === 0 && !loading">
+      <text class="empty-text">暂无年级数据</text>
+    </view>
+
+    <!-- 加载状态 -->
+    <view class="loading-state" v-if="loading">
+      <text class="loading-text">加载中...</text>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { getGradeStatisticsApi } from '@/api/statistics/studentScaleApi'
+
+interface GradeStats {
+  nj_id: string;
+  njmc: string;
+  totalCount: number;
+  [key: string]: any;
+}
+
+const pageTitle = ref('')
+const statType = ref('') // count, source, status
+const statCode = ref('') // all, followed, unfollowed, A, B, C, etc.
+const gradeStats = ref<GradeStats[]>([])
+const loading = ref(false)
+
+// 获取年级详情项
+const getGradeDetailItems = (grade: GradeStats) => {
+  const items: any[] = []
+  
+  if (statType.value === 'count') {
+    if (statCode.value === 'all') {
+      // 总人数统计，显示已关注和未关注
+      items.push(
+        { label: '已关注', value: grade.followedCount || 0, type: 'followed', valueClass: 'success' },
+        { label: '未关注', value: grade.unfollowedCount || 0, type: 'unfollowed', valueClass: 'danger' }
+      )
+    } else if (statCode.value === 'followed') {
+      // 已关注统计
+      items.push({ label: '已关注', value: grade.followedCount || 0, type: 'followed', valueClass: 'success' })
+    } else if (statCode.value === 'unfollowed') {
+      // 未关注统计
+      items.push({ label: '未关注', value: grade.unfollowedCount || 0, type: 'unfollowed', valueClass: 'danger' })
+    }
+  } else if (statType.value === 'source') {
+    // 学生来源统计 - totalCount就是符合条件的数量
+    const sourceMap: Record<string, string> = {
+      'A': '正常入学',
+      'B': '转入',
+      'C': '复学'
+    }
+    const label = sourceMap[statCode.value] || '未知'
+    items.push({ label, value: grade.totalCount || 0, type: statCode.value, valueClass: 'info' })
+  } else if (statType.value === 'status') {
+    // 学生状态统计 - totalCount就是符合条件的数量
+    const statusMap: Record<string, string> = {
+      'A': '正常',
+      'B': '转出',
+      'C': '休学',
+      'D': '删除',
+      'E': '辍学',
+      'G': '死亡'
+    }
+    const label = statusMap[statCode.value] || '未知'
+    items.push({ label, value: grade.totalCount || 0, type: statCode.value, valueClass: 'info' })
+  }
+  
+  return items
+}
+
+// 刷新数据
+const refreshData = async () => {
+  await loadGradeStats()
+}
+
+// 跳转到班级详情页面
+const goToClassDetail = (njId: string, njmc: string) => {
+  uni.navigateTo({
+    url: `/pages/statistics/xs/classDetail?type=${statType.value}&code=${statCode.value}&njId=${njId}&njmc=${encodeURIComponent(njmc)}&title=${encodeURIComponent(pageTitle.value)}`
+  })
+}
+
+// 跳转到学生列表页面
+const goToStudentList = (njId: string, njmc: string, type: string, label: string) => {
+  uni.navigateTo({
+    url: `/pages/statistics/xs/studentList?type=${statType.value}&code=${statCode.value}&subType=${type}&njId=${njId}&njmc=${encodeURIComponent(njmc)}&title=${encodeURIComponent(label)}`
+  })
+}
+
+// 加载年级统计数据
+const loadGradeStats = async () => {
+  try {
+    loading.value = true
+    
+    const result = await getGradeStatisticsApi({
+      type: statType.value,
+      code: statCode.value
+    })
+    
+    if (result.resultCode === 1 && result.result) {
+      gradeStats.value = result.result
+    }
+    
+  } catch (error) {
+    console.error('加载年级统计数据失败:', error)
+    uni.showToast({
+      title: '加载失败',
+      icon: 'error'
+    })
+  } finally {
+    loading.value = false
+  }
+}
+
+onLoad((options) => {
+  if (options.type && options.code && options.title) {
+    statType.value = options.type
+    statCode.value = options.code
+    pageTitle.value = decodeURIComponent(options.title)
+    loadGradeStats()
+  }
+})
+</script>
+
+<style scoped lang="scss">
+.grade-detail-page {
+  min-height: 100vh;
+  background-color: #f5f7fa;
+  padding: 12px;
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 12px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.page-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+}
+
+.refresh-btn {
+  font-size: 14px;
+  color: #1890ff;
+  padding: 4px 8px;
+  border: 1px solid #1890ff;
+  border-radius: 4px;
+}
+
+.grade-stats {
+  margin-bottom: 12px;
+  border: 1px solid #f0f0f0;
+  border-radius: 8px;
+  background-color: #fff;
+  overflow: hidden;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.grade-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 12px 16px;
+  background-color: #fafafa;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.grade-right {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.grade-name {
+  font-size: 14px;
+  font-weight: 600;
+  color: #333;
+}
+
+.detail-arrow {
+  font-size: 16px;
+  color: #999;
+  font-weight: bold;
+  cursor: pointer;
+  transition: color 0.3s ease;
+  
+  &:active {
+    color: #1890ff;
+  }
+}
+
+.grade-details {
+  display: flex;
+  justify-content: space-between;
+  padding: 12px 16px;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px 0;
+}
+
+.detail-item {
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  min-height: 50px;
+  justify-content: center;
+  flex: 1;
+  min-width: 0;
+  
+  &.clickable {
+    cursor: pointer;
+    transition: all 0.3s ease;
+    border-radius: 8px;
+    padding: 8px;
+    
+    &:active {
+      transform: scale(0.95);
+      background-color: #f0f8ff;
+    }
+  }
+}
+
+.detail-label {
+  display: block;
+  font-size: 12px;
+  color: #666;
+  margin-bottom: 4px;
+}
+
+.detail-value {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+  
+  &.success {
+    color: #52c41a;
+  }
+  
+  &.danger {
+    color: #ff4d4f;
+  }
+  
+  &.info {
+    color: #1890ff;
+  }
+}
+
+.empty-state,
+.loading-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200px;
+  background-color: #fff;
+  border-radius: 12px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.empty-text,
+.loading-text {
+  font-size: 14px;
+  color: #999;
+}
+</style>
+
diff --git a/src/pages/statistics/xs/index.vue b/src/pages/statistics/xs/index.vue
new file mode 100644
index 0000000..44a00cd
--- /dev/null
+++ b/src/pages/statistics/xs/index.vue
@@ -0,0 +1,909 @@
+<template>
+  <view class="student-scale-page">
+    <!-- 加载遮罩层 -->
+    <view v-if="loading" class="loading-mask">
+      <view class="loading-content">
+        <view class="loading-spinner"></view>
+        <text class="loading-text">数据加载中...</text>
+      </view>
+    </view>
+    
+    <scroll-view 
+      scroll-y 
+      class="statistics-scroll"
+      :enable-back-to-top="true"
+    >
+      <!-- 1. 学生人数 -->
+      <view class="section">
+        <view class="section-header">
+          <text class="section-title">学生人数</text>
+        </view>
+        <view class="student-count-stats">
+          <view 
+            class="stat-card stat-card-full clickable" 
+            :style="{ backgroundColor: studentCountStats[0].bgColor }"
+            @click="goToStudentDetail('count', 'all', '总人数')"
+          >
+            <view class="card-icon" :style="{ backgroundColor: studentCountStats[0].iconBg }">
+              <text class="card-icon-text" :style="{ color: studentCountStats[0].color }">{{ studentCountStats[0].icon }}</text>
+            </view>
+            <view class="card-content">
+              <text class="card-label">{{ studentCountStats[0].label }}</text>
+              <text class="card-value" :style="{ color: studentCountStats[0].color }">{{ studentCountStats[0].value }}</text>
+            </view>
+          </view>
+          
+          <view class="student-count-cards">
+            <view 
+              class="stat-card clickable" 
+              v-for="(item, index) in studentCountStats.slice(1)" 
+              :key="index"
+              :style="{ backgroundColor: item.bgColor }"
+              @click="goToStudentDetail('count', item.type || 'all', item.label)"
+            >
+              <view class="card-icon" :style="{ backgroundColor: item.iconBg }">
+                <text class="card-icon-text" :style="{ color: item.color }">{{ item.icon }}</text>
+              </view>
+              <view class="card-content">
+                <text class="card-label">{{ item.label }}</text>
+                <text class="card-value" :style="{ color: item.color }">{{ item.value }}</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 2. 家长情况 -->
+      <view class="section">
+        <view class="section-header">
+          <text class="section-title">家长情况</text>
+        </view>
+        <view class="parent-content">
+          <view class="parent-chart-wrapper">
+            <QiunDataCharts
+              class="parent-chart"
+              canvas-id="parent-industry-ring"
+              type="ring"
+              :chart-data="parentIndustryChart"
+              :opts="parentIndustryChartOpts"
+              :animation="false"
+              :in-scroll-view="true"
+            />
+          </view>
+          <view class="parent-side">
+            <view v-if="loading" class="parent-placeholder">加载中...</view>
+            <view v-else-if="!parentIndustryLegend.length" class="parent-placeholder">暂无数据</view>
+            <view v-else class="parent-legend">
+              <view 
+                class="legend-item clickable" 
+                v-for="(item, index) in parentIndustryLegend" 
+                :key="index"
+                @click="goToParentDetail(item.industry)"
+              >
+                <view class="legend-info">
+                  <view class="legend-left">
+                    <view class="legend-dot" :style="{ backgroundColor: item.color }" />
+                    <text class="legend-name-large">{{ item.label }}</text>
+                  </view>
+                  <view class="legend-right">
+                    <view class="legend-value-group">
+                      <text class="legend-count">{{ item.value }}人</text>
+                      <text class="legend-divider">|</text>
+                      <text class="legend-percent">{{ item.percent }} ></text>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 3. 学生来源 -->
+      <view class="section">
+        <view class="section-header">
+          <text class="section-title">学生来源</text>
+        </view>
+        <view class="source-stats">
+          <view 
+            class="stat-card clickable" 
+            v-for="(item, index) in studentSourceStats" 
+            :key="index"
+            :style="{ backgroundColor: item.bgColor }"
+            @click="goToStudentDetail('source', item.sourceCode, item.label)"
+          >
+            <view class="card-content">
+              <text class="card-label">{{ item.label }}</text>
+              <text class="card-value" :style="{ color: item.color }">{{ item.value }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 4. 学生状态 -->
+      <view class="section">
+        <view class="section-header">
+          <text class="section-title">学生状态</text>
+        </view>
+        <view class="status-stats">
+          <view 
+            class="stat-card clickable" 
+            v-for="(item, index) in studentStatusStats" 
+            :key="index"
+            :style="{ backgroundColor: item.bgColor }"
+            @click="goToStudentDetail('status', item.statusCode, item.label)"
+          >
+            <view class="card-content">
+              <text class="card-label">{{ item.label }}</text>
+              <text class="card-value" :style="{ color: item.color }">{{ item.value }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed, onMounted } from 'vue';
+import QiunDataCharts from '@/components/charts/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue';
+import {
+  getStudentScaleDashboardApi,
+} from '@/api/statistics/studentScaleApi';
+
+// 加载状态
+const loading = ref(false);
+
+// 1. 学生人数统计数据
+interface StudentCountStat {
+  label: string;
+  value: number;
+  type?: string;
+  icon: string;
+  color: string;
+  bgColor: string;
+  iconBg: string;
+}
+
+const studentCountStats = ref<StudentCountStat[]>([
+  {
+    label: '总人数',
+    value: 0,
+    icon: '👥',
+    color: '#4F46E5',
+    bgColor: '#EEF2FF',
+    iconBg: '#E0E7FF',
+  },
+  {
+    label: '已关注',
+    value: 0,
+    type: 'followed',
+    icon: '✓',
+    color: '#22C55E',
+    bgColor: '#F0FDF4',
+    iconBg: '#DCFCE7',
+  },
+  {
+    label: '未关注',
+    value: 0,
+    type: 'unfollowed',
+    icon: '✕',
+    color: '#EF4444',
+    bgColor: '#FEF2F2',
+    iconBg: '#FEE2E2',
+  }
+]);
+
+// 2. 家长情况数据
+const parentIndustryData = ref<Array<{industry: string; count: number}>>([]);
+
+const parentTotalCount = computed(() => {
+  return parentIndustryData.value.reduce((sum, item) => sum + (item.count || 0), 0);
+});
+
+const parentIndustryChart = computed(() => {
+  const total = parentTotalCount.value;
+  const colors = [
+    '#0EA5E9', '#22C55E', '#F59E0B', '#EF4444', '#8B5CF6', 
+    '#14B8A6', '#F97316', '#EC4899', '#6366F1', '#84CC16'
+  ];
+  
+  return {
+    series: [
+      {
+        name: '家长行业',
+        data: parentIndustryData.value.map((item, index) => {
+          const percent = total > 0 ? ((item.count / total) * 100).toFixed(1) : '0.0';
+          return {
+            name: item.industry,
+            value: item.count,
+            color: colors[index % colors.length],
+            labelText: `${percent}%`,
+          };
+        }),
+      },
+    ],
+  };
+});
+
+interface ParentIndustryLegendItem {
+  label: string;
+  value: number;
+  percent: string;
+  industry: string;
+  color: string;
+}
+
+const parentIndustryLegend = computed<ParentIndustryLegendItem[]>(() => {
+  const colors = [
+    '#0EA5E9', '#22C55E', '#F59E0B', '#EF4444', '#8B5CF6', 
+    '#14B8A6', '#F97316', '#EC4899', '#6366F1', '#84CC16'
+  ];
+  const total = parentTotalCount.value;
+  
+  return parentIndustryData.value.map((item, index) => {
+    const percent = total > 0 ? ((item.count / total) * 100).toFixed(1) : '0.0';
+    return {
+      label: item.industry,
+      value: item.count,
+      percent: `${percent}%`,
+      industry: item.industry,
+      color: colors[index % colors.length],
+    };
+  });
+});
+
+const parentIndustryChartOpts = computed(() => ({
+  height: 420,
+  rotate: false,
+  rotateLock: false,
+  color: ['#0EA5E9', '#22C55E', '#F59E0B', '#EF4444', '#8B5CF6', 
+    '#14B8A6', '#F97316', '#EC4899', '#6366F1', '#84CC16'],
+  padding: [15, 20, 15, 15],
+  dataLabel: true,
+  enableScroll: false,
+  legend: {
+    show: false,
+  },
+  title: {
+    name: String(parentTotalCount.value || 0),
+    fontSize: 30,
+    color: '#3b82f6',
+  },
+  subtitle: {
+    name: '总人数',
+    fontSize: 12,
+    color: '#666666',
+  },
+  dataPointShape: false,
+  extra: {
+    ring: {
+      ringWidth: 15,
+      activeOpacity: 0.5,
+      activeRadius: 10,
+      offsetAngle: 0,
+      labelWidth: 22,
+      border: true,
+      borderWidth: 3,
+      borderColor: '#FFFFFF',
+      customLabel: true,
+    },
+  },
+}));
+
+// 3. 学生来源统计数据
+interface StudentSourceStat {
+  label: string;
+  value: number;
+  sourceCode: string;
+  icon: string;
+  color: string;
+  bgColor: string;
+  iconBg: string;
+}
+
+const studentSourceStats = ref<StudentSourceStat[]>([
+  {
+    label: '正常入学',
+    value: 0,
+    sourceCode: 'A',
+    icon: '📚',
+    color: '#22C55E',
+    bgColor: '#F0FDF4',
+    iconBg: '#DCFCE7',
+  },
+  {
+    label: '转入',
+    value: 0,
+    sourceCode: 'B',
+    icon: '🔄',
+    color: '#0EA5E9',
+    bgColor: '#F0F9FF',
+    iconBg: '#E0F2FE',
+  },
+  {
+    label: '复学',
+    value: 0,
+    sourceCode: 'C',
+    icon: '📖',
+    color: '#F59E0B',
+    bgColor: '#FFFBEB',
+    iconBg: '#FEF3C7',
+  }
+]);
+
+// 4. 学生状态统计数据
+interface StudentStatusStat {
+  label: string;
+  value: number;
+  statusCode: string;
+  icon: string;
+  color: string;
+  bgColor: string;
+  iconBg: string;
+}
+
+const studentStatusStats = ref<StudentStatusStat[]>([
+  {
+    label: '正常',
+    value: 0,
+    statusCode: 'A',
+    icon: '✓',
+    color: '#22C55E',
+    bgColor: '#F0FDF4',
+    iconBg: '#DCFCE7',
+  },
+  {
+    label: '转出',
+    value: 0,
+    statusCode: 'B',
+    icon: '➡️',
+    color: '#0EA5E9',
+    bgColor: '#F0F9FF',
+    iconBg: '#E0F2FE',
+  },
+  {
+    label: '休学',
+    value: 0,
+    statusCode: 'C',
+    icon: '⏸️',
+    color: '#F59E0B',
+    bgColor: '#FFFBEB',
+    iconBg: '#FEF3C7',
+  },
+  {
+    label: '辍学',
+    value: 0,
+    statusCode: 'E',
+    icon: '⚠️',
+    color: '#EF4444',
+    bgColor: '#FEF2F2',
+    iconBg: '#FEE2E2',
+  },
+  {
+    label: '死亡',
+    value: 0,
+    statusCode: 'G',
+    icon: '💔',
+    color: '#6B7280',
+    bgColor: '#F9FAFB',
+    iconBg: '#F3F4F6',
+  }
+]);
+
+// 加载统计数据
+const loadStatistics = async () => {
+  loading.value = true;
+  try {
+    // 统一接口获取所有统计数据
+    const dashboardRes = await getStudentScaleDashboardApi();
+    if (dashboardRes?.resultCode === 1 && dashboardRes.result) {
+      const dashboard = dashboardRes.result;
+
+      // 1. 处理学生人数统计
+      if (dashboard.studentCount) {
+        const data = dashboard.studentCount;
+        studentCountStats.value = [
+          {
+            label: '总人数',
+            value: data.totalCount || 0,
+            icon: '👥',
+            color: '#4F46E5',
+            bgColor: '#EEF2FF',
+            iconBg: '#E0E7FF',
+          },
+          {
+            label: '已关注',
+            value: data.followedCount || 0,
+            type: 'followed',
+            icon: '✓',
+            color: '#22C55E',
+            bgColor: '#F0FDF4',
+            iconBg: '#DCFCE7',
+          },
+          {
+            label: '未关注',
+            value: data.unfollowedCount || 0,
+            type: 'unfollowed',
+            icon: '✕',
+            color: '#EF4444',
+            bgColor: '#FEF2F2',
+            iconBg: '#FEE2E2',
+          }
+        ];
+      }
+
+      // 2. 处理家长情况统计
+      if (Array.isArray(dashboard.parentIndustry)) {
+        parentIndustryData.value = dashboard.parentIndustry.map((item: any) => ({
+          industry: item.industry || '未填写',
+          count: item.count || 0,
+        }));
+      }
+
+      // 3. 处理学生来源统计
+      if (Array.isArray(dashboard.studentSource)) {
+        const sourceMap = new Map();
+        dashboard.studentSource.forEach((item: any) => {
+          sourceMap.set(item.sourceCode, item.count || 0);
+        });
+        
+        studentSourceStats.value = [
+          {
+            label: '正常入学',
+            value: sourceMap.get('A') || 0,
+            sourceCode: 'A',
+            icon: '📚',
+            color: '#22C55E',
+            bgColor: '#F0FDF4',
+            iconBg: '#DCFCE7',
+          },
+          {
+            label: '转入',
+            value: sourceMap.get('B') || 0,
+            sourceCode: 'B',
+            icon: '🔄',
+            color: '#0EA5E9',
+            bgColor: '#F0F9FF',
+            iconBg: '#E0F2FE',
+          },
+          {
+            label: '复学',
+            value: sourceMap.get('C') || 0,
+            sourceCode: 'C',
+            icon: '📖',
+            color: '#F59E0B',
+            bgColor: '#FFFBEB',
+            iconBg: '#FEF3C7',
+          }
+        ];
+      }
+
+      // 4. 处理学生状态统计
+      if (Array.isArray(dashboard.studentStatus)) {
+        const statusMap = new Map();
+        dashboard.studentStatus.forEach((item: any) => {
+          statusMap.set(item.statusCode, item.count || 0);
+        });
+        
+        studentStatusStats.value = [
+          {
+            label: '正常',
+            value: statusMap.get('A') || 0,
+            statusCode: 'A',
+            icon: '✓',
+            color: '#22C55E',
+            bgColor: '#F0FDF4',
+            iconBg: '#DCFCE7',
+          },
+          {
+            label: '转出',
+            value: statusMap.get('B') || 0,
+            statusCode: 'B',
+            icon: '➡️',
+            color: '#0EA5E9',
+            bgColor: '#F0F9FF',
+            iconBg: '#E0F2FE',
+          },
+          {
+            label: '休学',
+            value: statusMap.get('C') || 0,
+            statusCode: 'C',
+            icon: '⏸️',
+            color: '#F59E0B',
+            bgColor: '#FFFBEB',
+            iconBg: '#FEF3C7',
+          },
+          {
+            label: '辍学',
+            value: statusMap.get('E') || 0,
+            statusCode: 'E',
+            icon: '⚠️',
+            color: '#EF4444',
+            bgColor: '#FEF2F2',
+            iconBg: '#FEE2E2',
+          },
+          {
+            label: '死亡',
+            value: statusMap.get('G') || 0,
+            statusCode: 'G',
+            icon: '💔',
+            color: '#6B7280',
+            bgColor: '#F9FAFB',
+            iconBg: '#F3F4F6',
+          }
+        ];
+      }
+    }
+    
+  } catch (error) {
+    console.error('加载统计数据异常:', error);
+    uni.showToast({
+      title: '网络异常，请稍后重试',
+      icon: 'none',
+      duration: 2000
+    });
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 跳转到学生明细页面
+const goToStudentDetail = (type: string, code: string, title: string) => {
+  uni.navigateTo({
+    url: `/pages/statistics/xs/gradeDetail?type=${type}&code=${code}&title=${encodeURIComponent(title)}`
+  });
+};
+
+// 跳转到家长明细页面
+const goToParentDetail = (industry: string) => {
+  uni.navigateTo({
+    url: `/pages/statistics/xs/parentDetail?industry=${encodeURIComponent(industry)}`
+  });
+};
+
+onMounted(() => {
+  loadStatistics();
+});
+</script>
+
+<style scoped lang="scss">
+.student-scale-page {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  background-color: #f8f9fa;
+}
+
+.statistics-scroll {
+  flex: 1;
+  padding: 10px 0 20px 0;
+  background-color: #f8f9fa;
+}
+
+.section {
+  background-color: #fff;
+  margin: 0 15px 15px;
+  border-radius: 12px;
+  padding: 15px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+}
+
+.section-header {
+  margin-bottom: 15px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-bottom: 12px;
+  border-bottom: 1px solid #e5e7eb;
+  background: #fafbfc;
+  margin: -15px -15px 15px -15px;
+  padding: 15px;
+
+  .section-title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #1f2933;
+    display: flex;
+    align-items: center;
+    position: relative;
+    padding-left: 12px;
+    
+    &::before {
+      content: "";
+      position: absolute;
+      left: 0;
+      top: 50%;
+      transform: translateY(-50%);
+      width: 4px;
+      height: 16px;
+      background-color: #3B82F6;
+      border-radius: 2px;
+    }
+  }
+
+  .section-subtitle {
+    font-size: 12px;
+    color: #999;
+  }
+}
+
+// 学生人数统计
+.student-count-stats {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.stat-card-full {
+  width: 100%;
+  box-sizing: border-box;
+  
+  .card-content {
+    max-width: calc(100% - 100px);
+  }
+  
+  .card-value {
+    font-size: 24px !important;
+  }
+}
+
+.student-count-cards {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 12px;
+}
+
+.stat-card {
+  display: flex;
+  align-items: center;
+  padding: 15px;
+  border-radius: 12px;
+  gap: 12px;
+  overflow: hidden;
+  box-sizing: border-box;
+  
+  &.clickable {
+    cursor: pointer;
+    transition: all 0.3s ease;
+    
+    &:active {
+      transform: scale(0.98);
+      opacity: 0.9;
+    }
+  }
+
+  .card-icon {
+    width: 48px;
+    height: 48px;
+    border-radius: 12px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+
+    .card-icon-text {
+      font-size: 24px;
+    }
+  }
+
+  .card-content {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+    min-width: 0;
+    overflow: hidden;
+
+    .card-label {
+      font-size: 12px;
+      color: #666;
+      white-space: nowrap;
+    }
+
+    .card-value {
+      font-size: 20px;
+      font-weight: bold;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+}
+
+// 家长情况
+.parent-content {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+  padding: 15px;
+}
+
+.parent-chart-wrapper {
+  position: relative;
+  width: 100%;
+  max-width: 600rpx;
+  margin: 0 auto;
+}
+
+.parent-chart {
+  width: 100% !important;
+  height: 460rpx !important;
+}
+
+.parent-side {
+  width: 100%;
+}
+
+.parent-placeholder {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-height: 200px;
+  color: #999;
+  font-size: 14px;
+}
+
+.parent-legend {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  background: #f8faff;
+  border-radius: 12px;
+  padding: 15px;
+}
+
+.legend-item {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  padding: 12px;
+  border-radius: 8px;
+  background: #fff;
+  
+  &.clickable {
+    cursor: pointer;
+    transition: all 0.3s ease;
+    
+    &:active {
+      transform: scale(0.98);
+      background: rgba(59, 130, 246, 0.1);
+    }
+  }
+}
+
+.legend-info {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 12px;
+}
+
+.legend-left {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  flex: 1;
+}
+
+.legend-dot {
+  width: 12px;
+  height: 12px;
+  border-radius: 50%;
+  flex-shrink: 0;
+}
+
+.legend-name {
+  font-size: 14px;
+  color: #1f2933;
+  font-weight: 500;
+}
+
+.legend-name-large {
+  font-size: 15px;
+  color: #1f2933;
+  font-weight: 600;
+}
+
+.legend-right {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  font-size: 12px;
+  color: #4b5563;
+  margin-right: 8px;
+}
+
+.legend-value-group {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.legend-count {
+  font-weight: 500;
+  color: #1f2933;
+}
+
+.legend-divider {
+  color: #d1d5db;
+}
+
+.legend-percent {
+  color: #2563eb;
+  font-weight: 500;
+}
+
+.legend-value {
+  font-size: 14px;
+  color: #3b82f6;
+  font-weight: 600;
+}
+
+// 学生来源和学生状态
+.source-stats,
+.status-stats {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 12px;
+  
+  .stat-card {
+    justify-content: center;
+    
+    .card-content {
+      align-items: center;
+      text-align: center;
+    }
+  }
+}
+
+// 加载状态
+.loading-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 9999;
+}
+
+.loading-content {
+  background: #ffffff;
+  border-radius: 16rpx;
+  padding: 48rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 24rpx;
+  box-shadow: 0 8rpx 32rpx rgba(0, 0, 0, 0.15);
+}
+
+.loading-spinner {
+  width: 60rpx;
+  height: 60rpx;
+  border: 4rpx solid #e5e7eb;
+  border-top-color: #3b82f6;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+.loading-text {
+  font-size: 28rpx;
+  color: #6b7280;
+  font-weight: 500;
+}
+</style>
+
diff --git a/src/pages/statistics/xs/parentDetail.vue b/src/pages/statistics/xs/parentDetail.vue
new file mode 100644
index 0000000..6fb8a1c
--- /dev/null
+++ b/src/pages/statistics/xs/parentDetail.vue
@@ -0,0 +1,178 @@
+<!-- src/pages/statistics/xs/parentDetail.vue -->
+<template>
+  <view class="parent-detail-page">
+    <!-- 页面头部 -->
+    <view class="page-header">
+      <text class="page-title">{{ industry }} - 家长明细</text>
+      <text class="refresh-btn" @click="refreshData">刷新</text>
+    </view>
+
+    <!-- 家长列表 -->
+    <view class="parent-list">
+      <view 
+        class="parent-item" 
+        v-for="parent in parentList" 
+        :key="parent.jzId"
+      >
+        <view class="parent-main-info">
+          <text class="parent-name">{{ parent.jzxm }}</text>
+          <text class="parent-student">{{ parent.xsxm }}（{{ parent.njmc }}{{ parent.bjmc }}）</text>
+          <text class="parent-work" v-if="parent.gzdw">{{ parent.gzdw }}</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 空状态 -->
+    <view class="empty-state" v-if="parentList.length === 0 && !isLoading">
+      <text class="empty-text">暂无家长数据</text>
+    </view>
+
+    <!-- 加载状态 -->
+    <view class="loading-state" v-if="isLoading">
+      <text class="loading-text">加载中...</text>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { getParentListApi } from '@/api/statistics/studentScaleApi'
+
+interface Parent {
+  jzId: string;
+  jzxm: string;
+  xsxm: string;
+  njmc: string;
+  bjmc: string;
+  gzdw?: string;
+  [key: string]: any;
+}
+
+const industry = ref('')
+const parentList = ref<Parent[]>([])
+const isLoading = ref(false)
+
+// 刷新数据
+const refreshData = async () => {
+  await loadParentData()
+}
+
+// 加载家长数据
+const loadParentData = async () => {
+  try {
+    isLoading.value = true
+    
+    const result = await getParentListApi({
+      industry: industry.value
+    })
+    
+    if (result.resultCode === 1 && result.result) {
+      parentList.value = Array.isArray(result.result) ? result.result : []
+    }
+    
+  } catch (error) {
+    console.error('加载家长数据失败:', error)
+    uni.showToast({
+      title: '加载失败',
+      icon: 'error'
+    })
+  } finally {
+    isLoading.value = false
+  }
+}
+
+onLoad((options) => {
+  if (options.industry) {
+    industry.value = decodeURIComponent(options.industry)
+    loadParentData()
+  }
+})
+</script>
+
+<style scoped lang="scss">
+.parent-detail-page {
+  min-height: 100vh;
+  background-color: #f5f7fa;
+  padding: 12px;
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 12px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.page-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+}
+
+.refresh-btn {
+  font-size: 14px;
+  color: #1890ff;
+  padding: 4px 8px;
+  border: 1px solid #1890ff;
+  border-radius: 4px;
+}
+
+.parent-list {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.parent-item {
+  background-color: #fff;
+  border-radius: 12px;
+  padding: 16px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.parent-main-info {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.parent-name {
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+}
+
+.parent-student {
+  font-size: 14px;
+  color: #666;
+}
+
+.parent-work {
+  font-size: 12px;
+  color: #999;
+  margin-top: 4px;
+}
+
+.empty-state,
+.loading-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200px;
+  background-color: #fff;
+  border-radius: 12px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.empty-text,
+.loading-text {
+  font-size: 14px;
+  color: #999;
+}
+</style>
+
diff --git a/src/pages/statistics/xs/studentList.vue b/src/pages/statistics/xs/studentList.vue
new file mode 100644
index 0000000..65234ba
--- /dev/null
+++ b/src/pages/statistics/xs/studentList.vue
@@ -0,0 +1,316 @@
+<!-- src/pages/statistics/xs/studentList.vue -->
+<template>
+  <view class="student-list-page">
+    <!-- 页面头部 -->
+    <view class="page-header">
+      <text class="page-title">{{ pageTitle }}</text>
+      <text class="refresh-btn" @click="refreshData">刷新</text>
+    </view>
+
+    <!-- 筛选信息 -->
+    <view class="filter-info" v-if="njmc || bjmc">
+      <text class="filter-text">{{ njmc }}{{ bjmc }}</text>
+    </view>
+
+    <!-- 学生列表 -->
+    <view class="student-list">
+      <view 
+        class="student-item" 
+        v-for="student in studentList" 
+        :key="student.xsId"
+        @click="viewStudentDetail(student)"
+      >
+        <view class="student-main-info">
+          <text class="student-name">{{ student.xsxm }}</text>
+          <text class="student-class">{{ student.njmc }}{{ student.bjmc }}</text>
+        </view>
+        <view class="student-status" v-if="statType === 'count'">
+          <view class="status-tag" :class="getStatusClass(student)">
+            {{ getStatusText(student) }}
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 空状态 -->
+    <view class="empty-state" v-if="studentList.length === 0 && !isLoading">
+      <text class="empty-text">暂无学生数据</text>
+    </view>
+
+    <!-- 加载状态 -->
+    <view class="loading-state" v-if="isLoading">
+      <text class="loading-text">加载中...</text>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { getStudentListApi } from '@/api/statistics/studentScaleApi'
+import { useDataStore } from '@/store/modules/data'
+
+interface Student {
+  xsId: string;
+  xsxm: string;
+  njmc: string;
+  bjmc: string;
+  jzxm?: string;
+  [key: string]: any;
+}
+
+const pageTitle = ref('')
+const statType = ref('')
+const statCode = ref('')
+const subType = ref('')
+const njId = ref('')
+const njmc = ref('')
+const bjId = ref('')
+const bjmc = ref('')
+const studentList = ref<Student[]>([])
+const isLoading = ref(false)
+
+const { setXs } = useDataStore()
+
+// 获取状态样式类
+const getStatusClass = (student: Student) => {
+  if (subType.value === 'followed') {
+    return 'completed'
+  } else if (subType.value === 'unfollowed') {
+    return 'unfollowed'
+  }
+  return ''
+}
+
+// 获取状态文本
+const getStatusText = (student: Student) => {
+  if (subType.value === 'followed') {
+    return '已关注'
+  } else if (subType.value === 'unfollowed') {
+    return '未关注'
+  }
+  return ''
+}
+
+// 刷新数据
+const refreshData = async () => {
+  await loadStudentData()
+}
+
+// 查看学生详情
+const viewStudentDetail = (student: Student) => {
+  setXs({
+    xsId: student.xsId,
+    id: student.xsId,
+    xsxm: student.xsxm,
+    xm: student.xsxm,
+    njmc: student.njmc,
+    njmcName: student.njmc,
+    bjmc: student.bjmc,
+    jzxm: student.jzxm
+  })
+  
+  uni.navigateTo({
+    url: '/pages/view/homeSchool/parentAddressBook/detail'
+  })
+}
+
+// 加载学生数据
+const loadStudentData = async () => {
+  try {
+    isLoading.value = true
+    
+    const params: any = {
+      type: statType.value,
+      code: statCode.value
+    }
+    
+    if (subType.value) {
+      params.subType = subType.value
+    }
+    
+    if (njId.value) {
+      params.njId = njId.value
+    }
+    
+    if (bjId.value) {
+      params.bjId = bjId.value
+    }
+    
+    const result = await getStudentListApi(params)
+    
+    if (result.resultCode === 1 && result.result) {
+      studentList.value = Array.isArray(result.result) ? result.result : []
+    }
+    
+  } catch (error) {
+    console.error('加载学生数据失败:', error)
+    uni.showToast({
+      title: '加载失败',
+      icon: 'error'
+    })
+  } finally {
+    isLoading.value = false
+  }
+}
+
+onLoad((options) => {
+  if (options.type && options.code && options.title) {
+    statType.value = options.type
+    statCode.value = options.code
+    pageTitle.value = decodeURIComponent(options.title)
+    
+    if (options.subType) {
+      subType.value = options.subType
+    }
+    
+    if (options.njId) {
+      njId.value = options.njId
+    }
+    
+    if (options.njmc) {
+      njmc.value = decodeURIComponent(options.njmc)
+    }
+    
+    if (options.bjId) {
+      bjId.value = options.bjId
+    }
+    
+    if (options.bjmc) {
+      bjmc.value = decodeURIComponent(options.bjmc)
+    }
+    
+    loadStudentData()
+  }
+})
+</script>
+
+<style scoped lang="scss">
+.student-list-page {
+  min-height: 100vh;
+  background-color: #f5f7fa;
+  padding: 12px;
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 12px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.page-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+}
+
+.refresh-btn {
+  font-size: 14px;
+  color: #1890ff;
+  padding: 4px 8px;
+  border: 1px solid #1890ff;
+  border-radius: 4px;
+}
+
+.filter-info {
+  background-color: #fff;
+  border-radius: 12px;
+  padding: 12px 16px;
+  margin-bottom: 12px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.filter-text {
+  font-size: 14px;
+  color: #1890ff;
+  font-weight: 500;
+}
+
+.student-list {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.student-item {
+  background-color: #fff;
+  border-radius: 12px;
+  padding: 16px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  
+  &:active {
+    transform: scale(0.98);
+    background-color: #f0f8ff;
+  }
+}
+
+.student-main-info {
+  flex: 1;
+}
+
+.student-name {
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+  display: block;
+  margin-bottom: 4px;
+}
+
+.student-class {
+  font-size: 14px;
+  color: #666;
+}
+
+.student-status {
+  flex-shrink: 0;
+}
+
+.status-tag {
+  display: inline-flex;
+  align-items: center;
+  padding: 4px 12px;
+  border-radius: 12px;
+  font-size: 12px;
+  font-weight: 500;
+  
+  &.completed {
+    background-color: #e1f3d8;
+    color: #67c23a;
+    border: 1px solid #b3e19d;
+  }
+  
+  &.unfollowed {
+    background-color: #fff7e6;
+    color: #faad14;
+    border: 1px solid #ffd591;
+  }
+}
+
+.empty-state,
+.loading-state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200px;
+  background-color: #fff;
+  border-radius: 12px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.empty-text,
+.loading-text {
+  font-size: 14px;
+  color: #999;
+}
+</style>
+
diff --git a/src/pages/statistics/zb/overview.vue b/src/pages/statistics/zb/overview.vue
index 9999218..9bed786 100644
--- a/src/pages/statistics/zb/overview.vue
+++ b/src/pages/statistics/zb/overview.vue
@@ -43,9 +43,9 @@
             <!-- 表头 -->
             <view class="table-header">
               <view class="name-column header-cell">姓名</view>
-              <view class="scroll-column header-cell">值班位置</view>
-              <view class="scroll-column header-cell">值班行政</view>
-              <view class="scroll-column header-cell">值班区域</view>
+              <view class="scroll-column header-cell">值周点位</view>
+              <view class="scroll-column header-cell">值周岗位</view>
+              <view class="scroll-column header-cell">值周校区</view>
               <view 
                 v-for="date in pivotData.dateList" 
                 :key="date" 
diff --git a/src/pages/view/routine/ShiTangXunCha/add.vue b/src/pages/view/routine/ShiTangXunCha/add.vue
index 6750802..6e1bf0d 100644
--- a/src/pages/view/routine/ShiTangXunCha/add.vue
+++ b/src/pages/view/routine/ShiTangXunCha/add.vue
@@ -22,40 +22,27 @@
           v-model="formData.gzms"
           class="form-textarea"
           placeholder="请输入工作描述"
-          maxlength="500"
-          :show-count="true"
+          :maxlength="999999"
         />
       </view>
 
-      <!-- 上传照片 -->
+      <!-- 上传照片和文档 -->
       <view class="form-item">
-        <text class="form-label">上传照片</text>
+        <text class="form-label">上传照片和文档</text>
         <view class="upload-section">
-          <view class="upload-list">
-            <view
-              v-for="(image, index) in imageList"
-              :key="index"
-              class="upload-item"
-            >
-              <image
-                :src="image.url ? imagUrl(image.url) : image.tempPath"
-                mode="aspectFill"
-                class="upload-image"
-                @click="previewImage(index)"
-              />
-              <view class="upload-delete" @click="deleteImage(index)">
-                <text class="delete-icon">×</text>
-              </view>
-            </view>
-            <view
-              v-if="imageList.length < 9"
-              class="upload-add"
-              @click="chooseImage"
-            >
-              <text class="add-icon">+</text>
-              <text class="add-text">添加图片</text>
-            </view>
-          </view>
+          <ImageVideoUpload
+            v-model:image-list="imageList"
+            v-model:file-list="fileList"
+            :max-image-count="10"
+            :max-file-count="10"
+            :enable-video="false"
+            :enable-file="true"
+            :allowed-file-types="['pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt']"
+            :compress-config="compressConfig"
+            :upload-api="attachmentUpload"
+            @image-upload-success="onImageUploadSuccess"
+            @file-upload-success="onFileUploadSuccess"
+          />
         </view>
       </view>
 
@@ -104,8 +91,8 @@ import { hcSaveApi } from "@/api/base/hcApi";
 import { attachmentUpload } from "@/api/system/upload";
 import { useUserStore } from "@/store/modules/user";
 import { showLoading, hideLoading, showToast } from "@/utils/uniapp";
-import { imagUrl } from "@/utils";
 import { ref, onMounted } from "vue";
+import { ImageVideoUpload, type ImageItem, type FileItem, COMPRESS_PRESETS } from '@/components/ImageVideoUpload';
 
 const { getJs } = useUserStore();
 
@@ -119,14 +106,13 @@ const formData = ref({
   tjfj: '' // 提交附件
 });
 
-// 图片列表 - 修改为包含临时路径和服务器路径的对象
-interface ImageItem {
-  tempPath?: string; // 临时路径（用于预览）
-  url?: string; // 服务器路径（上传成功后）
-  name?: string; // 文件名
-}
+// 压缩配置
+const compressConfig = ref(COMPRESS_PRESETS.high);
 
+// 图片列表
 const imageList = ref<ImageItem[]>([]);
+// 文档列表
+const fileList = ref<FileItem[]>([]);
 
 // 提交状态
 const submitting = ref(false);
@@ -142,89 +128,13 @@ onMounted(() => {
   formData.value.tjtime = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
 });
 
-// 选择图片
-const chooseImage = () => {
-  uni.chooseImage({
-    count: 9 - imageList.value.length,
-    sizeType: ['compressed'],
-    sourceType: ['album', 'camera'],
-    success: async (res) => {
-      // 添加临时图片到列表
-      const tempFilePaths = res.tempFilePaths as string[];
-      const newImages = tempFilePaths.map((path: string) => ({
-        tempPath: path,
-        name: path.split('/').pop() || 'image.jpg'
-      }));
-      imageList.value = [...imageList.value, ...newImages];
-      // 自动上传图片
-      await uploadImages(newImages);
-    }
-  });
+// 上传成功回调
+const onImageUploadSuccess = (image: ImageItem, index: number) => {
+  console.log('图片上传成功:', image, index);
 };
 
-// 上传图片到服务器
-const uploadImages = async (images: ImageItem[]) => {
-  try {
-    showLoading('上传图片中...');
-    
-    for (let i = 0; i < images.length; i++) {
-      const image = images[i];
-      if (image.tempPath) {
-        try {
-          // 调用上传接口
-          const uploadResult: any = await attachmentUpload(image.tempPath as any);
-          
-          if (uploadResult && uploadResult.resultCode === 1 && uploadResult.result && uploadResult.result.length > 0) {
-            // 保存服务器返回的文件路径
-            const serverPath = uploadResult.result[0].filePath;
-            
-            // 更新图片对象，保存服务器路径
-            const index = imageList.value.findIndex(img => img.tempPath === image.tempPath);
-            if (index !== -1) {
-              imageList.value[index].url = serverPath;
-              // 可以删除临时路径以节省内存
-              delete imageList.value[index].tempPath;
-            }
-          } else {
-            throw new Error('上传响应格式异常');
-          }
-        } catch (error) {
-          console.error('图片上传失败:', error);
-          showToast({ title: `${image.name || '图片'}上传失败`, icon: 'none' });
-          
-          // 从列表中移除上传失败的图片
-          const index = imageList.value.findIndex(img => img.tempPath === image.tempPath);
-          if (index !== -1) {
-            imageList.value.splice(index, 1);
-          }
-        }
-      }
-    }
-    
-    hideLoading();
-    showToast({ title: '图片上传完成', icon: 'success' });
-  } catch (error) {
-    hideLoading();
-    console.error('批量上传图片失败:', error);
-    showToast({ title: '图片上传失败，请重试', icon: 'none' });
-  }
-};
-
-// 预览图片
-const previewImage = (index: number) => {
-  const urls = imageList.value.map(img => 
-    img.url ? imagUrl(img.url) : img.tempPath
-  ).filter((url): url is string => !!url);
-  
-  uni.previewImage({
-    urls: urls,
-    current: index
-  });
-};
-
-// 删除图片
-const deleteImage = (index: number) => {
-  imageList.value.splice(index, 1);
+const onFileUploadSuccess = (file: FileItem, index: number) => {
+  console.log('文档上传成功:', file, index);
 };
 
 // 时间选择
@@ -245,10 +155,11 @@ const handleSubmit = async () => {
     return;
   }
 
-  // 检查是否有图片正在上传
-  const hasUploadingImages = imageList.value.some(img => img.tempPath && !img.url);
-  if (hasUploadingImages) {
-    showToast({ title: '请等待图片上传完成', icon: 'none' });
+  // 检查是否有图片或文档正在上传
+  const hasUploadingImages = imageList.value.some(img => !img.url);
+  const hasUploadingFiles = fileList.value.some(file => !file.url);
+  if (hasUploadingImages || hasUploadingFiles) {
+    showToast({ title: '请等待上传完成', icon: 'none' });
     return;
   }
 
@@ -256,18 +167,26 @@ const handleSubmit = async () => {
   showLoading('提交中...');
 
   try {
-    // 处理图片路径
+    // 处理图片路径（只保存图片）
     let tjfj = '';
     const uploadedImages = imageList.value.filter(img => img.url);
     if (uploadedImages.length > 0) {
-      // 使用服务器路径，用逗号分隔，过滤掉 undefined 值
       const imageUrls = uploadedImages.map(img => img.url).filter((url): url is string => !!url);
       tjfj = imageUrls.join(',');
     }
+    
+    // 处理文档路径（保存到wd字段）
+    let wd = '';
+    const uploadedFiles = fileList.value.filter(file => file.url);
+    if (uploadedFiles.length > 0) {
+      const fileUrls = uploadedFiles.map(file => file.url).filter((url): url is string => !!url);
+      wd = fileUrls.join(',');
+    }
 
     const submitData = {
       ...formData.value,
-      tjfj
+      tjfj,
+      wd
     };
 
     await hcSaveApi(submitData);
@@ -384,72 +303,6 @@ const handleSubmit = async () => {
   }
 }
 
-.upload-section {
-  .upload-list {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 8px;
-  }
-
-  .upload-item {
-    position: relative;
-    width: 80px;
-    height: 80px;
-    border-radius: 8px;
-    overflow: hidden;
-    border: 1px solid #e9ecef;
-
-    .upload-image {
-      width: 100%;
-      height: 100%;
-      object-fit: cover;
-    }
-
-    .upload-delete {
-      position: absolute;
-      top: 4px;
-      right: 4px;
-      width: 20px;
-      height: 20px;
-      background-color: rgba(0, 0, 0, 0.6);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      .delete-icon {
-        color: #ffffff;
-        font-size: 14px;
-        font-weight: bold;
-      }
-    }
-  }
-
-  .upload-add {
-    width: 80px;
-    height: 80px;
-    border: 2px dashed #e9ecef;
-    border-radius: 8px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    background-color: #f8f9fa;
-    cursor: pointer;
-
-    .add-icon {
-      font-size: 24px;
-      color: #6c757d;
-      margin-bottom: 4px;
-    }
-
-    .add-text {
-      font-size: 12px;
-      color: #6c757d;
-    }
-  }
-}
-
 .submit-section {
   padding: 0 16px;
 
diff --git a/src/pages/view/routine/ShiTangXunCha/detail.vue b/src/pages/view/routine/ShiTangXunCha/detail.vue
index be8f7f4..be7b112 100644
--- a/src/pages/view/routine/ShiTangXunCha/detail.vue
+++ b/src/pages/view/routine/ShiTangXunCha/detail.vue
@@ -33,6 +33,29 @@
         </view>
       </view>
 
+      <!-- 文档展示 -->
+      <view v-if="fileList.length > 0" class="detail-section">
+        <text class="section-title">附件文档</text>
+        <view class="file-list">
+          <view
+            v-for="(file, index) in fileList"
+            :key="index"
+            class="file-item"
+            @click="downloadFile(file)"
+          >
+            <view class="file-icon">
+              <uni-icons type="paperclip" size="20" color="#4080ff"></uni-icons>
+            </view>
+            <view class="file-info">
+              <text class="file-name">{{ getFileName(file) }}</text>
+            </view>
+            <view class="file-action">
+              <uni-icons type="download" size="18" color="#999"></uni-icons>
+            </view>
+          </view>
+        </view>
+      </view>
+
       <!-- 提交信息 -->
       <view class="detail-section">
         <text class="section-title">提交信息</text>
@@ -75,6 +98,7 @@ interface DetailData {
   jsxm: string;
   tjtime: string;
   tjfj: string;
+  wd: string;
 }
 
 // 详情数据
@@ -85,15 +109,18 @@ const detailData = ref<DetailData>({
   jsId: '',
   jsxm: '',
   tjtime: '',
-  tjfj: ''
+  tjfj: '',
+  wd: ''
 });
 
 // 图片列表
 const imageList = ref<string[]>([]);
+// 文档列表
+const fileList = ref<string[]>([]);
 
 // 获取页面参数
-onLoad((options) => {
-  if (options.id) {
+onLoad((options: any) => {
+  if (options && options.id) {
     loadDetail(options.id);
   }
 });
@@ -109,10 +136,20 @@ const loadDetail = async (id: string) => {
     if (res && res.rows && res.rows.length > 0) {
       detailData.value = res.rows[0];
       
-      // 处理图片
+      // 处理图片（从tjfj字段）
       if (detailData.value.tjfj) {
-        const images = detailData.value.tjfj.split(',').filter(img => img.trim());
-        imageList.value = images.map(img => imagUrl(img));
+        const imageUrls = detailData.value.tjfj.split(',').filter((url: string) => url.trim());
+        imageList.value = imageUrls.map((url: string) => imagUrl(url));
+      } else {
+        imageList.value = [];
+      }
+      
+      // 处理文档（从wd字段）
+      if (detailData.value.wd) {
+        const fileUrls = detailData.value.wd.split(',').filter((url: string) => url.trim());
+        fileList.value = fileUrls;
+      } else {
+        fileList.value = [];
       }
     }
   } catch (error) {
@@ -139,6 +176,53 @@ const formatTime = (timeStr: string) => {
   return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(date.getDate()).padStart(2, "0")}`;
 };
 
+// 获取文件名
+const getFileName = (url: string) => {
+  if (!url) return '未知文件';
+  const parts = url.split('/');
+  return parts[parts.length - 1] || '未知文件';
+};
+
+// 格式化文件大小
+const formatFileSize = (bytes: number) => {
+  if (!bytes || bytes === 0) return '';
+  const k = 1024;
+  const sizes = ['B', 'KB', 'MB', 'GB'];
+  const i = Math.floor(Math.log(bytes) / Math.log(k));
+  return Math.round(bytes / Math.pow(k, i) * 100) / 100 + ' ' + sizes[i];
+};
+
+// 下载文件
+const downloadFile = (url: string) => {
+  uni.downloadFile({
+    url: imagUrl(url),
+    success: (res) => {
+      if (res.statusCode === 200) {
+        uni.openDocument({
+          filePath: res.tempFilePath,
+          success: () => {
+            console.log('打开文档成功');
+          },
+          fail: (err) => {
+            console.error('打开文档失败:', err);
+            uni.showToast({
+              title: '无法打开该文件',
+              icon: 'none'
+            });
+          }
+        });
+      }
+    },
+    fail: (err) => {
+      console.error('下载文件失败:', err);
+      uni.showToast({
+        title: '下载失败',
+        icon: 'none'
+      });
+    }
+  });
+};
+
 // 返回列表
 const goBack = () => {
   uni.navigateBack();
@@ -285,4 +369,55 @@ const goBack = () => {
     width: calc(50% - 4px);
   }
 }
+
+.file-list {
+  .file-item {
+    display: flex;
+    align-items: center;
+    padding: 12px;
+    margin-bottom: 8px;
+    background-color: #f8f9fa;
+    border-radius: 8px;
+    border: 1px solid #e9ecef;
+    transition: all 0.3s ease;
+    
+    &:active {
+      background-color: #e9ecef;
+    }
+    
+    .file-icon {
+      width: 40px;
+      height: 40px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background-color: #e3f2fd;
+      border-radius: 6px;
+      margin-right: 12px;
+    }
+    
+    .file-info {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      
+      .file-name {
+        font-size: 14px;
+        color: #2c3e50;
+        font-weight: 500;
+        margin-bottom: 4px;
+        word-break: break-all;
+      }
+      
+      .file-size {
+        font-size: 12px;
+        color: #999;
+      }
+    }
+    
+    .file-action {
+      margin-left: 8px;
+    }
+  }
+}
 </style> 
\ No newline at end of file
diff --git a/src/pages/view/routine/ShiTangXunCha/edit.vue b/src/pages/view/routine/ShiTangXunCha/edit.vue
index a84e2ca..744ca37 100644
--- a/src/pages/view/routine/ShiTangXunCha/edit.vue
+++ b/src/pages/view/routine/ShiTangXunCha/edit.vue
@@ -22,40 +22,27 @@
           v-model="formData.gzms"
           class="form-textarea"
           placeholder="请输入工作描述"
-          maxlength="500"
-          :show-count="true"
+          :maxlength="999999"
         />
       </view>
 
-      <!-- 上传照片 -->
+      <!-- 上传照片和文档 -->
       <view class="form-item">
-        <text class="form-label">上传照片</text>
+        <text class="form-label">上传照片和文档</text>
         <view class="upload-section">
-          <view class="upload-list">
-            <view
-              v-for="(image, index) in imageList"
-              :key="index"
-              class="upload-item"
-            >
-              <image
-                :src="image.url ? imagUrl(image.url) : image.tempPath"
-                mode="aspectFill"
-                class="upload-image"
-                @click="previewImage(index)"
-              />
-              <view class="upload-delete" @click="deleteImage(index)">
-                <text class="delete-icon">×</text>
-              </view>
-            </view>
-            <view
-              v-if="imageList.length < 9"
-              class="upload-add"
-              @click="chooseImage"
-            >
-              <text class="add-icon">+</text>
-              <text class="add-text">添加图片</text>
-            </view>
-          </view>
+          <ImageVideoUpload
+            v-model:image-list="imageList"
+            v-model:file-list="fileList"
+            :max-image-count="10"
+            :max-file-count="10"
+            :enable-video="false"
+            :enable-file="true"
+            :allowed-file-types="['pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt']"
+            :compress-config="compressConfig"
+            :upload-api="attachmentUpload"
+            @image-upload-success="onImageUploadSuccess"
+            @file-upload-success="onFileUploadSuccess"
+          />
         </view>
       </view>
 
@@ -104,9 +91,9 @@ import { hcSaveApi, hcFindPageApi } from "@/api/base/hcApi";
 import { attachmentUpload } from "@/api/system/upload";
 import { useUserStore } from "@/store/modules/user";
 import { showLoading, hideLoading, showToast } from "@/utils/uniapp";
-import { imagUrl } from "@/utils";
 import { ref, onMounted } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
+import { ImageVideoUpload, type ImageItem, type FileItem, COMPRESS_PRESETS } from '@/components/ImageVideoUpload';
 
 const { getJs } = useUserStore();
 
@@ -121,17 +108,17 @@ const formData = ref({
   jsId: '', // 提交老师ID
   jsxm: '', // 提交老师姓名
   tjtime: '', // 提交时间
-  tjfj: '' // 提交附件
+  tjfj: '', // 提交附件（图片）
+  wd: '' // 文档
 });
 
-// 图片列表 - 修改为包含临时路径和服务器路径的对象
-interface ImageItem {
-  tempPath?: string; // 临时路径（用于预览）
-  url?: string; // 服务器路径（上传成功后）
-  name?: string; // 文件名
-}
+// 压缩配置
+const compressConfig = ref(COMPRESS_PRESETS.high);
 
+// 图片列表
 const imageList = ref<ImageItem[]>([]);
+// 文档列表
+const fileList = ref<FileItem[]>([]);
 
 // 提交状态
 const submitting = ref(false);
@@ -173,16 +160,40 @@ const loadData = async () => {
         jsId: data.jsId || '',
         jsxm: data.jsxm || '',
         tjtime: data.tjtime ? data.tjtime.split(' ')[0] : '', // 只取日期部分
-        tjfj: data.tjfj || ''
+        tjfj: data.tjfj || '',
+        wd: data.wd || ''
       };
       
-      // 处理图片数据
+      // 处理图片数据（从tjfj字段）
       if (data.tjfj) {
         const imageUrls = data.tjfj.split(',').filter((url: string) => url.trim());
-        imageList.value = imageUrls.map((url: string) => ({
-          url: url.trim(),
-          name: url.split('/').pop() || 'image.jpg'
-        }));
+        imageList.value = imageUrls.map((url: string) => {
+          const trimmedUrl = url.trim();
+          const fileName = trimmedUrl.split('/').pop() || 'image.jpg';
+          return {
+            url: trimmedUrl,
+            name: fileName,
+            originalName: fileName
+          };
+        });
+      } else {
+        imageList.value = [];
+      }
+      
+      // 处理文档数据（从wd字段）
+      if (data.wd) {
+        const fileUrls = data.wd.split(',').filter((url: string) => url.trim());
+        fileList.value = fileUrls.map((url: string) => {
+          const trimmedUrl = url.trim();
+          const fileName = trimmedUrl.split('/').pop() || 'file';
+          return {
+            url: trimmedUrl,
+            name: fileName,
+            originalName: fileName
+          };
+        });
+      } else {
+        fileList.value = [];
       }
     } else {
       throw new Error('获取数据失败');
@@ -205,89 +216,13 @@ onMounted(() => {
   formData.value.jsxm = js.jsxm;
 });
 
-// 选择图片
-const chooseImage = () => {
-  uni.chooseImage({
-    count: 9 - imageList.value.length,
-    sizeType: ['compressed'],
-    sourceType: ['album', 'camera'],
-    success: async (res) => {
-      // 添加临时图片到列表
-      const tempFilePaths = res.tempFilePaths as string[];
-      const newImages = tempFilePaths.map((path: string) => ({
-        tempPath: path,
-        name: path.split('/').pop() || 'image.jpg'
-      }));
-      imageList.value = [...imageList.value, ...newImages];
-      // 自动上传图片
-      await uploadImages(newImages);
-    }
-  });
+// 上传成功回调
+const onImageUploadSuccess = (image: ImageItem, index: number) => {
+  console.log('图片上传成功:', image, index);
 };
 
-// 上传图片到服务器
-const uploadImages = async (images: ImageItem[]) => {
-  try {
-    showLoading('上传图片中...');
-    
-    for (let i = 0; i < images.length; i++) {
-      const image = images[i];
-      if (image.tempPath) {
-        try {
-          // 调用上传接口
-          const uploadResult: any = await attachmentUpload(image.tempPath as any);
-          
-          if (uploadResult && uploadResult.resultCode === 1 && uploadResult.result && uploadResult.result.length > 0) {
-            // 保存服务器返回的文件路径
-            const serverPath = uploadResult.result[0].filePath;
-            
-            // 更新图片对象，保存服务器路径
-            const index = imageList.value.findIndex(img => img.tempPath === image.tempPath);
-            if (index !== -1) {
-              imageList.value[index].url = serverPath;
-              // 可以删除临时路径以节省内存
-              delete imageList.value[index].tempPath;
-            }
-          } else {
-            throw new Error('上传响应格式异常');
-          }
-        } catch (error) {
-          console.error('图片上传失败:', error);
-          showToast({ title: `${image.name || '图片'}上传失败`, icon: 'none' });
-          
-          // 从列表中移除上传失败的图片
-          const index = imageList.value.findIndex(img => img.tempPath === image.tempPath);
-          if (index !== -1) {
-            imageList.value.splice(index, 1);
-          }
-        }
-      }
-    }
-    
-    hideLoading();
-    showToast({ title: '图片上传完成', icon: 'success' });
-  } catch (error) {
-    hideLoading();
-    console.error('批量上传图片失败:', error);
-    showToast({ title: '图片上传失败，请重试', icon: 'none' });
-  }
-};
-
-// 预览图片
-const previewImage = (index: number) => {
-  const urls = imageList.value.map(img => 
-    img.url ? imagUrl(img.url) : img.tempPath
-  ).filter((url): url is string => !!url);
-  
-  uni.previewImage({
-    urls: urls,
-    current: index
-  });
-};
-
-// 删除图片
-const deleteImage = (index: number) => {
-  imageList.value.splice(index, 1);
+const onFileUploadSuccess = (file: FileItem, index: number) => {
+  console.log('文档上传成功:', file, index);
 };
 
 // 时间选择
@@ -308,10 +243,11 @@ const handleSubmit = async () => {
     return;
   }
 
-  // 检查是否有图片正在上传
-  const hasUploadingImages = imageList.value.some(img => img.tempPath && !img.url);
-  if (hasUploadingImages) {
-    showToast({ title: '请等待图片上传完成', icon: 'none' });
+  // 检查是否有图片或文档正在上传
+  const hasUploadingImages = imageList.value.some(img => !img.url);
+  const hasUploadingFiles = fileList.value.some(file => !file.url);
+  if (hasUploadingImages || hasUploadingFiles) {
+    showToast({ title: '请等待上传完成', icon: 'none' });
     return;
   }
 
@@ -319,18 +255,26 @@ const handleSubmit = async () => {
   showLoading('提交中...');
 
   try {
-    // 处理图片路径
+    // 处理图片路径（只保存图片）
     let tjfj = '';
     const uploadedImages = imageList.value.filter(img => img.url);
     if (uploadedImages.length > 0) {
-      // 使用服务器路径，用逗号分隔，过滤掉 undefined 值
       const imageUrls = uploadedImages.map(img => img.url).filter((url): url is string => !!url);
       tjfj = imageUrls.join(',');
     }
+    
+    // 处理文档路径（保存到wd字段）
+    let wd = '';
+    const uploadedFiles = fileList.value.filter(file => file.url);
+    if (uploadedFiles.length > 0) {
+      const fileUrls = uploadedFiles.map(file => file.url).filter((url): url is string => !!url);
+      wd = fileUrls.join(',');
+    }
 
     const submitData = {
       ...formData.value,
-      tjfj
+      tjfj,
+      wd
     };
 
     await hcSaveApi(submitData);
@@ -448,69 +392,7 @@ const handleSubmit = async () => {
 }
 
 .upload-section {
-  .upload-list {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 8px;
-  }
-
-  .upload-item {
-    position: relative;
-    width: 80px;
-    height: 80px;
-    border-radius: 8px;
-    overflow: hidden;
-    border: 1px solid #e9ecef;
-
-    .upload-image {
-      width: 100%;
-      height: 100%;
-      object-fit: cover;
-    }
-
-    .upload-delete {
-      position: absolute;
-      top: 4px;
-      right: 4px;
-      width: 20px;
-      height: 20px;
-      background-color: rgba(0, 0, 0, 0.6);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      .delete-icon {
-        color: #ffffff;
-        font-size: 14px;
-        font-weight: bold;
-      }
-    }
-  }
-
-  .upload-add {
-    width: 80px;
-    height: 80px;
-    border: 2px dashed #e9ecef;
-    border-radius: 8px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    background-color: #f8f9fa;
-    cursor: pointer;
-
-    .add-icon {
-      font-size: 24px;
-      color: #6c757d;
-      margin-bottom: 4px;
-    }
-
-    .add-text {
-      font-size: 12px;
-      color: #6c757d;
-    }
-  }
+  // ImageVideoUpload 组件自带样式
 }
 
 .submit-section {
diff --git a/src/pages/view/routine/qd/index.vue b/src/pages/view/routine/qd/index.vue
index 28e5d06..0123003 100644
--- a/src/pages/view/routine/qd/index.vue
+++ b/src/pages/view/routine/qd/index.vue
@@ -154,19 +154,24 @@ interface QdItem {
   qdry: string; // 签到人员
 }
 
-// 获取当月第一天和最后一天
-const getCurrentMonthRange = () => {
+// 获取当前周的第一天和最后一天
+const getCurrentWeekRange = () => {
   const now = new Date();
-  const year = now.getFullYear();
-  const month = now.getMonth();
+  const day = now.getDay(); // 0-6, 0是周日
+  const diff = day === 0 ? -6 : 1 - day; // 如果是周日，往前推6天；否则推到周一
   
-  // 当月第一天
-  const firstDay = new Date(year, month, 1);
-  const startTime = `${year}-${String(month + 1).padStart(2, '0')}-01`;
+  // 当前周的第一天（周一）
+  const firstDay = new Date(now);
+  firstDay.setDate(now.getDate() + diff);
+  firstDay.setHours(0, 0, 0, 0);
   
-  // 当月最后一天
-  const lastDay = new Date(year, month + 1, 0);
-  const endTime = `${year}-${String(month + 1).padStart(2, '0')}-${String(lastDay.getDate()).padStart(2, '0')}`;
+  // 当前周的最后一天（周日）
+  const lastDay = new Date(firstDay);
+  lastDay.setDate(firstDay.getDate() + 6);
+  lastDay.setHours(23, 59, 59, 999);
+  
+  const startTime = `${firstDay.getFullYear()}-${String(firstDay.getMonth() + 1).padStart(2, '0')}-${String(firstDay.getDate()).padStart(2, '0')}`;
+  const endTime = `${lastDay.getFullYear()}-${String(lastDay.getMonth() + 1).padStart(2, '0')}-${String(lastDay.getDate()).padStart(2, '0')}`;
   
   return { startTime, endTime };
 };
@@ -177,7 +182,7 @@ const pageParams = ref({
 });
 
 // 获取默认时间范围
-const defaultRange = getCurrentMonthRange();
+const defaultRange = getCurrentWeekRange();
 
 // 搜索表单
 const searchForm = reactive({
@@ -209,7 +214,7 @@ const handleSearch = () => {
 
 // 重置搜索
 const handleReset = () => {
-  const resetRange = getCurrentMonthRange();
+  const resetRange = getCurrentWeekRange();
   searchForm.startTime = resetRange.startTime;
   searchForm.endTime = resetRange.endTime;
   getQdList();
diff --git a/src/pages/view/routine/qd/publish.vue b/src/pages/view/routine/qd/publish.vue
index cded3ff..814c386 100644
--- a/src/pages/view/routine/qd/publish.vue
+++ b/src/pages/view/routine/qd/publish.vue
@@ -575,11 +575,14 @@ onLoad((options: any) => {
   if (options.qdlx) {
     formData.qdlx = options.qdlx;
     console.log('新增签到页面接收到qdlx参数:', options.qdlx);
-    
     // 如果是ysyc或xkjy类型，加载课程/教研组列表
     if (options.qdlx === 'ysyc' || options.qdlx === 'xkjy') {
       loadCourseList();
     }
+  } else {
+    // 未传入类型，默认常规会议
+    formData.qdlx = 'cghy';
+    console.log('未收到qdlx参数，默认设置为 cghy');
   }
 });
 
@@ -731,7 +734,7 @@ const handlePublish = async () => {
       qdmc: formData.qdmc,
       qdwz: formData.qdwz,
       qdry: uniqueIds.join(','), // 使用去重后的ID列表
-      qdlx: formData.qdlx, // 签到类型
+  qdlx: formData.qdlx || 'cghy', // 签到类型（兜底为常规会议）
       mdqz: formData.mdqz,
       qdkstime: formatDateTime(formData.qdkstime),
       qdjstime: formatDateTime(formData.qdjstime),
diff --git a/src/static/base/home/xsgm.png b/src/static/base/home/xsgm.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac46f62a42847900cf560441c4b57e392579d312
GIT binary patch
literal 10262
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

literal 0
HcmV?d00001

diff --git a/src/store/modules/teacherAnalytics.ts b/src/store/modules/teacherAnalytics.ts
index 5dd5ff4..89c133e 100644
--- a/src/store/modules/teacherAnalytics.ts
+++ b/src/store/modules/teacherAnalytics.ts
@@ -22,6 +22,7 @@ interface TeacherAnalyticsState {
     position: TeacherDistributionItem[];
     political: TeacherDistributionItem[];
     workingYears: TeacherDistributionItem[];
+    zdqk: TeacherDistributionItem[];
   };
   list: TeacherAnalyticsListItem[];
   pagination: {
@@ -43,6 +44,7 @@ const defaultDistributions = {
   position: [] as TeacherDistributionItem[],
   political: [] as TeacherDistributionItem[],
   workingYears: [] as TeacherDistributionItem[],
+  zdqk: [] as TeacherDistributionItem[],
 };
 
 export const useTeacherAnalyticsStore = defineStore("teacherAnalytics", {
@@ -124,6 +126,7 @@ export const useTeacherAnalyticsStore = defineStore("teacherAnalytics", {
             position: data.position || [],
             political: data.political || [],
             workingYears: data.workingYears || [],
+            zdqk: data.zdqk || [],
           };
         } else {
           this.composition = [];