From 815acda0da637457a4b266dc15bda6eb72a25eed Mon Sep 17 00:00:00 2001
From: Hermes CI Fix <hermes-ci@sxbh.ltd>
Date: Mon, 31 Aug 2026 15:51:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(workbench):=20=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
 =?UTF-8?q?=E5=BE=85=E5=85=B3=E6=B3=A8=E4=BC=98=E5=8C=96+=E9=9A=94?=
 =?UTF-8?q?=E7=A6=BB=E8=A1=A5=E6=BC=8F=E2=80=94=E2=80=94=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE/=E6=8E=92=E5=BA=8F=E5=9B=BA=E5=8C=96/?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=8E=AA=E8=BE=9E=20+=20my=5Fdashboard?=
 =?UTF-8?q?=E6=8C=89entity=5Fid=E8=BF=87=E6=BB=A4=20(dashboard-optimize)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/api/dashboard.py       |  8 ++++++--
 frontend/src/views/MyDashboard.vue | 19 ++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/backend/app/api/dashboard.py b/backend/app/api/dashboard.py
index 915f1b53..4eec9d26 100644
--- a/backend/app/api/dashboard.py
+++ b/backend/app/api/dashboard.py
@@ -476,13 +476,17 @@ def my_dashboard(
     from app.models import ActionPlan
     if current_user.role == "ceo":
         # CEO/管理员查看全部行动方案（2026-08-26修复: 原逻辑只按assignee过滤导致工作台显示空）
-        my_plans = db.query(ActionPlan).order_by(ActionPlan.updated_at.desc()).all()
+        # 2026-08-31 隔离补漏: CEO 看全部也须按 entity_id 过滤，防跨账套待办串数据
+        my_plans = db.query(ActionPlan).filter(
+            ActionPlan.entity_id == entity_id,
+        ).order_by(ActionPlan.updated_at.desc()).all()
     else:
         my_plans = db.query(ActionPlan).filter(
             or_(
                 ActionPlan.assignee == username,
                 ActionPlan.assignee == name,
-            )
+            ),
+            ActionPlan.entity_id == entity_id,
         ).order_by(ActionPlan.updated_at.desc()).all()
 
     plan_list = []
diff --git a/frontend/src/views/MyDashboard.vue b/frontend/src/views/MyDashboard.vue
index b43f0d27..92420f30 100644
--- a/frontend/src/views/MyDashboard.vue
+++ b/frontend/src/views/MyDashboard.vue
@@ -32,16 +32,17 @@
     </div>
 
     <template v-if="!loading">
-      <!-- 待办提醒 -->
+      <!-- 待关注提醒（行动逾期 + KPI预警） -->
       <div v-if="reminders.length > 0" class="reminder-section">
         <div class="section-header">
           <span class="section-icon">📌</span>
-          <span class="section-title">待办提醒</span>
+          <span class="section-title">待关注</span>
           <span class="section-badge">{{ reminders.length }}</span>
         </div>
-        <div v-for="r in reminders" :key="r.type + r.related_id" class="reminder-card" :class="'sev-' + r.severity">
+        <div v-for="r in sortedReminders" :key="r.type + r.related_id" class="reminder-card" :class="'sev-' + r.severity">
           <div class="reminder-left">
             <span class="reminder-icon">{{ r.severity === 'danger' ? '🔴' : '🟡' }}</span>
+            <el-tag size="small" :type="r.related_type === 'action_plan' ? 'primary' : 'warning'" class="reminder-tag">{{ r.related_type === 'action_plan' ? '行动' : '指标' }}</el-tag>
           </div>
           <div class="reminder-body">
             <div class="reminder-msg">{{ r.message }}</div>
@@ -115,10 +116,17 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from "vue"
+import { ref, computed, onMounted } from "vue"
 import { useRouter } from "vue-router"
 import api from "../api/index"
 
+// 排序固化: danger(逾期行动/红色预警) 在前, warning(黄色预警) 在后;
+// 同 severity 保持后端生成顺序 (overdue→red→yellow), 不改变现有展示次序
+const severityOrder: Record<string, number> = { danger: 0, warning: 1 }
+const sortedReminders = computed(() =>
+  [...reminders.value].sort((a: any, b: any) => (severityOrder[a.severity] ?? 2) - (severityOrder[b.severity] ?? 2))
+)
+
 const router = useRouter()
 const userStr = localStorage.getItem('cma_user') || '{}'
 const user = JSON.parse(userStr)
@@ -255,8 +263,9 @@ onMounted(async () => {
 }
 .reminder-card.sev-danger { background: #fef0f0; border: 1px solid #fde2e2; }
 .reminder-card.sev-warning { background: #fdf6ec; border: 1px solid #f5dab1; }
-.reminder-left { flex-shrink: 0; }
+.reminder-left { flex-shrink: 0; display: flex; align-items: center; gap: 6px; }
 .reminder-icon { font-size: 18px; }
+.reminder-tag { font-size: 11px; }
 .reminder-body { flex: 1; }
 .reminder-msg { font-size: 14px; }