|
|
@@ -18,7 +18,7 @@
|
|
|
<div itemcode="2"><span>生产效率</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>
|
|
|
<div itemcode="3"><span>稼动率</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>
|
|
|
<div itemcode="4"><span>生产趋势</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>
|
|
|
- <div itemcode="5"><span>能耗趋势</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>
|
|
|
+ <div itemcode="5"><span>能耗趋势</span><img src="image/imp2.png" style="float: right;margin-top: 7px;"></div>
|
|
|
</div>
|
|
|
<div id="search"><input type="text" placeholder="请输入设备编号" maxlength="4"><img style="position: absolute;top: 20%;right: 5px;" src="image/search_icon.png" class="search_btn"></div>
|
|
|
<div id="search_result"></div>
|
|
|
@@ -44,31 +44,31 @@
|
|
|
</div>
|
|
|
<div class="stat" style="float: left;width: 100%;margin-top: 35px;">
|
|
|
<div title="落米停机数" style="float: left;width: 33%;color: #FFB342;">
|
|
|
- <img src="image/t1.png" style="float: left;width: 40px;">
|
|
|
+ <img src="image/t1.png" style="float: left;width: 40px;">
|
|
|
<span class="number" attr="stop6" style="float: left;font-family: Bebas Neue, Bebas Neue;font-weight: 400;font-size: 20px;line-height: 30px;text-align: left;font-style: normal;text-transform: none;margin-left: 1%;">-</span>
|
|
|
<span style="float: left;font-size: 15px;margin-top: 6px;">(台)</span>
|
|
|
<span style="float: left;font-weight: 500;font-size: 14px;color: #FFFFFF;line-height: 22px;text-align: left;width: 65%;margin-left: 1%;">落米停机数</span>
|
|
|
</div>
|
|
|
<div title="断纱停机数" style="float: left;width: 33%;color: #FFB342;">
|
|
|
- <img src="image/t1.png" style="float: left;width: 40px;">
|
|
|
+ <img src="image/t1.png" style="float: left;width: 40px;">
|
|
|
<span class="number" attr="stop2" style="float: left;font-family: Bebas Neue, Bebas Neue;font-weight: 400;font-size: 20px;line-height: 30px;text-align: left;font-style: normal;text-transform: none;margin-left: 1%;color: #FFB342;">-</span>
|
|
|
<span style="float: left;font-size: 15px;margin-top: 6px;">(台)</span>
|
|
|
<span style="float: left;font-weight: 500;font-size: 14px;color: #FFFFFF;line-height: 22px;text-align: left;width: 65%;margin-left: 1%;">断纱停机数</span>
|
|
|
</div>
|
|
|
<div title="停经片停机数" style="float: left;width: 33%;color: #FFB342;">
|
|
|
- <img src="image/t1.png" style="float: left;width: 40px;">
|
|
|
+ <img src="image/t1.png" style="float: left;width: 40px;">
|
|
|
<span class="number" attr="stop1" style="float: left;font-family: Bebas Neue, Bebas Neue;font-weight: 400;font-size: 20px;line-height: 30px;text-align: left;font-style: normal;text-transform: none;margin-left: 1%;color: #FFB342;">-</span>
|
|
|
<span style="float: left;font-size: 15px;margin-top: 6px;">(台)</span>
|
|
|
<span style="float: left;font-weight: 500;font-size: 14px;color: #FFFFFF;line-height: 22px;text-align: left;width: 65%;margin-left: 1%;">停经片停机数</span>
|
|
|
</div>
|
|
|
<div title="叫料数" style="float: left;width: 33%;margin-top: 15px;color: #FFB342;">
|
|
|
- <img src="image/t1.png" style="float: left;width: 40px;">
|
|
|
+ <img src="image/t1.png" style="float: left;width: 40px;">
|
|
|
<span class="number" attr="stop8" style="float: left;font-family: Bebas Neue, Bebas Neue;font-weight: 700;font-size: 22px;line-height: 30px;text-align: left;font-style: normal;text-transform: none;margin-left: 1%;color: red;">-</span>
|
|
|
<span style="float: left;font-size: 15px;margin-top: 6px;">(台)</span>
|
|
|
<span style="float: left;font-weight: 500;font-size: 14px;color: #FFFFFF;line-height: 22px;text-align: left;width: 65%;margin-left: 1%;">叫料数</span>
|
|
|
</div>
|
|
|
<div title="故障告警数" style="float: left;width: 33%;margin-top: 15px;color: #FFB342;">
|
|
|
- <img src="image/t1.png" style="float: left;width: 40px;">
|
|
|
+ <img src="image/t1.png" style="float: left;width: 40px;">
|
|
|
<span class="number" attr="alarm" style="float: left;font-family: Bebas Neue, Bebas Neue;font-weight: 700;font-size: 22px;line-height: 30px;text-align: left;font-style: normal;text-transform: none;margin-left: 1%;color: red;">-</span>
|
|
|
<span style="float: left;font-size: 15px;margin-top: 6px;">(台)</span>
|
|
|
<span style="float: left;font-weight: 500;font-size: 14px;color: #FFFFFF;line-height: 22px;text-align: left;width: 65%;margin-left: 1%;">故障告警数</span>
|
|
|
@@ -100,7 +100,7 @@
|
|
|
<div style="margin-top: 15px;">
|
|
|
<div style="text-align: center;"><img src="image/alarm_txt.png"></div>
|
|
|
<div class="echarts_alarm" id="echarts_alarm" style="height: 122px;width: 100%;">
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -110,7 +110,7 @@
|
|
|
<div class="content">
|
|
|
<div style="margin-top: 15px;">
|
|
|
<div class="echarts_stop" id="echarts_stop" style="height: 190px;width: 100%;">
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -161,27 +161,27 @@
|
|
|
<div class="content">
|
|
|
<div style="margin-top: 15px;">
|
|
|
<div class="echarts_jiadonglv" id="echarts_jiadonglv" style="height: 142px;width: 100%;">
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
+ </div>
|
|
|
<div id="dev_sc_qushi" show="生产趋势" style="color: #ffffff;font-size: 14px;">
|
|
|
<div class="title"></div>
|
|
|
<div class="content">
|
|
|
<div style="margin-top: 15px;">
|
|
|
<div class="echarts_sc_qushi" id="echarts_sc_qushi" style="height: 142px;width: 100%;">
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
+ </div>
|
|
|
<div id="dev_used_qushi" show="能耗趋势" style="color: #ffffff;font-size: 14px;">
|
|
|
<div class="title"></div>
|
|
|
<div class="content">
|
|
|
<div style="margin-top: 15px;">
|
|
|
<div class="echarts_used_qushi" id="echarts_used_qushi" style="height: 142px;width: 100%;">
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -502,9 +502,9 @@
|
|
|
loop: true,
|
|
|
// 渲染的格式svg/canvas/html，svg性能更优，兼容性更好
|
|
|
renderer: "svg",
|
|
|
- });
|
|
|
+ });
|
|
|
var sam0023;
|
|
|
- var modelsMap={}
|
|
|
+ var modelsMap={}
|
|
|
var MODEL_LOADED = 0; //模型是否加载完成
|
|
|
var ALARM_DEVS = []; //未提醒的告警设备，将在模型加载完成时提醒
|
|
|
var LoadServerDataTimer=null;
|
|
|
@@ -561,7 +561,7 @@
|
|
|
return
|
|
|
}
|
|
|
$("#dev_alarm .title").html("");
|
|
|
- $("#dev_alarm .content").show();
|
|
|
+ $("#dev_alarm .content").show();
|
|
|
var tpl='<tr style="font-weight:bold" devno="{1}"><td style="width: 30%;">{1}#</td><td style="width: 70%;color:{COLOR}">{2}</td></tr>';
|
|
|
var lst=[];
|
|
|
for (var i = 0; i < data.length; i++) {
|
|
|
@@ -592,7 +592,7 @@
|
|
|
tb.css({"top":"0px","position":"relative"});
|
|
|
this.devAlarmAutoLoadTimter=window.setInterval(function(){
|
|
|
var tb = $("#dev_alarm_list");
|
|
|
- var tbtop = tb.css("top").replace("px","")*1;
|
|
|
+ var tbtop = tb.css("top").replace("px","")*1;
|
|
|
if(Math.abs(tbtop)>=(tb.height()-32)){
|
|
|
tb.css("top","0px");
|
|
|
}else{
|
|
|
@@ -633,7 +633,7 @@
|
|
|
color: '#F0F27560' // 这里同时设置线头的颜色
|
|
|
}
|
|
|
}
|
|
|
- },
|
|
|
+ },
|
|
|
});
|
|
|
var opt={
|
|
|
title: {
|
|
|
@@ -659,8 +659,8 @@
|
|
|
grid: {
|
|
|
left: '1%',
|
|
|
right: '1%',
|
|
|
- bottom: '2%',
|
|
|
- top:'5%',
|
|
|
+ bottom: '2%',
|
|
|
+ top:'5%',
|
|
|
containLabel: true
|
|
|
},
|
|
|
xAxis: {
|
|
|
@@ -709,12 +709,12 @@
|
|
|
var week={"stop1A":[],"stop2A":[],"stop3A":[],"stop1B":[],"stop2B":[],"stop3B":[]};
|
|
|
var times=[];
|
|
|
var v_series=[];
|
|
|
- for (var i = 0; i < data.length; i++) {
|
|
|
+ for (var i = 0; i < data.length; i++) {
|
|
|
var tv = data[i]['time'].split("-")
|
|
|
times.push(tv[1]+"-"+tv[2])
|
|
|
for(var k1 in week){
|
|
|
week[k1].push(data[i][k1])
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
if((week.stop1A.length+week.stop2A.length+week.stop3A.length+week.stop1B.length+week.stop2B.length+week.stop3B.length)==0){
|
|
|
t.find(".content").hide();
|
|
|
@@ -810,10 +810,10 @@
|
|
|
}]
|
|
|
};
|
|
|
var echartsEle = echarts.init($("#echarts_stop")[0]);
|
|
|
- echartsEle.setOption(option);
|
|
|
+ echartsEle.setOption(option);
|
|
|
},
|
|
|
LoadSCXL:function(data){
|
|
|
- //生产效率
|
|
|
+ //生产效率
|
|
|
$("#totay1").html(data.totalLength.toFixed(2))
|
|
|
$("#totay2").html(data.totalWeight.toFixed(2))
|
|
|
$("#scxl_a>td:eq(1)").html(data.atime.toFixed(2))
|
|
|
@@ -852,7 +852,7 @@
|
|
|
lineStyle: {color: '#F0F275' // 这里同时设置线头的颜色
|
|
|
}
|
|
|
}
|
|
|
- },
|
|
|
+ },
|
|
|
});
|
|
|
v_series.push({name:"A组稼动率",type:'line',smooth: true, //symbol: 'none',
|
|
|
data:week_aefficiency,itemStyle: {
|
|
|
@@ -860,7 +860,7 @@
|
|
|
lineStyle: {color: '#1EFFFF' // 这里同时设置线头的颜色
|
|
|
}
|
|
|
}
|
|
|
- },
|
|
|
+ },
|
|
|
});
|
|
|
v_series.push({name:"B组稼动率",type:'line',smooth: true, //symbol: 'none',
|
|
|
data:week_befficiency,itemStyle: {
|
|
|
@@ -868,7 +868,7 @@
|
|
|
lineStyle: {color: '#295589' // 这里同时设置线头的颜色
|
|
|
}
|
|
|
}
|
|
|
- },
|
|
|
+ },
|
|
|
});
|
|
|
var opt={
|
|
|
title: {
|
|
|
@@ -889,13 +889,13 @@
|
|
|
inactiveColor:"#04417A",
|
|
|
data:"",
|
|
|
textStyle:{color:"#fff"},
|
|
|
- top:"5",
|
|
|
+ top:"5",
|
|
|
},
|
|
|
grid: {
|
|
|
left: '3%',
|
|
|
right: '1%',
|
|
|
- bottom: '0',
|
|
|
- top:'25%',
|
|
|
+ bottom: '0',
|
|
|
+ top:'25%',
|
|
|
containLabel: true
|
|
|
},
|
|
|
xAxis: {
|
|
|
@@ -954,7 +954,7 @@
|
|
|
lineStyle: {color: '#F0F275' // 这里同时设置线头的颜色
|
|
|
}
|
|
|
}
|
|
|
- },
|
|
|
+ },
|
|
|
});
|
|
|
v_series.push({name:"A组重量",type:'bar',stack:'1',smooth: true, //symbol: 'none',
|
|
|
data:week_aefficiency,itemStyle: {
|
|
|
@@ -962,8 +962,8 @@
|
|
|
lineStyle: {color: '#1EFFFF' // 这里同时设置线头的颜色
|
|
|
}
|
|
|
}
|
|
|
- },
|
|
|
- barWidth:"15",
|
|
|
+ },
|
|
|
+ barWidth:"15",
|
|
|
itemStyle: {
|
|
|
color: new echarts.graphic.LinearGradient(
|
|
|
0, 0, 0, 1, // 这四个参数分别表示渐变的起点 (x1, y1) 与终点 (x2, y2)
|
|
|
@@ -972,7 +972,7 @@
|
|
|
{offset: 1, color: '#1D7777'} // 100% 处的颜色
|
|
|
]
|
|
|
)
|
|
|
- }
|
|
|
+ }
|
|
|
});
|
|
|
v_series.push({name:"B组重量",type:'bar',stack:'1',smooth: true, //symbol: 'none',
|
|
|
data:week_befficiency,itemStyle: {
|
|
|
@@ -980,8 +980,8 @@
|
|
|
lineStyle: {color: '#295589' // 这里同时设置线头的颜色
|
|
|
}
|
|
|
}
|
|
|
- },
|
|
|
- barWidth:"15",
|
|
|
+ },
|
|
|
+ barWidth:"15",
|
|
|
itemStyle: {
|
|
|
barBorderRadius: [3,3,0,0,],
|
|
|
color: new echarts.graphic.LinearGradient(
|
|
|
@@ -991,7 +991,7 @@
|
|
|
{offset: 1, color: '#2B5A7C'} // 100% 处的颜色
|
|
|
]
|
|
|
)
|
|
|
- }
|
|
|
+ }
|
|
|
});
|
|
|
var opt={
|
|
|
title: {
|
|
|
@@ -1012,7 +1012,7 @@
|
|
|
inactiveColor:"#04417A",
|
|
|
data:"",
|
|
|
textStyle:{color:"#fff"},
|
|
|
- top:"5",
|
|
|
+ top:"5",
|
|
|
},
|
|
|
tooltip: {
|
|
|
trigger: 'axis',
|
|
|
@@ -1039,8 +1039,8 @@
|
|
|
grid: {
|
|
|
left: '3%',
|
|
|
right: '1%',
|
|
|
- bottom: '0',
|
|
|
- top:'25%',
|
|
|
+ bottom: '0',
|
|
|
+ top:'25%',
|
|
|
containLabel: true
|
|
|
},
|
|
|
xAxis: {
|
|
|
@@ -1099,7 +1099,7 @@
|
|
|
lineStyle: {color: '#F0F275' // 这里同时设置线头的颜色
|
|
|
}
|
|
|
}
|
|
|
- },
|
|
|
+ },
|
|
|
});
|
|
|
v_series.push({name:"A组电量",type:'line',smooth: true, //symbol: 'none',
|
|
|
data:week_aefficiency,itemStyle: {
|
|
|
@@ -1107,7 +1107,7 @@
|
|
|
lineStyle: {color: '#1EFFFF' // 这里同时设置线头的颜色
|
|
|
}
|
|
|
}
|
|
|
- },
|
|
|
+ },
|
|
|
});
|
|
|
v_series.push({name:"B组电量",type:'line',smooth: true, //symbol: 'none',
|
|
|
data:week_befficiency,itemStyle: {
|
|
|
@@ -1115,7 +1115,7 @@
|
|
|
lineStyle: {color: '#295589' // 这里同时设置线头的颜色
|
|
|
}
|
|
|
}
|
|
|
- },
|
|
|
+ },
|
|
|
});
|
|
|
var opt={
|
|
|
title: {
|
|
|
@@ -1136,13 +1136,13 @@
|
|
|
inactiveColor:"#04417A",
|
|
|
data:"",
|
|
|
textStyle:{color:"#fff"},
|
|
|
- top:"5",
|
|
|
+ top:"5",
|
|
|
},
|
|
|
grid: {
|
|
|
left: '3%',
|
|
|
right: '1%',
|
|
|
- bottom: '0',
|
|
|
- top:'25%',
|
|
|
+ bottom: '0',
|
|
|
+ top:'25%',
|
|
|
containLabel: true
|
|
|
},
|
|
|
xAxis: {
|
|
|
@@ -1178,7 +1178,7 @@
|
|
|
}
|
|
|
$(document).ready(function(){
|
|
|
$("#dev_stop").css("top",($("#dev_alarm").offset().top*1+$("#dev_alarm").height()+15)+"px");
|
|
|
- $("#search input:eq(0)").off().on('keypress',function(e){
|
|
|
+ $("#search input:eq(0)").off().on('keypress',function(e){
|
|
|
if(e.keyCode==13){
|
|
|
search()
|
|
|
}
|
|
|
@@ -1195,9 +1195,9 @@
|
|
|
$("#imp_item>div").on('click',function(){
|
|
|
//导出数据
|
|
|
var code = $(this).attr("itemcode")
|
|
|
- window.open(SERVER_URL+"/api/export/"+code)
|
|
|
+ window.open(SERVER_URL+"/export/"+code)
|
|
|
})
|
|
|
- $("#autoplayer_btn").off().on('click',function(){
|
|
|
+ $("#autoplayer_btn").off().on('click',function(){
|
|
|
var img=$(this).find("img");
|
|
|
AutoPlayer=!AutoPlayer
|
|
|
if(AutoPlayer){
|
|
|
@@ -1213,10 +1213,10 @@
|
|
|
try{
|
|
|
player.Native.CameraAnimation.stop();
|
|
|
}catch(e){}
|
|
|
- }
|
|
|
+ }
|
|
|
})
|
|
|
function GetData(){
|
|
|
- $.getJSON(SERVER_URL+"/api/index",{},function(res){
|
|
|
+ $.getJSON(SERVER_URL+"/index",{},function(res){
|
|
|
setTimeout(function(){
|
|
|
//每60秒主动查询一次数据
|
|
|
GetData()
|
|
|
@@ -1225,8 +1225,6 @@
|
|
|
return
|
|
|
}
|
|
|
var jsondata=res.data;
|
|
|
- DataFill.DevInfo(jsondata.device)
|
|
|
- DataFill.AlarmTable(jsondata.alarm)
|
|
|
DataFill.AlarmLine(jsondata.weekData)
|
|
|
DataFill.StopLine(jsondata.weekData)
|
|
|
DataFill.LoadSCXL(jsondata.efficiency)
|
|
|
@@ -1237,12 +1235,29 @@
|
|
|
}
|
|
|
//获取数据
|
|
|
GetData();
|
|
|
- });
|
|
|
+
|
|
|
+ function GetAlarmData(){
|
|
|
+ $.getJSON(SERVER_URL+"/alarm",{},function(res){
|
|
|
+ setTimeout(function(){
|
|
|
+ //每10秒主动查询一次数据
|
|
|
+ GetAlarmData()
|
|
|
+ },10000);
|
|
|
+ if(res==null || res.code!=0){
|
|
|
+ return
|
|
|
+ }
|
|
|
+ var jsondata=res.data;
|
|
|
+ DataFill.DevInfo(jsondata.device)
|
|
|
+ DataFill.AlarmTable(jsondata.alarm)
|
|
|
+ })
|
|
|
+ }
|
|
|
+ //获取数据
|
|
|
+ GetAlarmData();
|
|
|
+ });
|
|
|
//最佳视图
|
|
|
function backMasterView(){
|
|
|
player.Native.Camera.moveTo([-60.91624261330108, -39.68511717426356, 85.99570940739352],[-61.26059834308166, -0.225858934410347, -0.5930273740619612],[-0.007940809332449061, 0.9099266223396253, 0.41469324265623975],1);
|
|
|
- }
|
|
|
-
|
|
|
+ }
|
|
|
+
|
|
|
//1.创建RemotePlayer对象
|
|
|
var player = new RemotePlayer({
|
|
|
video: document.getElementById("EngineContent"), //绑定视频标签或图片标签
|
|
|
@@ -1285,15 +1300,15 @@
|
|
|
//var loadedcnt = document.getElementById("loadedcnt")
|
|
|
//var totalcnt = document.getElementById("totalcnt")
|
|
|
//totalcnt.innerText = devAllCount;
|
|
|
- //loadedcnt.innerText="0";
|
|
|
+ //loadedcnt.innerText="0";
|
|
|
var cf="data://models/ALL.pr";
|
|
|
var t2File = "data://models/T2.pr";
|
|
|
//var SamplerFile = "data://models/sampler.pr";
|
|
|
// var errStr = await PlayerUtils.call(Native.NodeProxy.openProject, "data://pprj/test/test.pprj");
|
|
|
// 加载工程模型
|
|
|
var errStr = await PlayerUtils.call(Native.Model.loadModel, "all", cf);
|
|
|
- //let cfInfo=await player.Native.Model.getInfo("all");
|
|
|
- //player.Native.NodeProxy.setNodeRotation(cfInfo.nodePtr, [0,0,90]);
|
|
|
+ //let cfInfo=await player.Native.Model.getInfo("all");
|
|
|
+ //player.Native.NodeProxy.setNodeRotation(cfInfo.nodePtr, [0,0,90]);
|
|
|
var rootItem = await player.Native.ModelTree.getRootItems()
|
|
|
var rowItems = await player.Native.ModelTree.getSubItems(rootItem[0].item)
|
|
|
for(var row =0;row<rowItems.length;row++){
|
|
|
@@ -1305,8 +1320,8 @@
|
|
|
//计算当前设备在世界坐标
|
|
|
var xyz=await player.Native.ModelTree.calcItemAabb(tmp.item)
|
|
|
var xyz2=[(xyz.aabb.max[0]+xyz.aabb.min[0])*0.5,(xyz.aabb.max[1]+xyz.aabb.min[1])*0.5,(xyz.aabb.max[2]+xyz.aabb.min[2])*0.5];
|
|
|
- // 创建设备编号标记
|
|
|
- var options = {"text":devItems[i].name.replace("C_","")+"#","visible":true,"maxLod":110,"minLod":0.1,"textColor":parseInt("0xffffffff")};
|
|
|
+ // 创建设备编号标记
|
|
|
+ var options = {"text":devItems[i].name.replace("C_","")+"#","visible":true,"maxLod":110,"minLod":0.1,"textColor":parseInt("0xffffffff")};
|
|
|
options.pos = [xyz2[0]-1.5,xyz2[1]-3,0]
|
|
|
var markPtr = await player.Native.GisMarker.create(options);
|
|
|
player.Native.GisMarker.update(markPtr, options);
|
|
|
@@ -1325,7 +1340,7 @@
|
|
|
for (var i in ANIMATION_DATA) {
|
|
|
// 添加关键帧
|
|
|
player.Native.CameraAnimation.addKeyFrames([ANIMATION_DATA[i]]);
|
|
|
- }
|
|
|
+ }
|
|
|
document.getElementById("loading").remove(true) //加载完成，移除Loading
|
|
|
document.getElementById("loading_a1").remove(true)
|
|
|
//调整视角，使其达到最佳初始效果
|
|
|
@@ -1343,7 +1358,7 @@
|
|
|
//点选背景虚化
|
|
|
player.Native.Settings.set("color.pickup.bkAlpha", "float", 0.8);
|
|
|
// 选中展示节点
|
|
|
- // sam0023 = await player.Native.ModelTree.findItemByName("CYLINDER 3 of EQUIPMENT /C1101", 0, true, 3);
|
|
|
+ // sam0023 = await player.Native.ModelTree.findItemByName("CYLINDER 3 of EQUIPMENT /C1101", 0, true, 3);
|
|
|
player.Native.Settings.set('ambientIndenty', 'float', 0.39);//初始化环境光补偿
|
|
|
player.Native.Settings.set('diffuseIntensity', 'float', 0.8);//初始化光线强度
|
|
|
player.Native.Settings.set('specularIntensity', 'float', 0.64);//初始化高光强度
|
|
|
@@ -1356,7 +1371,7 @@
|
|
|
Native.ModelTree.EventBrowseRClick.connect((event) => {
|
|
|
updateInfo("RClick", event)
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
})
|
|
|
|
|
|
async function updateSettings(object, type) {
|
|
|
@@ -1406,8 +1421,8 @@
|
|
|
}
|
|
|
//设置设置名称或者模型id的颜色
|
|
|
async function ChangeModelColor(name,color,hinttxt){
|
|
|
- var iteminfo = modelsMap[name]
|
|
|
- if(iteminfo==null) return
|
|
|
+ var iteminfo = modelsMap[name]
|
|
|
+ if(iteminfo==null) return
|
|
|
//var tmp = await player.Native.ModelTree.findItemByName(name,0,true,3);
|
|
|
if (color==null || color==""){
|
|
|
//还原
|
|
|
@@ -1417,9 +1432,9 @@
|
|
|
if(hinttxt!=null && hinttxt!=""){
|
|
|
var srcPosition = iteminfo.xyz // await player.Native.NodeProxy.getNodePosition(temp.item);
|
|
|
//console.log("posio",srcPosition)
|
|
|
- // 创建标记
|
|
|
- var imgid = await player.Native.GisMarker.loadImage("rgba:255,0,0,255");
|
|
|
- var options = {"text":hinttxt,"visible":true,"maxLod":110,"minLod":0.1,"textColor":parseInt("0xffffffff")};
|
|
|
+ // 创建标记
|
|
|
+ var imgid = await player.Native.GisMarker.loadImage("rgba:255,0,0,255");
|
|
|
+ var options = {"text":hinttxt,"visible":true,"maxLod":110,"minLod":0.1,"textColor":parseInt("0xffffffff")};
|
|
|
options.pos = [srcPosition[0]-1,srcPosition[1]-2,srcPosition[2]];
|
|
|
//options.parentNode=tmp.item;
|
|
|
options.imgId = imgid
|
|
|
@@ -1449,7 +1464,7 @@
|
|
|
return
|
|
|
}
|
|
|
var devName=null;
|
|
|
- var cnt=0;
|
|
|
+ var cnt=0;
|
|
|
var p = null;
|
|
|
while(devName==null){
|
|
|
if(cnt>5) break //最多查找5层
|
|
|
@@ -1491,7 +1506,7 @@
|
|
|
if(v==""){
|
|
|
s2.html("").hide();
|
|
|
return
|
|
|
- }
|
|
|
+ }
|
|
|
var lst=[];
|
|
|
for(var k in modelsMap){
|
|
|
if(k.indexOf(v)>-1){
|
|
|
@@ -1522,7 +1537,7 @@
|
|
|
$(this).addClass("btn_active");
|
|
|
LoadDevDetail(name,window.Device_Data,$(this).index())
|
|
|
})
|
|
|
- $.getJSON(SERVER_URL+"/api/query/"+name,{},function(res){
|
|
|
+ $.getJSON(SERVER_URL+"/query/C_"+name,{},function(res){
|
|
|
window.Device_Data = res.data
|
|
|
LoadDevDetail(name,window.Device_Data,"0")
|
|
|
})
|
|
|
@@ -1536,7 +1551,7 @@
|
|
|
}
|
|
|
//显示设备基本信息
|
|
|
async function ShowInfo(name){
|
|
|
- var se=modelsMap[name];// await player.Native.ModelTree.findItemByName(name,0,true,3);
|
|
|
+ var se=modelsMap[name];// await player.Native.ModelTree.findItemByName(name,0,true,3);
|
|
|
//选中
|
|
|
player.Native.ModelTree.setSelectItem(se.item);
|
|
|
var calcInfo = await PlayerUtils.call(player.Native.ModelTree.calcItemAabb, se.item);
|
|
|
@@ -1544,7 +1559,7 @@
|
|
|
name = name.replace("C_","")
|
|
|
$("#showinfo .title .text").html(name+"#经编机-基本信息")
|
|
|
$("#showinfo").show();
|
|
|
- $.getJSON(SERVER_URL+"/api/query/"+name,{},function(res){
|
|
|
+ $.getJSON(SERVER_URL+"/query/C_"+name,{},function(res){
|
|
|
LoadDevBaseData(res.data.data)
|
|
|
})
|
|
|
}
|
|
|
@@ -1610,7 +1625,7 @@
|
|
|
color: '#F0F27560' // 这里同时设置线头的颜色
|
|
|
}
|
|
|
}
|
|
|
- },
|
|
|
+ },
|
|
|
});
|
|
|
var opt={
|
|
|
title: {
|
|
|
@@ -1636,8 +1651,8 @@
|
|
|
grid: {
|
|
|
left: '1%',
|
|
|
right: '1%',
|
|
|
- bottom: '2%',
|
|
|
- top:'5%',
|
|
|
+ bottom: '2%',
|
|
|
+ top:'5%',
|
|
|
containLabel: true
|
|
|
},
|
|
|
xAxis: {
|
|
|
@@ -1670,7 +1685,7 @@
|
|
|
var echartsEle = echarts.init(t[0]);
|
|
|
echartsEle.setOption(opt);
|
|
|
}
|
|
|
- //当前告警数据加载
|
|
|
+ //当前告警数据加载
|
|
|
if(DataFill.AlarmData==null || DataFill.AlarmData.length==0){
|
|
|
$(".newwin .dataContent .no_alarm").show();
|
|
|
$(".newwin .dataContent .has_alarm").hide();
|
|
|
@@ -1678,7 +1693,7 @@
|
|
|
}
|
|
|
var t1 = [];
|
|
|
for (var i = 0; i < DataFill.AlarmData.length; i++) {
|
|
|
- if(DataFill.AlarmData[i].code==name){
|
|
|
+ if(DataFill.AlarmData[i].code=='C_'+name){
|
|
|
t1.push(DataFill.AlarmType[DataFill.AlarmData[i].type])
|
|
|
}
|
|
|
}
|
|
|
@@ -1691,7 +1706,7 @@
|
|
|
var a1=$(".newwin .dataContent .has_alarm").show().html("");
|
|
|
for (var i = 0; i < t1.length; i++) {
|
|
|
a1.append('<span class="alarm_span"><img src="image/alarm_icon.png" style="vertical-align: middle;"><b>'+t1[i]+'</b></span>')
|
|
|
- }
|
|
|
+ }
|
|
|
}else{
|
|
|
t.find(".value").each(function(){
|
|
|
var th=$(this), attrname=th.attr("attr"),unit=th.attr("unit"),v=data.data[attrname];
|
|
|
@@ -1706,4 +1721,4 @@
|
|
|
</script>
|
|
|
<style type="text/css">
|
|
|
|
|
|
-</script>
|
|
|
+</script>
|
