ETA1.0.5 bug修复

src/views/dataEntry_manage/databaseComponents/createChart.vue

@@ -534,7 +534,7 @@ export default {
             data: [],
             type: 'spline',
             yAxis: 0,
-            name: j.ChartLegend,
+            name: j.Year,
           };
           const data_array = _.cloneDeep(j.DataList);
           data_array &&
@@ -542,7 +542,7 @@ export default {
               serie_item.data.push([item.DataTimestamp, item.Value]);
             });
           const index = chartDataHandle.findIndex(
-            (item) => item.ChartLegend === j.ChartLegend
+            (item) => item.Year === j.Year
           );
           const s_yItem = {
             labels: {

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -768,11 +768,16 @@ export const chartSetMixin = {
           //预测指标配置
           let predict_params =  chartData.EdbInfoCategoryType === 1 ? this.getSeasonPredictParams(j.CuttingDataTimestamp) : {};
           
+          /**
+           * isPredictorChart - 预测指标的chartInfo.vue组件内定义的变量
+           * 后端为了去除与预测指标季节性图不必要的逻辑，预测指标返回的图例名称字段是Year而图库返回的是ChartLegend
+           * 这边需要做个兼容
+           */
           let serie_item = {
             data: [],
             type: chartData.ChartStyle,
             yAxis: 0,
-            name: j.ChartLegend,
+            name: this.isPredictorChart?j.Year:j.ChartLegend,
             ...predict_params
           };
           const data_array = _.cloneDeep(j.DataList);
@@ -781,7 +786,7 @@ export const chartSetMixin = {
               serie_item.data.push([item.DataTimestamp, item.Value]);
             });
           const index = chartDataHandle.findIndex(
-            (item) => item.ChartLegend === j.ChartLegend
+            (item) => this.isPredictorChart?item.Year === j.Year:item.ChartLegend === j.ChartLegend
           );
           const s_yItem = {
             labels: {

src/views/predictEdb_manage/addPredicEdb.vue

@@ -807,11 +807,27 @@ export default {
           }
         })
 
-			let dateArray=this.$refs.chartInfo.chartInfo.ChartTyp==2?this.$refs.chartInfo.season_year:this.$refs.chartInfo.select_date
+      let dateArray=[]
+      let DateType,StartYear;
+      
+      if(this.$refs.chartInfo.chartInfo.ChartType==2){
+          DateType=this.$refs.chartInfo.year_select_season
+          StartYear=this.$refs.chartInfo.count_year_season
+          if(!(this.$refs.chartInfo.season_year && this.$refs.chartInfo.season_year.length>0)){
+              // 初始化日期显示
+              let latestYear = parseInt(this.$refs.chartInfo.tableData[0].LatestDate.substring(0,4))
+              this.$refs.chartInfo.season_year = [`${latestYear-StartYear+1}-01-01`,`${latestYear}-12-31`];
+          }
+          dateArray = this.$refs.chartInfo.season_year
+      }else{
+          DateType=this.$refs.chartInfo.year_select
+          StartYear=this.$refs.chartInfo.count_year
+          dateArray = this.$refs.chartInfo.select_date
+      }
       
       let params = {
         SourceEdbInfoId: this.formData.oldEdb,
-        DateType: this.$refs.chartInfo.year_select,
+        DateType,
         StartDate: dateArray[0] || "",
         EndDate: dateArray[1] || "",
         Calendar: this.$refs.chartInfo.calendar_type,
@@ -820,7 +836,7 @@ export default {
         // SeasonStartDate: this.$refs.chartInfo.season_year[0] || "",
         // SeasonEndDate: this.$refs.chartInfo.season_year[1] || "",
         DataDateType: this.formData.dateType,
-        StartYear:this.$refs.chartInfo.count_year || 0
+        StartYear:StartYear || 0
       }
 
       const res = await preDictEdbInterface.edbChartDataForAdd(rules_params.length ? {...params,RuleList: rules_params} : params);

src/views/predictEdb_manage/components/chartInfo.vue

@@ -111,7 +111,6 @@ export default {
         return {
             year_select: 10, //年份选择项
             year_select_season: 20, //季节性年份选择项 默认最近五年
-            year_select_curve: 10, //曲线年份选择项 默认全部
             yearSelector: [
                 {
                     name: '全部',
@@ -132,9 +131,9 @@ export default {
             isDateDia: false, // 时间段弹窗
             dateForm: {},
             dateTip: '请选择时间段',
-            count_year:0,
+            count_year:5,
             count_year_season:5,
-            count_year_curve:5,
+            isPredictorChart:true, // 复用了相同的逻辑，为了预测指标图表和正常的图库图表区分开
         }
     },
     mounted() {
@@ -148,38 +147,44 @@ export default {
                     DataList:this.edbData.DataList
                 }
             ]
-            if(this.chartInfo.ChartType==2){
-                //季节性图 默认时间 初始化 默认最近5年
-                this.year_select=this.year_select_season
-                this.count_year=this.count_year_season
-                if(!(this.select_date && this.select_date.length>0)){
-                    let latestYear = parseInt(this.tableData[0].LatestDate.substring(0,4))
-                    this.season_year = [`${latestYear-this.count_year+1}-01-01`,`${latestYear}-12-31`];
-                }
-            }else{
-                this.year_select=this.year_select_curve
-                this.count_year=this.count_year_curve
-            }
             this.setAddChartDefault();
             this.setChartOptionHandle(this.tableData)
         },
 
         changeYear(item){
-            this.year_select = this.year_select_curve =item.value
+            this.year_select = item.value
             this.select_date = [];
             this.dateTip = '请选择时间段';
             this.$emit('refreshData','saveLimit')
         },
+		/* 打开时间段弹窗 */
+		openDateDia() {
+			// 自定义时间段回显
+			let selectDateStart = this.chartInfo.ChartType === 2?this.season_year[0]:this.select_date[0]
+			let selectDateEnd = this.chartInfo.ChartType === 2?this.season_year[1]:this.select_date[1]
+
+            let year_select_real = this.chartInfo.ChartType === 2?this.year_select_season:this.year_select
 
+			this.dateForm = {
+				date_type: year_select_real,
+				start_date:
+					year_select_real === 5 || year_select_real === 6
+						? selectDateStart
+						: '',
+				end_date: year_select_real === 5 ? selectDateEnd : '',
+				count_year: year_select_real === 20 ?
+                            this.chartInfo.ChartType === 2?this.count_year_season:this.count_year 
+                            : ''
+			};
+			this.isDateDia = true;
+		},
         /* 保存完自定义日期 刷新数据 保存当前的图表配置和上下限 只改变图表*/
         dataChangeBack(data) {
-            this.year_select = data.dateType;
             this.isDateDia = false;
 
-            this.count_year = data.count_year
             if(this.chartInfo.ChartType==1){
-                this.year_select_curve = data.dateType
-                this.count_year_curve = data.count_year
+                this.year_select = data.dateType
+                this.count_year = data.count_year
             }else{
                 this.year_select_season = data.dateType
                 this.count_year_season = data.count_year
@@ -196,8 +201,8 @@ export default {
 					// 回显
 					dateEnd = this.tableData[0].LatestDate
 				}
+                this.season_year = [dateStart, dateEnd];
 			}
-            this.season_year = [dateStart, dateEnd];
 
             this.select_date = [dateStart, dateEnd];
 

src/views/predictEdb_manage/components/edbDetail.vue

@@ -49,11 +49,27 @@ export default {
     },
     methods: {
         getDetail(type=''){
-			let dateArray=this.$refs.chartInfo.chartInfo.ChartType==2?this.$refs.chartInfo.season_year:this.$refs.chartInfo.select_date
+			let dateArray=[]
+            let DateType,StartYear;
+            
+            if(this.$refs.chartInfo.chartInfo.ChartType==2){
+                DateType=this.$refs.chartInfo.year_select_season
+                StartYear=this.$refs.chartInfo.count_year_season
+                if(!(this.$refs.chartInfo.season_year && this.$refs.chartInfo.season_year.length>0)){
+                    // 初始化日期显示
+                    let latestYear = parseInt(this.$refs.chartInfo.tableData[0].LatestDate.substring(0,4))
+                    this.$refs.chartInfo.season_year = [`${latestYear-StartYear+1}-01-01`,`${latestYear}-12-31`];
+                }
+                dateArray = this.$refs.chartInfo.season_year
+            }else{
+                DateType=this.$refs.chartInfo.year_select
+                StartYear=this.$refs.chartInfo.count_year
+                dateArray = this.$refs.chartInfo.select_date
+            }
 
             preDictEdbInterface.edbChartInfo({
 				EdbInfoId: this.id,
-                DateType: this.$refs.chartInfo.year_select,
+                DateType,
 				StartDate: dateArray[0]||'',
 				EndDate: dateArray[1]||'',
                 ChartType:this.$refs.chartInfo.chartInfo.ChartType,
@@ -61,7 +77,7 @@ export default {
                 // SeasonStartDate:this.$refs.chartInfo.season_year[0]||'',
                 // SeasonEndDate:this.$refs.chartInfo.season_year[1]||'',
                 Calendar:this.$refs.chartInfo.calendar_type,
-                StartYear:this.$refs.chartInfo.count_year || 0
+                StartYear:StartYear || 0
 			}).then(res=>{
                 if(res.Ret!=200) return
                 this.edbData.DataList=res.Data.DataList||[]

src/views/predictEdb_manage/predictEdb.vue

@@ -628,13 +628,11 @@ export default {
 					this.$refs.detailComponentRef.$refs.chartInfo.chartInfo.ChartType=1;
 					this.$refs.detailComponentRef.$refs.chartInfo.year_select=10;
 					this.$refs.detailComponentRef.$refs.chartInfo.year_select_season=20;
-					this.$refs.detailComponentRef.$refs.chartInfo.year_select_curve=10;
 
 					this.$refs.detailComponentRef.$refs.chartInfo.calendar_type='公历';
 
-					this.$refs.detailComponentRef.$refs.chartInfo.count_year=0;
+					this.$refs.detailComponentRef.$refs.chartInfo.count_year=5;
 					this.$refs.detailComponentRef.$refs.chartInfo.count_year_season=5;
-					this.$refs.detailComponentRef.$refs.chartInfo.count_year_curve=5;
 					
 					this.$refs.detailComponentRef.$refs.chartInfo.select_date=[];
 					this.$refs.detailComponentRef.$refs.chartInfo.season_year=[];