海南站三维元素添加

package.json

@@ -36,7 +36,7 @@
     "amos-gojs": "^2.0.15",
     "amos-icon": "^1.0.3",
     "amos-pluggable": "^1.0.6",
-    "amos-processor": "^1.2.17",
+    "amos-processor": "^2.x",
     "amos-richtext": "^1.0.1",
     "amos-rules-config": "^1.0.4",
     "amos-security": "^2.0.19",

src/routes/view.js

@@ -52,7 +52,7 @@ import DifferentiateView from './../view/bizview/intelligentDifferentiate/Differ
 import AlarmVideoMonitor from './../view/bizview/alarmVideoMonitor';
 import alarmTestView from './../view/bizview/alarm';
 import CusVizLib from './../view/planMgmt/cusVizLib';
-import RealTimeMonitor from './../view/morphic';
+// import RealTimeMonitor from './../view/morphic';组态监控屏功能，组态升级暂时有问题。
 import PublishView from './../view/planMgmt/view';
 import LeaderStruct from './../view/planMgmt/view/leaderStruct';
 import Graph3DModel from 'amos-iot-3dgraph/lib/view/modelMgmt';
@@ -86,7 +86,7 @@ const Routes = {
   checkdetail: CheckDetail,
   checklist: CheckList,
   task: TaskView,
-  morphic: RealTimeMonitor,
+  // morphic: RealTimeMonitor, 组态监控屏功能，组态升级暂时有问题。
 
   //设备台账
   assessment: RiskAssessment,

threeres/models/hainan/building_08.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:21.05.2020 16:25:50
+
+newmtl bai
+	Ns 31.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.7059 0.7059 0.7059
+	Kd 0.7059 0.7059 0.7059
+	Ks 0.2700 0.2700 0.2700
+	Ke 0.0000 0.0000 0.0000
+
+newmtl Material__2
+	Ns 31.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.1569 0.5216 0.5255
+	Kd 0.1569 0.5216 0.5255
+	Ks 0.2700 0.2700 0.2700
+	Ke 0.0000 0.0000 0.0000
+
+newmtl men
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5882 0.5882 0.5882
+	Kd 0.5882 0.5882 0.5882
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka men.jpg
+	map_Kd men.jpg
+
+newmtl shuini
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5882 0.5882 0.5882
+	Kd 0.5882 0.5882 0.5882
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka shuini.png
+	map_Kd shuini.png
+
+newmtl hei
+	Ns 31.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.1255 0.1255 0.1255
+	Kd 0.1255 0.1255 0.1255
+	Ks 0.2700 0.2700 0.2700
+	Ke 0.0000 0.0000 0.0000

threeres/models/hainan/index.json

@@ -9,6 +9,7 @@
 	  { "objName": "building_05.obj", "mtlName": "building_05.mtl", "modelLevel": "Building" },
     { "objName": "building_06.obj", "mtlName": "building_06.mtl", "modelLevel": "Building" },  
 	{ "objName": "building_07.obj", "mtlName": "building_07.mtl", "modelLevel": "Building" },  
+	{ "objName": "building_08.obj", "mtlName": "building_08.mtl", "modelLevel": "Building" }, 
     { "objName": "ground_01.obj", "mtlName": "ground_01.mtl", "modelLevel": "Park" },
 	  { "objName": "ground_02.obj", "mtlName": "ground_02.mtl", "modelLevel": "Park"},
     { "objName": "guandao.obj", "mtlName": "guandao.mtl", "modelLevel": "Park" },