Merge branch 'ETA2.4.2' into debug

src/views/myETA/ChartDetail.vue

@@ -96,6 +96,16 @@ function handleSwitchChart(type){
     getChartInfo()
 }
 
+// 是否面积图堆叠百分比
+function isChartHeap(info){
+    let tag=true
+    if(info.ChartType==3&&info.ExtraConfig){
+        let ExtraConfig=JSON.parse(info.ExtraConfig)
+        tag=ExtraConfig.HeapWay==2?false:true
+    }
+    return tag
+}
+
 // 获取图详情
 let chartInfoData=null
 let chartInfo=ref(null)
@@ -811,7 +821,7 @@ const showSaveToMaterial=ref(false)
                     >{{chartState.startTime?chartState.startTime+'~'+(chartState.endTime?chartState.endTime:'至今'):'请选择时间段'}}</span>
                 </div>
                 <div class="right-action-box">
-                    <div class="item" @click="handleShowAxisLimitOpt" v-if="[1,2,5,10,12].includes(chartInfo.Source)&&checkAuthBtn(myETABtn.myChart_editLimit)">
+                    <div class="item" @click="handleShowAxisLimitOpt" v-if="[1,2,5,10,12].includes(chartInfo.Source)&&checkAuthBtn(myETABtn.myChart_editLimit)&&isChartHeap(chartInfo)">
                         <img src="@/assets/imgs/myETA/icon_limit2.png" alt="">
                         <span>上下限设置</span>
                     </div>
@@ -899,7 +909,7 @@ const showSaveToMaterial=ref(false)
                     <img class="icon" style="transform: rotate(180deg);" src="@/assets/imgs/icon_arrow.png" alt="">
                     <div>下一张</div>
                 </div>
-                <div class="item" @click="handleShowAxisLimitOpt" v-if="[1,2,5,10].includes(chartInfo.Source)&&checkAuthBtn(myETABtn.myChart_editLimit)">
+                <div class="item" @click="handleShowAxisLimitOpt" v-if="[1,2,5,10].includes(chartInfo.Source)&&checkAuthBtn(myETABtn.myChart_editLimit)&&isChartHeap(chartInfo)">
                     <img class="icon" src="@/assets/imgs/myETA/icon_limit.png" alt="">
                     <div>上下限</div>
                 </div>