Merge branch 'new-demand' into dev

src/views/warningManage/redLineWarning/index.vue

@@ -2,7 +2,7 @@
     <div class="dashboard">
         <div class="header">
             <div class="title-section">
-                <h1><i class="fas fa-shield-alt" style="color:#2c5282; margin-right: 8px;"></i>综合预警工作台</h1>
+                <h1><i class="fas fa-shield-alt" style="color:#2c5282; margin-right: 8px;"></i>红线指标预警</h1>
                 <p>员工综合评估（＜75分红色预警 | ≥90分优秀）</p>
             </div>
             <div class="badge-group">
@@ -44,7 +44,7 @@
 
         <div class="employee-section">
             <div class="section-title">
-                <i class="fas fa-users" style="color:#dc2626;"></i> 员工综合预警
+                <i class="fas fa-users" style="color:#dc2626;"></i> 红线指标预警
                 <span
                     style="font-size:0.7rem; background:#eef2ff; padding:4px 12px; border-radius:30px; margin-left:12px;">
                     评分依据：员工配分表
@@ -60,30 +60,28 @@
                             </template>
                         </el-table-column>
                         <el-table-column prop="deptName" label="所属部门" />
-                        <el-table-column prop="eventTime" label="事件时间" sortable width="180" />
+                        <!-- <el-table-column prop="eventTime" label="事件时间" sortable width="180" /> -->
                         <el-table-column prop="dimensionName" label="维度名称" />
                         <el-table-column prop="level2Name" label="二级指标名称" />
                         <el-table-column prop="totalScore" label="扣分分值合计" sortable />
                         <el-table-column prop="occurrenceCount" label="发生次数" sortable />
-                        <el-table-column prop="overallScore" label="预警等级">
+                        <el-table-column prop="warningLevel" label="预警等级">
                             <template #default="{ row }">
-                                <span v-if="row.overallScore < 75" class="status-badge"
-                                    style="animation: subtlePulse 1s infinite;"><i
-                                        class="fas fa-exclamation-triangle"></i> 红色预警</span>
-                                <span v-else-if="row.overallScore >= 90" class="status-excellent"
-                                    style="background:#d1fae5; color:#065f46;"><i class="fas fa-star"></i>
-                                    优秀标杆</span>
-                                <span v-else class="status-warning">正常范围</span>
+                                <span v-if="row.warningLevel == '1'" style="color:#b91c1c;" class="status-badge">{{
+                                    getAlertLabel(row.warningLevel)
+                                    }}</span>
+                                <span v-else class="status-excellent"><i class="fas fa-star"></i>
+                                    {{ getAlertLabel(row.warningLevel) }}</span>
+
                             </template>
                         </el-table-column>
                         <el-table-column prop="coreRisks" label="核心风险" />
                         <el-table-column prop="statusLabel" label="状态标签">
                             <template #default="{ row }">
-                                <span v-if="row.overallScore < 75" style="color:#b91c1c;"><i class="fas fa-bell"></i>
-                                    {{ getAlertLabel(row.statusLabel) }}</span>
-                                <span v-else-if="row.overallScore >= 90" style="color:#15803d;"><i
-                                        class="fas fa-crown"></i> {{ getAlertLabel(row.statusLabel) }}</span>
-                                <span v-else>{{ getAlertLabel(row.statusLabel) }}</span>
+                                <span v-if="row.statusLabel == '1'" style="color:#b91c1c;"><i class="fas fa-bell"></i>
+                                    {{ getStatusLabel(row.statusLabel) }}</span>
+                                <span v-else><i class="fas fa-crown"></i> {{ getStatusLabel(row.statusLabel) }}</span>
+
                             </template>
                         </el-table-column>
                     </el-table>
@@ -117,7 +115,7 @@ import { useRoute } from 'vue-router'
 
 const route = useRoute()
 
-const { alert_level } = useDict('alert_level')
+const { alert_level, status_label } = useDict('alert_level', 'status_label')
 
 const dateRangeInput = ref(null)
 const activeRange = ref('month')
