Merge branch 'employeeScreen'

src/api/ledger/index.js

@@ -1,8 +1,8 @@
 import request from '@/utils/request'
 
 // ===== 台账一键全量导入（多Sheet合并Excel）=====
-export function importCombinedLedger(data) {
-  return request({ url: '/ledger/import/combined', method: 'post', data })
+export function importCombinedLedger(data, timeout = 300000) {
+  return request({ url: '/ledger/import/combined', method: 'post', data, timeout })
 }
 
 // ===== 台账数据清理（按导入时间范围）=====

src/router/index.js

@@ -107,17 +107,17 @@ export const constantRoutes = [
       //   meta: { title: '机场安检员考勤管理系统', icon: 'dashboard' }
       // },
       // {
-	    //   path: '/examQuestionStatistics',
-	    //   component: () => import('@/views/dataBigScreen/examQuestionStatistics'),
-	    //   name: 'examQuestionStatistics',
-	    //   meta: { title: '答题统计', icon: 'dashboard' }
-	    // },
+      //   path: '/examQuestionStatistics',
+      //   component: () => import('@/views/dataBigScreen/examQuestionStatistics'),
+      //   name: 'examQuestionStatistics',
+      //   meta: { title: '答题统计', icon: 'dashboard' }
+      // },
       // {
-	    //   path: '/abilityPortrait',
-	    //   component: () => import('@/views/dataBigScreen/abilityPortrait'),
-	    //   name: 'abilityPortrait',
-	    //   meta: { title: '能力画像显示大屏', icon: 'dashboard' }
-	    // }
+      //   path: '/abilityPortrait',
+      //   component: () => import('@/views/dataBigScreen/abilityPortrait'),
+      //   name: 'abilityPortrait',
+      //   meta: { title: '能力画像显示大屏', icon: 'dashboard' }
+      // }
     ]
   },
 ]

src/views/portraitManagement/components/SearchBar.vue

@@ -52,7 +52,7 @@
 </template>
 
 <script setup>
-import { ref, nextTick, onMounted, onUnmounted } from 'vue'
+import { ref, nextTick, onMounted } from 'vue'
 import { searchPortraitUsers } from '@/api/score/index'
 import { getDeptList, getDeptUserTree } from '@/api/item/items'
 import { listDept } from '@/api/system/dept'
@@ -74,46 +74,36 @@ const treeRef = ref(null)
 const currentKey = ref(null)
 const curQuery = ref({})
 
