|
@@ -576,11 +576,14 @@ export default {
|
|
const {
|
|
const {
|
|
min, max, rightMin, rightMax, rightTwoMin, rightTwoMax
|
|
min, max, rightMin, rightMax, rightTwoMin, rightTwoMax
|
|
} = this.chartLimit
|
|
} = this.chartLimit
|
|
- console.log(this.chartInfo);
|
|
|
|
|
|
+ const ExtraConfig={
|
|
|
|
+ ...edbParams.ExtraConfig,
|
|
|
|
+ MultipleGraphConfigId:this.MultipleGraphConfigId
|
|
|
|
+ }
|
|
const params = {
|
|
const params = {
|
|
ChartInfoId: Number(this.$route.query.id),
|
|
ChartInfoId: Number(this.$route.query.id),
|
|
ChartEdbInfoList: edbParams.ChartEdbInfoList,
|
|
ChartEdbInfoList: edbParams.ChartEdbInfoList,
|
|
- ExtraConfig: JSON.stringify(edbParams.ExtraConfig),
|
|
|
|
|
|
+ ExtraConfig:JSON.stringify(ExtraConfig),
|
|
ChartClassifyId: this.chartInfo.ChartClassifyId,
|
|
ChartClassifyId: this.chartInfo.ChartClassifyId,
|
|
ChartName: this.chartName,
|
|
ChartName: this.chartName,
|
|
ChartType: 1,
|
|
ChartType: 1,
|
|
@@ -628,7 +631,10 @@ export default {
|
|
} = this.chartLimit
|
|
} = this.chartLimit
|
|
const params = {
|
|
const params = {
|
|
ChartEdbInfoList: edbParams.ChartEdbInfoList,
|
|
ChartEdbInfoList: edbParams.ChartEdbInfoList,
|
|
- ExtraConfig: JSON.stringify(edbParams.ExtraConfig),
|
|
|
|
|
|
+ ExtraConfig:{
|
|
|
|
+ ...edbParams.ExtraConfig,
|
|
|
|
+ MultipleGraphConfigId:this.MultipleGraphConfigId
|
|
|
|
+ },
|
|
ChartClassifyId: e.classify,
|
|
ChartClassifyId: e.classify,
|
|
ChartName: e.name,
|
|
ChartName: e.name,
|
|
ChartType: 1,
|
|
ChartType: 1,
|
|
@@ -686,12 +692,13 @@ export default {
|
|
//计算绘图
|
|
//计算绘图
|
|
async handleComputed() {
|
|
async handleComputed() {
|
|
const edbParams = this.$refs.edbComputedWrap.getParams()
|
|
const edbParams = this.$refs.edbComputedWrap.getParams()
|
|
|
|
+ const ExtraConfig={
|
|
|
|
+ ...edbParams.ExtraConfig,
|
|
|
|
+ MultipleGraphConfigId:this.MultipleGraphConfigId
|
|
|
|
+ }
|
|
const params = {
|
|
const params = {
|
|
ChartEdbInfoList:edbParams.ChartEdbInfoList,
|
|
ChartEdbInfoList:edbParams.ChartEdbInfoList,
|
|
- ExtraConfig:{
|
|
|
|
- ...edbParams.ExtraConfig,
|
|
|
|
- MultipleGraphConfigId:this.MultipleGraphConfigId
|
|
|
|
- },
|
|
|
|
|
|
+ ExtraConfig:JSON.stringify(ExtraConfig),
|
|
DateType: this.year_select,
|
|
DateType: this.year_select,
|
|
StartDate: [5, 6].includes(this.year_select)
|
|
StartDate: [5, 6].includes(this.year_select)
|
|
? this.select_date[0]
|
|
? this.select_date[0]
|