@@ -214,19 +212,7 @@ const allFilteredEmployees = computed(() => {
 
     // 预警等级筛选
     if (selectedAlertLevel.value) {
-        // 根据字典值判断筛选条件（红色预警 <75，优秀标杆 >=90，正常范围 75-89）
-        // 可以根据字典的 value 或 label 来判断
-        const alertItem = alert_level.value.find(item => item.value === selectedAlertLevel.value)
-        if (alertItem) {
-            const label = alertItem.label
-            if (label.includes('红色') || label.includes('预警')) {
-                result = result.filter(emp => emp.overallScore < 75)
-            } else if (label.includes('优秀') || label.includes('标杆')) {
-                result = result.filter(emp => emp.overallScore >= 90)
-            } else if (label.includes('正常')) {
-                result = result.filter(emp => emp.overallScore >= 75 && emp.overallScore < 90)
-            }
-        }
+        result = result.filter(emp => emp.warningLevel == selectedAlertLevel.value)
     }
 
     return result
@@ -273,6 +259,12 @@ const getAlertLabel = (value) => {
     return item ? item.label : value
 }
 
+const getStatusLabel = (value) => {
+    if (!value) return ''
+    const item = status_label.value.find(d => d.value === value)
+    return item ? item.label : value
+}
+
 const setActiveRange = (range) => {
     activeRange.value = range
     // 清除自定义日期

src/views/warningManage/warningPage/index.vue

@@ -88,7 +88,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="deptName" label="所属部门" />
-            <el-table-column prop="eventTime" label="事件时间" sortable width="180" />
+            <!-- <el-table-column prop="eventTime" label="事件时间" sortable width="180" /> -->
             <el-table-column prop="overallScore" label="综合评估得分" sortable>
               <template #default="{ row }">
                 <span v-if="row.overallScore < 75" class="score-danger">{{ row.overallScore }} 分</span>
@@ -97,24 +97,23 @@
                 <span v-else style="font-weight:600;">{{ row.overallScore }} 分</span>
               </template>
             </el-table-column>
-            <el-table-column prop="overallScore" label="预警等级">
+            <el-table-column prop="warningLevel" label="预警等级">
               <template #default="{ row }">
-                <span v-if="row.overallScore < 75" class="status-badge" style="animation: subtlePulse 1s infinite;"><i
-                    class="fas fa-exclamation-triangle"></i> 红色预警</span>
-                <span v-else-if="row.overallScore >= 90" class="status-excellent"
-                  style="background:#d1fae5; color:#065f46;"><i class="fas fa-star"></i>
-                  优秀标杆</span>
-                <span v-else class="status-warning">正常范围</span>
+                <span v-if="row.warningLevel == '1'" class="status-badge" style="color:#b91c1c;"><i
+                    class="fas fa-exclamation-triangle"></i> {{ getAlertLabel(row.warningLevel) }}</span>
+                <span v-else class="status-excellent"><i class="fas fa-star"></i>
+                  {{ getAlertLabel(row.warningLevel) }}</span>
+
               </template>
             </el-table-column>
             <el-table-column prop="coreRisksOrOutstandingAchievements" label="核心风险/优秀事迹" />
             <el-table-column prop="statusLabel" label="状态标签">
               <template #default="{ row }">
-                <span v-if="row.overallScore < 75" style="color:#b91c1c;"><i class="fas fa-bell"></i>
-                  {{ getAlertLabel(row.statusLabel) }}</span>
-                <span v-else-if="row.overallScore >= 90" style="color:#15803d;"><i class="fas fa-crown"></i> {{
-                  getAlertLabel(row.statusLabel) }}</span>
-                <span v-else>{{ getAlertLabel(row.statusLabel) }}</span>
+                <span v-if="row.statusLabel == '1'" style="color:#b91c1c;"><i class="fas fa-bell"></i>
+                  {{ getStatusLabel(row.statusLabel) }}</span>
+                <span v-else ><i class="fas fa-crown"></i> {{
+                  getStatusLabel(row.statusLabel) }}</span>
+
               </template>
             </el-table-column>
             <el-table-column label="详情" width="80">
@@ -167,7 +166,7 @@ import { useRoute } from "vue-router";
 const route = useRoute();
 const router = useRouter();
 
-const { alert_level } = useDict("alert_level");
+const { alert_level, status_label } = useDict("alert_level", "status_label");
 
 const dateRangeInput = ref(null);
 const activeRange = ref("month");
@@ -366,21 +365,7 @@ const allFilteredEmployees = computed(() => {
 
   // 预警等级筛选
   if (selectedAlertLevel.value) {
-    // 根据字典值判断筛选条件（红色预警 <75，优秀标杆 >=90，正常范围 75-89）
-    // 可以根据字典的 value 或 label 来判断
-    const alertItem = alert_level.value.find(
-      (item) => item.value === selectedAlertLevel.value
-    );
-    if (alertItem) {
-      const label = alertItem.label;
-      if (label.includes("红色") || label.includes("预警")) {
-        result = result.filter((emp) => emp.overallScore < 75);
-      } else if (label.includes("优秀") || label.includes("标杆")) {
-        result = result.filter((emp) => emp.overallScore >= 90);
-      } else if (label.includes("正常")) {
-        result = result.filter((emp) => emp.overallScore >= 75 && emp.overallScore < 90);
-      }
-    }
+    result = result.filter((emp) => emp.warningLevel == selectedAlertLevel.value);
   }
 
   return result;
@@ -463,6 +448,12 @@ const getAlertLabel = (value) => {
   return item ? item.label : value;
 };
 
+const getStatusLabel = (value) => {
+  if (!value) return "";
+  const item = status_label.value.find((d) => d.value === value);
+  return item ? item.label : value;
+};
+
 const setActiveRange = (range) => {
   activeRange.value = range;
   if (range !== "custom") {