季节性图同期配置调试

src/views/dataEntry_manage/addChart.vue

@@ -783,7 +783,7 @@ export default {
 			this.$refs.diaForm.validate((valid) => {
 				if(valid) {
 					// 季节图只允许添加一个指标
-					if(this.chartInfo.ChartType === 2 && this.tableData.length > 1) 
+					if(this.chartInfo.ChartType === 2 && this.tableData.length > 1)
 						return this.$message.warning(/* '您选择的图表样式为季节性图表，只支持单指标画图' */this.$t('Chart.OptMsg.season_one_msg'));
 
 					else if([7,11].includes(this.chartInfo.ChartType)  && !this.$refs.BarOptRef.dateList.length)  
@@ -895,6 +895,10 @@ export default {
 							Right2Max:rightTwoMax+'',
 							MinMaxSave:Number(hasLimitChange)
 						}
+					}
+					//如果是季节性图,在这里加上同期/右轴的参数
+					if(this.chartInfo.ChartType===2){
+
 					}
 					dataBaseInterface.chartAdd(params).then(res => {
 						if(res.Ret !== 200) return;

src/views/dataEntry_manage/components/addMarkerDialog.vue

@@ -38,7 +38,7 @@
               <div class="mark-value-wrap">
                 <!-- 固定值：原标识线输入框 -->
                 <div class="default-value">
-                    <el-radio v-model="radio" label="固定值"></el-radio>
+                    <!-- <el-radio v-model="radio" label="固定值"></el-radio> -->
                     <!-- 时间轴1,2,4,6的y轴数字 x轴日期  -->
                     <template v-if="[1,2,4,6].includes(chartInfo.ChartType)">
                         <el-date-picker
@@ -76,9 +76,9 @@
                     </template>
                 </div>
                 <!-- 指标计算 -->
-                <div class="custom-value">
+                <!-- <div class="custom-value">
                     <el-radio v-model="radio" label="指标计算"></el-radio>
-                </div>
+                </div> -->
               </div>
             </template>
 
@@ -153,7 +153,7 @@
           </el-form-item>
 
           <!-- 标识线-指标计算部分 -->
-          <div class="custom-value-setting-wrap" v-if="form.markerType==='line'">
+          <div class="custom-value-setting-wrap" v-if="form.markerType==='line'&&radio==='指标计算'">
             <!-- 指标选择 -->
             <el-form-item label="指标">
                 <!-- 固定第一个指标 -->

src/views/dataEntry_manage/components/addRightEdbDialog.vue

@@ -224,7 +224,7 @@ export default {
             if(!this.search_have_more) return;
             this.searchApi(this.current_search,++this.search_page);
         },
-        //选择指标,作为曲线图拿该指标的数据
+        //选择指标,不需要拿详情,仅保存基本信息
         selectTarget(item,type=''){
             if(!item) return 
             let params = {
@@ -236,40 +236,30 @@ export default {
                 StartDate:'',
                 EndDate:''
             }
-            dataBaseInterface.chartInfo(params).then((res) => {
-                if(res.Ret !== 200) return;
-                let tableItem = res.Data.EdbInfoList[0];
-                tableItem.EdbAliasName = tableItem.EdbName;
-                //检查添加指标是否已存在
-                let have_bol = this.tableData.every(item => item.EdbInfoId !== tableItem.EdbInfoId);
-
-                if(have_bol) {
-                    this.search_txt = '';
-                    this.tableData.push(tableItem);
-                    //默认拼接来源
-                    if(!this.chartInfo.SourcesFrom) {
-
-                        this.chartInfo.SourcesFrom = JSON.stringify({
-                            isShow: this.chartInfo.SourcesFromVisable,
-                            text: res.Data.ChartInfo.ChartSource,
-                            color: JSON.parse(this.chartInfo.ChartThemeStyle).markerOptions.style.color,
-                            fontSize: JSON.parse(this.chartInfo.ChartThemeStyle).markerOptions.style.fontSize
-                        });
-                    }else {
-                        let sourceObj = JSON.parse(_.cloneDeep(this.chartInfo.SourcesFrom));
-                        let concatSourceArr = `${sourceObj.text},${res.Data.ChartInfo.ChartSource}`.split(',');
-                        let sourceStr = Array.from(new Set(concatSourceArr)).join(',');
-                        this.chartInfo.SourcesFrom = JSON.stringify({
-                            ...sourceObj,
-                            text: sourceStr
-                        });
-                    }
+            //检查添加指标是否已存在
+            let have_bol = this.tableData.every(item => item.EdbInfoId === tableItem.EdbInfoId);
+            if(have_bol){
+                // this.$message.warning('录入指标已存在');
+                this.$message.warning(this.$t('Chart.OptMsg.edb_haved_msg'));
+            }else{
+                 //默认拼接来源
+                 /* if(!this.chartInfo.SourcesFrom) {
+                    this.chartInfo.SourcesFrom = JSON.stringify({
+                        isShow: this.chartInfo.SourcesFromVisable,
+                        text: item.SourceName,
+                        color: JSON.parse(this.chartInfo.ChartThemeStyle).markerOptions.style.color,
+                        fontSize: JSON.parse(this.chartInfo.ChartThemeStyle).markerOptions.style.fontSize
+                    });
                 }else {
-                    // this.$message.warning('录入指标已存在');
-                    this.$message.warning(this.$t('Chart.OptMsg.edb_haved_msg'));
-                }
-            })
-
+                    let sourceObj = JSON.parse(_.cloneDeep(this.chartInfo.SourcesFrom));
+                    let concatSourceArr = `${sourceObj.text},${res.Data.ChartInfo.ChartSource}`.split(',');
+                    let sourceStr = Array.from(new Set(concatSourceArr)).join(',');
+                    this.chartInfo.SourcesFrom = JSON.stringify({
+                        ...sourceObj,
+                        text: sourceStr
+                    });
+                } */
+            }
         },
         confirmPerson(){
             //校验

src/views/dataEntry_manage/components/chartReleationEdbTable.vue

@@ -151,7 +151,14 @@ export default {
           key: 'SourceName',
         },
       ]
-    }
+    },
+    currentTableData(){
+        if(!(this.chartInfo.ChartType===2&&tableData[1])){
+            //如果tableData是左轴同比,只展示第一条
+            //return this.tableData[0]
+        }
+        return this.tableData
+    },
   },
   data() {
     return {

src/views/dataEntry_manage/components/markersSection.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="chart-markers-section">
     <!-- 季节性图升级-添加右轴指标-->
-    <div class="section-item" v-if="chartInfo.ChartType===2">
+    <!-- <div class="section-item" v-if="chartInfo.ChartType===2">
         <div class="average-item" v-if="rightEdbForm.IsAdd">
             <span>{{rightEdbForm.EdbName||0}}</span>
             <div style="flex-shrink:0">
@@ -19,9 +19,9 @@
                 alt=""
                 style="width: 16px; height: 16px; margin-right: 10px"
             />
-            <span><!-- 添加同期上下限 -->{{`添加右轴指标`}}</span>
+            <span>{{`添加右轴指标`}}</span>
         </div>
-    </div>
+    </div> -->
     <!-- 雷达不要 -->
     <template v-if="chartInfo.ChartType!==11">
       <!-- 标示线 -->

src/views/dataEntry_manage/editChart.vue

@@ -789,13 +789,13 @@ export default {
 						Unit: ChartInfo.ChartType===7 
 							? (this.currentLang==='en'?BarChartInfo.UnitEn:BarChartInfo.Unit) 
 							: (this.currentLang==='en'?ChartInfo.UnitEn:ChartInfo.Unit),
-						SourcesFromVisable: ChartInfo.SourcesFrom ? JSON.parse(ChartInfo.SourcesFrom).isShow : true
+						SourcesFromVisable: ChartInfo.SourcesFrom ? JSON.parse(ChartInfo.SourcesFrom).isShow : true,
+						//处理SeasonAverageConfig,SeasonRightEdbConfig,如果有
 					};
 					//处理下历史默认来源
 					this.setDefaultSourceFrom();
 
 					this.$refs.markerSectionRef.initData(ChartInfo);
-
 					this.tableData = EdbInfoList;
 					this.updateData = this.tableData.map(item=>{
 						return this.formatUpdateData(item)

src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -545,12 +545,14 @@ export default {
 
       this.tableData.forEach((item) => {
         let edbData = EdbInfoList.find(_ => _.EdbInfoId===item.EdbInfoId);
-        item.DataList = edbData.DataList;
-				//更新起始时间和最近更新时间
-        item.StartDate = edbData.StartDate;
-        item.ModifyTime = edbData.ModifyTime;
-				
-        if(edbData.EdbInfoCategoryType===1) item.MoveLatestDate = edbData.MoveLatestDate;
+		if(edbData){
+			item.DataList = edbData.DataList;
+			//更新起始时间和最近更新时间
+			item.StartDate = edbData.StartDate;
+			item.ModifyTime = edbData.ModifyTime;
+			if(edbData.EdbInfoCategoryType===1) item.MoveLatestDate = edbData.MoveLatestDate;
+		}
+        
       });
 		},
 
@@ -1090,49 +1092,62 @@ export default {
 				? chartTypeMap[this.chartInfo.ChartType]() 
 				: this.setChartOptionHandle(this.tableData);
 		},
-		//更新季节性图(不重新获取数据)
+		//更新季节性图额外配置显示隐藏(不重新获取数据)
 		updateSeasonChart({SeasonAverageConfig,SeasonRightEdbConfig}){
 			if(this.chartInfo.SeasonAverageConfig){
 				const {MaxMinLimits,SamePeriodAverage,SamePeriodStandardDeviation} = SeasonAverageConfig
 				this.chartInfo.SeasonAverageConfig.MaxMinLimits.IsShow = MaxMinLimits.IsShow||false
 				this.chartInfo.SeasonAverageConfig.SamePeriodAverage.IsShow = SamePeriodAverage.IsShow||false
 				this.chartInfo.SeasonAverageConfig.SamePeriodStandardDeviation.IsShow = SamePeriodStandardDeviation.IsShow||false
-
-				this.reLoadChartOption()
 			}
+			if(this.chartInfo.SearonRightConfig){
+				this.chartInfo.SearonRightConfig.IsShow = SeasonRightEdbConfig.IsShow||false
+			}
+			this.reLoadChartOption()
 		},
 		//预览季节性图(请求接口)
-		previewSeasonChart({SeasonAverageConfig,SeasonRightEdbConfig}){
-			let db_arr = this.tableData.map(item => ({
-				ChartColor: item.ChartColor,
-				PredictChartColor: item.PredictChartColor,
-				ChartStyle: item.ChartStyle,
-				ChartWidth: Number(item.ChartWidth),
-				EdbInfoId: item.EdbInfoId,
-				EdbAliasName: item.EdbAliasName,
-				EdbInfoType: item.EdbInfoType,
-				IsAxis: item.IsAxis,
-				IsOrder: item.IsOrder,
-				LeadUnit: item.EdbInfoType ? '' : item.LeadUnit,
-				LeadValue: item.EdbInfoType ? 0 : Number(item.LeadValue),
-				MaxData: Number(item.MaxData),
-				MinData: Number(item.MinData)
-			}))
-			const ChartEdbInfoList = db_arr
+		previewSeasonChart({SeasonAverageConfig,SeasonRightEdbConfig={IndicatorType:1}}){
+			let db_arr = this.tableData.map((_,index) => {
+				const {IsConvert,ConvertType,ConvertValue,ConvertUnit,ConvertEnUnit} = this.updateData[index]
+					return {
+						EdbInfoId: _.EdbInfoId,
+						EdbInfoType: _.EdbInfoType,
+						LeadValue: _.EdbInfoType ? 0 : Number(_.LeadValue),
+						LeadUnit: _.EdbInfoType ? '' : _.LeadUnit,
+						IsConvert:Number(IsConvert),
+						ConvertType,
+						ConvertValue:Number(ConvertValue),
+						ConvertUnit:IsConvert?ConvertUnit:'',
+						ConvertEnUnit:IsConvert?ConvertEnUnit:''
+					}
+			})
+			const params = {
+				ChartType:this.chartInfo.ChartType,
+				DateType:this.year_select,
+				StartDate:[5 , 6].includes(this.year_select)? dateArray[0]: '',
+				EndDate:this.year_select === 5 ? dateArray[1]: '',
+				Calendar: this.calendar_type,
+				StartYear:this.count_year || 0,
+				ChartEdbInfoList:SeasonRightEdbConfig.IndicatorType===1?db_arr[0]:db_arr,//如果右轴为左轴同比,则只取第一个
+			}
 			const {MaxMinLimits,SamePeriodAverage,SamePeriodStandardDeviation} = SeasonAverageConfig
 			const SeasonExtraConfig = {
 				...this.SeasonExtraConfig,
 				MaxMinLimits:MaxMinLimits.IsAdd?SeasonAverageConfig.MaxMinLimits:{},
 				SamePeriodAverage:SamePeriodAverage.IsAdd?SamePeriodAverage:{},
-				SamePeriodStandardDeviation:SamePeriodStandardDeviation.IsAdd?SamePeriodStandardDeviation:{}
+				SamePeriodStandardDeviation:SamePeriodStandardDeviation.IsAdd?SamePeriodStandardDeviation:{},
+				RightAxis:SeasonRightEdbConfig.IsAdd?SeasonRightEdbConfig:{}
+				//右轴的具体配置
 			}
-			dataBaseInterface.seasonPreviewData({ChartEdbInfoList,SeasonExtraConfig}).then(res=>{
+			params.SeasonExtraConfig = SeasonExtraConfig
+			dataBaseInterface.getSplinePreviewData(params).then(res=>{
 				if(res.Ret!==200) return 
 				const {DataResp} = res.Data
-				const {MaxMinLimits,SamePeriodAverage,SamePeriodStandardDeviation} = DataResp
+				const {MaxMinLimits,SamePeriodAverage,SamePeriodStandardDeviation,RightAxis} = DataResp
 				this.chartInfo.SeasonAverageConfig = {
 					MaxMinLimits,SamePeriodAverage,SamePeriodStandardDeviation
 				}
+				this.chartInfo.SearonRightConfig = RightAxis
 				this.reLoadChartOption()
 			})
 
@@ -1149,7 +1164,9 @@ export default {
 			}else{
 				this.delTarget(tableData)
 			}
-			this.reLoadChartOption()
+			//mock
+			//this.reLoadChartOption()
+			this.previewSeasonChart({SeasonAverageConfig:this.chartInfo.SeasonAverageConfig,SeasonRightEdbConfig:rightConfig})
 		},
 		//获取图表全局设置
 		async getChartBaseSetting(){

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -1198,19 +1198,27 @@ export const chartSetMixin = {
       const {SearonRightConfig} = this.chartInfo
       if(newval[1]&&SearonRightConfig.IsShow){
         //右轴的设置
-        let serieItem = {
-            type:'line',
-            data:[],
-            name:SearonRightConfig.Legend||'右轴test',
+        let serieConfig = SearonRightConfig.Style==='column'?{
+            //柱形
+            type:'column',
+            color:SearonRightConfig.ChartColor
+        }:{
+            //标记点
+            type:'spline',
             lineWidth:SearonRightConfig.LineWidth,
             dashStyle:SearonRightConfig.LineStyle,
-            color:SearonRightConfig.LineColor,
-            marker:SearonRightConfig.Style==='mark'?{
+            color:SearonRightConfig.IsConnected?SearonRightConfig.LineColor:'rgba(255, 255, 255, 0)',//没有连线颜色设置为透明
+            marker:{
                 enabled:true,
                 symbol:SearonRightConfig.Shape,
                 fillColor:SearonRightConfig.ChartColor,
                 radius:SearonRightConfig.Size
-            }:{},
+            },
+        }
+        let serieItem = {
+            ...serieConfig,
+            name:SearonRightConfig.Legend||'右轴test',
+            data:[],
             yAxis:1,
         }
         newval[1].DataList.forEach(item=>{
@@ -1255,7 +1263,7 @@ export const chartSetMixin = {
         plotBands: this.setAxisPlotAreas(1),
         plotLines: this.setAxisPlotLines(1)
       }];
-      //如果有右轴,加上右轴
+      //如果有右轴,seasonYdata加上右轴
       if(newval[1]&&SearonRightConfig.IsShow){
         seasonYdata.push({
             ...seasonOptions.yAxis,
@@ -1271,7 +1279,7 @@ export const chartSetMixin = {
                 }
               },
               title: {
-                text: SearonRightConfig.Legend||'右轴',
+                text: SearonRightConfig.Legend||'右轴test',
                 style:{
                   ...chartTheme&&chartTheme.yAxisOptions.style
                 },