|
@@ -1202,7 +1202,7 @@
|
|
|
<div id="maogaoWin" class="showinfo">
|
|
|
<div class="title">
|
|
|
<img src="image/title_icon.png" style="margin: 7px;float: left;">
|
|
|
- <span class="text">毛高占比</span>
|
|
|
+ <span class="text">生产工艺总览</span>
|
|
|
<img src="image/Close.png" style="margin: 7px;float: right;cursor: pointer;" onclick="$('#maogaoWin').hide()">
|
|
|
</div>
|
|
|
<div class="content">
|
|
@@ -1231,7 +1231,7 @@
|
|
|
<div id="maogaoDetailWin" class="newwin">
|
|
|
<div class="title">
|
|
|
<img src="image/title_icon.png" style="margin: 7px;float: left;">
|
|
|
- <span class="text">毛高占比详情</span>
|
|
|
+ <span class="text">生产工艺详情</span>
|
|
|
<img src="image/Close.png" style="margin: 7px;float: right;cursor: pointer;" onclick="$('#maogaoDetailWin').hide()">
|
|
|
</div>
|
|
|
<div class="content">
|
|
@@ -1270,7 +1270,7 @@
|
|
|
</table>
|
|
|
</div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
+ </div>
|
|
|
</body>
|
|
|
<script type="text/html" id="maogodetail_tpl">
|
|
|
{{each data}}
|
|
@@ -1288,8 +1288,8 @@
|
|
|
<td width="60">{{$value.formula_data_4}}</td>
|
|
|
<td width="60">{{$value.formula_data_5}}</td>
|
|
|
<td width="60">{{$value.formula_data_6}}</td>
|
|
|
- </tr>
|
|
|
- {{/each}}
|
|
|
+ </tr>
|
|
|
+ {{/each}}
|
|
|
</script>
|
|
|
</html>
|
|
|
<!-- 引入qwebchannel.js、Player.js、PlayerUtils.js -->
|
|
@@ -1382,8 +1382,8 @@
|
|
|
$("#dev_alarm .content").hide();
|
|
|
$("#dev_alarm .title").html("当前无告警");
|
|
|
for(var devcode in modelsMap){
|
|
|
- this.LastAlarmDevs[devcode] = null;
|
|
|
- if(this.PanAlarm[devcode]==null){
|
|
|
+ this.LastAlarmDevs[devcode] = null;
|
|
|
+ if(this.PanAlarm[devcode]==null){
|
|
|
//还原设备状态
|
|
|
ChangeModelColor(devcode);
|
|
|
}
|
|
@@ -1426,7 +1426,7 @@
|
|
|
this.LastAlarmDevs[devcode]=null;
|
|
|
}
|
|
|
}
|
|
|
- if(noAlarmDevs.length>0){
|
|
|
+ if(noAlarmDevs.length>0){
|
|
|
for (var i = 0; i < noAlarmDevs.length; i++) {
|
|
|
ChangeModelColor(noAlarmDevs[i]) //还原设备的无告警状态
|
|
|
}
|
|
@@ -2056,7 +2056,7 @@
|
|
|
} else {
|
|
|
//记录下来,等待模型加载完成时处理
|
|
|
ALARM_DEVS.push(devCode + ">"+this.AlarmType["1000"])
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
is20=true
|
|
|
this.PanAlarm[devCode]=20
|
|
@@ -2091,7 +2091,7 @@
|
|
|
continue
|
|
|
}
|
|
|
this.PanAlarm[devCode]=null;
|
|
|
- if (MODEL_LOADED == 1) {
|
|
|
+ if (MODEL_LOADED == 1) {
|
|
|
//盘头剩余比例正常,隐藏提示标签
|
|
|
ChangeModelColor(devCode)
|
|
|
}
|
|
@@ -2249,7 +2249,7 @@
|
|
|
$("#maogaoDetailWin").attr("maogao",v).show();
|
|
|
}
|
|
|
})
|
|
|
-
|
|
|
+
|
|
|
})
|
|
|
})
|
|
|
})
|
|
@@ -2561,7 +2561,7 @@
|
|
|
}else{
|
|
|
var markPtr = await player.Native.GisMarker.create(options);
|
|
|
await player.Native.GisMarker.update(markPtr, options);
|
|
|
- MarkerMap[name] = markPtr;
|
|
|
+ MarkerMap[name] = markPtr;
|
|
|
}
|
|
|
}else{
|
|
|
await player.Native.GisMarker.update(MarkerMap[name],{"visible":false});
|