右轴参数调试

src/views/dataEntry_manage/addChart.vue

@@ -900,18 +900,21 @@ export default {
 					//如果是季节性图,在这里加上同期/右轴的参数
 					if(this.chartInfo.ChartType===2){
 						//const {MaxMinLimits={},SamePeriodAverage={},SamePeriodStandardDeviation={}} = this.chartInfo.SeasonAverageConfig||{}
-						const {SeasonRightEdbConfig={}} = this.chartInfo
+						const {SeasonRightConfig={}} = this.chartInfo
 						const tempData = _.cloneDeep(this.chartInfo.SeasonAverageConfig||{})
 						delete tempData.MaxMinLimits.List
 						delete tempData.SamePeriodAverage.List
 						delete tempData.SamePeriodStandardDeviation.List
+						const tempConfig = _.cloneDeep(SeasonRightConfig)
+						delete tempConfig.EdbInfoList
 						const {MaxMinLimits={},SamePeriodAverage={},SamePeriodStandardDeviation={}} = tempData||{}
 						params.SeasonExtraConfig = {
 							...this.SeasonExtraConfig,
 							MaxMinLimits:MaxMinLimits.IsAdd?MaxMinLimits:{},
 							SamePeriodAverage:SamePeriodAverage.IsAdd?SamePeriodAverage:{},
 							SamePeriodStandardDeviation:SamePeriodStandardDeviation.IsAdd?SamePeriodStandardDeviation:{},
-							RightAxis:SeasonRightEdbConfig.IsAdd?SeasonRightEdbConfig:{}//右轴的具体配置
+							//RightAxis:SeasonRightConfig.IsAdd?tempConfig:{}//右轴的具体配置
+							RightAxis:{}
 						}
 					}
 					dataBaseInterface.chartAdd(params).then(res => {

src/views/dataEntry_manage/components/markersSection.vue

@@ -322,6 +322,7 @@ export default {
       /* 右轴指标弹窗 */
       isAddRightEdbDialogShow:false,
       rightEdbForm:{},//初始化和回显用
+      rightEdbInfo:{},//右轴不为同比时,有值
     }
   },
   methods:{
@@ -437,87 +438,6 @@ export default {
     },
     //添加右轴指标
     addRightEdb({form,data}){
-        //mock tableData
-        const mockTableData = {
-            Unit:"",//若数字格式为百分数,这里有值%
-            UnitEn:"无",//同上
-            DataList:[
-                {
-                    "DataTimestamp": 1706486400000, //1.29
-                    "Value": -0.2015
-                },{
-                    "DataTimestamp": 1708905600000, //2.26
-                    "Value": -0.1998
-                },{
-                    "DataTimestamp": 1711843200000,//3.31
-                    "Value": -0.407
-                },{
-                    "DataTimestamp": 1714435200000,//4.30
-                    "Value": -0.1553
-                },{
-                    "DataTimestamp": 1717113600000,//5.31
-                    "Value": -0.1208
-                },
-                {
-                    "DataTimestamp": 1719705600000,//6.30
-                    "Value": -0.0092
-                },
-                {
-                    "DataTimestamp": 1722297600000,//7.30
-                    "Value": 0.2432
-                },
-                {
-                    "DataTimestamp": 1725062400000,//8.31
-                    "Value": 0.1005
-                },
-                {
-                    "DataTimestamp": 1727654400000,//9.30
-                    "Value": 0.3251
-                },
-                {
-                    "DataTimestamp": 1730160000000,//10.29
-                    "Value": 0.3751
-                },{
-                    "DataTimestamp": 1732924800000,//11.30
-                    "Value": 1.1125
-                },{
-                    "DataTimestamp": 1735603200000,//12.31
-                    "Value": 0.9805
-                },
-            ],//需要展示在页面的数据
-            "IsAxis":0,//0为右轴
-            "EdbInfoId":123456,
-            "SourceName":"同比值",
-            "Source":6,
-            "SubSource":0,
-            "EdbCode":"C2407010950156183",
-            "EdbName":"杭州螺纹价格2同比",
-            "EdbAliasName":"杭州螺纹价格2同比",
-            "EdbNameEn":"杭州螺纹价格2同比",
-            "EdbAliasNameEn":"",
-            "EdbType":2,
-            "Frequency":"日度",
-            "FrequencyEn":"day",
-            "StartDate":"2007-04-24",
-            "EndDate":"2024-05-08",
-            "ModifyTime":"2024-07-01 09:50:17",
-            "ChartEdbMappingId":0,
-            "ChartInfoId":0,
-            "MaxData":1.1125,
-            "MinData":-0.407,
-            "IsOrder":false,
-            "EdbInfoType":1,
-            "EdbInfoCategoryType":0,
-            "PredictChartColor":"rgba(102, 255, 0, 1)",
-            "ChartWidth":2,
-            "ChartType":0,
-            "LatestDate":"2024-05-08",
-            "LatestValue":-0.0419,
-            "MoveLatestDate":"2024-05-08",
-            "UniqueCode":"0494dabcba3885d03b4dedbb0dc8e594",
-            "ChartStyle":"line",
-            "ChartColor":"rgba(102, 255, 0, 1)",
-        }
         const tableData = {
             ...data,
             IsAxis:0,
@@ -525,6 +445,7 @@ export default {
             UnitEn:''
 
         }
+        this.rightEdbForm = tableData
         Object.assign(this.rightEdbForm,form)
         this.rightEdbForm.IsAdd = true
         this.rightEdbForm.IsShow = true
@@ -534,7 +455,8 @@ export default {
     //取消添加右轴指标
     deleteRightEdb(){
         Object.assign(this.rightEdbForm,baseRightForm)
-        this.$emit('previewSeasonRight',{rightConfig:form,tableData:{"EdbInfoId":123456,}})
+        this.$emit('previewSeasonRight',{rightConfig:this.rightEdbForm,tableData:this.rightEdbForm})
+        this.rightEdbForm = {}
     },
     //更新季节性图 同期/右轴
     //预览图表

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -1211,7 +1211,7 @@ export const chartSetMixin = {
         }
         let serieItem = {
             ...serieConfig,
-            name:SeasonRightConfig.Legend||'右轴test',
+            name:SeasonRightConfig.Legend||'右轴',
             data:[],
             yAxis:1,
         }