|
|
@@ -494,13 +494,13 @@ export default {
|
|
|
let imgId = await player.Native.GisMarker.loadImage("data://icon/rz-new/pp.png");
|
|
|
window.IN03Markers = {};
|
|
|
for(let i=0;i<8;i++){
|
|
|
- player.Native.ModelTree.findItemByName("Text00"+(i+1), rootObj.item,true,3).then(res=>{
|
|
|
+ player.Native.ModelTree.findItemByName("Text00"+(i+1), rootObj.item,true,3).then(res=>{
|
|
|
player.Native.ModelTree.setItemVisible([res.item],false);
|
|
|
});
|
|
|
- player.Native.ModelTree.findItemByName("Plane0"+(11+i+1), rootObj.item,true,3).then(res=>{
|
|
|
+ player.Native.ModelTree.findItemByName("Plane0"+(11+i+1), rootObj.item,true,3).then(res=>{
|
|
|
player.Native.ModelTree.setItemVisible([res.item],false);
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
let line = i+1;
|
|
|
//产线编号标记
|
|
|
var options = {
|
|
|
@@ -517,46 +517,50 @@ export default {
|
|
|
"nodeOffset": [0, -24],
|
|
|
"userData": "line|"+line
|
|
|
};
|
|
|
+
|
|
|
options.pos = markerPos[i][0];
|
|
|
//options.parentNode=tmp.item;
|
|
|
options.imgId = imgId
|
|
|
options.imgSize = [16, 24];
|
|
|
player.Native.GisMarker.create(options).then(markPtr=>{
|
|
|
window.IN03Markers[markPtr] = options;
|
|
|
- });
|
|
|
- //产线温度、速度标记
|
|
|
+ });
|
|
|
+ let paraImg = await player.Native.GisMarker.loadImage("data://icon/rz-new/pp1.png");
|
|
|
+ //产线温度、速度标记
|
|
|
let optTmp = JSON.parse(JSON.stringify(options));
|
|
|
+ optTmp.imgId = paraImg;
|
|
|
optTmp.pos = tmpMarkerPos[i];
|
|
|
optTmp.userData = "tmp|"+line;
|
|
|
optTmp.textFontSize = "14";
|
|
|
- optTmp.imgSize = [316, 18];
|
|
|
+ optTmp.imgSize = [335, 18];
|
|
|
optTmp.nodeOffset = [-158, -24];
|
|
|
- optTmp.textColor = parseInt("0xe5cd10FF");
|
|
|
- player.Native.GisMarker.create(optTmp).then(markPtr=>{
|
|
|
+ optTmp.textColor = parseInt("0xFFFFFFFF");
|
|
|
+ player.Native.GisMarker.create(optTmp).then(markPtr=>{
|
|
|
window.IN03Markers[markPtr] = optTmp;
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
//产线订单花色标记.1\2号产线没有
|
|
|
if(line>2){
|
|
|
let optOrder = JSON.parse(JSON.stringify(options));
|
|
|
+ optOrder.imgId = paraImg;
|
|
|
optOrder.pos = orderMarkerPos[i];
|
|
|
optOrder.userData = "order|"+line;
|
|
|
optOrder.textFontSize = "14";
|
|
|
optOrder.imgSize = [300, 18];
|
|
|
- optOrder.textColor = parseInt("0xe5cd10FF");
|
|
|
+ optOrder.textColor = parseInt("0xFFFFFFFF");
|
|
|
optOrder.nodeOffset = [-115, -24];
|
|
|
- player.Native.GisMarker.create(optOrder).then(markPtr=>{
|
|
|
+ player.Native.GisMarker.create(optOrder).then(markPtr=>{
|
|
|
window.IN03Markers[markPtr] = optOrder;
|
|
|
});
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
//标记点击
|
|
|
player.Native.GisMarker.EventGisMarkerLClick.connect((event) => {
|
|
|
let markerLClickObj = window.IN03Markers[event.markerId];
|
|
|
if(markerLClickObj==null){
|
|
|
//emit('markerLClick',{});
|
|
|
markerLClickObj = compMarkerts[event.markerId];
|
|
|
- if(markerLClickObj!=null){
|
|
|
+ if(markerLClickObj!=null){
|
|
|
var params = JSON.stringify(compProctList.value);
|
|
|
emit('OpenIframeWin',{class:'newwin in03AiCompWin',src:'/in03-ai-comp#'+params,title:'AI工艺比对详情'});
|
|
|
}
|
|
|
@@ -570,8 +574,8 @@ export default {
|
|
|
//emit('markerLClick',markerLClickObj);
|
|
|
return;
|
|
|
});
|
|
|
- //加载产线数据
|
|
|
- showLineInfo();
|
|
|
+ //加载产线数据
|
|
|
+ showLineInfo();
|
|
|
})();
|
|
|
}
|
|
|
|
|
|
@@ -580,13 +584,13 @@ export default {
|
|
|
//4楼左边显示产线的定型温度dxTmp、烫光温度tgTmp以及速度speed
|
|
|
//4楼楼右边显示产线的订单号order和花色color
|
|
|
async function showLineInfo(){
|
|
|
- if(player==null || player.Native==null || lineCurr==null) return;
|
|
|
+ if(player==null || player.Native==null || lineCurr==null) return;
|
|
|
let lineDataInfo = {};
|
|
|
- lineCurr.forEach(function(item){
|
|
|
+ lineCurr.forEach(function(item){
|
|
|
lineDataInfo[item.line] = item;
|
|
|
- });
|
|
|
+ });
|
|
|
let getCnt = 0;
|
|
|
- for(let markerPtr in window.IN03Markers){
|
|
|
+ for(let markerPtr in window.IN03Markers){
|
|
|
let markerOpt = window.IN03Markers[markerPtr];
|
|
|
if(markerOpt["userData"]==null) continue;
|
|
|
let datatype = markerOpt["userData"].split("|")[0];
|