修改告警文字颜色

增加初始化指示灯设置为绿色

main.html

@@ -1487,7 +1487,7 @@
                 var alarmInfo = alarmDev[devcode];
                 var color = "rgb(206,161,94)" //默认告警文本颜色
                 var typeName = this.AlarmType[alarmInfo];
-                if (typeName.indexOf("故障") > -1 || typeName.indexOf("停机") > -1) color = "rgb(195,70,76)" //红色提醒
+                if (typeName.indexOf("故障") > -1 || typeName.indexOf("掉线") > -1) color = "rgb(195,70,76)" //红色提醒
                 lst.push(tpl.replace(/\{1\}/gi, devcode.replace(/C_/g, "")).replace(/\{2\}/g, typeName).replace('{COLOR}', color))
             }
             t.html(lst.join(''));
@@ -2684,6 +2684,7 @@
             for (var i = 0; i < devItems.length; i++) {
                 if (devItems[i].name.length < 2 || devItems[i].name.substr(0, 2) != 'C_') continue
                 var tmp = devItems[i];// await player.Native.ModelTree.findItemByName(name,0,true,3);
+
                 //计算当前设备在世界坐标
                 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];
@@ -2701,6 +2702,8 @@
                 player.Native.GisMarker.update(markPtr, options);
                 */
                 modelsMap[tmp.name] = {item: tmp.item, xyz: xyz2, rowno: rowItems[row].name.substr(1)}
+                //初始化设备状态颜色
+                ChangeModelAlarmState2(tmp.name);
                 //创建指示灯标记
                 /*
                 var alarmColorMarker = {
@@ -2893,7 +2896,7 @@
         color = color==null ? "" : color.toUpperCase();
         var iteminfo = modelsMap[name]
         if (iteminfo == null) return
-        var t = (color=="" ||color=="00FF00"||color=="FFFFFF")?"g":(color=="FF0000"?"r":"y");
+        var t = (!color ||color=="00FF00"||color=="FFFFFF")?"g":(color=="FF0000"?"r":"y");
         var y_itemid = await player.Native.ModelTree.findItemByName(name+"Y",iteminfo.item,true,1)
         var g_itemid = await player.Native.ModelTree.findItemByName(name+"G",iteminfo.item,true,1)
         var r_itemid = await player.Native.ModelTree.findItemByName(name+"R",iteminfo.item,true,1)
@@ -3035,8 +3038,6 @@
         //选中
         player.Native.ModelTree.setSelectItem(se.item);
         var calcInfo = await PlayerUtils.call(player.Native.ModelTree.calcItemAabb, se.item);
-        console.log(se.item)
-        console.log([calcInfo.localAabb.min, calcInfo.localAabb.max])
         //调整目标对象的视角和角度
         if(se.rowno%2==0){
             // 面索引，0表示不定位视角，可设置一个面，也可设置两个或三个面进行组合