|
@@ -231,14 +231,18 @@ func (this *ChartInfoController) MultipleGraphPreview() {
|
|
edbInfoType = 1
|
|
edbInfoType = 1
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ isOrder := 0
|
|
|
|
+ if curveConf.IsOrder {
|
|
|
|
+ isOrder = 1
|
|
|
|
+ }
|
|
for _, v := range mappingList {
|
|
for _, v := range mappingList {
|
|
v.EdbInfoType = 1
|
|
v.EdbInfoType = 1
|
|
- v.IsOrder = false
|
|
|
|
|
|
+ v.IsOrder = 0
|
|
if v.EdbInfoId == req.EdbInfoIdB {
|
|
if v.EdbInfoId == req.EdbInfoIdB {
|
|
v.LeadValue = curveConf.LeadValue
|
|
v.LeadValue = curveConf.LeadValue
|
|
v.LeadUnit = curveConf.LeadUnit
|
|
v.LeadUnit = curveConf.LeadUnit
|
|
v.EdbInfoType = edbInfoType
|
|
v.EdbInfoType = edbInfoType
|
|
- v.IsOrder = curveConf.IsOrder
|
|
|
|
|
|
+ v.IsOrder = isOrder
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -262,7 +266,7 @@ func (this *ChartInfoController) MultipleGraphPreview() {
|
|
}
|
|
}
|
|
|
|
|
|
chartEdbInfoMapping := *v
|
|
chartEdbInfoMapping := *v
|
|
- chartEdbInfoMapping.IsOrder = false
|
|
|
|
|
|
+ chartEdbInfoMapping.IsOrder = 0
|
|
|
|
|
|
if v.EdbInfoId == req.EdbInfoIdA {
|
|
if v.EdbInfoId == req.EdbInfoIdA {
|
|
chartEdbInfoMapping.IsAxis = 1
|
|
chartEdbInfoMapping.IsAxis = 1
|
|
@@ -281,7 +285,7 @@ func (this *ChartInfoController) MultipleGraphPreview() {
|
|
chartEdbInfoMapping.LeadValue = curveConf.LeadValue
|
|
chartEdbInfoMapping.LeadValue = curveConf.LeadValue
|
|
chartEdbInfoMapping.LeadUnit = curveConf.LeadUnit
|
|
chartEdbInfoMapping.LeadUnit = curveConf.LeadUnit
|
|
chartEdbInfoMapping.ChartWidth = 1
|
|
chartEdbInfoMapping.ChartWidth = 1
|
|
- chartEdbInfoMapping.IsOrder = curveConf.IsOrder
|
|
|
|
|
|
+ chartEdbInfoMapping.IsOrder = isOrder
|
|
chartEdbInfoMapping.EdbInfoType = edbInfoType
|
|
chartEdbInfoMapping.EdbInfoType = edbInfoType
|
|
}
|
|
}
|
|
|
|
|
|
@@ -523,14 +527,18 @@ func (this *ChartInfoController) MultipleGraphPreviewCurve() {
|
|
if curveConf.EdbInfoType {
|
|
if curveConf.EdbInfoType {
|
|
edbInfoType = 1
|
|
edbInfoType = 1
|
|
}
|
|
}
|
|
|
|
+ isOrder := 0
|
|
|
|
+ if curveConf.IsOrder {
|
|
|
|
+ isOrder = 1
|
|
|
|
+ }
|
|
for _, v := range mappingList {
|
|
for _, v := range mappingList {
|
|
v.EdbInfoType = 1
|
|
v.EdbInfoType = 1
|
|
- v.IsOrder = false
|
|
|
|
|
|
+ v.IsOrder = 0
|
|
if v.EdbInfoId == req.EdbInfoIdB {
|
|
if v.EdbInfoId == req.EdbInfoIdB {
|
|
v.LeadValue = curveConf.LeadValue
|
|
v.LeadValue = curveConf.LeadValue
|
|
v.LeadUnit = curveConf.LeadUnit
|
|
v.LeadUnit = curveConf.LeadUnit
|
|
v.EdbInfoType = edbInfoType
|
|
v.EdbInfoType = edbInfoType
|
|
- v.IsOrder = curveConf.IsOrder
|
|
|
|
|
|
+ v.IsOrder = isOrder
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -553,7 +561,7 @@ func (this *ChartInfoController) MultipleGraphPreviewCurve() {
|
|
}
|
|
}
|
|
|
|
|
|
chartEdbInfoMapping := *v
|
|
chartEdbInfoMapping := *v
|
|
- chartEdbInfoMapping.IsOrder = false
|
|
|
|
|
|
+ chartEdbInfoMapping.IsOrder = 0
|
|
chartEdbInfoMapping.EdbInfoType = 1
|
|
chartEdbInfoMapping.EdbInfoType = 1
|
|
|
|
|
|
if v.EdbInfoId == req.EdbInfoIdA {
|
|
if v.EdbInfoId == req.EdbInfoIdA {
|
|
@@ -572,7 +580,7 @@ func (this *ChartInfoController) MultipleGraphPreviewCurve() {
|
|
chartEdbInfoMapping.LeadValue = curveConf.LeadValue
|
|
chartEdbInfoMapping.LeadValue = curveConf.LeadValue
|
|
chartEdbInfoMapping.LeadUnit = curveConf.LeadUnit
|
|
chartEdbInfoMapping.LeadUnit = curveConf.LeadUnit
|
|
chartEdbInfoMapping.ChartWidth = 1
|
|
chartEdbInfoMapping.ChartWidth = 1
|
|
- chartEdbInfoMapping.IsOrder = curveConf.IsOrder
|
|
|
|
|
|
+ chartEdbInfoMapping.IsOrder = isOrder
|
|
chartEdbInfoMapping.EdbInfoType = edbInfoType
|
|
chartEdbInfoMapping.EdbInfoType = edbInfoType
|
|
}
|
|
}
|
|
|
|
|
|
@@ -713,12 +721,17 @@ func (this *ChartInfoController) MultipleGraphConfigSaveChart() {
|
|
edbInfoType = 0
|
|
edbInfoType = 0
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ var isOrder int
|
|
|
|
+ if curveConf.IsOrder {
|
|
|
|
+ isOrder = 1
|
|
|
|
+ }
|
|
|
|
+
|
|
chartSaveItemList := []*data_manage.ChartSaveItem{
|
|
chartSaveItemList := []*data_manage.ChartSaveItem{
|
|
{
|
|
{
|
|
EdbInfoId: edbInfoMappingA.EdbInfoId,
|
|
EdbInfoId: edbInfoMappingA.EdbInfoId,
|
|
MaxData: curveConf.LeftMax,
|
|
MaxData: curveConf.LeftMax,
|
|
MinData: curveConf.LeftMin,
|
|
MinData: curveConf.LeftMin,
|
|
- IsOrder: false,
|
|
|
|
|
|
+ IsOrder: 0,
|
|
IsAxis: 1,
|
|
IsAxis: 1,
|
|
EdbInfoType: 1,
|
|
EdbInfoType: 1,
|
|
//LeadValue: curveConf.LeadValue,
|
|
//LeadValue: curveConf.LeadValue,
|
|
@@ -732,7 +745,7 @@ func (this *ChartInfoController) MultipleGraphConfigSaveChart() {
|
|
EdbInfoId: edbInfoMappingB.EdbInfoId,
|
|
EdbInfoId: edbInfoMappingB.EdbInfoId,
|
|
MaxData: curveConf.RightMax,
|
|
MaxData: curveConf.RightMax,
|
|
MinData: curveConf.RightMin,
|
|
MinData: curveConf.RightMin,
|
|
- IsOrder: curveConf.IsOrder,
|
|
|
|
|
|
+ IsOrder: isOrder,
|
|
IsAxis: 0,
|
|
IsAxis: 0,
|
|
EdbInfoType: edbInfoType,
|
|
EdbInfoType: edbInfoType,
|
|
LeadValue: curveConf.LeadValue,
|
|
LeadValue: curveConf.LeadValue,
|
|
@@ -1047,12 +1060,16 @@ func CopyMultipleGraphConfigSaveChart(req request.SaveMultipleGraphChartReq, thi
|
|
if !curveConf.EdbInfoType {
|
|
if !curveConf.EdbInfoType {
|
|
edbInfoType = 0
|
|
edbInfoType = 0
|
|
}
|
|
}
|
|
|
|
+ var isOrder int
|
|
|
|
+ if curveConf.IsOrder {
|
|
|
|
+ isOrder = 1
|
|
|
|
+ }
|
|
chartSaveItemList := []*data_manage.ChartSaveItem{
|
|
chartSaveItemList := []*data_manage.ChartSaveItem{
|
|
{
|
|
{
|
|
EdbInfoId: edbInfoMappingA.EdbInfoId,
|
|
EdbInfoId: edbInfoMappingA.EdbInfoId,
|
|
MaxData: curveConf.LeftMax,
|
|
MaxData: curveConf.LeftMax,
|
|
MinData: curveConf.LeftMin,
|
|
MinData: curveConf.LeftMin,
|
|
- IsOrder: false,
|
|
|
|
|
|
+ IsOrder: 0,
|
|
IsAxis: 1,
|
|
IsAxis: 1,
|
|
EdbInfoType: 1,
|
|
EdbInfoType: 1,
|
|
//LeadValue: curveConf.LeadValue,
|
|
//LeadValue: curveConf.LeadValue,
|
|
@@ -1066,7 +1083,7 @@ func CopyMultipleGraphConfigSaveChart(req request.SaveMultipleGraphChartReq, thi
|
|
EdbInfoId: edbInfoMappingB.EdbInfoId,
|
|
EdbInfoId: edbInfoMappingB.EdbInfoId,
|
|
MaxData: curveConf.RightMax,
|
|
MaxData: curveConf.RightMax,
|
|
MinData: curveConf.RightMin,
|
|
MinData: curveConf.RightMin,
|
|
- IsOrder: curveConf.IsOrder,
|
|
|
|
|
|
+ IsOrder: isOrder,
|
|
IsAxis: 0,
|
|
IsAxis: 0,
|
|
EdbInfoType: edbInfoType,
|
|
EdbInfoType: edbInfoType,
|
|
LeadValue: curveConf.LeadValue,
|
|
LeadValue: curveConf.LeadValue,
|