Merge branch 'new-demand' into dev

src/views/warningManage/employeeDimensionDetails/index.vue

@@ -34,14 +34,14 @@
                 <span class="title-text">员工维度评分明细</span>
                 <span class="title-badge">评分依据: 员工配分表</span>
             </div>
-            <el-table :data="tableData" style="width: 100%;" border stripe>
+            <el-table :data="displayData" style="width: 100%;" border stripe @sort-change="handleSortChange">
                 <el-table-column prop="userId" label="员工ID" />
                 <el-table-column prop="nickName" label="姓名" />
                 <el-table-column prop="deptName" label="部门" />
                 <el-table-column prop="teamName" label="班组" />
                 <el-table-column prop="groupName" label="小组" />
                 <el-table-column prop="dimName" label="维度名称" />
-                <el-table-column prop="dimScore" label="维度分值" />
+                <el-table-column prop="dimScore" label="维度分值" sortable="custom" />
             </el-table>
             <el-pagination v-show="total > 0" :total="total" v-model:current-page="queryParams.pageNum"
                 v-model:page-size="queryParams.pageSize" :page-sizes="[10, 20, 50, 100]"
@@ -52,10 +52,9 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, watch } from 'vue'
+import { ref, reactive, computed, onMounted, watch } from 'vue'
 import { useRoute } from 'vue-router'
 import { getDeptUserTree } from '@/api/item/items'
-import { getEmployeeDimensionPageData } from '@/api/warningManage/employeeDimensionDetails'
 
 const route = useRoute()
 
@@ -71,24 +70,37 @@ const dimensionOptions = ref([
     { label: '服务响应能力', value: '服务响应能力' }
 ])
 
