优化图表配置，调整数据展示逻辑

src/views/Home/Index.vue

@@ -303,22 +303,28 @@ const barOptionsData = ref({
     },
     {
       name: '执法记录',
-      type: 'bar',
+      type: 'pictorialBar',
+      symbol: 'rect',
+      symbolPosition: 'end',
+      symbolSize: [20, 5],
+      symbolOffset: [-13, -1],
       barWidth: 20,
-      stack: '执法记录',
+      barGap: '-100% ',
-      barGap: '30%',
       itemStyle: {
         color: 'rgba(64, 158, 255, 1)'
       },
       tooltip: {
         show: false
       },
-      data: [1, 1, 1, 1, 1]
+      data: []
     },
     {
       name: '整改次数',
-      type: 'bar',
+      type: 'pictorialBar',
-      stack: '整改次数',
+      symbol: 'rect',
+      symbolPosition: 'end',
+      symbolSize: [20,5],
+	    symbolOffset: [13, -1],
       barWidth: 20,
       itemStyle: {
         color: 'rgba(103, 194, 58, 1)'
@@ -326,103 +332,103 @@ const barOptionsData = ref({
       tooltip: {
         show: false
       },
-      data: [1, 1, 1, 1, 1]
+      data: []
     }
   ]
 })
 const lineOptionsData = ref({
-	tooltip: {
+  tooltip: {
-		trigger: 'axis',
+    trigger: 'axis',
-		axisPointer: {
+    axisPointer: {
-			type: 'shadow'
+      type: 'shadow'
-		}
+    }
-	},
+  },
-	grid: {
+  grid: {
-		top: 42,
+    top: 42,
-		left: 16,
+    left: 16,
-		right: 16,
+    right: 16,
-		bottom: 16,
+    bottom: 16,
-		containLabel: true
+    containLabel: true
-	},
+  },
-	legend: {
+  legend: {
-		show: true,
+    show: true,
-		top: 16,
+    top: 16,
-		left: 'center',
+    left: 'center',
-		textStyle: {
+    textStyle: {
-			color: '#333'
+      color: '#333'
-		}
+    }
-	},
+  },
-	xAxis: {
+  xAxis: {
-		type: 'category',
+    type: 'category',
-		data:[],
+    data: [],
-		axisTick: {
+    axisTick: {
-			show: false
+      show: false
-		},
+    },
-		axisLine: {
+    axisLine: {
-			show: false
+      show: false
-		},
+    },
-		splitLine: {
+    splitLine: {
-			show: true,
+      show: true,
-			lineStyle: {
+      lineStyle: {
-				type: 'dashed',
+        type: 'dashed',
-				color: '#E5E7EB'
+        color: '#E5E7EB'
-			}
+      }
-		},
+    },
-		axisLabel: {
+    axisLabel: {
-			show: false,
+      show: false,
-			color: '#333'
+      color: '#333'
-		}
+    }
-	},
+  },
-	yAxis: {
+  yAxis: {
-		type: 'value',
+    type: 'value',
-		axisLine: {
+    axisLine: {
-			show: false
+      show: false
-		},
+    },
-		max: (v) => {
+    max: (v) => {
-			return Math.floor(v.max * 1.2 + 1)
+      return Math.floor(v.max * 1.2 + 1)
-		},
+    },
-		axisTick: {
+    axisTick: {
-			show: false
+      show: false
-		},
+    },
-		splitLine: {
+    splitLine: {
-			lineStyle: {
+      lineStyle: {
-				type: 'dashed',
+        type: 'dashed',
-				color: '#E5E7EB'
+        color: '#E5E7EB'
-			}
+      }
-		}
+    }
-	},
+  },
-	series: [
+  series: [
-		{
+    {
-			name: '任务数',
+      name: '任务数',
-			data: [13253, 34235, 26321, 12340, 24643],
+      data: [13253, 34235, 26321, 12340, 24643],
-			type: 'line',
+      type: 'line',
-			smooth: true,
+      smooth: true,
-			itemStyle: {
+      itemStyle: {
-				color: 'rgba(64, 158, 255, 1)'
+        color: 'rgba(64, 158, 255, 1)'
-			},
+      },
-			lineStyle: {
+      lineStyle: {
-				color: 'rgba(64, 158, 255, 1)'
+        color: 'rgba(64, 158, 255, 1)'
-			},
+      },
-			areaStyle: {
+      areaStyle: {
-				color: 'rgba(64, 158, 255, .3)'
+        color: 'rgba(64, 158, 255, .3)'
-			}
+      }
-		},
+    },
-		{
+    {
-			name: '执法数',
+      name: '执法数',
-			data: [15678, 28943, 31452, 19876, 22345],
+      data: [15678, 28943, 31452, 19876, 22345],
-			type: 'line',
+      type: 'line',
-			smooth: true,
+      smooth: true,
-			itemStyle: {
+      itemStyle: {
-				color: 'rgba(103, 194, 58, 1)'
+        color: 'rgba(103, 194, 58, 1)'
-			},
+      },
-			lineStyle: {
+      lineStyle: {
-				color: 'rgba(103, 194, 58, 1)'
+        color: 'rgba(103, 194, 58, 1)'
-			},
+      },
-			areaStyle: {
+      areaStyle: {
-				color: 'rgba(103, 194, 58, .3)'
+        color: 'rgba(103, 194, 58, .3)'
-			}
+      }
-		}
+    }
-	]
+  ]
 })
 
 const queryParams = reactive({
@@ -497,9 +503,9 @@ const getS3Data = async () => {
     data1.push({ name: item.month, value: item.taskCount })
     data2.push({ name: item.month, value: item.inspectionCount })
   })
-	lineOptionsData.value.series[0].data = data1
+  lineOptionsData.value.series[0].data = data1
-	lineOptionsData.value.series[1].data = data2
+  lineOptionsData.value.series[1].data = data2
-	lineOptionsData.value.xAxis.data = res.map((i) => i.month)
+  lineOptionsData.value.xAxis.data = res.map((i) => i.month)
 }
 
 // 执法整改
@@ -518,12 +524,11 @@ const getS2Data = async () => {
     }
   })
   const axis = res.map((i) => i.realName)
-  const top = (res[0].inspectionCount % 10) / 10
   barOptionsData.value.series[0].data = data1
   barOptionsData.value.series[1].data = data2
   barOptionsData.value.xAxis.data = axis
-  barOptionsData.value.series[2].data = new Array(axis.length).fill(top || 0.1)
+  barOptionsData.value.series[2].data = data1
-  barOptionsData.value.series[3].data = new Array(axis.length).fill(top || 0.1)
+  barOptionsData.value.series[3].data = data2
 }
 
 // 获取最新任务