|
@@ -951,7 +951,6 @@ export default {
|
|
|
MinData: Number(item.MinData)
|
|
MinData: Number(item.MinData)
|
|
|
})
|
|
})
|
|
|
)
|
|
)
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
|
|
|
|
|
let hasLimitChange = Boolean(this.chartInfo.MinMaxSave)
|
|
let hasLimitChange = Boolean(this.chartInfo.MinMaxSave)
|
|
|
//需检测上下限是否修改
|
|
//需检测上下限是否修改
|
|
@@ -959,7 +958,6 @@ export default {
|
|
|
const limitSame= this.getLimitInfo()
|
|
const limitSame= this.getLimitInfo()
|
|
|
hasLimitChange = !limitSame
|
|
hasLimitChange = !limitSame
|
|
|
}
|
|
}
|
|
|
-=======
|
|
|
|
|
if(![10,11].includes(this.chartInfo.ChartType)){
|
|
if(![10,11].includes(this.chartInfo.ChartType)){
|
|
|
db_arr = db_arr.map((item,index)=>{
|
|
db_arr = db_arr.map((item,index)=>{
|
|
|
const {IsConvert,ConvertType,ConvertValue,ConvertUnit,ConvertEnUnit} = this.updateData[index]
|
|
const {IsConvert,ConvertType,ConvertValue,ConvertUnit,ConvertEnUnit} = this.updateData[index]
|
|
@@ -974,7 +972,6 @@ export default {
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
->>>>>>> ETA1.5.8
|
|
|
|
|
const { ChartType,ChartName,ChartThemeId,SourcesFrom,Instructions,MarkersLines,MarkersAreas,ChartThemeStyle } = this.chartInfo;
|
|
const { ChartType,ChartName,ChartThemeId,SourcesFrom,Instructions,MarkersLines,MarkersAreas,ChartThemeStyle } = this.chartInfo;
|
|
|
let public_param = {
|
|
let public_param = {
|
|
|
ChartClassifyId: this.chartInfo.classify.length ? this.chartInfo.classify[this.chartInfo.classify.length - 1] : 0,
|
|
ChartClassifyId: this.chartInfo.classify.length ? this.chartInfo.classify[this.chartInfo.classify.length - 1] : 0,
|
cxmo