Merge branch 'blockingData' into dev

src/views/blockingData/blockingDataScreen/components/ModuleBrigadeOne.vue

@@ -206,6 +206,10 @@ const generateData = (count, min, max) => {
 
 const multiLineChartOption = (xAxisData, series) => ({
   grid: { left: '10%', top: '15%', right: '5%', bottom: '15%', containLabel: true },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: { type: 'cross' }
+  },
   xAxis: { type: 'category', data: xAxisData, axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' } },
   yAxis: { type: 'value', axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' }, splitLine: { lineStyle: { color: '#eee' } } },
   legend: { 
@@ -230,6 +234,10 @@ const multiLineChartOption = (xAxisData, series) => ({
 
 const horizontalBarChartOption = (data, color) => ({
   grid: { left: '20%', top: '15%', right: '5%', bottom: '15%', containLabel: true },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: { type: 'shadow' }
+  },
   xAxis: { type: 'value', axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' }, splitLine: { lineStyle: { color: '#eee' } } },
   yAxis: { type: 'category', data: data.map(d => d.name), axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' } },
   series: [{ 
@@ -243,6 +251,10 @@ const horizontalBarChartOption = (data, color) => ({
 
 const barLineChartOption = (xAxisData, barData, lineData) => ({
   grid: { left: '10%', top: '15%', right: '5%', bottom: '15%', containLabel: true },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: { type: 'cross' }
+  },
   xAxis: { type: 'category', data: xAxisData, axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' } },
   yAxis: { type: 'value', axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' }, splitLine: { lineStyle: { color: '#eee' } } },
   legend: { 
@@ -381,7 +393,7 @@ onMounted(() => {
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
   display: flex;
   flex-direction: column;
-  min-height: 280px;
+  min-height: 300px;
 }
 
 .chart-title {

src/views/blockingData/blockingDataScreen/components/ModuleBrigadeThree.vue

@@ -151,7 +151,7 @@ onMounted(() => {
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
   display: flex;
   flex-direction: column;
-  min-height: 280px;
+  min-height: 300px;
 }
 
 .chart-title {

src/views/blockingData/blockingDataScreen/components/ModuleBrigadeTwo.vue

@@ -201,7 +201,7 @@ const fetchData = async () => {
     if (genderRes.value?.data) {
       const genderData = genderRes.value.data.map(item => ({
         name: item.gender || item.name || '',
-        value: item.percentage || item.value || 0
+        value: item.count || item.value || 0
       }))
       setOption4(pieChartOption(genderData, ['#ec4899', '#3b82f6']))
     }
@@ -209,7 +209,7 @@ const fetchData = async () => {
     if (certDetailRes.value?.data) {
       const certData = certDetailRes.value.data.map(item => ({
         name: item.certificateLevel || item.name || '',
-        value: item.percentage || item.value || 0
+        value: item.count || item.value || 0
       }))
       setOption5(pieChartOption(certData, ['#22c55e', '#3b82f6']))
     }
@@ -217,7 +217,7 @@ const fetchData = async () => {
     if (certBaseRes.value?.data) {
       const baseData = certBaseRes.value.data.map(item => ({
         name: item.certificateLevel || item.name || '',
-        value: item.percentage || item.value || 0
+        value: item.count || item.value || 0
       }))
       setOption6(pieChartOption(baseData, ['#22c55e', '#3b82f6']))
     }
@@ -226,7 +226,7 @@ const fetchData = async () => {
       const colors = ['#8b5cf6', '#ec4899', '#f97316', '#22c55e', '#3b82f6', '#14b8a6', '#ef4444', '#fbbf24', '#6366f1', '#06b6d4', '#84cc16', '#e11d48']
       const locationData = locationRes.value.data.map(item => ({
         name: item.itemLocation || item.name || '',
-        value: item.percentage || item.value || 0
+        value: item.count || item.value || 0
       }))
       setOption7(donutChartOption(locationData, colors))
     }
@@ -249,7 +249,7 @@ const fetchData = async () => {
       const colors = ['#3b82f6', '#22c55e', '#f97316', '#ec4899', '#8b5cf6', '#14b8a6', '#ef4444', '#fbbf24', '#6366f1', '#06b6d4', '#84cc16', '#e11d48', '#a855f7', '#f59e0b']
       const supervisorData = supervisorDistRes.value.data.map(item => ({
         name: item.supervisorName || item.name || '',
-        value: item.percentage || item.value || 0
+        value: item.totalCount || item.value || 0
       }))
       setOption10(donutChartOption(supervisorData, colors))
     }
@@ -329,18 +329,14 @@ const pieChartOption = (data, colors) => ({
   },
   series: [{
     type: 'pie',
-    radius: ['40%', '65%'],
+    radius: ['35%', '45%'],
     center: ['50%', '55%'],
     data: data,
     label: {
       show: true,
-      formatter: (params) => {
-        const total = data.reduce((sum, item) => sum + item.value, 0)
-        const percentage = ((params.value / total) * 100).toFixed(2)
-        return `${params.name}\n${params.value}(${percentage}%)`
-      },
+      formatter: '{b}\n{c} ({d}%)',
       fontSize: 10
-    }
+    },
   }]
 })
 
@@ -436,7 +432,7 @@ onMounted(() => {
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
   display: flex;
   flex-direction: column;
-  min-height: 280px;
+  min-height: 320px;
 }
 
 .chart-title {

src/views/blockingData/blockingDataScreen/components/ModuleOne.vue

@@ -303,13 +303,14 @@ const loadData = async () => {
       },
       series: [{
         type: 'bar',
-        data: brigadeRateData.map(d => d.avgBlockedRate),
+        data: brigadeRateData.map(d => Number(d.avgBlockedRate.toFixed(2))),
         itemStyle: { color: '#3b82f6' },
         barWidth: 8,
         label: {
           show: true,
           position: 'right',
-          fontSize: 10
+          fontSize: 10,
+          formatter: '{c}'
         }
       }]
     }
@@ -1408,7 +1409,7 @@ onMounted(() => {
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
   display: flex;
   flex-direction: column;
-  min-height: 280px;
+  min-height: 300px;
 }
 
 .chart-row.full-width .chart-item {

src/views/blockingData/blockingDataScreen/components/ModuleTwo.vue

@@ -127,7 +127,7 @@ const loadData = async () => {
       teamLeaderRanking(queryParams),
       reviewedUserRanking(queryParams)
     ])
-    
+
     // 更新排行榜数据
     if (supervisorRankRes?.value?.data) {
       rankData1.splice(0, rankData1.length, ...supervisorRankRes.value.data.map((item, index) => ({
@@ -172,7 +172,7 @@ const loadData = async () => {
 
     setOption2(pieOption(
       missCheckReasonRes?.value?.data?.map(item => ({
-        name: item.name || item.reason || '未知',
+        name: item.missCheckReasonCategory || item.reason || '未知',
         value: item.value || item.count || 0
       })) || [],
       ['#ef4444', '#f97316', '#eab308', '#22c55e', '#3b82f6', '#64748b'],
@@ -186,7 +186,6 @@ const loadData = async () => {
       })) || [],
       ['#3b82f6', '#60a5fa', '#93c5fd', '#bfdbfe', '#dbeafe', '#eff6ff']
     ))
-
     setOption4(pieOption(
       genderRes?.value?.data?.map(item => ({
         name: item.gender || '未知',
@@ -214,7 +213,7 @@ const loadData = async () => {
         { name: '4年', key: 'cnt4Years' },
         { name: '5年', key: 'cntGe5Year' }
       ]
-      
+
       const seriesData = tenureLevels.map(level => ({
         name: level.name,
         type: 'bar',
@@ -231,9 +230,9 @@ const loadData = async () => {
 
       setOption6({
         grid: { left: '15%', top: '10%', right: '5%', bottom: '15%', containLabel: true },
-        xAxis: { 
-          type: 'category', 
-          data: categories, 
+        xAxis: {
+          type: 'category',
+          data: categories,
           axisLabel: { fontSize: 9 },
           axisTick: {
             alignWithLabel: true
@@ -250,7 +249,7 @@ const loadData = async () => {
     if (certificateData.length > 0) {
       const certificateCategories = ['高级证书', '中级证书', '初级证书']
       const brigadeNames = [...new Set(certificateData.map(item => item.brigadeName))]
-      
+
       const certificateSeriesData = brigadeNames.map((brigadeName, index) => {
         const brigadeData = certificateData.find(d => d.brigadeName === brigadeName)
         return {
@@ -271,22 +270,22 @@ const loadData = async () => {
 
       setOption7({
         grid: { left: '15%', top: '10%', right: '5%', bottom: '15%', containLabel: true },
-        xAxis: { 
-          type: 'category', 
-          data: certificateCategories, 
+        xAxis: {
+          type: 'category',
+          data: certificateCategories,
           axisLabel: { fontSize: 10 },
           axisLine: { lineStyle: { color: '#999' } }
         },
-        yAxis: { 
-          type: 'value', 
+        yAxis: {
+          type: 'value',
           axisLabel: { fontSize: 10 },
           axisLine: { lineStyle: { color: '#999' } },
           splitLine: { lineStyle: { color: '#eee' } }
         },
-        legend: { 
-          top: 0, 
-          right: 10, 
-          textStyle: { fontSize: 10 } 
+        legend: {
+          top: 0,
+          right: 10,
+          textStyle: { fontSize: 10 }
         },
         series: certificateSeriesData
       })
@@ -303,19 +302,24 @@ watch(() => props.filterParams, () => {
 }, { deep: true })
 
 const rankData1 = reactive([
-  
+
 ])
 
 const rankData2 = reactive([
-  
+
 ])
 
 const rankData3 = reactive([
- 
+
 ])
 
 const pieOption = (data, colors, isRing = false) => ({
   color: colors,
+  legend: {
+    orient: 'horizontal',
+    top: 'top',
+    textStyle: { fontSize: 10 }
+  },
   series: [{
     type: 'pie',
     radius: isRing ? ['50%', '70%'] : '60%',
@@ -325,7 +329,8 @@ const pieOption = (data, colors, isRing = false) => ({
       show: true,
       formatter: '{b}\n{c} ({d}%)',
       fontSize: 10
-    }
+    },
+
   }]
 })
 
@@ -390,7 +395,7 @@ onMounted(() => {
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
   display: flex;
   flex-direction: column;
-  min-height: 280px;
+  min-height: 300px;
 }
 
 .chart-title {