Merge remote-tracking branch 'origin/cfclub' into cfclub

cfc-backend/src/main/java/com/etotem/cfc/dto/MemberEnergyDTO.java

@@ -74,6 +74,7 @@ public class MemberEnergyDTO {
     private Integer emotionResilience;        // 心理韧性 (0-100)
     private Integer emotionStressCoping;      // 压力应对 (0-100)
     private Integer emotionSelfAwareness;     // 自我认知 (0-100)
+    private Integer emotionStability;         // 情绪稳定性综合分 (0-100)
 
     // ========== 心·自驱力（3维） ==========
     private Integer driveAutonomy;            // 自主性 (0-100)

cfc-backend/src/main/java/com/etotem/cfc/service/EnergyService.java

@@ -1129,6 +1129,10 @@ public class EnergyService {
             dto.setEmotionResilience(safeScore(dan.getResilienceScore()));
             dto.setEmotionStressCoping(safeScore(dan.getStressCopingScore()));
             dto.setEmotionSelfAwareness(safeScore(dan.getSelfAwarenessScore()));
+            // 情绪稳定性 = 四个 EMI 维度均值
+            int emiSum = safeScore(dan.getEmotionScore()) + safeScore(dan.getResilienceScore())
+                    + safeScore(dan.getStressCopingScore()) + safeScore(dan.getSelfAwarenessScore());
+            dto.setEmotionStability(emiSum / 4);
 
             // 自驱力（3维）+ 自我概念（1维）— 从 structuredAnalysis JSON 嵌套 extra 解析
             Map<String, Object> analysis = parseStructuredAnalysis(dan.getStructuredAnalysis());

cfc-frontend/pages/mind-detail/emotion-report.vue

@@ -94,10 +94,7 @@ export default {
       report: null,
       loading: true,
       dimensions: [
-        { key: 'emotionScore', label: '情绪商数', icon: '\u2764\uFE0F', color: '#FF6B35', desc: '识别、理解和管理自身及他人情绪的能力' },
-        { key: 'resilienceScore', label: '心理韧性', icon: '\u{1F4AA}', color: '#F97316', desc: '面对压力和挫折时的适应与恢复能力' },
-        { key: 'stressCopingScore', label: '压力应对', icon: '\u{1F64F}', color: '#FB923C', desc: '有效应对生活压力和心理负担的能力' },
-        { key: 'selfAwarenessScore', label: '自我认知', icon: '\u{1F9EC}', color: '#FBBF24', desc: '对自身情绪、优势、弱点的深度理解' }
+        { key: 'emotionStability', label: '情绪稳定性', icon: '\u{1F9E0}', color: '#FF6B35', desc: '情绪调节的综合能力（含自卑-自信、抑郁-愉悦、焦虑-安详、无力感-掌控感四个隐性指标）' }
       ]
     }
   },

cfc-frontend/pages/mind-detail/index.vue

@@ -186,10 +186,7 @@ components: { TabTransition, PageBanner, RadarChart, FamilyEnergyBar, PsychCrisi
       emiData: null,
       emiLoading: true,
       emiDimensions: [
-        { key: 'emotionScore', label: '情绪管理', color: '#FF6B35' },
-        { key: 'resilienceScore', label: '抗压能力', color: '#F97316' },
-        { key: 'stressCopingScore', label: '压力应对', color: '#FB923C' },
-        { key: 'selfAwarenessScore', label: '自我认知', color: '#FBBF24' }
+        { key: 'emotionStability', label: '情绪稳定性', color: '#FF6B35' }
       ],
       // 大五维度（用于雷达图）
       personalityDimensions: [
@@ -197,7 +194,7 @@ components: { TabTransition, PageBanner, RadarChart, FamilyEnergyBar, PsychCrisi
         { key: 'conscientiousnessScore', label: '尽责性' },
         { key: 'extraversionScore', label: '外向性' },
         { key: 'agreeablenessScore', label: '宜人性' },
-        { key: 'neuroticismScore', label: '情绪稳定性' }
+        { key: 'neuroticismScore', label: '神经质' }
       ],
 
       // 功能入口
@@ -250,16 +247,13 @@ components: { TabTransition, PageBanner, RadarChart, FamilyEnergyBar, PsychCrisi
             { key: 'bigFiveConscientiousness', label: '尽责性' },
             { key: 'bigFiveExtraversion', label: '外向性' },
             { key: 'bigFiveAgreeableness', label: '宜人性' },
-            { key: 'bigFiveNeuroticism', label: '情绪稳定性' }
+            { key: 'bigFiveNeuroticism', label: '神经质' }
           ]
         },
         {
-          label: '情绪稳定',
+          label: '情绪稳定性',
           dimensions: [
-            { key: 'emotionEmotion', label: '情绪管理' },
-            { key: 'emotionResilience', label: '抗压能力' },
-            { key: 'emotionStressCoping', label: '压力应对' },
-            { key: 'emotionSelfAwareness', label: '自我认知' }
+            { key: 'emotionStability', label: '情绪稳定性' }
           ]
         },
         {

cfc-web/.last_build_commit

@@ -1 +1 @@
-bf327e3dae70cbaa56759e95d3d43e79562c5fa2
+fd99c53876d07f6e6d8b35a1fef9bb03661990b7

cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.1026",
+  "version": "1.0.1028",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.1026",
+      "version": "1.0.1028",
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^1.0.2",

cfc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfc-web",
-  "version": "1.0.1027",
+  "version": "1.0.1028",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

cfc-web/public/CHANGELOG-v1.0.md

@@ -4,6 +4,18 @@
 
 ---
 
+## v1.0.1028 (2026-08-13)
+
+### 重构
+- 心维度子维度命名优化
+
+### 其他
+- - EMI四个子维度(情绪管理/抗压能力/压力应对/自我认知)合并为'情绪稳定性'综合指标
+- - 后端新增 emotionStability 字段 = (emotion+resilience+coping+selfAwareness)/4
+- - 前端雷达图展示统一使用'情绪稳定性'标签
+- 
+
+
 ## v1.0.1027 (2026-08-13)
 
 ### 重构

cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.1027
+> 当前版本: v1.0.1028
 
 ## 历史版本
 
@@ -8,6 +8,18 @@
 
 ---
 
+## v1.0.1028 (2026-08-13)
+
+### 重构
+- 心维度子维度命名优化
+
+### 其他
+- - EMI四个子维度(情绪管理/抗压能力/压力应对/自我认知)合并为'情绪稳定性'综合指标
+- - 后端新增 emotionStability 字段 = (emotion+resilience+coping+selfAwareness)/4
+- - 前端雷达图展示统一使用'情绪稳定性'标签
+- 
+
+
 ## v1.0.1027 (2026-08-13)
 
 ### 重构