-const defaultIdMap = {
-  user: 13,
-  BRIGADE: 103,
-  STATION: 100,
-  MANAGER: 104,
-  TEAMS: 110
-}
-
-const findNodeById = (nodes, id) => {
-  if (!nodes) return null
-  for (const node of nodes) {
-    if (node.id === id || node.deptId === id) return node
-    if (node.children) {
-      const found = findNodeById(node.children, id)
-      if (found) return found
-    }
+const findFirstNodeByDeptType = (nodes, targetType) => {
+  if (!nodes || nodes.length === 0) return null
+  const first = nodes[0]
+  if (first.deptType === targetType || first.nodeType === targetType) return first
+  if (first.children && first.children.length > 0) {
+    return findFirstNodeByDeptType(first.children, targetType)
   }
   return null
 }
 
-const buildPathForNode = (nodes, targetId, path = []) => {
-  if (!nodes) return path
+const buildPathForNode = (nodes, targetId) => {
+  if (!nodes) return null
   for (const node of nodes) {
     if (node.id === targetId || node.deptId === targetId) {
       // 如果是用户节点，不把用户名字加入 path
       if (node.deptType === 'user' || node.nodeType === 'user') {
-        return path
+        return []
       }
       const name = node.nickName || node.deptName || node.name || node.label
-      return [...path, name]
+      return [name]
     }
-    if (node.children) {
-      const name = node.deptName || node.name || node.label
-      const found = buildPathForNode(node.children, targetId, [...path, name])
-      if (found.length > path.length) {
-        return found
+    if (node.children && node.children.length > 0) {
+      const childPath = buildPathForNode(node.children, targetId)
+      if (childPath !== null) {
+        const name = node.deptName || node.name || node.label
+        return [name, ...childPath]
       }
     }
   }
-  return path
+  return null
 }
 
 const queryUsers = async (query, cb) => {
@@ -123,7 +113,7 @@ const queryUsers = async (query, cb) => {
     const mapped = (res.data || []).map(u => {
       let path = []
       if (u.deptId) {
-        path = buildPathForNode(departments.value, u.deptId)
+        path = buildPathForNode(departments.value, u.deptId) || []
       }
       return { ...u, value: u.nickName, path }
     })
@@ -138,7 +128,7 @@ const queryDept = async (query, cb) => {
     const mapped = (res.data || []).map(d => {
       let path = []
       if (d.id || d.deptId) {
-        path = buildPathForNode(departments.value, d.deptId || d.id)
+        path = buildPathForNode(departments.value, d.deptId || d.id) || []
       }
       return { ...d, value: d.deptName, path }
     })
@@ -149,14 +139,14 @@ const queryDept = async (query, cb) => {
 const handleSelect = (item) => {
   
   if (props.deptType === 'user') {
-    const path = item.path && item.path.length > 0 ? item.path : (item.deptId ? buildPathForNode(departments.value, item.deptId) : [])
+    const path = item.path && item.path.length > 0 ? item.path : (item.deptId ? buildPathForNode(departments.value, item.deptId) || [] : [])
     const name = item.nickName
 
     personName.value = path.length > 0 ? `${path.join(' / ')} / ${name}` : name
     curQuery.value = { personName: item.nickName,id:item.id }
     searchHandler(curQuery.value)
   } else {
-    const path = item.path && item.path.length > 0 ? item.path : ((item.id || item.deptId) ? buildPathForNode(departments.value, item.deptId || item.id) : [])
+    const path = item.path && item.path.length > 0 ? item.path : ((item.id || item.deptId) ? buildPathForNode(departments.value, item.deptId || item.id) || [] : [])
     const name = item.deptName || item.name || item.label
     personName.value = path.length > 0 ? path.join(' / ') : name
     if (props.deptType === 'BRIGADE' || props.deptType === 'STATION') {
@@ -239,7 +229,7 @@ const handleNodeClick = (node) => {
   if (props.deptType === 'user') {
     if (node.nodeType === 'user') {
    
-      const path = buildPathForNode(departments.value, node.deptId || node.id)
+      const path = buildPathForNode(departments.value, node.deptId || node.id) || []
       const name = node.label
       
       personName.value = path.length > 0 ? `${path.join(' / ')} / ${name}` : name
@@ -248,7 +238,7 @@ const handleNodeClick = (node) => {
     }
   } else {
     if (node.deptType === props.deptType) {
-      const path = buildPathForNode(departments.value, node.deptId || node.id)
+      const path = buildPathForNode(departments.value, node.deptId || node.id) || []
       const name = node.deptName || node.name || node.label;
       personName.value = path.length > 0 ? path.join(' / ') : name
       if (props.deptType === 'BRIGADE' || props.deptType === 'STATION') {
@@ -265,32 +255,7 @@ const handleNodeClick = (node) => {
   }
 }
 
-const setStyle = () => {
-  const root = document.querySelector(':root')
-  root.style.setProperty('--el-bg-color-overlay', '#1c1936')
-  root.style.setProperty('--el-border-color-extra-light', '#5c676d')
-  root.style.setProperty('--el-border-color-light', 'transparent')
-  root.style.setProperty('--el-popover-padding', '0px')
-  root.style.setProperty('--el-text-color-regular', '#fff')
-  root.style.setProperty('--el-fill-color-light', '#5c676d')
-  root.style.setProperty('--el-text-color-primary', '#fff')
-}
-
-const resetStyle = () => {
-  const root = document.querySelector(':root')
-  root.style.setProperty('--el-bg-color-overlay', '#ffffff')
-  root.style.setProperty('--el-border-color-extra-light', '#f2f6fc')
-  root.style.setProperty('--el-border-color-light', '#e4e7ed')
-  root.style.setProperty('--el-popover-padding', '12px')
-  root.style.setProperty('--el-text-color-regular', '#606266')
-  root.style.setProperty('--el-fill-color-light', '#f5f7fa')
-  root.style.setProperty('--el-text-color-primary', '#303133')
-
-}
-
 onMounted(async () => {
-  setStyle()
-
   if (props.deptType === 'user') {
     const res = await getDeptUserTree()
     departments.value = res.data
@@ -299,48 +264,42 @@ onMounted(async () => {
     departments.value = filterDeptTree(res.data, props.deptType)
   }
 
-  const defaultId = defaultIdMap[props.deptType]
-  if (defaultId) {
-    const defaultNode = findNodeById(departments.value, defaultId)
-    if (defaultNode) {
-      currentKey.value = defaultId
-      if (props.deptType === 'user') {
-        const path = buildPathForNode(departments.value, defaultNode.deptId || defaultNode.id)
-        const name = defaultNode.label
-        personName.value = path.length > 0 ? `${path.join(' / ')} / ${name}` : name
-        curQuery.value = { personName: defaultNode.label,id:defaultNode.id }
-        searchHandler(curQuery.value)
-      } else {
-        const path = buildPathForNode(departments.value, defaultNode.deptId || defaultNode.id)
-        const name = defaultNode.deptName || defaultNode.name || defaultNode.label
-        personName.value = path.length > 0 ? path.join(' / ') : name
-        if (props.deptType === 'BRIGADE' || props.deptType === 'STATION') {
-          curQuery.value = { deptId: defaultNode.deptId || defaultNode.id }
-        }
-        if (props.deptType === 'MANAGER') {
-          curQuery.value = { teamId: defaultNode.deptId || defaultNode.id, deptId: defaultNode.deptId || defaultNode.id }
-        }
-        if (props.deptType === 'TEAMS') {
-          curQuery.value = { groupId: defaultNode.deptId || defaultNode.id, deptId: defaultNode.deptId || defaultNode.id }
-        }
-        searchHandler(curQuery.value)
+  const targetType = props.deptType === 'user' ? 'user' : props.deptType
+  const defaultNode = findFirstNodeByDeptType(departments.value, targetType)
+  if (defaultNode) {
+    const nodeId = defaultNode.deptId || defaultNode.id
+    currentKey.value = nodeId
+    if (props.deptType === 'user') {
+      const path = buildPathForNode(departments.value, nodeId) || []
+      const name = defaultNode.label
+      personName.value = path.length > 0 ? `${path.join(' / ')} / ${name}` : name
+      curQuery.value = { personName: defaultNode.label, id: defaultNode.id }
+      searchHandler(curQuery.value)
+    } else {
+      const path = buildPathForNode(departments.value, nodeId) || []
+      const name = defaultNode.deptName || defaultNode.name || defaultNode.label
+      personName.value = path.length > 0 ? path.join(' / ') : name
+      if (props.deptType === 'BRIGADE' || props.deptType === 'STATION') {
+        curQuery.value = { deptId: nodeId }
+      }
+      if (props.deptType === 'MANAGER') {
+        curQuery.value = { teamId: nodeId, deptId: nodeId }
       }
-      nextTick(() => {
-        treeRef.value?.setCurrentKey(defaultId)
-      })
+      if (props.deptType === 'TEAMS') {
+        curQuery.value = { groupId: nodeId, deptId: nodeId }
+      }
+      searchHandler(curQuery.value)
     }
+    nextTick(() => {
+      treeRef.value?.setCurrentKey(nodeId)
+    })
   }
 })
-onUnmounted(() => {
-  resetStyle()
-})
 
 defineExpose({
   getDefQuery() {
-
     return {
       ...getTimeRange(),
-
     }
   }
 })

src/views/portraitManagement/components/TestResult.vue

@@ -31,9 +31,10 @@ const setChartsOptionsBar = computed(() => {
       textStyle: { color: '#fff' }
     },
     legend: {
-      top: '10%',
-      left: '0%',
-      orient: 'vertical',
+      type: 'scroll',
+      top: '0%',
+      left: 'center',
+      orient: 'horizontal',
       textStyle: { color: '#fff' }
     },
     series: [{

src/views/portraitManagement/deptProfile/index.vue

@@ -31,9 +31,10 @@ const queryParams = ref({})
 
 const pentagonItems = ref([])
 const invokerCountDeptTeamStats = (params) => {
+  console.log(params,999)
   const copyParams = {
     deptId: params.deptId,
-
+    ...params
   }
   countDeptTeamStats(copyParams).then(res => {
     if (res.code === 200 && res.data) {

src/views/portraitManagement/employeeProfile/index.vue

@@ -187,9 +187,9 @@
         <!-- 加分区域 -->
         <div class="tooltip-section">
           <div class="section-list">
-            <div v-if="addList.length" class="list-item" v-for="(item, i) in addList" :key="i">
-              <span>{{ item.level3Name }}:</span>
-              <span class="add-text">{{ item.totalScore }}分</span>
+            <div v-if="addGroupList.length" class="list-item" v-for="(item, i) in addGroupList" :key="i">
+              <span>{{ item.name }}:</span>
+              <span class="add-text">+{{ item.total }}分</span>
             </div>
             <div v-else class="p-empty">暂无加分记录</div>
           </div>
@@ -201,11 +201,11 @@
         <!-- 扣分区域 -->
         <div class="tooltip-section">
           <div class="section-list">
-            <div v-if="deductList.length" class="list-item" v-for="(item, i) in deductList" :key="i">
-              <span>{{ item.level3Name }}:</span>
-              <span class="deduct-text">{{ item.totalScore }}分</span>
+            <div v-if="deductGroupList.length" class="list-item" v-for="(item, i) in deductGroupList" :key="i">
+              <span>{{ item.name }}:</span>
+              <span class="deduct-text">{{ item.total }}分</span>
             </div>
-            <div v-if="!deductList.length" class="p-empty">暂无扣分记录</div>
+            <div v-if="!deductGroupList.length" class="p-empty">暂无扣分记录</div>
           </div>
           <div class="section-total deduct">
             <span>合计扣分:</span>
@@ -229,6 +229,8 @@ import { useECharts } from '@/hooks/useEcharts'
 import useUserStore from '@/store/modules/user'
 import { useRouter } from 'vue-router'
 
+defineOptions({ name: 'ProfileEmployeeProfile' })
+
 const router = useRouter()
 let radarChartInstance = null
 
@@ -252,6 +254,22 @@ const deductList = computed(() => {
   const all = scoreDetails.value.filter(d => d.totalScore != null && Number(d.totalScore) < 0)
   return activeDimName.value ? all.filter(d => d.dimensionName === activeDimName.value) : all
 })
+const addGroupList = computed(() => {
+  const groups = {}
+  addList.value.forEach(d => {
+    const key = d.level2Name || '其他'
+    groups[key] = (groups[key] || 0) + Number(d.totalScore)
+  })
+  return Object.entries(groups).map(([name, total]) => ({ name, total: total.toFixed(2) }))
+})
+const deductGroupList = computed(() => {
+  const groups = {}
+  deductList.value.forEach(d => {
+    const key = d.level2Name || '其他'
+    groups[key] = (groups[key] || 0) + Number(d.totalScore)
+  })
+  return Object.entries(groups).map(([name, total]) => ({ name, total: total.toFixed(2) }))
+})
 const addTotal = computed(() => {
   const s = addList.value.reduce((acc, d) => acc + Number(d.totalScore), 0)
   return (s > 0 ? '+' : '') + s.toFixed(2)

src/views/portraitManagement/employeeProfile/indexOld.vue

@@ -380,7 +380,7 @@ import { searchPortraitUsers, getEmployeePortrait } from '@/api/score/index'
 import { getDeptUserTree } from '@/api/item/items'
 import { useDict } from '@/utils/dict'
 
-defineOptions({ name: 'EmployeeProfile' })
+// defineOptions({ name: 'EmployeeProfile' })
 
 const route = useRoute()
 const currentTime = ref('year')

src/views/portraitManagement/groupProfile/index.vue

@@ -33,7 +33,9 @@ const queryParams = ref({})
 const pentagonItems = ref([])
 const invokerCountDeptTeamStats = (params) => {
   const copyParams = {
-    deptId: params.groupId
+    deptId: params.groupId,
+    startDate: params.startDate,
+    endDate: params.endDate
   }
   countDeptTeamStats(copyParams).then(res => {
     if (res.code === 200 && res.data) {

src/views/portraitManagement/teamProfile/index.vue

@@ -31,7 +31,9 @@ const queryParams = ref({})
 const pentagonItems = ref([])
 const invokerCountDeptTeamStats = (params) => {
   const copyParams = {
-    deptId: params.teamId
+    deptId: params.teamId,
+    startDate: params.startDate,
+    endDate: params.endDate
   }
   countDeptTeamStats(copyParams).then(res => {
     if (res.code === 200 && res.data) {

src/views/score/event/index.vue

@@ -45,6 +45,27 @@
         <el-date-picker v-model="dateRange" type="daterange" value-format="YYYY-MM-DD" range-separator="-"
           start-placeholder="开始日期" end-placeholder="结束日期" clearable />
       </el-form-item>
+      <el-form-item label="扣分类型" prop="scoreType">
+        <el-select v-model="queryParams.scoreType" placeholder="全部类型" clearable style="width:150px">
+          <el-option v-for="dict in score_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="区域" prop="regionalId">
+        <el-select v-model="queryParams.regionalId" placeholder="请选择区域" clearable filterable style="width:200px"
+          @change="handleRegionalChange">
+          <el-option v-for="item in regionalOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="工作点" prop="channelId">
+        <el-select v-model="queryParams.channelId" placeholder="请选择工作点" clearable filterable style="width:150px">
+          <el-option v-for="item in channelOptions" :key="item.id" :label="item.positionName" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="岗位" prop="postId">
+        <el-tree-select v-model="queryParams.postId" :data="postTreeData"
+          :props="{ value: 'postId', label: 'postName', children: 'children' }" clearable filterable placeholder="请选择岗位"
+          check-strictly />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -67,36 +88,40 @@
         <el-button type="warning" plain icon="Download" @click="handleExport"
           v-hasPermi="['score:event:export']">导出</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-upload :show-file-list="false" accept=".xlsx,.xls" :auto-upload="false" :on-change="handleImportFile">
           <el-button type="info" plain icon="Upload" v-hasPermi="['score:event:import']">导入</el-button>
         </el-upload>
-      </el-col>
+      </el-col> -->
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
 
-    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="配分层级" align="center" prop="org" width="110">
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" style="width: 100%;" fit="true"
+      :scrollbar-always-on="true">
+      <el-table-column type="selection" width="55" align="center" resizable />
+      <el-table-column label="配分层级" align="center" prop="org" width="110" resizable>
         <template #default="{ row }"><dict-tag :options="score_level" :value="row.org" /></template>
       </el-table-column>
-      <el-table-column label="事件时间" align="center" prop="eventTime" width="120">
+      <el-table-column label="事件时间" align="center" prop="eventTime" width="120" resizable>
         <template #default="{ row }">{{ parseTime(row.eventTime, '{y}-{m}-{d}') }}</template>
       </el-table-column>
-      <el-table-column label="维度" align="center" prop="dimensionName" width="110" />
-      <el-table-column label="二级指标" align="center" prop="level2Name" show-overflow-tooltip />
-      <el-table-column label="三级指标" align="center" prop="level3Name" show-overflow-tooltip />
-      <el-table-column label="责任人" align="center" prop="personName" width="80" />
-      <el-table-column label="部门" align="center" prop="deptName" />
-      <el-table-column label="班组" align="center" prop="teamName" />
-      <el-table-column label="基础分值" align="center" prop="scoreValue" width="90">
+      <el-table-column label="维度" align="center" prop="dimensionName" width="150" resizable />
+      <el-table-column label="二级指标" align="center" prop="level2Name" min-width="250" show-overflow-tooltip resizable />
+      <el-table-column label="三级指标" align="center" prop="level3Name" min-width="250" show-overflow-tooltip resizable />
+      <el-table-column label="责任人" align="center" prop="personName" width="80" resizable />
+      <el-table-column label="部门" align="center" prop="deptName" min-width="120" resizable />
+      <el-table-column label="班组" align="center" prop="teamName" min-width="120" resizable />
+      <el-table-column label="区域" align="center" prop="regionalName" min-width="200" resizable />
+      <el-table-column label="工作点" align="center" prop="channelName" min-width="100" resizable />
+      <el-table-column label="岗位" align="center" prop="postName" min-width="190" resizable />
+      <el-table-column label="基础分值" align="center" prop="scoreValue" width="90" resizable>
         <template #default="{ row }">
           <span :style="{ color: row.scoreValue > 0 ? '#67c23a' : row.scoreValue < 0 ? '#f56c6c' : '' }">
             {{ row.scoreValue > 0 ? '+' : '' }}{{ row.scoreValue }}
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="叠加分" align="center" prop="cascadeScore" width="80">
+      <el-table-column label="叠加分" align="center" prop="cascadeScore" width="80" resizable>
         <template #default="{ row }">
           <span v-if="row.cascadeScore" :style="{ color: row.cascadeScore > 0 ? '#67c23a' : '#f56c6c' }">
             {{ row.cascadeScore > 0 ? '+' : '' }}{{ row.cascadeScore }}
@@ -104,22 +129,22 @@
           <span v-else style="color:#c0c4cc">-</span>
         </template>
       </el-table-column>
-      <el-table-column label="总分值" align="center" prop="totalScore" width="90">
+      <el-table-column label="总分值" align="center" prop="totalScore" width="90" resizable>
         <template #default="{ row }">
           <strong :style="{ color: row.totalScore > 0 ? '#67c23a' : row.totalScore < 0 ? '#f56c6c' : '' }">
             {{ row.totalScore > 0 ? '+' : '' }}{{ row.totalScore }}
           </strong>
         </template>
       </el-table-column>
-      <el-table-column label="来源" align="center" width="90">
+      <el-table-column label="来源" align="center" width="90" resizable>
         <template #default="{ row }">
           <el-tag :type="row.sourceType === '1' ? 'primary' : 'warning'" size="small">
             {{ row.sourceType === '1' ? '手动录入' : '台账同步' }}
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="事件描述" align="center" prop="eventDesc" show-overflow-tooltip />
-      <el-table-column label="操作" align="center" width="180">
+      <el-table-column label="事件描述" min-width="450" align="center" prop="eventDesc" show-overflow-tooltip resizable />
+      <el-table-column label="操作" align="center" width="180" resizable fixed="right">
         <template #default="{ row }">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(row)"
             v-hasPermi="['score:event:edit']">修改</el-button>
@@ -180,8 +205,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="位置">
-              <el-input v-model="form.location" placeholder="区域/通道" />
+            <el-form-item label="区域">
+              <el-select v-model="form.regionalId" placeholder="请选择区域" clearable filterable style="width:100%"
+                @change="handleFormRegionalChange">
+                <el-option v-for="item in regionalOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工作点">
+              <el-select v-model="form.channelId" placeholder="请选择工作点" clearable filterable style="width:100%">
+                <el-option v-for="item in formChannelOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -217,6 +252,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="岗位">
+              <el-tree-select v-model="form.postId" :data="postTreeData"
+                :props="{ value: 'postId', label: 'postName', children: 'children' }" clearable filterable
+                placeholder="请选择岗位" style="width:100%" check-strictly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="基础分值" prop="scoreValue">
               <el-input-number v-model="form.scoreValue" :precision="2" style="width:100%" placeholder="正数=加分 负数=扣分" />
             </el-form-item>
@@ -251,6 +293,8 @@ import { ref, reactive, computed, watch, onMounted, getCurrentInstance } from 'v
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute } from 'vue-router'
 import { listUser, getDeptOrgInfo, getUserOrgInfo } from '@/api/system/user'
+import { listPosition } from '@/api/system/position'
+import { listAllTree } from '@/api/system/post'
 import {
   listScoreEvent, addScoreEvent, updateScoreEvent, delScoreEvent,
   exportScoreEvent, importScoreEvent
@@ -263,7 +307,7 @@ import { parseTime } from '@/utils/ruoyi'
 defineOptions({ name: 'ScoreEvent' })
 
 const { proxy } = getCurrentInstance()
-const { score_level } = proxy.useDict('score_level')
+const { score_level, score_type } = proxy.useDict('score_level', 'score_type')
 
 const loading = ref(false), list = ref([]), total = ref(0), showSearch = ref(true)
 const dateRange = ref([]), queryRef = ref(null), formRef = ref(null)
@@ -282,9 +326,13 @@ const queryDeptOptions = ref([])
 const queryTeamOptions = ref([])
 const queryGroupOptions = ref([])
 const queryPersonOptions = ref([])
+const regionalOptions = ref([])
+const channelOptions = ref([])
+const postTreeData = ref([])
 
-const queryParams = reactive({ pageNum: 1, pageSize: 10, personId: null, personName: '', deptId: null, deptName: '', teamId: null, teamName: '', groupId: null, groupName: '', dimensionId: null, sourceType: '', org: '' })
-const form = reactive({ id: null, dimensionId: null, dimensionName: '', indicatorId: null, level2Id: null, level2Name: '', level3Id: null, level3Name: '', level4Id: null, level4Name: '', eventTime: '', location: '', personId: null, deptName: '', deptId: null, teamId: null, groupId: null, scoreValue: 0, cascadeScore: 0, eventDesc: '', remark: '', org: '' })
+const queryParams = reactive({ pageNum: 1, pageSize: 10, personId: null, personName: '', deptId: null, deptName: '', teamId: null, teamName: '', groupId: null, groupName: '', dimensionId: null, sourceType: '', org: '', scoreType: null, regionalId: null, channelId: null, postId: null })
+const form = reactive({ id: null, dimensionId: null, dimensionName: '', indicatorId: null, level2Id: null, level2Name: '', level3Id: null, level3Name: '', level4Id: null, level4Name: '', eventTime: '', location: '', personId: null, deptName: '', deptId: null, teamId: null, groupId: null, scoreValue: 0, cascadeScore: 0, eventDesc: '', remark: '', org: '', regionalId: null, channelId: null, postId: null })
+const formChannelOptions = ref([])
 const rules = computed(() => {
   return {
     org: [{ required: true, message: '请选择配分层级', trigger: 'submit' }],
@@ -300,6 +348,7 @@ const rules = computed(() => {
 
 // 搜索表单责任人选项：未选择部门/班组/小组时使用全量人员，否则使用过滤后的人员
 const searchPersonOptions = computed(() => {
+
   if (queryParams.deptId || queryParams.teamId || queryParams.groupId) {
     return queryPersonOptions.value
   }
@@ -328,6 +377,10 @@ async function handleFormLevelChange() {
   teamOptions.value = []; groupOptions.value = []; personOptions.value = []
 
   const org = form.org
+
+
+  const r = await getDimensionAll({ pageNum: 1, pageSize: 100, org })
+  dimensionOptions.value = r.data || []
   // if (org === '2') {
   await loadAllTeams()
   // } else if (org === '3') {
@@ -335,9 +388,6 @@ async function handleFormLevelChange() {
   // } else if (org === '4') {
   await loadAllPersons()
   // }
-
-  const r = await getDimensionAll({ pageNum: 1, pageSize: 100, org })
-  dimensionOptions.value = r.data || []
 }
 
 async function loadAllTeams() {
@@ -357,9 +407,33 @@ async function loadAllGroups() {
 
 async function loadAllPersons() {
   const r = await listUser({ pageSize: 9999 })
+
   personOptions.value = r.rows || []
 }
 
+async function loadRegions() {
+  const r = await listPosition({ positionType: 'REGIONAL' })
+  regionalOptions.value = r.data || []
+}
+
+async function handleRegionalChange(val) {
+  queryParams.channelId = null
+  channelOptions.value = []
+  if (val) {
+    const r = await listPosition({ parentId: val })
+    channelOptions.value = r.data || []
+  }
+}
+
+async function handleFormRegionalChange(val) {
+  form.channelId = null
+  formChannelOptions.value = []
+  if (val) {
+    const r = await listPosition({ parentId: val })
+    formChannelOptions.value = r.data || []
+  }
+}
+
 function handleBrigadeChange() {
 }
 
@@ -443,60 +517,90 @@ function getList() {
 function handleQuery() { queryParams.pageNum = 1; getList() }
 function resetQuery() {
   dateRange.value = []
-  Object.assign(queryParams, { 
-    pageNum: 1, 
-    pageSize: 10, 
-    personId: null, 
-    personName: '', 
-    deptId: null, 
-    deptName: '', 
-    teamId: null, 
-    teamName: '', 
-    groupId: null, 
-    groupName: '', 
-    dimensionId: null, 
-    sourceType: '', 
-    org: '' 
+  Object.assign(queryParams, {
+    pageNum: 1,
+    pageSize: 10,
+    personId: null,
+    personName: '',
+    deptId: null,
+    deptName: '',
+    teamId: null,
+    teamName: '',
+    groupId: null,
+    groupName: '',
+    dimensionId: null,
+    sourceType: '',
+    org: '',
+    scoreType: null,
+    regionalId: null,
+    channelId: null,
+    postId: null
   })
-  queryTeamOptions.value = []; queryGroupOptions.value = []; queryPersonOptions.value = []
+  queryTeamOptions.value = []; queryGroupOptions.value = []; queryPersonOptions.value = []; channelOptions.value = []
   queryRef.value?.resetFields()
   handleQuery()
 }
 function handleSelectionChange(sel) { ids.value = sel.map(s => s.id); single.value = sel.length !== 1; multiple.value = !sel.length }
 
 function resetForm() {
-  Object.assign(form, { id: null, dimensionId: null, dimensionName: '', indicatorId: null, level2Id: null, level2Name: '', level3Id: null, level3Name: '', level4Id: null, level4Name: '', eventTime: '', location: '', personId: null, deptName: '', deptId: null, teamId: null, groupId: null, scoreValue: 0, cascadeScore: 0, eventDesc: '', remark: '', org: '' })
+  Object.assign(form, { id: null, dimensionId: null, dimensionName: '', indicatorId: null, level2Id: null, level2Name: '', level3Id: null, level3Name: '', level4Id: null, level4Name: '', eventTime: '', location: '', personId: null, deptName: '', deptId: null, teamId: null, groupId: null, scoreValue: 0, cascadeScore: 0, eventDesc: '', remark: '', org: '', regionalId: null, channelId: null, postId: null })
   level2Options.value = []; level3Options.value = []; level4Options.value = []
-  teamOptions.value = []; groupOptions.value = []; personOptions.value = []
+  teamOptions.value = []; groupOptions.value = []; personOptions.value = []; formChannelOptions.value = []
 }
 
 function handleAdd() { resetForm(); dialogTitle.value = '新增配分事项'; dialogVisible.value = true }
-function handleUpdate(row) {
+async function handleUpdate(row) {
   resetForm()
   const record = row?.id ? row : list.value.find(r => r.id === ids.value[0])
   if (record) {
     Object.assign(form, record)
     const org = String(record.org)
     form.org = org
+
+    // 加载区域和工作点
+    if (record.regionalId) {
+      await handleFormRegionalChange(record.regionalId)
+    }
+
+    // 加载队室/班组和通道/小组
+    if (record.deptId) {
+      // 先加载队室/班组
+      const r = await deptTreeSelect({ parentId: record.deptId })
+      teamOptions.value = r.data || []
+
+      if (record.teamId) {
+        // 再加载通道/小组
+        const r2 = await deptTreeSelect({ parentId: record.teamId })
+        groupOptions.value = r2.data || []
+
+        // 最后加载责任人
+        if (record.groupId) {
+          const r3 = await listUser({ deptId: record.groupId })
+          personOptions.value = r3.rows || []
+        }
+      }
+    } else if (org === '2') {
+      await loadAllTeams()
+    } else if (org === '3') {
+      await loadAllGroups()
+    } else if (org === '4') {
+      await loadAllPersons()
+    }
+
     if (org === '1') {
       form.deptId = record.deptId || null
     } else if (org === '2') {
-      loadAllTeams().then(() => {
-        form.teamId = record.teamId || null
-        if (form.teamId) handleDepartmentChange(form.teamId)
-      })
+      form.teamId = record.teamId || null
+      if (form.teamId) await handleDepartmentChange(form.teamId)
     } else if (org === '3') {
-      loadAllGroups().then(() => {
-        form.groupId = record.groupId || null
-        if (form.groupId) handleGroupChange(form.groupId)
-      })
+      form.groupId = record.groupId || null
+      if (form.groupId) await handleGroupChange(form.groupId)
     } else if (org === '4') {
-      loadAllPersons().then(() => {
-        form.personId = record.personId || null
-        if (form.personId) handlePersonChange(form.personId)
-      })
+      form.personId = record.personId || null
+      if (form.personId) await handlePersonChange(form.personId)
     }
-    if (record.dimensionId) onDimensionChange(record.dimensionId, true)
+
+    if (record.dimensionId) await onDimensionChange(record.dimensionId, true)
     if (record.level2Id) onLevel2Change(record.level2Id, true)
     if (record.level3Id) onLevel3Change(record.level3Id, true)
     if (record.level4Id) onLevel4Change(record.level4Id, true)
@@ -548,6 +652,20 @@ function onLevel4Change(val) {
   }
 }
 
+// 递归查找树形结构中的节点
+const findTreeNode = (nodes, targetId, idKey, nameKey) => {
+  for (const node of nodes) {
+    if (node[idKey] === targetId) {
+      return node
+    }
+    if (node.children) {
+      const found = findTreeNode(node.children, targetId, idKey, nameKey)
+      if (found) return found
+    }
+  }
+  return null
+}
+
 async function submitForm() {
   await formRef.value.validate()
   let copyForm = { ...form }
@@ -568,6 +686,18 @@ async function submitForm() {
     const g = groupOptions.value.find(g => g.id === copyForm.groupId)
     if (g) copyForm.groupName = g.label
   }
+  if (copyForm.regionalId) {
+    const r = regionalOptions.value.find(r => r.id === copyForm.regionalId)
+    if (r) copyForm.regionalName = r.name
+  }
+  if (copyForm.channelId) {
+    const c = formChannelOptions.value.find(c => c.id === copyForm.channelId)
+    if (c) copyForm.channelName = c.name || c.positionName
+  }
+  if (copyForm.postId) {
+    const postNode = findTreeNode(postTreeData.value, copyForm.postId, 'postId', 'postName')
+    if (postNode) copyForm.postName = postNode.postName
+  }
 
   if (form.id) { await updateScoreEvent(copyForm); ElMessage.success('修改成功') }
   else { await addScoreEvent(copyForm); ElMessage.success('新增成功') }
@@ -619,5 +749,39 @@ watch(() => route.query, (query) => {
   isInit = false
 }, { immediate: true })
 
-onMounted(() => { loadDimensions(); loadDepts(); loadQueryDepts(); loadAllPersons(); getList() })
+// 递归处理岗位树，禁用第一级
+const processPostTree = (nodes, isFirstLevel = true) => {
+  return nodes.map(node => {
+    const newNode = { ...node, disabled: isFirstLevel }
+    if (node.children) {
+      newNode.children = processPostTree(node.children, false)
+    }
+    return newNode
+  })
+}
+
+onMounted(() => {
+  loadDimensions();
+  loadDepts();
+  loadQueryDepts();
+  loadAllPersons();
+  loadRegions();
+  listAllTree().then(res => {
+    postTreeData.value = processPostTree(res.data || [])
+  });
+  getList()
+})
 </script>
+
+<style scoped lang="less">
+/* Element Plus表格横向滚动配置 */
+.table-container :deep(.el-table) {
+  width: 100%;
+  min-width: 100%;
+}
+
+.table-container :deep(.el-table .el-table__header-wrapper),
+.table-container :deep(.el-table .el-table__body-wrapper) {
+  overflow-x: auto !important;
+}
+</style>