From a5c6d998398f726408ae84f20968b3006b10c13c Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 27 Nov 2025 10:33:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/calendar/index.vue                  | 14 ++++--
 src/views/course/components/addTypes.vue      |  8 ++--
 src/views/course/types.vue                    |  8 ++--
 .../components/addHistoryCourse.vue           |  6 +--
 src/views/statistics/index.vue                | 46 +++++++++++++++----
 vue.config.js                                 |  4 +-
 6 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/src/views/calendar/index.vue b/src/views/calendar/index.vue
index 4e37eb8..2dcfa4f 100644
--- a/src/views/calendar/index.vue
+++ b/src/views/calendar/index.vue
@@ -1,10 +1,12 @@
 <template>
   <div class="admin-calendar">
     <!-- 顶部操作区 -->
-    <div class="admin-header">
+    <div class="admin-header" style="display: flex; align-items: center; gap: 20px;">
       <el-button type="success" icon="el-icon-plus" @click="openCreateModal('add')">新建日历事件</el-button>
       <el-button type="primary" icon="el-icon-plus" @click="exportCalendar">导出日历事件</el-button>
-
+      <div style="color: #333; font-size: 16px; font-weight: 500;">
+        本月开课天数：{{ monthDayCalendar }}天 {{ calendarDate.getFullYear() }}年累计开课天数：{{ yearDayCalendar }}天
+      </div>
     </div>
       <!-- 日历预览区 -->
     <div class="admin-main">
@@ -63,7 +65,9 @@ import { getToken } from '@/utils/auth';
       list: [],
       calendarDate: new Date(),
       // 记录每一周行在容器内的实际像素 top，解决不等高行导致定位偏差
-      weekRowTops: []
+      weekRowTops: [],
+      monthDayCalendar: 0,
+      yearDayCalendar: 0
       }
     },
     computed: {
@@ -146,7 +150,9 @@ import { getToken } from '@/utils/auth';
         month: this.selectMonth
         })
         // 统一规范化 id，避免 _id 与 id 不一致导致点击与定位异常
-        this.list = (res || []).map(e => ({ ...e, id: e.id || e._id }))
+        this.list = (res.list || res || []).map(e => ({ ...e, id: e.id || e._id }))
+        this.monthDayCalendar = res.monthDayCalendar || 0
+        this.yearDayCalendar = res.yearDayCalendar || 0
         // 重新生成动态样式
         this.generateDynamicStyles()
         // 渲染后测量行位置信息
diff --git a/src/views/course/components/addTypes.vue b/src/views/course/components/addTypes.vue
index 98d2070..e1ffd56 100644
--- a/src/views/course/components/addTypes.vue
+++ b/src/views/course/components/addTypes.vue
@@ -39,7 +39,7 @@
           </div>
         </div>
       </template>
-      
+
       <template v-slot:is_chart>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
@@ -185,7 +185,7 @@
       <template v-slot:is_history>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>是否历史课程体系：
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>是否额外添加课程体系：
           </div>
           <div class="xy-table-item-content">
             <el-radio-group style="width:100%" v-model="form.is_history">
@@ -224,7 +224,7 @@
           wait_tip:"",
           pass_tip:"",
           fault_tip:'',
-          back_tip:"",  
+          back_tip:"",
           year_total:"",
           color:'',
           is_fee:'',
