Merge branch 'master' into ybht_6.1

.env.production

@@ -3,6 +3,6 @@ VITE_APP_API_URL="https://mveta.hzinsights.com/v1"
 # 路由根地址
 VITE_APP_BASE_URL="/"
 # 打包输入文件名
-VITE_APP_OUTDIR="hongze_ETA_mobile"
+VITE_APP_OUTDIR="eta_mobile_front"
 #分享图表地址
 VITE_CHART_LINK="https://chartlib.hzinsights.com/chartshow"

.env.test

@@ -3,6 +3,6 @@ VITE_APP_API_URL="http://8.136.199.33:8610/v1"
 # 路由根地址
 VITE_APP_BASE_URL="/"
 # 打包输入文件名
-VITE_APP_OUTDIR="hongze_ETA_mobile"
+VITE_APP_OUTDIR="eta_mobile_front"
 #分享图表地址
 VITE_CHART_LINK="https://charttest.hzinsights.com/chartshow"

.gitignore

@@ -14,6 +14,8 @@ dist-ssr
 package-lock.json
 hongze_ETA_mobile
 hongze_ETA_mobile.zip
+eta_mobile_front
+eta_mobile_front.zip
 
 # Editor directories and files
 .vscode/*

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "hongze_ETA_mobile",
+  "name": "eta_mobile_front",
   "private": true,
   "version": "0.0.0",
   "type": "module",

src/hooks/chart/render.js

@@ -114,9 +114,9 @@ export function chartRender({data,renderId,lang='zh',changeLangIsCheck,showChart
         chartOpt=chartSetMap[data.ChartInfo.ChartType](data)
     }else if([2,5].includes(data.ChartInfo.Source)){//商品价格曲线
         chartOpt=initCommodityData(data);
-    }else if([3,4].includes(data.ChartInfo.Source)){//相关性 滚动相关性
+    }else if([3].includes(data.ChartInfo.Source)){//相关性 滚动相关性
         chartOpt=initRelevanceChart(data);
-    }else if([6,7,8].includes(data.ChartInfo.Source)){//拟合方程 标准差 百分比
+    }else if([4,6,7,8].includes(data.ChartInfo.Source)){//滚动相关性 拟合方程 标准差 百分比
         chartOpt=setSplineOpt(data);
     }else if([9].includes(data.ChartInfo.Source)){//统计频率
         chartOpt=setStatisticFrequency(data);
@@ -349,7 +349,7 @@ function setChartLang(changeLangIsCheck){
                 LangType.value == 'en'?_.NameEn:_.Name
             });
         }
-        if([3,4].includes(Source)){
+        if([3].includes(Source)){
             options.value.xAxis.title.text=LangType.value == 'en'?options.value.xAxis.title.textEn:options.value.xAxis.title.textZh
         }
     }
@@ -452,7 +452,7 @@ function setStatisticFrequency(e){
 
 //曲线图
 function setSplineOpt(e){
-    const data=[6,7,8].includes(e.ChartInfo.Source)?[e.DataResp]:e.EdbInfoList
+    const data=[4,6,7,8].includes(e.ChartInfo.Source)?[e.DataResp]:e.EdbInfoList
     let series=[]
     let yAxis=[]
     let xAxis = {}
@@ -1560,11 +1560,11 @@ function initRelevanceChart(data){
           },
           align: 'center',
         },
-        min: -1,
-        max: 1,
+        // min: -1,
+        // max: 1,
         opposite: false,
         tickWidth: 1,
-        tickInterval:0.2,
+        // tickInterval:0.2,
     }
 
     //处理series
@@ -1606,11 +1606,11 @@ function initRelevanceChart(data){
     }
     
     nextTick(()=>{
-        if(data.ChartInfo.Source===3){
-            const hEl=document.getElementById(RenderDomId.value)
-            // console.log(hEl.offsetHeight);
-            xAxis.offset=-(hEl.offsetHeight-98)/2
-        }
+        // if(data.ChartInfo.Source===3){
+        //     const hEl=document.getElementById(RenderDomId.value)
+        //     // console.log(hEl.offsetHeight);
+        //     xAxis.offset=-(hEl.offsetHeight-98)/2
+        // }
         
         options.value = {
             isRelevanceChart:data.ChartInfo.Source===3,

src/views/chartETA/ChartDetail.vue

@@ -582,6 +582,7 @@ function initChartState(data){
             v-model:show="chartState.showTimePop"
             :position="width>650?'center':'bottom'"
             :style="width>650?{ width: '400px'}:''"
+            round
         >
             <div class="time-picker-wrap">
                 <van-picker-group

src/views/chartETA/components/AddChartToMyETA.vue

@@ -150,6 +150,8 @@ function handleConfirmEditClassify(){
         }
     }
     .classify-list{
+        max-height: 600px;
+        overflow-y: auto;
         .item{
             padding:32px;
             border-bottom: 1px solid #DCDFE6;
@@ -192,6 +194,8 @@ function handleConfirmEditClassify(){
             }
         }
         .classify-list{
+            max-height: 500px;
+            overflow-y: auto;
             .item{
                 padding:16px;
                 &.active{