-const tableData = ref([
-    { userId: 397, nickName: '胡婷婷', deptName: '旅检一部', teamName: '安平班组', groupName: '陈行小组', dimName: '安全响应能力', dimScore: 80.5 },
-    { userId: 437, nickName: '李璐', deptName: '旅检一部', teamName: '安平班组', groupName: '陈行小组', dimName: '服务响应能力', dimScore: 79.2 },
-    { userId: 564, nickName: '徐倩', deptName: '旅检一部', teamName: '安平班组', groupName: '陈行小组', dimName: '安全响应能力', dimScore: 81.3 },
-    { userId: 587, nickName: '余杭洋', deptName: '旅检一部', teamName: '安平班组', groupName: '陈行小组', dimName: '服务响应能力', dimScore: 78.6 },
-    { userId: 550, nickName: '肖垚', deptName: '旅检一部', teamName: '安平班组', groupName: '陈行小组', dimName: '安全响应能力', dimScore: 80.1 },
-    { userId: 107, nickName: '刘珊', deptName: '旅检三部', teamName: '安平班组', groupName: '陈行小组', dimName: '服务响应能力', dimScore: 79.8 },
-    { userId: 191, nickName: '王佐朝', deptName: '旅检三部', teamName: '安平班组', groupName: '陈行小组', dimName: '安全响应能力', dimScore: 82.0 },
-    { userId: 250, nickName: '张元媛', deptName: '旅检三部', teamName: '安平班组', groupName: '陈行小组', dimName: '服务响应能力', dimScore: 78.9 },
-    { userId: 293, nickName: '陈凯琳', deptName: '旅检三部', teamName: '安平班组', groupName: '陈行小组', dimName: '安全响应能力', dimScore: 80.7 },
-    { userId: 603, nickName: '张霞', deptName: '旅检一部', teamName: '安平班组', groupName: '陈行小组', dimName: '服务响应能力', dimScore: 79.5 }
+// 两页假数据（20条），含事件日期
+const allMockData = ref([
+    { userId: 397, nickName: '胡婷婷', deptName: '旅检一部', teamName: '安平班组', groupName: '陈行小组', dimName: '安全响应能力', dimScore: 80.5, eventDate: '2026-05-10' },
+    { userId: 437, nickName: '李璐', deptName: '旅检一部', teamName: '安平班组', groupName: '陈行小组', dimName: '服务响应能力', dimScore: 79.2, eventDate: '2026-05-15' },
+    { userId: 564, nickName: '徐倩', deptName: '旅检一部', teamName: '安平班组', groupName: '陈行小组', dimName: '安全响应能力', dimScore: 81.3, eventDate: '2026-05-20' },
+    { userId: 587, nickName: '余杭洋', deptName: '旅检一部', teamName: '安平班组', groupName: '陈行小组', dimName: '服务响应能力', dimScore: 78.6, eventDate: '2026-05-25' },
+    { userId: 550, nickName: '肖垚', deptName: '旅检一部', teamName: '安平班组', groupName: '陈行小组', dimName: '安全响应能力', dimScore: 80.1, eventDate: '2026-06-01' },
+    { userId: 107, nickName: '刘珊', deptName: '旅检三部', teamName: '安平班组', groupName: '陈行小组', dimName: '服务响应能力', dimScore: 79.8, eventDate: '2026-06-05' },
+    { userId: 191, nickName: '王佐朝', deptName: '旅检三部', teamName: '安平班组', groupName: '陈行小组', dimName: '安全响应能力', dimScore: 82.0, eventDate: '2026-06-08' },
+    { userId: 250, nickName: '张元媛', deptName: '旅检三部', teamName: '安平班组', groupName: '陈行小组', dimName: '服务响应能力', dimScore: 78.9, eventDate: '2026-06-10' },
+    { userId: 293, nickName: '陈凯琳', deptName: '旅检三部', teamName: '安平班组', groupName: '陈行小组', dimName: '安全响应能力', dimScore: 80.7, eventDate: '2026-06-12' },
+    { userId: 603, nickName: '张霞', deptName: '旅检一部', teamName: '安平班组', groupName: '陈行小组', dimName: '服务响应能力', dimScore: 79.5, eventDate: '2026-04-15' },
+    { userId: 412, nickName: '赵敏', deptName: '旅检一部', teamName: '安行班组', groupName: '拓新小组', dimName: '安全响应能力', dimScore: 83.2, eventDate: '2026-04-20' },
+    { userId: 528, nickName: '孙磊', deptName: '旅检一部', teamName: '安行班组', groupName: '拓新小组', dimName: '服务响应能力', dimScore: 77.4, eventDate: '2026-03-10' },
+    { userId: 631, nickName: '周杰', deptName: '旅检二部', teamName: '木兰班组', groupName: '飞跃小组', dimName: '安全响应能力', dimScore: 85.1, eventDate: '2026-03-15' },
+    { userId: 745, nickName: '吴芳', deptName: '旅检二部', teamName: '木兰班组', groupName: '飞跃小组', dimName: '服务响应能力', dimScore: 76.8, eventDate: '2026-02-20' },
+    { userId: 802, nickName: '郑浩', deptName: '旅检二部', teamName: '芮茜班组', groupName: '先锋小组', dimName: '安全响应能力', dimScore: 81.9, eventDate: '2026-01-10' },
+    { userId: 156, nickName: '冯婷', deptName: '旅检三部', teamName: '拓新班组', groupName: '锐行小组', dimName: '服务响应能力', dimScore: 78.3, eventDate: '2026-01-25' },
+    { userId: 267, nickName: '褚伟', deptName: '旅检三部', teamName: '拓新班组', groupName: '锐行小组', dimName: '安全响应能力', dimScore: 84.6, eventDate: '2025-12-05' },
+    { userId: 389, nickName: '卫兰', deptName: '旅检一部', teamName: '屹动班组', groupName: '护航小组', dimName: '服务响应能力', dimScore: 77.1, eventDate: '2025-11-18' },
+    { userId: 471, nickName: '蒋涛', deptName: '旅检一部', teamName: '屹动班组', groupName: '护航小组', dimName: '安全响应能力', dimScore: 82.7, eventDate: '2025-10-22' },
+    { userId: 598, nickName: '沈琳', deptName: '旅检二部', teamName: '安行班组', groupName: '拓新小组', dimName: '服务响应能力', dimScore: 80.0, eventDate: '2025-09-30' }
 ])
-const total = ref(972)
+
 const queryParams = reactive({
     pageNum: 1,
     pageSize: 10
 })
 
+const sortState = ref({ prop: '', order: '' })
+
 const transformCascadeData = (nodes) => {
     if (!nodes) return []
     return nodes.map(node => {
@@ -152,45 +164,76 @@ const setActiveRange = (range) => {
     }
 }
 
-const fetchDimensionData = async () => {
-    // TODO: 接入真实接口
-    // let params = {
-    //     pageNum: queryParams.pageNum,
-    //     pageSize: queryParams.pageSize
-    // }
-    // if (startDate.value && endDate.value) {
-    //     params.startDate = formatDate(startDate.value)
-    //     params.endDate = formatDate(endDate.value)
-    // } else {
-    //     const range = getDateRangeFromActive()
-    //     params.startDate = range.startDate
-    //     params.endDate = range.endDate
-    // }
-    // const selectedInfo = getSelectedInfo(selectedOrg.value)
-    // if (selectedInfo) {
-    //     const rawId = Number(selectedInfo.value.split('_')[1])
-    //     if (selectedInfo.deptType === 'BRIGADE') params.deptId = rawId
-    //     else if (selectedInfo.deptType === 'MANAGER') params.teamId = rawId
-    //     else if (selectedInfo.deptType === 'TEAMS') params.groupId = rawId
-    //     else if (selectedInfo.deptType === 'user') params.userId = rawId
-    // }
-    // if (selectedDimension.value) {
-    //     params.dimName = selectedDimension.value
-    // }
-    // try {
-    //     const res = await getEmployeeDimensionPageData(params)
-    //     if (res.data) {
-    //         tableData.value = res.data.rows || res.data || []
-    //         total.value = res.total || res.data?.total || 0
-    //     }
-    // } catch (error) {
-    //     console.error('获取员工维度评分明细失败:', error)
-    // }
+// 筛选后的数据（点击搜索才更新）
+const filteredData = ref([...allMockData.value])
+
+const displayData = computed(() => {
+    const start = (queryParams.pageNum - 1) * queryParams.pageSize
+    const end = start + queryParams.pageSize
+    return filteredData.value.slice(start, end)
+})
+
+const total = computed(() => filteredData.value.length)
+
+// 执行筛选（点击搜索时调用）
+const doFilter = () => {
+    let data = [...allMockData.value]
+
+    // 日期范围筛选
+    let rangeStart = null
+    let rangeEnd = null
+    if (startDate.value && endDate.value) {
+        rangeStart = formatDate(startDate.value)
+        rangeEnd = formatDate(endDate.value)
+    } else {
+        const range = getDateRangeFromActive()
+        rangeStart = range.startDate
+        rangeEnd = range.endDate
+    }
+    if (rangeStart && rangeEnd) {
+        data = data.filter(item => item.eventDate >= rangeStart && item.eventDate <= rangeEnd)
+    }
+
+    // 维度筛选
+    if (selectedDimension.value) {
+        data = data.filter(item => item.dimName === selectedDimension.value)
+    }
+
+    // 组织架构/员工筛选
+    const selectedInfo = getSelectedInfo(selectedOrg.value)
+    if (selectedInfo) {
+        if (selectedInfo.deptType === 'user') {
+            const rawId = Number(selectedInfo.value.split('_')[1])
+            data = data.filter(item => item.userId === rawId)
+        }
+    }
+
+    // 排序（基于全量过滤后数据）
+    if (sortState.value.prop && sortState.value.order) {
+        const { prop, order } = sortState.value
+        data.sort((a, b) => {
+            const valA = a[prop]
+            const valB = b[prop]
+            if (valA == null) return 1
+            if (valB == null) return -1
+            const result = valA > valB ? 1 : valA < valB ? -1 : 0
+            return order === 'ascending' ? result : -result
+        })
+    }
+
+    filteredData.value = data
+}
+
+const handleSortChange = ({ prop, order }) => {
+    sortState.value = { prop, order }
+    queryParams.pageNum = 1
+    doFilter()
 }
 
 const handleSearch = () => {
     queryParams.pageNum = 1
-    fetchDimensionData()
+    sortState.value = { prop: '', order: '' }
+    doFilter()
 }
 
 const handleReset = () => {
@@ -200,18 +243,17 @@ const handleReset = () => {
     selectedOrg.value = ''
     selectedDimension.value = ''
     queryParams.pageNum = 1
-    fetchDimensionData()
+    sortState.value = { prop: '', order: '' }
+    doFilter()
 }
 
 const handlePageChange = (newPage) => {
     queryParams.pageNum = newPage
-    fetchDimensionData()
 }
 
 const handleSizeChange = (newSize) => {
     queryParams.pageSize = newSize
     queryParams.pageNum = 1
-    fetchDimensionData()
 }
 
 onMounted(async () => {
@@ -223,33 +265,33 @@ onMounted(async () => {
     } catch (error) {
         console.error('获取组织架构数据失败:', error)
     }
-    fetchDimensionData()
+    doFilter()
 })
 
-watch(() => route.query, (query) => {
-    const { id, org, startDate: sd, endDate: ed, activeRange: ar, dimension } = query
-    if (id) {
-        selectedOrg.value = `user_${id}`
-    } else if (org) {
-        selectedOrg.value = org
-    } else {
-        selectedOrg.value = ''
-    }
-    if (sd && ed) {
-        startDate.value = sd
-        endDate.value = ed
-        activeRange.value = 'custom'
-    } else {
-        startDate.value = null
-        endDate.value = null
-        activeRange.value = ar || 'month'
-    }
-    if (dimension) {
-        selectedDimension.value = dimension
-    }
-    queryParams.pageNum = 1
-    fetchDimensionData()
-}, { immediate: true })
+// watch(() => route.query, (query) => {
+//     const { id, org, startDate: sd, endDate: ed, activeRange: ar, dimension } = query
+//     if (id) {
+//         selectedOrg.value = `user_${id}`
+//     } else if (org) {
+//         selectedOrg.value = org
+//     } else {
+//         selectedOrg.value = ''
+//     }
+//     if (sd && ed) {
+//         startDate.value = sd
+//         endDate.value = ed
+//         activeRange.value = 'custom'
+//     } else {
+//         startDate.value = null
+//         endDate.value = null
+//         activeRange.value = ar || 'month'
+//     }
+//     if (dimension) {
+//         selectedDimension.value = dimension
+//     }
+//     queryParams.pageNum = 1
+//     sortState.value = { prop: '', order: '' }
+// }, { immediate: true })
 </script>
 
 <style scoped>

src/views/warningManage/redLineWarning/index.vue

@@ -30,8 +30,7 @@
                 </div>
                 <el-tree-select v-model="selectedOrg" :data="cascadeOptions"
                     :props="{ label: 'label', value: 'value', children: 'children' }" node-key="value"
-                    placeholder="组织架构/员工" clearable filterable check-strictly style="width: 480px;"
-                     />
+                    placeholder="组织架构/员工" clearable filterable check-strictly style="width: 480px;" />
             </div>
             <div class="filter-group">
                 <el-select v-model="selectedAlertLevel" placeholder="预警等级" clearable style="width: 250px;">
@@ -376,8 +375,6 @@ watch(() => route.query, (query) => {
     // 回显员工选择
     if (id) {
         selectedOrg.value = `user_${id}`
-    } else if (org) {
-        selectedOrg.value = org
     } else {
         selectedOrg.value = ''
     }

src/views/warningManage/warningPage/index.vue

@@ -451,8 +451,8 @@ const goToDetail = (row) => {
   if (selectedAlertLevel.value) {
     query.alertLevel = selectedAlertLevel.value;
   }
-  if (selectedOrg.value) {
-    query.org = selectedOrg.value;
+  if (row.userId) {
+    query.id = row.userId || "";
   }
   router.push({ path: "/warningManage/redLineWarning", query });
 };