优化图表等4项内容

src/main/java/com/bowintek/practice/services/impl/FactWellServiceImpl.java

@@ -30,7 +30,7 @@ public class FactWellServiceImpl implements FactWellService {
     @Override
     @SwitchDataSource(DBTypeEnum.POSTGRE)
     public FactWellResult getFactWellList(String wellId, String timeType){
-        if(wellId==null) return FactWellResult.gen(new ArrayList<>(), null);
+        if(wellId==null) return FactWellResult.gen(new ArrayList<>(), null, wellId);
         //当前只有月份计算方式
         return getMonthShowInList(wellId, null, null);
     }
@@ -83,7 +83,7 @@ public class FactWellServiceImpl implements FactWellService {
         }
 
         return FactWellResult.gen(supplementList(wellId, monthList, rtnList),
-                Arrays.stream((new FactWellTimeResult[]{timeResult})).toList());
+                Arrays.stream((new FactWellTimeResult[]{timeResult})).toList(), wellId);
     }
 
     @Override
@@ -122,7 +122,7 @@ public class FactWellServiceImpl implements FactWellService {
             time = calendarTime.getTime();
         }
 
-        return FactWellResult.gen(supplementList(wellId, dayList, rtnList), timeList);
+        return FactWellResult.gen(supplementList(wellId, dayList, rtnList), timeList, wellId);
     }
 
     public FactWellResult getMonthGroupList(String wellId, Date startTime, Date endTime){
@@ -153,7 +153,7 @@ public class FactWellServiceImpl implements FactWellService {
             time = calendarTime.getTime();
         }
 
-        return FactWellResult.gen(supplementList(wellId, monthList, rtnList), timeList);
+        return FactWellResult.gen(supplementList(wellId, monthList, rtnList), timeList, wellId);
     }
 
     public FactWellResult getYearGroupList(String wellId, Date startTime, Date endTime){
@@ -184,7 +184,7 @@ public class FactWellServiceImpl implements FactWellService {
             time = calendarTime.getTime();
         }
 
-        return FactWellResult.gen(supplementList(wellId, monthList, rtnList), timeList);
+        return FactWellResult.gen(supplementList(wellId, monthList, rtnList), timeList, wellId);
     }
 
     public List<FactWellTimeResult> getTimeLimitList(String wellId){

src/main/java/com/bowintek/practice/vo/FactWell/FactWellResult.java

@@ -8,11 +8,13 @@ import java.util.List;
 public class FactWellResult {
     private List<FactWellGroupList> rows;
     private List<FactWellTimeResult> timeList;
+    private String wellId;
 
-    public static FactWellResult gen(List<FactWellGroupList> rows, List<FactWellTimeResult> timeList){
+    public static FactWellResult gen(List<FactWellGroupList> rows, List<FactWellTimeResult> timeList, String wellId){
         FactWellResult obj = new FactWellResult();
         obj.setRows(rows);
         obj.setTimeList(timeList);
+        obj.setWellId(wellId);
         return obj;
     }
 }

vue/src/components/basic/chart/chart-cell.vue

@@ -103,7 +103,7 @@
         return xAxis;
       },
       getyAxis:function (){
-        return {type: 'value', min:'dataMin', max:'dataMax', show:false };
+        return {type: 'value', show:false };
       },
       getSeries:async function (symbolSize){
         let dataArys = await this.getDatas();
@@ -163,7 +163,7 @@
       onOpenChange:function(visible){
         console.log("onOpenChange", visible);
         if(visible) {
-          setTimeout(this.readerChart, 100);
+          setTimeout(this.readerChart, 10);
         }
         else{
           this.chart.dispose();