Merge branch 'eta1.9.4'

src/views/dataEntry_manage/chartSetting.vue

@@ -1863,6 +1863,19 @@ export default {
       if(res.Ret !== 200) return
       //标识线回显
       this.chartInfo.MarkersLines = res.Data.ChartInfo.MarkersLines||''
+      if(this.chartInfo.ChartType===2){
+        //更新对应数据
+        const {DataResp} = res.Data
+        const {MaxMinLimits,SamePeriodAverage,SamePeriodStandardDeviation,
+                RightAxis={
+                    IndicatorType:1,
+                    EdbInfoList:[]
+                }} = DataResp
+        this.chartInfo.SeasonAverageConfig = {
+            MaxMinLimits,SamePeriodAverage,SamePeriodStandardDeviation
+        }
+        this.chartInfo.SeasonRightConfig = RightAxis
+      }
 
       const { EdbInfoList } = res.Data;
 

src/views/dataEntry_manage/components/addMarkerDialog.vue

@@ -230,11 +230,11 @@
                     <el-form-item :label="$t('Chart.Detail.time_base')">
                         <div class="form-item-content">
                             <div class="format">
-                                <el-radio v-model="markerForm.startTime.baseDate" :label="0"><!-- 系统日期 -->{{ $t('Chart.Detail.sys_time') }}</el-radio>
+                                <el-radio v-model="markerForm.startTime.conf.baseDate" :label="0"><!-- 系统日期 -->{{ $t('Chart.Detail.sys_time') }}</el-radio>
                             </div>
                             <div class="format" style="display: flex;align-items: center;">
                                 <p>
-                                    <el-radio v-model="markerForm.startTime.baseDate" :label="1" style="margin-right:5px;"><!-- 指标最新日期 -->{{ $t('Chart.Detail.edb_new_time') }}</el-radio>
+                                    <el-radio v-model="markerForm.startTime.conf.baseDate" :label="1" style="margin-right:5px;"><!-- 指标最新日期 -->{{ $t('Chart.Detail.edb_new_time') }}</el-radio>
                                 </p>
                                 <p><!-- 期数前移 -->{{ $t('Chart.Detail.edb_periods') }}{{ $t('Chart.Detail.edb_periods_lead') }}
                                     <el-input style="width:60px" type="number" class="number-input"
@@ -286,11 +286,11 @@
                     <el-form-item :label="$t('Chart.Detail.time_base')">
                         <div class="form-item-content">
                             <div class="format">
-                                <el-radio v-model="markerForm.endTime.baseDate" :label="0"><!-- 系统日期 -->{{ $t('Chart.Detail.sys_time') }}</el-radio>
+                                <el-radio v-model="markerForm.endTime.conf.baseDate" :label="0"><!-- 系统日期 -->{{ $t('Chart.Detail.sys_time') }}</el-radio>
                             </div>
                             <div class="format" style="display: flex;align-items: center;">
                                 <p>
-                                    <el-radio v-model="markerForm.endTime.baseDate" :label="1" style="margin-right:5px;"><!-- 指标最新日期 -->{{ $t('Chart.Detail.edb_new_time') }}</el-radio>
+                                    <el-radio v-model="markerForm.endTime.conf.baseDate" :label="1" style="margin-right:5px;"><!-- 指标最新日期 -->{{ $t('Chart.Detail.edb_new_time') }}</el-radio>
                                 </p>
                                 <p><!-- 期数前移 -->{{ $t('Chart.Detail.edb_periods') }}{{ $t('Chart.Detail.edb_periods_lead') }}
                                     <el-input style="width:60px" type="number" class="number-input"
@@ -586,9 +586,9 @@ export default {
         startTime:{//当timeInterval为1时,有值
             timeType:1,//起始时间类型 1 固定 2动态
             date:'2020-01-01',//固定的时间值,timeType为2时为空
-            baseDate:0,//基准日期 0系统日期 1指标最新日期
             conf:{
-                moveForward:0,//baseTimeType为2时,表示前移的期数
+                baseDate:0,//基准日期 0系统日期 1指标最新日期
+                moveForward:0,//baseDate为1时,表示前移的期数
                 dateChange:[
                     {//和 datasheet_manage/components/dateMoveWaySection 保持一致
                         ChangeType:1,//1日期位移 2指定频率
@@ -605,8 +605,8 @@ export default {
         endTime:{
             timeType:3,//起始时间类型 3至今 1 固定 2动态
             date:'2024-01-01',//固定的时间值,timeType不为1时为空
-            baseDate:0,//基准日期 0系统日期 1指标最新日期
             conf:{
+                baseDate:0,//基准日期 0系统日期 1指标最新日期
                 moveForward:0,
                 dateChange:[]
             },

src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -155,8 +155,15 @@ export default {
 					this.chartInfo.LeftMax = '';
 					this.chartInfo.LeftMin = '';
 					this.chartInfo.MarkersLines = "";
+					this.$refs.markerSectionRef&&this.$refs.markerSectionRef.initData(this.chartInfo||{});
 					this.chartInfo.MarkersAreas = "";
 				}
+				//从普通图切换到柱形图,截面散点,雷达图 清空MarkersLines
+				if(![7,10,11].includes(oldval)&&[7,10,11].includes(newval)){
+					this.chartInfo.MarkersLines = ""
+					this.$refs.markerSectionRef&&this.$refs.markerSectionRef.initData(this.chartInfo||{});
+				}
+
 
 				this.initStatus();
 
@@ -168,6 +175,7 @@ export default {
 					this.tableData.length===1 && this.selectTarget(this.tableData[0],'switch');
 					this.tableData.length > 1 && this.setChartOptionHandle(this.tableData);
 				}
+
       },
 		}
 	},
@@ -548,6 +556,17 @@ export default {
 				chartDataHandle.map(item =>{
 					this.SeasonExtraConfig.ChartLegend.push({Name:item.Years,Value:item.ChartLegend})
 				})
+				//更新对应数据
+				const {DataResp} = res.Data
+				const {MaxMinLimits,SamePeriodAverage,SamePeriodStandardDeviation,
+						RightAxis={
+							IndicatorType:1,
+							EdbInfoList:[]
+						}} = DataResp
+				this.chartInfo.SeasonAverageConfig = {
+					MaxMinLimits,SamePeriodAverage,SamePeriodStandardDeviation
+				}
+				this.chartInfo.SeasonRightConfig = RightAxis
 			}
 
       this.tableData.forEach((item) => {
@@ -651,6 +670,16 @@ export default {
 			this.$nextTick(()=>{
 				// 等待 tableData的 监听里面的获取到 起始时间和最近日期
 				this.setChartDefault()
+				//如果标识线含有指标计算部分,请求一次preview
+				const markerLinesArr = JSON.parse(this.chartInfo.MarkersLines||'[]')
+				if(markerLinesArr.find(i=>i.markLineType===2)){
+					//柱形图单独设置
+					if(this.chartInfo.ChartType===7){
+						this.barDateList.length && this.$refs.BarOptRef.getBarData();
+					}else{
+						this.getPreviewSplineInfo()
+					}
+				}
 			})
 		},
 

src/views/mychart_manage/components/chartDetailDia.vue

@@ -796,6 +796,19 @@ export default {
       if(res.Ret !== 200) return
       //标识线回显
       this.chartInfo.MarkersLines = res.Data.ChartInfo.MarkersLines||''
+      if(this.chartInfo.ChartType===2){
+        //更新对应数据
+        const {DataResp} = res.Data
+        const {MaxMinLimits,SamePeriodAverage,SamePeriodStandardDeviation,
+                RightAxis={
+                    IndicatorType:1,
+                    EdbInfoList:[]
+                }} = DataResp
+        this.chartInfo.SeasonAverageConfig = {
+            MaxMinLimits,SamePeriodAverage,SamePeriodStandardDeviation
+        }
+        this.chartInfo.SeasonRightConfig = RightAxis
+      }
       const { EdbInfoList } = res.Data;
 
       this.tableData.forEach((item) => {