添加大经编机

src/pages/components/In02.vue

@@ -634,7 +634,7 @@ export default {
             var lst = [];
             for (var k in modelsMap) {
                 if (k.indexOf(seachValue.value) > -1) {
-                    lst.push({"code":k,"name":k.replace("C_", "")});
+                    lst.push({"code":k,"name":k.replace("C_", "小经编机").replace("D_", "大经编机")});
                 }
             }
             search_result_list.value = lst;
@@ -687,10 +687,10 @@ export default {
             }
             var rowItems = await player.Native.ModelTree.getSubItems(rootObj.item)
             for (var row = 0; row < rowItems.length; row++) {
-                if (rowItems[row].name.length < 2 || rowItems[row].name.substr(0, 1) != "R") continue;
+                if (rowItems[row].name.length < 2 || (rowItems[row].name.substr(0, 1) != "R" && rowItems[row].name.substr(0, 1) != "D")) continue;
                 var devItems = await player.Native.ModelTree.getSubItems(rowItems[row].item)
                 for (var i = 0; i < devItems.length; i++) {
-                    if (devItems[i].name.length < 2 || devItems[i].name.substr(0, 2) != 'C_') continue
+                    if (devItems[i].name.length < 2 || (devItems[i].name.substr(0, 2) != 'C_' && devItems[i].name.substr(0, 2) != 'D_')) continue
                     var tmp = devItems[i];// await player.Native.ModelTree.findItemByName(name,0,true,3);
 
                     //计算当前设备在世界坐标
@@ -729,6 +729,7 @@ export default {
                         */
                 }
             }
+            //console.log(modelsMap)
             clearTimeout(dataTimer1);
             clearTimeout(dataTimer2);
             clearTimeout(dataTimer3);
@@ -877,7 +878,7 @@ export default {
                 if (cnt > 5) break //最多查找5层
                 if (ty == 'NODE') p = await player.Native.NodeProxy.getNodeParent(modelsId) //节点类型的node
                 else p = await player.Native.ModelTree.getItemInfo(modelsId)
-                if (p.name != null && p.name.substr(0, 2) == "C_") {
+                if (p.name != null && (p.name.substr(0, 2) == "C_")||p.name.substr(0, 2) == "D_") {
                     devName = p.name
                     break
                 }
@@ -926,13 +927,13 @@ export default {
                 //backMasterView();
                 player.Native.Camera.moveToAabbWithDistance([calcInfo.localAabb.min, [calcInfo.localAabb.max[0],calcInfo.localAabb.max[1],calcInfo.localAabb.max[2]-1]], 0.2, 5, 0.5);
             }
-            emit('OpenIframeWin',{class:'newwin deviceInfoWin',src:'/in02-device-info#'+name,title:name+'基本信息'})
+            emit('OpenIframeWin',{class:'newwin deviceInfoWin',src:'/in02-device-info#'+name,title:name.replace('C_','小经编机').replace('D_','大经编机')+'#基本信息'})
             //player.Native.Camera.moveToAabbWithDistance([calcInfo.localAabb.min, calcInfo.localAabb.max], 0.2, 21, 4);
           }
         //打开单设备窗口
         function OpenWin(name) {
             if (LastClickObj != null && name != LastClickObj) return;
-            emit('OpenIframeWin',{class:'newwin',src:'/in02-device-peifang#'+name,title:name+'详细信息'})
+            emit('OpenIframeWin',{class:'newwin',src:'/in02-device-peifang#'+name,title:name.replace('C_','小经编机').replace('D_','大经编机')+'#详细信息'})
         }
 
         function AlarmLine (data) {
@@ -1576,7 +1577,7 @@ export default {
                 var color = "rgb(206,161,94)" //默认告警文本颜色
                 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, ""),typename:typeName,type:alarmInfo};
+                alarmDev[devcode]={color:color,devcode:devcode.replace(/C_/g, ""),devcode_all:devcode,typename:typeName,type:alarmInfo};
                 ChangeModelAlarmState2(devcode,AlarmColorTypeCode[alarmInfo]); //"00ff00" 绿色
                 //lst.push(tpl.replace(/\{1\}/gi, devcode.replace(/C_/g, "")).replace(/\{2\}/g, typeName).replace('{COLOR}', color))
             }
@@ -1644,10 +1645,9 @@ export default {
             }
         }
         function clickalarmtr(item){
-            var devno = item.devcode;
+            var devno = item.devcode_all;
             if (devno == '') return;
-            let name="C_" + devno;
-            ShowInfo(name);
+            ShowInfo(devno);
         }
 
         function openStopView(){