Browse Source

Merge branch 'fix_chartrender' into debug

jwyu 8 months ago
parent
commit
224fb00463
3 changed files with 11 additions and 9 deletions
  1. 3 0
      src/assets/styles/common.scss
  2. 7 3
      src/hooks/chart/render.js
  3. 1 6
      src/views/externalReport/Preview.vue

+ 3 - 0
src/assets/styles/common.scss

@@ -4,6 +4,9 @@
     --van-green:#2BA471; 
     --van-gray-3:#DCDFE6;
     --van-button-round-radius:6PX;
+    --van-floating-bubble-size: 40PX;
+    --van-floating-bubble-initial-gap: 20PX;
+    --van-floating-bubble-icon-size:20PX;
 }
 
 html,body,#app{

+ 7 - 3
src/hooks/chart/render.js

@@ -1062,9 +1062,13 @@ function setSeasonOpt(e){
             }
             item.DataList=item.DataList||[]
 
-            let dateRange = item.DataList[item.DataList.length-1].DataTimestamp - item.DataList[0].DataTimestamp
-            // 时间范围
-            maxDateRange=Math.max(maxDateRange,dateRange)
+            const data_array=item.DataList||[]
+            if(data_array.length>0){
+                let dateRange = item.DataList[item.DataList.length-1].DataTimestamp - item.DataList[0].DataTimestamp
+                // 时间范围
+                maxDateRange=Math.max(maxDateRange,dateRange)
+            }
+            
 
             for(let i of item.DataList){
                 seriesItem.data.push([i.DataTimestamp, i.Value])

+ 1 - 6
src/views/externalReport/Preview.vue

@@ -152,7 +152,7 @@ function getFileIcon(name) {
         @click="handleCopyLink"
     />
 
-    <van-back-top bottom="100" right="10" z-index="9999"/>
+    <van-back-top bottom="80" right="10" z-index="9999"/>
 
     <!-- 预览-->
     <van-popup
@@ -229,11 +229,6 @@ function getFileIcon(name) {
     }
 }
 
-.van-floating-bubble {
-    width: 48px;
-    height: 48px;
-}
-
 @media screen and (min-width:$media-width){
     .report-detail-page{
         max-width: 800px;