|
@@ -3062,6 +3062,8 @@
|
|
|
if (!AutoPlayer && currentTargetType=='IN02') $("#autoplayer_btn").trigger('click') //开启自动漫游
|
|
|
});
|
|
|
async function showMarker(type){
|
|
|
+ console.log(type)
|
|
|
+ console.log(MarkerMapFac)
|
|
|
for (var t in MarkerMapFac) {
|
|
|
if(t==type){
|
|
|
for (var markPtr in MarkerMapFac[t]) {
|
|
@@ -3140,14 +3142,14 @@
|
|
|
var pantou = await player.Native.ModelTree.findItemByName("B412",0,true,1);
|
|
|
//var imgid = await player.Native.GisMarker.loadImage("rgba:255,0,255,255");
|
|
|
var options = {
|
|
|
- "text": "原材料(个)\r\rfdy当日入库:- 出库:-\rfdy当月入库:- 出库:-\rpoy当日入库:- 出库:-\rpoy当月入库:- 出库:-",
|
|
|
+ "text": "原材料(条)\r\rfdy当日入库:- 出库:-\rfdy当月入库:- 出库:-\rpoy当日入库:- 出库:-\rpoy当月入库:- 出库:-",
|
|
|
"visible": true,
|
|
|
//"maxLod": 130,
|
|
|
"minLod": 0,
|
|
|
"textFontSize":16,
|
|
|
"textColor": parseInt("0xffffffff"),
|
|
|
"contentPadding":[5,5,5,5],
|
|
|
- "userData":"ycl|原材料(个)\r\rfdy当日入库:{fdy.d-in} 出库:{fdy.d-out}\rfdy当月入库:{fdy.m-in} 出库:{fdy.m-out}\rpoy当日入库:{poy.d-in} 出库:{poy.d-out}\rpoy当月入库:{poy.m-in} 出库:{poy.m-out}"
|
|
|
+ "userData":"ycl|原材料(条)\r\rfdy当日入库:{fdy.d-in} 出库:{fdy.d-out}\rfdy当月入库:{fdy.m-in} 出库:{fdy.m-out}\rpoy当日入库:{poy.d-in} 出库:{poy.d-out}\rpoy当月入库:{poy.m-in} 出库:{poy.m-out}"
|
|
|
};
|
|
|
var obj02Aabb = await player.Native.ModelTree.getItemShapeInfo(pantou.item);
|
|
|
options.pos = [obj02Aabb.aabb[0][0], obj02Aabb.aabb[0][1]-30, obj02Aabb.aabb[0][2]+60];
|
|
@@ -3205,9 +3207,8 @@
|
|
|
var cf = "data://models/T_03.pr";
|
|
|
var errStr = await PlayerUtils.call(Native.Model.loadModel, currentTargetType, cf);
|
|
|
modelLoadState[currentTargetType] = true;
|
|
|
- }else{
|
|
|
- showMarker(currentTargetType);
|
|
|
}
|
|
|
+ showMarker(currentTargetType);
|
|
|
await player.Native.Model.setModelVisible("IN03",true);
|
|
|
}
|
|
|
//前整
|
|
@@ -3230,9 +3231,9 @@
|
|
|
var cf = "data://models/T_03.pr";
|
|
|
var errStr = await PlayerUtils.call(Native.Model.loadModel, currentTargetType, cf);
|
|
|
modelLoadState[currentTargetType] = true;
|
|
|
- }else{
|
|
|
- showMarker(currentTargetType);
|
|
|
}
|
|
|
+ showMarker(currentTargetType);
|
|
|
+
|
|
|
await player.Native.Model.setModelVisible("IN03",true);
|
|
|
}
|
|
|
//印花
|
|
@@ -3255,9 +3256,8 @@
|
|
|
var cf = "data://models/T_03.pr";
|
|
|
var errStr = await PlayerUtils.call(Native.Model.loadModel, currentTargetType, cf);
|
|
|
modelLoadState[currentTargetType] = true;
|
|
|
- }else{
|
|
|
- showMarker(currentTargetType);
|
|
|
}
|
|
|
+ showMarker(currentTargetType);
|
|
|
await player.Native.Model.setModelVisible(currentTargetType,true);
|
|
|
player.Native.CameraAnimation.clearKeyFrame();
|
|
|
}
|
|
@@ -3347,9 +3347,8 @@
|
|
|
GetAlarmData();
|
|
|
//获取在线设备列表
|
|
|
GetOnlineDev();
|
|
|
- }else{
|
|
|
- showMarker(currentTargetType);
|
|
|
}
|
|
|
+ showMarker(currentTargetType);
|
|
|
for (var i in ANIMATION_DATA) {
|
|
|
// 添加关键帧
|
|
|
player.Native.CameraAnimation.addKeyFrames([ANIMATION_DATA[i]]);
|