@@ -294,7 +294,7 @@
           this.id = ''
           this.form = {
             name:'',
-           
+
             open_mobile:0,
             status:1,
             is_chart:0,
diff --git a/src/views/course/types.vue b/src/views/course/types.vue
index ec2c786..64e594d 100644
--- a/src/views/course/types.vue
+++ b/src/views/course/types.vue
@@ -13,7 +13,7 @@
                 </el-select>
               </div>
               <div>
-                <el-select v-model="select.is_history" placeholder="请选择是否历史课程体系" clearable style="width: 100%;">
+                <el-select v-model="select.is_history" placeholder="请选择是否额外添加课程体系" clearable style="width: 100%;">
                   <el-option label="是" :value="1">
                   </el-option>
                   <el-option label="否" :value="0">
@@ -47,11 +47,11 @@
           </el-table-column>
         </template>
         <template v-slot:is_history>
-          <el-table-column align='center' label="是否历史课程体系" width="180" header-align="center">
+          <el-table-column align='center' label="是否额外添加课程体系" width="180" header-align="center">
             <template slot-scope="scope">
               <el-tag :type="scope.row.is_history === 1 ? 'success' : 'info'" v-if="scope.row.is_history === 1">是</el-tag>
               <el-tag :type="scope.row.is_history === 0 ? 'info' : 'success'" v-else>否</el-tag>
-              
+
             </template>
           </el-table-column>
         </template>
@@ -108,7 +108,7 @@
           width: 120,
         }, {
           prop: 'is_history',
-          label: '是否历史课程体系',
+          label: '是否额外添加课程体系',
           align: 'center',
           width: 180,
           formatter: (row) => {
diff --git a/src/views/historyCourse/components/addHistoryCourse.vue b/src/views/historyCourse/components/addHistoryCourse.vue
index 1f43548..87209bb 100644
--- a/src/views/historyCourse/components/addHistoryCourse.vue
+++ b/src/views/historyCourse/components/addHistoryCourse.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <xy-dialog ref="dialog" :width="70" :is-show.sync="isShow" :type="'form'"
-      :title="type === 'add' ? '新增历史课程体系' : '编辑历史课程体系'" :form="form" :rules="rules" @submit="submit">
+      :title="type === 'add' ? '新增额外添加课程体系' : '编辑额外添加课程体系'" :form="form" :rules="rules" @submit="submit">
       <template v-slot:type>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
@@ -164,7 +164,7 @@ export default {
         if (res && res.data) {
           this.courseTypeOptions = res.data
           if (this.courseTypeOptions.length === 0) {
-            this.$message.warning('请先创建历史课程体系')
+            this.$message.warning('请先创建额外添加课程体系')
           }
         }
       } catch (error) {
@@ -174,7 +174,7 @@ export default {
     },
     submit() {
       if (this.courseTypeOptions.length === 0) {
-        this.$message.warning('请先创建历史课程体系')
+        this.$message.warning('请先创建额外添加课程体系')
         return
       }
       if (this.id) {
diff --git a/src/views/statistics/index.vue b/src/views/statistics/index.vue
index 7e9d2f4..399b0f3 100644
--- a/src/views/statistics/index.vue
+++ b/src/views/statistics/index.vue
@@ -146,12 +146,15 @@
               :header-cell-style="headerCellStyle"
               show-summary
               :summary-method="getCourseDetailSummary">
-              <el-table-column prop="courseSystem" label="课程体系" width="200" align="center"></el-table-column>
+              <el-table-column prop="courseSystem" label="课程体系" width="200" align="center" fixed="left"></el-table-column>
               <el-table-column prop="totalPeople" label="培养人数（未去重）" width="200" align="center"></el-table-column>
               <el-table-column prop="uniquePeople" label="培养人数（课程体系内已去重）" width="280" align="center"></el-table-column>
               <el-table-column prop="courseIndex" label="期数" width="120" align="center"></el-table-column>
               <el-table-column prop="courseName" label="开课" min-width="200"></el-table-column>
               <el-table-column prop="coursePeople" label="课程培养人数" width="150" align="center"></el-table-column>
+              <el-table-column prop="genban_total" label="跟班学员数" width="150" align="center"></el-table-column>
+              <el-table-column prop="yh_invested_total" label="被投企业数" width="150" align="center"></el-table-column>
+              <el-table-column prop="company_join_total" label="元禾同事数" width="150" align="center"></el-table-column>
             </el-table>
           </div>
         </el-col>
@@ -368,7 +371,10 @@ export default {
       courseDetailSummary: {
         totalPeople: 0,
         uniquePeople: 0,
-        coursePeople: 0
+        coursePeople: 0,
+        genban_total: 0,
+        yh_invested_total: 0,
+        company_join_total: 0
       },
       regionData: [],
       regionSummary: {
@@ -526,7 +532,7 @@ export default {
       try {
         // 准备Excel数据
         const excelData = [
-          ['课程体系', '培养人数（未去重）', '培养人数（课程体系内已去重）', '开课', '课程培养人数']
+          ['课程体系', '培养人数（未去重）', '培养人数（课程体系内已去重）', '开课', '课程培养人数', '跟班学员数', '被投企业数', '元禾同事数']
         ]
         
         // 添加数据行，只导出合并后的数据（每行都显示完整信息）
@@ -536,7 +542,10 @@ export default {
             row.totalPeople,
             row.uniquePeople,
             row.courseName,
-            row.coursePeople
+            row.coursePeople,
+            row.genban_total,
+            row.yh_invested_total,
+            row.company_join_total
           ])
         })
         
@@ -550,7 +559,10 @@ export default {
           { wch: 18 }, // 培养人数（未去重）
           { wch: 22 }, // 培养人数（课程体系内已去重）
           { wch: 30 }, // 开课
-          { wch: 15 }  // 课程培养人数
+          { wch: 15 }, // 课程培养人数
+          { wch: 15 }, // 跟班学员数
+          { wch: 15 }, // 被投企业数
+          { wch: 15 }  // 元禾同事数
         ]
         ws['!cols'] = colWidths
         
@@ -843,7 +855,10 @@ export default {
           // 添加课程信息
           groupedData[courseType].courses.push({
             courseName: item.course_name || '',
-            coursePeople: item.course_signs_pass || 0
+            coursePeople: item.course_signs_pass || 0,
+            genban_total: item.genban_total || 0,
+            yh_invested_total: item.yh_invested_total || 0,
+            company_join_total: item.company_join_total || 0
           })
         })
         
@@ -860,6 +875,9 @@ export default {
               courseIndex: index + 1,
               courseName: course.courseName,
               coursePeople: course.coursePeople,
+              genban_total: course.genban_total,
+              yh_invested_total: course.yh_invested_total,
+              company_join_total: course.company_join_total,
               isFirstRow: index === 0 // 标记是否为该课程体系的第一行
             })
           })
@@ -870,11 +888,14 @@ export default {
           acc.totalPeople += Number(group.totalPeople) || 0
           acc.uniquePeople += Number(group.uniquePeople) || 0
           acc.coursePeople += group.courses.reduce((sum, course) => sum + (Number(course.coursePeople) || 0), 0)
+          acc.genban_total += group.courses.reduce((sum, course) => sum + (Number(course.genban_total) || 0), 0)
+          acc.yh_invested_total += group.courses.reduce((sum, course) => sum + (Number(course.yh_invested_total) || 0), 0)
+          acc.company_join_total += group.courses.reduce((sum, course) => sum + (Number(course.company_join_total) || 0), 0)
           return acc
-        }, { totalPeople: 0, uniquePeople: 0, coursePeople: 0 })
+        }, { totalPeople: 0, uniquePeople: 0, coursePeople: 0, genban_total: 0, yh_invested_total: 0, company_join_total: 0 })
         this.courseDetailSummary = summary
       } else {
-        this.courseDetailSummary = { totalPeople: 0, uniquePeople: 0, coursePeople: 0 }
+        this.courseDetailSummary = { totalPeople: 0, uniquePeople: 0, coursePeople: 0, genban_total: 0, yh_invested_total: 0, company_join_total: 0 }
       }
       
       // 更新区域明细统计表格
