修改一个null值错误

src/pages/components/In02.vue

@@ -650,7 +650,7 @@ export default {
                             //设备已接入
                             if (OFFLINE_DEVS[devcode] != null) {
                                 ChangeModelColor(devcode); //恢复原颜色
-                                ChangeModelAlarmState2(devcode);//"00ff00"
+                                //ChangeModelAlarmState2(devcode);//"00ff00"
                                 OFFLINE_DEVS[devcode] = null;
                                 console.log('设备上线：', devcode)
                             }
@@ -658,7 +658,7 @@ export default {
                             if (OFFLINE_DEVS[devcode] == null) {
                                 //设备未接入
                                 ChangeModelColor(devcode, DEV_OFFLINE_COLOR);
-                                ChangeModelAlarmState2(devcode);
+                                //ChangeModelAlarmState2(devcode);
                                 OFFLINE_DEVS[devcode] = 1
                                 console.log('离线设备：',devcode)
                             }
@@ -678,6 +678,7 @@ export default {
                     res.data.detail.map(item=>{ 
                         DiffStatusDevList.value[item.device] = item;
                     });
+                    //console.log('设备变化列表：',DiffStatusDevList.value)
                     if(StopDevList.value!=null && StopDevList.value.length>0){
                         //找出状态有变化的设备
                         for(var i=0;i<StopDevList.value.length;i++){
@@ -689,17 +690,18 @@ export default {
                                 delete DiffStatusDevList.value[item.device];
                             }
                         }
-                    }
+                    } 
                     for(var k in DiffStatusDevList.value){                         
                         let item = DiffStatusDevList.value[k];
                         //状态=0的显示生产中  蓝色，其他停机显示红色
                         let devIten=modelsMap["C_"+item.device]||modelsMap["D_"+item.device];
                         if(devIten==null) continue
+                        //console.log(item.device,'设备状态变化：',devIten)
                         if(player!=null && player.Native!=null)player.Native.GisMarker.destroy(devIten['markPtr']);
                         let imgid = null;
                         let options = null;
-                        console.log('设备状态变化：',item.device,"====",item.device*1%2)
                         if(item.status=="0"){ 
+                            continue;
                             //正常生产态                            
                             imgid = await player.Native.GisMarker.loadImage("data://icon/qietu/tip3.png");
                             options = {
@@ -833,7 +835,7 @@ export default {
                     modelsMap[tmp.name] = {item: tmp.item, xyz: xyz2, rowno: rowItems[row].name.substr(1)}
                     //console.log(tmp.name)
                     //初始化设备状态颜色
-                    ChangeModelAlarmState2(tmp.name);
+                    //ChangeModelAlarmState2(tmp.name);
                         //创建指示灯标记
                         /*
                         var alarmColorMarker = {
@@ -865,7 +867,7 @@ export default {
                     var s = ALARM_DEVS[i].split(">")
                     //ChangeModelColor(s[0],s[1] , s[2]);
 
-                    ChangeModelAlarmState2(s[0], s[1]);
+                    //ChangeModelAlarmState2(s[0], s[1]);
                 }
                 ALARM_DEVS = [];//清除
             }
@@ -1010,7 +1012,7 @@ export default {
                 if (ty == 'NODE') p = await player.Native.NodeProxy.getNodeParent(modelsId) //节点类型的node
                 else p = await player.Native.ModelTree.getItemInfo(modelsId)
                 console.log('p:',p)
-                if (p.name != null &&p.name!=null && (p.name.substr(0, 2) == "C_")||p.name.substr(0, 2) == "D_") {
+                if (p != null &&p.name!=null && (p.name.substr(0, 2) == "C_")||p.name.substr(0, 2) == "D_") {
                     devName = p.name
                     break
                 }
@@ -1693,7 +1695,7 @@ export default {
                     if (PanAlarm[devcode] == null) {
                         //还原设备状态
                         ChangeModelColor(devcode);
-                        ChangeModelAlarmState2(devcode); //"00ff00" 绿色
+                        //ChangeModelAlarmState2(devcode); //"00ff00" 绿色
                     }
                 }
                 return
@@ -1710,7 +1712,7 @@ export default {
                 var typeName = AlarmType[alarmInfo];
                 if (typeName.indexOf("故障") > -1 || typeName.indexOf("掉线") > -1) color = "rgb(195,70,76)" //红色提醒
                 alarmDev[devcode]={color:color,devcode:devcode.replace(/C_/g, "").replace(/D_/g, ""),devcode_all:devcode,typename:typeName,type:alarmInfo};
-                ChangeModelAlarmState2(devcode,AlarmColorTypeCode[alarmInfo]); //"00ff00" 绿色
+                //ChangeModelAlarmState2(devcode,AlarmColorTypeCode[alarmInfo]); //"00ff00" 绿色
                 //lst.push(tpl.replace(/\{1\}/gi, devcode.replace(/C_/g, "")).replace(/\{2\}/g, typeName).replace('{COLOR}', color))
             }
             alarmDevList.value = alarmDev;
@@ -1727,7 +1729,7 @@ export default {
                             if (MODEL_LOADED == 1) {
                                 //机器告警提示
                                 //ChangeModelColor(devcode, DEV_ALAR_COLOR, typeName)
-                                ChangeModelAlarmState2(devcode, AlarmColorTypeCode[alarmInfo]);
+                                //ChangeModelAlarmState2(devcode, AlarmColorTypeCode[alarmInfo]);
                             } else {
                                 //记录下来，等待模型加载完成时处理
                                 //ALARM_DEVS.push(devcode + ">"+DEV_ALAR_COLOR+">" + typeName)
@@ -1772,7 +1774,7 @@ export default {
                     if(LastAlarmDevs[noAlarmDevs[i]]==null) continue;
                     //还原设备的无告警状态
                     ChangeModelColor(noAlarmDevs[i])
-                    ChangeModelAlarmState2(noAlarmDevs[i]) //00ff00
+                    //ChangeModelAlarmState2(noAlarmDevs[i]) //00ff00
                 }
             }
         }