右轴指标回显

src/views/dataEntry_manage/components/addRightEdbDialog.vue

@@ -177,7 +177,6 @@ export default {
         },
         edbData:{
             type:Object,
-            default:{}
         }
     },
     computed:{
@@ -190,6 +189,8 @@ export default {
             if(newval){
                 Object.assign(this.rightEdbForm,this.formData)
                 this.rightEdbData = this.edbData
+                this.search_txt = this.edbData.EdbInfoId||''
+                this.searchOptions = this.edbData&&this.edbData.EdbInfoId?[this.edbData]:[]
             }
         }
     },

src/views/dataEntry_manage/editChart.vue

@@ -364,6 +364,7 @@
 						ref="markerSectionRef"
 						:chartType="chartInfo.ChartType"
 						:chartInfo="chartInfo"
+						:tableData="tableData"
 						@update="setChartMarkerInfo"
 						@updateSeason="updateSeasonChart"
 						@previewSeason="previewSeasonChart"
@@ -806,6 +807,9 @@ export default {
 						const tempData = _.cloneDeep(this.chartInfo.SeasonAverageConfig)
 						tempData.RightAxis = _.cloneDeep(RightAxis)
 						tempData.RightInfo = _.cloneDeep((RightAxis.EdbInfoList&&RightAxis.EdbInfoList[0])||{})
+						if(tempData.RightAxis.IndicatorType!==1){
+							tempData.RightInfo = EdbInfoList[1]||{}
+						}
 						delete tempData.MaxMinLimits.List
 						delete tempData.SamePeriodAverage.List
 						delete tempData.SamePeriodStandardDeviation.List