|
|
@@ -600,7 +600,7 @@ export default {
|
|
|
let line = markerOpt["userData"].split("|")[1];
|
|
|
if(lineDataInfo[line]==null) continue;
|
|
|
if(datatype=="tmp") {
|
|
|
- markerOpt["text"] = line+"# 定型温度:"+ (lineDataInfo[line].dxTmp||"--")+" 烫光温度:"+ (lineDataInfo[line].tgTmp||"--")+" 速度:"+ (lineDataInfo[line].speed||"--");
|
|
|
+ markerOpt["text"] = line+"# 定型温度:"+ (lineDataInfo[line].dxTmp==null?"--":lineDataInfo[line].dxTmp)+" 烫光温度:"+ (lineDataInfo[line].tgTmp==null?"--":lineDataInfo[line].tgTmp)+" 速度:"+ (lineDataInfo[line].speed==null?"--":lineDataInfo[line].speed);
|
|
|
}
|
|
|
if(datatype=="order") {
|
|
|
markerOpt["text"] = line+"# 订单号:"+ (lineDataInfo[line].order||"--")+" 花色:"+ (lineDataInfo[line].color||"--");
|