From 46de43e9aa09dc0c3d667b43cc9f6d8b9bf42ba4 Mon Sep 17 00:00:00 2001
From: wj <347312259@qq.com>
Date: Thu, 25 May 2023 18:16:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E6=AF=94=E5=88=86=E6=9E=90=E6=9F=B1?=
 =?UTF-8?q?=E7=8A=B6=E5=9B=BE=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 psdc-ui/src/views/analyse/nhfx/index.vue | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/psdc-ui/src/views/analyse/nhfx/index.vue b/psdc-ui/src/views/analyse/nhfx/index.vue
index 6dd165b..ba16586 100644
--- a/psdc-ui/src/views/analyse/nhfx/index.vue
+++ b/psdc-ui/src/views/analyse/nhfx/index.vue
@@ -215,7 +215,7 @@ function tongbiChartFun(){
   tongbiChart = echarts.init(chartDom);
   const option = {
     legend: {
-      data: ["本期","同期"],
+      data: [dateValue1.value,dateValue1.value - 1],
       // selectedMode: 'single',
       textStyle: {
         color: "#f3ffff"
@@ -284,7 +284,7 @@ function tongbiChartFun(){
     },
     series: [
       {
-        name: "本期",
+        name: dateValue1.value,
         data:  tongbiBenqi.value,
         type: 'bar',
         smooth: true,
@@ -329,7 +329,7 @@ function tongbiChartFun(){
         },
       },
       {
-        name: "同期",
+        name: dateValue1.value - 1,
         data:  tongbiTongqi.value,
         type: 'bar',
         smooth: true,
@@ -505,8 +505,12 @@ function close(){
 let huanbiChart;
 function huanbiChartFun(){
   dateValue2.value = dateValue2.value.toString()
-  console.log('X轴：',dateValue2.value)
-  console.log('本月：',thisMonthData.value,'上月：',lastMonthData.value)
+  // console.log('X轴：',dateValue2.value)
+  // console.log('本月：',thisMonthData.value,'上月：',lastMonthData.value)
+  let thisMonthDataArr = []
+  let lastMonthDataArr = []
+  thisMonthDataArr.push(thisMonthData.value)
+  lastMonthDataArr.push(lastMonthData.value)
   const chartDom = document.getElementById('huanbiChart')
   tongbiChart = echarts.init(chartDom);
   const option = {
@@ -581,7 +585,7 @@ function huanbiChartFun(){
     series: [
       {
         name: echartLegend.value[0],
-        data:  thisMonthData.value,
+        data:  thisMonthDataArr,
         type: 'bar',
         smooth: true,
         symbol: "none", //去掉圆点
@@ -591,7 +595,7 @@ function huanbiChartFun(){
       },
       {
         name: echartLegend.value[1],
-        data:  lastMonthData.value,
+        data:  lastMonthDataArr,
         type: 'bar',
         smooth: true,
         symbol: "none", //去掉圆点