|
@@ -1662,8 +1662,9 @@ export const chartSetMixin = {
|
|
|
|
|
|
if(haveContract) {
|
|
|
// 利润曲线指标名
|
|
|
+ const isEdb=commodityEdbList.some(_=>_.EdbInfoId===haveContract)
|
|
|
let edb_name = chartInfo.Source === 5
|
|
|
- ? (index === 0 ? obj_item.NameList[index] : `${chartInfo.ProfitName}(${obj_item.NameList[index]})`)
|
|
|
+ ? (isEdb ? obj_item.NameList[index] : `${chartInfo.ProfitName}(${obj_item.NameList[index]})`)
|
|
|
: commodityEdbList.find(_ => _.EdbInfoId === obj_item.XEdbInfoIdList[index]).EdbName;
|
|
|
str+=`<b>${ edb_name }</b>`
|
|
|
|
|
@@ -1687,8 +1688,9 @@ export const chartSetMixin = {
|
|
|
|
|
|
if(haveContract) {
|
|
|
// 利润曲线指标名
|
|
|
+ const isEdb=commodityEdbList.some(_=>_.EdbInfoId===haveContract)
|
|
|
let edb_name = chartInfo.Source === 5
|
|
|
- ? (index === 0 ? obj_item.NameList[index] : `${chartInfo.ProfitName}(${obj_item.NameList[index]})`)
|
|
|
+ ? (isEdb? obj_item.NameList[index] : `${chartInfo.ProfitName}(${obj_item.NameList[index]})`)
|
|
|
: commodityEdbList.find(_ => _.EdbInfoId === obj_item.XEdbInfoIdList[index]).EdbName;
|
|
|
str+=`<b>${ edb_name }</b>`
|
|
|
|
|
@@ -1712,8 +1714,9 @@ export const chartSetMixin = {
|
|
|
|
|
|
if(haveContract) {
|
|
|
// 利润曲线指标名
|
|
|
+ const isEdb=commodityEdbList.some(_=>_.EdbInfoId===haveContract)
|
|
|
let edb_name = chartInfo.Source === 5
|
|
|
- ? (index === 0 ? obj_item.NameList[index] : `${chartInfo.ProfitNameEn}(${obj_item.NameList[index]})`)
|
|
|
+ ? (isEdb ? obj_item.NameList[index] : `${chartInfo.ProfitNameEn}(${obj_item.NameList[index]})`)
|
|
|
: commodityEdbList.find(_ => _.EdbInfoId === obj_item.XEdbInfoIdList[index]).EdbNameEn;
|
|
|
str+=`<b>${ edb_name }</b>`
|
|
|
|