feat: fix bug处理

src/views/portraitManagement/components/InterceptionDistribution.vue

@@ -21,11 +21,10 @@ const setChartsOptionsBar = computed(() => {
     grid: {
       top: 10,
       bottom: 30,
-      left: 80,
+      left: 110,
       right: 40
     },
     xAxis: {
-      max: 'dataMax',
       axisLabel: { color: '#fff', fontSize: 14 },
     },
     dataset: {
@@ -36,7 +35,13 @@ const setChartsOptionsBar = computed(() => {
     yAxis: {
       type: 'category',
       position: 'left',
-      axisLabel: { color: '#fff', fontSize: 14 },
+      axisLabel: { 
+        color: '#fff',
+        fontSize: 14, 
+        formatter: function(value) {
+          return value.length > 5 ? value.substring(0, 6) + '...' : value;
+        }
+      },
       splitLine: { lineStyle: { color: '#344067' } }
     },
     series: [

src/views/portraitManagement/components/ProfileRadar.vue

@@ -72,10 +72,16 @@ const updateRadarChart = () => {
   }
 
   const option = {
+    grid: {
+      top: 40,
+      bottom: 40,
+      left: 50,
+      right: 50
+    },
     radar: {
       indicator: computedIndicators.value,
       center: ['50%', '50%'],
-      radius: '70%',
+      radius: '60%',
       splitNumber: 4,
       axisLine: {
         lineStyle: {

src/views/portraitManagement/components/SearchBar.vue

@@ -9,14 +9,14 @@
         <div :class="currentTime === 'custom' ? 'primary' : 'default'" @click="selectTime('custom')">自定义时间范围</div>
         <div class="custom-style-date-picker-wrap" v-if="currentTime === 'custom'">
           <el-date-picker class="custom-style-date-picker" v-model="dateRange" type="daterange" range-separator="至"
-            start-placeholder="开始" end-placeholder="结束" style="width:320px" @change="() => searchHandler()" />
+            start-placeholder="开始" end-placeholder="结束" style="width:320px" @change="() => searchHandler(curQuery)" />
         </div>
       </div>
-      <el-popover class="popover" title="" :visible="visible" placement="bottom-start" trigger="click" width="45vw">
+      <el-popover v-if=" deptType !== 'STATION' " class="popover" title="" :visible="visible" placement="bottom-start" trigger="click" width="45vw">
         <template #reference>
           <div class="primary" style="border-radius: 6px;" @click.stop="visible = !visible">{{ props.deptType === 'user'
             ?
-            '组织架构/模糊搜索' : '部门选择' }}</div>
+            '组织架构/模糊搜索' : deptType === 'BRIGADE' ?  '部门选择' : deptType === 'MANAGER' ? '班组选择' :   deptType === 'TEAMS' ? '小组选择' : '组织选择' }}</div>
         </template>
 
         <div class="custom-el-style">
@@ -68,6 +68,7 @@ const departments = ref([])
 const dateRange = ref([])
 const treeRef = ref(null)
 const currentKey = ref(null)
+const curQuery = ref({})
 
 const defaultIdMap = {
   user: 13,
@@ -108,20 +109,20 @@ const queryDept = async (query, cb) => {
 const handleSelect = (item) => {
   if (props.deptType === 'user') {
     personName.value = item.nickName
-    searchHandler({ personName: item.nickName })
+    curQuery.value = { personName: item.nickName }
+    searchHandler(curQuery.value)
   } else {
     personName.value = item.deptName
-    let obj = {}
     if (props.deptType === 'BRIGADE' || props.deptType === 'STATION') {
-      obj = { deptId: item.deptId || item.id }
+      curQuery.value = { deptId: item.deptId || item.id }
     }
     if (props.deptType === 'MANAGER') {
-      obj = { teamId: item.deptId || item.id, deptId: item.deptId || item.id }
+      curQuery.value = { teamId: item.deptId || item.id, deptId: item.deptId || item.id }
     }
     if (props.deptType === 'TEAMS') {
-      obj = { groupId: item.deptId || item.id, deptId: item.deptId || item.id }
+      curQuery.value = { groupId: item.deptId || item.id, deptId: item.deptId || item.id }
     }
-    searchHandler(obj)
+    searchHandler(curQuery.value)
   }
 }
 
@@ -173,7 +174,7 @@ const formatDate = (d) => {
 
 const selectTime = (t) => {
   currentTime.value = t
-  if (t !== 'custom') searchHandler()
+  if (t !== 'custom') searchHandler(curQuery.value)
 }
 
 const searchHandler = (query = {}) => {
@@ -192,23 +193,22 @@ const handleNodeClick = (node) => {
   if (props.deptType === 'user') {
     if (node.nodeType === 'user') {
       personName.value = node.label
-      searchHandler({ personName: node.label })
+      curQuery.value = { personName: node.label }
+      searchHandler(curQuery.value)
     }
   } else {
     if (node.deptType === props.deptType) {
       personName.value = node.deptName || node.name || node.label;
-      let obj = {}
-
       if (props.deptType === 'BRIGADE' || props.deptType === 'STATION') {
-        obj = { deptId: node.deptId || node.id }
+        curQuery.value = { deptId: node.deptId || node.id }
       }
       if (props.deptType === 'MANAGER') {
-        obj = { teamId: node.deptId || node.id, deptId: node.deptId || node.id }
+        curQuery.value = { teamId: node.deptId || node.id, deptId: node.deptId || node.id }
       }
       if (props.deptType === 'TEAMS') {
-        obj = { groupId: node.deptId || node.id, deptId: node.deptId || node.id }
+        curQuery.value = { groupId: node.deptId || node.id, deptId: node.deptId || node.id }
       }
-      searchHandler(obj)
+      searchHandler(curQuery.value)
     }
   }
 }
@@ -221,6 +221,7 @@ const setStyle = () => {
   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 = () => {
@@ -231,6 +232,7 @@ const resetStyle = () => {
   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')
 
 }
 
@@ -252,20 +254,20 @@ onMounted(async () => {
       currentKey.value = defaultId
       if (props.deptType === 'user') {
         personName.value = defaultNode.label
-        searchHandler({ personName: defaultNode.label })
+        curQuery.value = { personName: defaultNode.label }
+        searchHandler(curQuery.value)
       } else {
         personName.value = defaultNode.deptName || defaultNode.name || defaultNode.label
-        let obj = {}
         if (props.deptType === 'BRIGADE' || props.deptType === 'STATION') {
-          obj = { deptId: defaultNode.deptId || defaultNode.id }
+          curQuery.value = { deptId: defaultNode.deptId || defaultNode.id }
         }
         if (props.deptType === 'MANAGER') {
-          obj = { teamId: defaultNode.deptId || defaultNode.id, deptId: defaultNode.deptId || defaultNode.id }
+          curQuery.value = { teamId: defaultNode.deptId || defaultNode.id, deptId: defaultNode.deptId || defaultNode.id }
         }
         if (props.deptType === 'TEAMS') {
-          obj = { groupId: defaultNode.deptId || defaultNode.id, deptId: defaultNode.deptId || defaultNode.id }
+          curQuery.value = { groupId: defaultNode.deptId || defaultNode.id, deptId: defaultNode.deptId || defaultNode.id }
         }
-        searchHandler(obj)
+        searchHandler(curQuery.value)
       }
       nextTick(() => {
         treeRef.value?.setCurrentKey(defaultId)

src/views/portraitManagement/components/SeizedInfo.vue

@@ -77,7 +77,7 @@ const setChartsOptionsBar = computed(() => {
   return {
     grid: {
       top: 20,
-      bottom: 40,
+      bottom: 55,
       left: 45,
       right: 15
     },

src/views/portraitManagement/components/rollingTable.vue

@@ -40,7 +40,7 @@ let pendingStart = false
 
 const scrollData = computed(() => {
   if (!props.data || props.data.length === 0) return []
-  return [...props.data, ...props.data]
+  return [...props.data]
 })
 
 const startScroll = () => {

src/views/portraitManagement/deptProfile/component/profile.vue

@@ -3,7 +3,7 @@
     <div class="main-content">
       <div class="content-row">
         <ProfileRadar :chartData="radarData" />
-        <ProfileMembers :columns="memberColumns" :data="teamMembers" />
+        <ProfileMembers :columns="teamColumns" :data="teamMembers" />
       </div>
 
       <div class="content-row">
@@ -20,7 +20,7 @@ import ProfileRadar from '../../components/ProfileRadar.vue'
 import ProfileMembers from '../../components/ProfileMembers.vue'
 import ProfileBasicDistribution from '../../components/ProfileBasicDistribution.vue'
 import ProfilePositionDistribution from '../../components/ProfilePositionDistribution.vue'
-import { getDeptMembers, getDeptMemberDistribution, getDeptPositionDistribution, getDimensionScoreOverview } from '@/api/portraitManagement/portraitManagement'
+import { countDeptTeamStats, getDeptMemberDistribution, getDeptPositionDistribution, getDimensionScoreOverview } from '@/api/portraitManagement/portraitManagement'
 const props = defineProps({
   queryParams: {
     type: Object,
@@ -33,29 +33,32 @@ const radarData = ref([
 ])
 
 
+const teamMembers = ref([])
 
-const teamMembers = ref([
-  // { name: '孙晓波', age: 25, seniority: 3, gender: '男', nation: '汉', political: '群众', position: '安检员', qualification: '前传、特检、人身', skillLevel: '三级', operateYears: 5, avgYears: 6, totalScore: 88 },
-  // { name: '孙晓波', age: 28, seniority: 6, gender: '男', nation: '汉', political: '群众', position: '组长', qualification: '前传、特检、人身', skillLevel: '三级', operateYears: 5, avgYears: 5, totalScore: 85 },
-  // { name: '孙晓波', age: 31, seniority: 2, gender: '女', nation: '汉', political: '党员', position: '组长', qualification: '前传、特检、人身', skillLevel: '四级', operateYears: 5, avgYears: 76, totalScore: 76 },
-  // { name: '马力', age: 26, seniority: 3, gender: '男', nation: '汉', political: '群众', position: '组长', qualification: '前传、特检、人身', skillLevel: '五级', operateYears: 5, avgYears: 81, totalScore: 81 },
-  // { name: '马建国', age: 24, seniority: 5, gender: '男', nation: '汉', political: '党员', position: '安检员', qualification: '前传、特检、人身', skillLevel: '三级', operateYears: 6, avgYears: 78, totalScore: 78 }
-])
-
-const memberColumns = ref([
-  { label: '姓名', prop: 'personName' },
-  { label: '年龄', prop: 'age' },
-  { label: '司龄', prop: 'workYears' },
-  { label: '性别', prop: 'sex' },
-  { label: '民族', prop: 'nation' },
-  { label: '政治面貌', prop: 'politicalStatus' },
-  { label: '职务', prop: 'roleNames' },
-  { label: '岗位资质', prop: 'qualificationLevel' },
-  { label: '职业技能等级', prop: 'skillLevel' },
-  { label: '开机年限', prop: 'xrayOperatorYears' },
-  { label: '平均年限', prop: 'avgYears' },
+const teamColumns = [
+  { label: '班组', prop: 'deptName' },
+  { label: '员工数量', prop: 'employeeCount' },
+  { label: '党员数量', prop: 'partyMemberCount' },
+  { label: '平均年龄', prop: 'avgAge' },
+  { label: '平均工龄', prop: 'avgWorkYears' },
+  { label: '职业资格等级证书数量', prop: 'qualificationLevel' },
+  { label: '平均开机年龄', prop: 'avgXrayOperatorYears' },
   { label: '综合得分', prop: 'totalScore' }
-])
+]
+
+const fetchTeamData = async (params) => {
+  try {
+    const res = await countDeptTeamStats(params)
+    if (res.code === 200 && res.data) {
+      console.log(res.data);
+      
+      teamData.value = res.data
+    }
+  } catch (error) {
+    console.error('获取部门成员列表失败', error)
+  }
+}
+
 
 const genderData = ref([
 
@@ -80,16 +83,6 @@ const operateData = ref([
 const postData = ref([
 
 ])
-const fetchTeamMembers = async (params) => {
-  try {
-    const res = await getDeptMembers(params)
-    if (res.code === 200 && res.data) {
-      teamMembers.value = res.data
-    }
-  } catch (error) {
-    console.error('获取部门成员列表失败', error)
-  }
-}
 
 const fetchMemberDistribution = async (params) => {
   try {
@@ -138,7 +131,7 @@ const fetchData = (params) => {
   }
   //  console.log('params', params)
   // debugger
-  fetchTeamMembers(params)
+  fetchTeamData(params)
   fetchMemberDistribution(params)
   fetchPositionDistribution(params)
   fetchRadarData(params)

src/views/portraitManagement/stationProfile/component/profile.vue

@@ -49,9 +49,20 @@ const teamColumns = [
   { label: '综合得分', prop: 'totalScore' }
 ]
 
-const teamData = ref([
-  
-])
+const teamData = ref([])
+
+const fetchTeamData = async (params) => {
+  try {
+    const res = await countStationTeamStats(params)
+    if (res.code === 200 && res.data) {
+      teamData.value = res.data
+      console.log(teamData.value);
+      
+    }
+  } catch (error) {
+    console.error('获取部门成员列表失败', error)
+  }
+}
 
 const genderData = ref([])
 const nationData = ref([])
@@ -68,16 +79,6 @@ const operateData = ref([
 const postData = ref([
   
 ])
-const fetchTeamData = async (params) => {
-  try {
-    const res = await countStationTeamStats(params)
-    if (res.code === 200 && res.data) {
-      teamData.value = res.data
-    }
-  } catch (error) {
-    console.error('获取部门成员列表失败', error)
-  }
-}
 
 const fetchMemberDistribution = async (params) => {
   try {

src/views/portraitManagement/stationProfile/component/runData.vue

@@ -272,6 +272,7 @@ const fetchData = () => {
       params[key] = val
     }
   })
+  delete params.deptId
 
   invokerCountStationHourlyThroughput(params)
   invokerCountSeizureInfoItem(params)

src/views/portraitManagement/teamProfile/component/profile.vue

@@ -3,7 +3,7 @@
     <div class="main-content">
       <div class="content-row">
         <ProfileRadar :chartData="radarData" />
-        <ProfileMembers :columns="memberColumns" :data="teamMembers" />
+        <ProfileMembers :columns="teamColumns" :data="teamMembers" />
       </div>
 
       <div class="content-row">
@@ -20,7 +20,7 @@ import ProfileRadar from '../../components/ProfileRadar.vue'
 import ProfileMembers from '../../components/ProfileMembers.vue'
 import ProfileBasicDistribution from '../../components/ProfileBasicDistribution.vue'
 import ProfilePositionDistribution from '../../components/ProfilePositionDistribution.vue'
-import { getDeptMembers, getDeptMemberDistribution, getDeptPositionDistribution, getDimensionScoreOverview } from '@/api/portraitManagement/portraitManagement'
+import { countDeptTeamStats, getDeptMemberDistribution, getDeptPositionDistribution, getDimensionScoreOverview } from '@/api/portraitManagement/portraitManagement'
 const props = defineProps({
   queryParams: {
     type: Object,
@@ -34,28 +34,30 @@ const radarData = ref([
 
 
 
-const teamMembers = ref([
-  // { name: '孙晓波', age: 25, seniority: 3, gender: '男', nation: '汉', political: '群众', position: '安检员', qualification: '前传、特检、人身', skillLevel: '三级', operateYears: 5, avgYears: 6, totalScore: 88 },
-  // { name: '孙晓波', age: 28, seniority: 6, gender: '男', nation: '汉', political: '群众', position: '组长', qualification: '前传、特检、人身', skillLevel: '三级', operateYears: 5, avgYears: 5, totalScore: 85 },
-  // { name: '孙晓波', age: 31, seniority: 2, gender: '女', nation: '汉', political: '党员', position: '组长', qualification: '前传、特检、人身', skillLevel: '四级', operateYears: 5, avgYears: 76, totalScore: 76 },
-  // { name: '马力', age: 26, seniority: 3, gender: '男', nation: '汉', political: '群众', position: '组长', qualification: '前传、特检、人身', skillLevel: '五级', operateYears: 5, avgYears: 81, totalScore: 81 },
-  // { name: '马建国', age: 24, seniority: 5, gender: '男', nation: '汉', political: '党员', position: '安检员', qualification: '前传、特检、人身', skillLevel: '三级', operateYears: 6, avgYears: 78, totalScore: 78 }
-])
+const teamMembers = ref([])
 
-const memberColumns = ref([
-  { label: '姓名', prop: 'personName' },
-  { label: '年龄', prop: 'age' },
-  { label: '司龄', prop: 'workYears' },
-  { label: '性别', prop: 'sex' },
-  { label: '民族', prop: 'nation' },
-  { label: '政治面貌', prop: 'politicalStatus' },
-  { label: '职务', prop: 'roleNames' },
-  { label: '岗位资质', prop: 'qualificationLevel' },
-  { label: '职业技能等级', prop: 'skillLevel' },
-  { label: '开机年限', prop: 'xrayOperatorYears' },
-  { label: '平均年限', prop: 'avgYears' },
+const teamColumns = [
+  { label: '小组', prop: 'deptName' },
+  { label: '员工数量', prop: 'employeeCount' },
+  { label: '党员数量', prop: 'partyMemberCount' },
+  { label: '平均年龄', prop: 'avgAge' },
+  { label: '平均工龄', prop: 'avgWorkYears' },
+  { label: '职业资格等级证书数量', prop: 'qualificationLevel' },
+  { label: '平均开机年龄', prop: 'avgXrayOperatorYears' },
   { label: '综合得分', prop: 'totalScore' }
-])
+]
+
+const fetchTeamData = async (params) => {
+  try {
+    const res = await countDeptTeamStats(params)
+    if (res.code === 200 && res.data) {
+      teamData.value = res.data
+    }
+  } catch (error) {
+    console.error('获取部门成员列表失败', error)
+  }
+}
+
 
 const genderData = ref([
   
@@ -80,16 +82,7 @@ const operateData = ref([
 const postData = ref([
   
 ])
-const fetchTeamMembers = async (params) => {
-  try {
-    const res = await getDeptMembers(params)
-    if (res.code === 200 && res.data) {
-      teamMembers.value = res.data
-    }
-  } catch (error) {
-    console.error('获取部门成员列表失败', error)
-  }
-}
+
 
 const fetchMemberDistribution = async (params) => {
   try {
@@ -138,7 +131,7 @@ const fetchData = (params) => {
   }
   //  console.log('params', params)
   // debugger
-  fetchTeamMembers(params)
+  fetchTeamData(params)
   fetchMemberDistribution(params)
   fetchPositionDistribution(params)
   fetchRadarData(params)

src/views/score/dimension/index.vue

@@ -286,7 +286,7 @@ async function loadTree() {
 }
 
 function handleAddIndicator(parentRow) {
-  Object.assign(indForm, { id: null, dimensionId: selectedDim.value.id, parentId: parentRow ? parentRow.id : 0, level: parentRow ? parentRow.level + 1 : 2, name: '', type: '2', scoreValue: 0, cascadeRule: '', sortOrder: 0, status: '0', remark: '' })
+  Object.assign(indForm, { id: null, org: selectedDim.value.org, dimensionId: selectedDim.value.id, parentId: parentRow ? parentRow.id : 0, level: parentRow ? parentRow.level + 1 : 2, name: '', type: '2', scoreValue: 0, cascadeRule: '', sortOrder: 0, status: '0', remark: '' })
   parentIndicatorName.value = parentRow ? parentRow.name : ''
   indDialogTitle.value = '新增' + (parentRow ? parentRow.level + 1 : 2) + '级指标'
   indDialogVisible.value = true