Pārlūkot izejas kodu

修复我的收入数据问题

Pq 3 gadi atpakaļ
vecāks
revīzija
0c3e480729

+ 2 - 0
teacher/src/main/assets/stacked_line_chart.html

@@ -22,6 +22,8 @@
 
              function loadEcharts(echartJson){
                 var option = JSON.parse(echartJson);
+                option.tooltip.confine = true;
+                    myChart.clear();
                     myChart.setOption(option,true);
             }
 

+ 4 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/income/EarningStatisticsActivity.java

@@ -434,9 +434,11 @@ public class EarningStatisticsActivity extends BaseMVPActivity<ActivityEarningSt
 
         for (AccountTotalBean accountTotalBean : data.infoList) {
             if (!isCheckMonth) {
-                xAxisData.add(DateUtil.getCurMonthStr(DateUtil.getDate(accountTotalBean.timeStr)) + "月");
+                Date date = DateUtil.str2Date(accountTotalBean.timeStr,"yyyy-MM");
+                xAxisData.add(DateUtil.getCurMonthStr(date) + "月");
             } else {
-                xAxisData.add(DateUtil.getCurDayStr(DateUtil.getDate(accountTotalBean.timeStr)) + "日");
+                Date date = DateUtil.str2Date(accountTotalBean.timeStr,"yyyy-MM-dd");
+                xAxisData.add(DateUtil.getCurDayStr(date) + "日");
             }
         }
         EarningStackedLineBean.XAxisBean axisBean = new EarningStackedLineBean.XAxisBean();