@@ -994,6 +1015,15 @@ export default {
         } else if (index === 5) {
           // 课程培养人数
           sums[index] = this.courseDetailSummary.coursePeople
+        } else if (index === 6) {
+          // 跟班学员数
+          sums[index] = this.courseDetailSummary.genban_total || 0
+        } else if (index === 7) {
+          // 被投企业数
+          sums[index] = this.courseDetailSummary.yh_invested_total || 0
+        } else if (index === 8) {
+          // 元禾同事数
+          sums[index] = this.courseDetailSummary.company_join_total || 0
         } else {
           sums[index] = ''
         }
diff --git a/vue.config.js b/vue.config.js
index 7ffc4f9..29ac6d1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -28,9 +28,9 @@ module.exports = {
    */
   publicPath: process.env.ENV === 'staging' ? '/admin' : '/admin',
   // 测试
-  // outputDir: '/Users/mac/Documents/朗业/2025/s-苏州科技商学院/wx.sstbc.com/public/admin',
+  outputDir: '/Users/mac/Documents/朗业/2025/s-苏州科技商学院/wx.sstbc.com/public/admin',
   //  正式
-  outputDir: '/Users/mac/Documents/朗业/2024/s-苏州科技商学院/wx.sstbc.com/public/admin',
+  // outputDir: '/Users/mac/Documents/朗业/2024/s-苏州科技商学院/wx.sstbc.com/public/admin',
   assetsDir: 'static',
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项