|
@@ -1360,7 +1360,7 @@
|
|
|
"25": "卷曲伺服故障",
|
|
|
"26": "拍照自停",
|
|
|
"27": "CCD位置报警信息显示",
|
|
|
- "1000":"盘头比例低于20%",
|
|
|
+ "1000":"", //盘头比例低于20%
|
|
|
"1001":"", //盘头比例低于50%
|
|
|
},
|
|
|
//停机原因类型
|
|
@@ -1420,7 +1420,7 @@
|
|
|
ChangeModelColor(devcode, DEV_ALAR_COLOR, typeName)
|
|
|
} else {
|
|
|
//记录下来,等待模型加载完成时处理
|
|
|
- ALARM_DEVS.push(devcode + ">" + typeName)
|
|
|
+ ALARM_DEVS.push(devcode + ">"+DEV_ALAR_COLOR+">" + typeName)
|
|
|
}
|
|
|
}
|
|
|
this.LastAlarmDevs[devcode]=1;
|
|
@@ -2061,7 +2061,7 @@
|
|
|
ChangeModelColor(devCode, DEV_ALAR_COLOR, this.AlarmType["1000"])
|
|
|
} else {
|
|
|
//记录下来,等待模型加载完成时处理
|
|
|
- ALARM_DEVS.push(devCode + ">"+this.AlarmType["1000"])
|
|
|
+ ALARM_DEVS.push(devCode + ">"+DEV_ALAR_COLOR+">"+this.AlarmType["1000"])
|
|
|
}
|
|
|
}
|
|
|
is20=true
|
|
@@ -2082,10 +2082,10 @@
|
|
|
if (MODEL_LOADED == 1) {
|
|
|
//机器提醒提示
|
|
|
console.log('设备',devCode,'盘头小于50%大于20%')
|
|
|
- ChangeModelColor(devCode, DEV_HINT_COLOR, this.AlarmType["1001"])
|
|
|
+ //ChangeModelColor(devCode, DEV_HINT_COLOR, this.AlarmType["1001"])
|
|
|
} else {
|
|
|
//记录下来,等待模型加载完成时处理
|
|
|
- ALARM_DEVS.push(devCode + ">"+this.AlarmType["1001"])
|
|
|
+ //ALARM_DEVS.push(devCode + ">"+DEV_HINT_COLOR+">"+this.AlarmType["1001"])
|
|
|
}
|
|
|
}
|
|
|
is50=true
|
|
@@ -2431,7 +2431,7 @@
|
|
|
if (ALARM_DEVS.length > 0) {
|
|
|
for (var i = 0; i < ALARM_DEVS.length; i++) {
|
|
|
var s = ALARM_DEVS[i].split(">")
|
|
|
- ChangeModelColor(s[0],s[1]==''? DEV_HINT_COLOR : DEV_ALAR_COLOR, s[1]);
|
|
|
+ ChangeModelColor(s[0],s[1] , s[2]);
|
|
|
}
|
|
|
ALARM_DEVS = [];//清除
|
|
|
}
|
|
@@ -2743,11 +2743,18 @@
|
|
|
//盘头剩余比例
|
|
|
tb = t.find("table:eq(3)>tbody>tr:eq(2)");
|
|
|
var paninfo = DataFill.Pan[devno]
|
|
|
- tb.find("td:eq(0)").html(paninfo!=null?paninfo[0]:"-");
|
|
|
- tb.find("td:eq(1)").html(paninfo!=null?paninfo[1]:"-");
|
|
|
- tb.find("td:eq(2)").html(paninfo!=null?paninfo[2]:"-");
|
|
|
- tb.find("td:eq(3)").html(paninfo!=null?paninfo[3]:"-");
|
|
|
- tb.find("td:eq(4)").html(paninfo!=null?paninfo[4]:"-");
|
|
|
+ for (var i = 0; i < 5; i++) {
|
|
|
+ var v = paninfo!=null?paninfo[i]:"-";
|
|
|
+ tb.find("td:eq("+i+")").html(v).css("color",getPantaoColor(v));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ function getPantaoColor(v){
|
|
|
+ if(v==null || v=="-") return "";
|
|
|
+ v=v*1;
|
|
|
+ if(v<20) return "#"+DEV_ALAR_COLOR;
|
|
|
+ else if(v<50) return "#"+DEV_HINT_COLOR;
|
|
|
+ return "";
|
|
|
}
|
|
|
|
|
|
function LoadDevDetail(name, data, typecode) {
|