feat: 新增多维度筛选与优化员工画像页面

1.  为扣分类型、区域、工作点、岗位新增搜索筛选条件
2.  调整事件描述列宽度，优化表格展示
3.  注释掉旧版员工画像页面的组件名定义，更新新版组件名
4.  移除SearchBar组件的onUnmounted钩子与多余的样式重置方法
5.  格式化代码缩进与对象空格，优化代码可读性

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'
@@ -265,32 +265,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
@@ -308,7 +283,7 @@ onMounted(async () => {
         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 }
+        curQuery.value = { personName: defaultNode.label, id: defaultNode.id }
         searchHandler(curQuery.value)
       } else {
         const path = buildPathForNode(departments.value, defaultNode.deptId || defaultNode.id)
@@ -331,16 +306,11 @@ onMounted(async () => {
     }
   }
 })
-onUnmounted(() => {
-  resetStyle()
-})
 
 defineExpose({
   getDefQuery() {
-
     return {
       ...getTimeRange(),
-
     }
   }
 })

src/views/portraitManagement/employeeProfile/index.vue

@@ -186,13 +186,14 @@
 
         <!-- 加分区域 -->
         <div class="tooltip-section">
-          <div class="section-list">
+          <!--<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>
             <div v-else class="p-empty">暂无加分记录</div>
           </div>
+          -->
           <div class="section-total add">
             <span>合计加分:</span>
             <span>{{ addTotal }}分</span>
@@ -200,13 +201,14 @@
         </div>
         <!-- 扣分区域 -->
         <div class="tooltip-section">
-          <div class="section-list">
+        <!--   <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>
             <div v-if="!deductList.length" class="p-empty">暂无扣分记录</div>
           </div>
+          -->
           <div class="section-total deduct">
             <span>合计扣分:</span>
             <span>{{ deductTotal }}分</span>
@@ -229,6 +231,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
 

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/score/event/index.vue

@@ -45,6 +45,28 @@
         <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:150px" @change="handleRegionalChange">
+          <el-option v-for="item in regionalOptions" :key="item.id" :label="item.positionName" :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="请选择岗位" style="width:150px" 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>
@@ -89,6 +111,9 @@
       <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="regionalName" />
+      <el-table-column label="工作点" align="center" prop="channelName" />
+      <el-table-column label="岗位" align="center" prop="postName" />
       <el-table-column label="基础分值" align="center" prop="scoreValue" width="90">
         <template #default="{ row }">
           <span :style="{ color: row.scoreValue > 0 ? '#67c23a' : row.scoreValue < 0 ? '#f56c6c' : '' }">
@@ -118,7 +143,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="事件描述" align="center" prop="eventDesc" show-overflow-tooltip />
+      <el-table-column label="事件描述" width="460" align="center" prop="eventDesc" show-overflow-tooltip />
       <el-table-column label="操作" align="center" width="180">
         <template #default="{ row }">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(row)"
@@ -180,8 +205,19 @@
             </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.positionName" :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.positionName" :value="item.id" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -217,6 +253,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 +294,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 +308,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 +327,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' }],
@@ -360,6 +409,29 @@ async function loadAllPersons() {
   personOptions.value = r.rows || []
 }
 
+async function loadRegions() {
+  const r = await listPosition({ positionType: 'REGIONAL' })
+  regionalOptions.value = r.rows || []
+}
+
+async function handleRegionalChange(val) {
+  queryParams.channelId = null
+  channelOptions.value = []
+  if (val) {
+    const r = await listPosition({ parentId: val })
+    channelOptions.value = r.rows || []
+  }
+}
+
+async function handleFormRegionalChange(val) {
+  form.channelId = null
+  formChannelOptions.value = []
+  if (val) {
+    const r = await listPosition({ parentId: val })
+    formChannelOptions.value = r.rows || []
+  }
+}
+
 function handleBrigadeChange() {
 }
 
@@ -456,18 +528,22 @@ function resetQuery() {
     groupName: '', 
     dimensionId: null, 
     sourceType: '', 
-    org: '' 
+    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 }
@@ -619,5 +695,5 @@ watch(() => route.query, (query) => {
   isInit = false
 }, { immediate: true })
 
-onMounted(() => { loadDimensions(); loadDepts(); loadQueryDepts(); loadAllPersons(); getList() })
+onMounted(() => { loadDimensions(); loadDepts(); loadQueryDepts(); loadAllPersons(); loadRegions(); listAllTree().then(res => { postTreeData.value = res.data || [] }); getList() })
 </script>