Merge branch 'chart14.3'

src/views/hzyb/chart/Detail.vue

@@ -218,7 +218,7 @@ const getChartInfo=async (type)=>{
     loading.value=true
 
     //相关性图表
-    if([3,4].includes(chartSource)) return getRelevanceDetail();
+    if([3,4,6].includes(chartSource)) return getRelevanceDetail();
     //商品价格曲线调另外的接口
     if([2,5].includes(chartSource)) return getCommordityDetail();
 
@@ -340,8 +340,13 @@ const getRelevanceDetail=async ()=>{
     loading.value=false
     if(res.code===200){
         resData.value=res.data
-        relevanceChartData.value=res.data
-        initRelevanceChart(res.data);
+        
+        if([3,4].includes(res.data.ChartInfo.Source)) { //相关性
+            relevanceChartData.value=res.data
+            initRelevanceChart(res.data);
+        }else if(res.data.ChartInfo.Source === 6) { //拟合方程曲线
+            setSplineOpt([res.data.DataResp])
+        }
 
         // 向小程序发送分享数据
         let postData = {
@@ -970,7 +975,7 @@ const setSplineOpt=(data)=>{
             },
             tickWidth: sameSideIndex !== index ? 0 : 1,
             title: {
-                text:  sameSideIndex !== index ? '' : `${item.Unit}`,
+                text:  sameSideIndex !== index ? '' : `${item.Unit||''}`,
                 align: 'high',
                 rotation: 0,
                 y: -15,
@@ -1961,7 +1966,7 @@ const setChartParams = () => {
 // 刷新图表
 const handleRefreshChart=async ()=>{
     let res=null 
-    if(resData.value.ChartInfo.Source === 1){
+    if([1,6].includes(resData.value.ChartInfo.Source)){
         res=await apiChartRefresh({ChartInfoId:Number(ChartInfoId)})
     }else if([2,5].includes(resData.value.ChartInfo.Source)){
         res=await apiCommonChartRefresh({ChartInfoId:Number(ChartInfoId)})
@@ -2051,7 +2056,7 @@ const posterParams=computed(()=>{
             >
                 <img class="icon" src="@/assets/hzyb/share-poster-chart-icon.png" alt="">
             </share-poster>
-            <img class="icon" src="../../../assets/hzyb/chart/save.png" alt="" @click="handleSaveChart" v-if="canSave&&![3,4].includes(chartSource)">
+            <img class="icon" src="../../../assets/hzyb/chart/save.png" alt="" @click="handleSaveChart" v-if="canSave&&![3,4,6].includes(chartSource)">
             <img class="icon" src="../../../assets/hzyb/chart/refresh.png" alt="" @click="handleRefreshChart">
         </div>
         
@@ -2072,12 +2077,12 @@ const posterParams=computed(()=>{
                 <span :class="calendarType==='农历'&&'active'" @click="calendarTypeChange('农历')">农历</span>
                 <span :class="calendarType==='公历'&&'active'" @click="calendarTypeChange('公历')">公历</span>
             </div>
-            <span style="color:#E3B377;flex:1;text-align:right" @click="showLimit=true" v-if="resData.ChartInfo.Source!=3">上下限设置</span>
+            <span style="color:#E3B377;flex:1;text-align:right" @click="showLimit=true" v-if="![3,4,6].includes(resData.ChartInfo.Source)">上下限设置</span>
         </div>
         <div class="source-box" style="margin-top:5px" v-if="resData&&resData.ChartInfo.ChartType===2">来源：{{resData&&resData.ChartInfo.ChartSource}}</div>
 
         <!-- 日期类型 -->
-        <div class="date-type-box" v-if="resData&&sameOptionType.includes(resData.ChartInfo.ChartType)">
+        <div class="date-type-box" v-if="resData&&sameOptionType.includes(resData.ChartInfo.ChartType)&&resData.ChartInfo.Source===1">
             <div 
                 :class="['item',item.value==dateType?'active':'']" 
                 v-for="item in dateTypeList"