3d图片更新

src/consts/imgStatic.js

@@ -89,6 +89,7 @@ export default {
 
   biz: {
     shmMap: require('./../assets/situation/background-shm.png'),
+    snMap: require('./../assets/situation/background-sn.png'),
     ynMap: require('./../assets/situation/background-yn.png')
   },
 

src/view/bizview/situation/riskAssessment/SituationMap.js

@@ -7,9 +7,16 @@ import * as endConf from 'amos-processor/lib/config/endconf';
 import ynSitMap from './datas/yn/sit-map';
 import ynInfo from './datas/yn/info';
 import ynText from './datas/yn/text';
+
 import shmSitMap from './datas/shm/sit-map';
 import shmInfo from './datas/shm/info';
 import shmText from './datas/shm/text';
+
+import snSitMap from './datas/sn/sit-map';
+import snInfo from './datas/sn/info';
+import snText from './datas/sn/text';
+
+
 import SysWsURL, { completeToken } from './../../../../consts/wsUrlConsts';
 import imgStatic from './../../../../consts/imgStatic';
 import { eventTopics, rulesDataFactory } from './../../../3dview/consts';
@@ -21,15 +28,77 @@ const colorEnum = { '0': 'initial', '1': 'one',  '2': 'two', '3': 'three', '4':
 const AmosConfig = endConf.AmosConfig;
 const projectName = AmosConfig.riskDynamicChart.projectName;
 
-import shmText from `./datas/${projectName}/text`;
 const riskSourceIdMap = AmosConfig.riskDynamicChart.riskSourceIdMap;
-const imgWidth = projectName==='shm'?988:1009;
-const imgHeight = projectName==='shm'?519:568;
-const imgTranslate = projectName==='shm'?'translate(0 27.13)':'translate(0 9.13)';
-const info = projectName==='shm'?shmInfo:ynInfo;
-const sitMap = projectName==='shm'?shmSitMap:ynSitMap;
-const text = projectName==='shm'?shmText:ynText;
-const imgUrl = projectName==='shm'?imgStatic.biz.shmMap:imgStatic.biz.ynMap;
+
+let imgWidth = 988;
+let imgHeight = 519;
+let imgTranslate = 'translate(0 27.13)';
+
+
+let info = '';
+let sitMap = '';
+let text = '';
+let imgUrl =imgStatic.biz.shmMap;
+switch(projectName) {
+  case 'sn':
+       imgWidth = 988;
+       imgHeight = 419;
+       imgTranslate = 'translate(0 27.13)';
+       info = snInfo;
+       sitMap = snSitMap;
+       text = snText;
+       imgUrl =imgStatic.biz.snMap;
+     break;
+  case 'shm':
+      imgWidth = 988;
+      imgHeight = 519;
+      imgTranslate = 'translate(0 27.13)';
+      info = shmInfo;
+      sitMap = shmSitMap;
+      text = shmText;
+      imgUrl =imgStatic.biz.shmMap;
+     break;
+  case 'yn':
+      imgWidth = 988;
+      imgHeight = 519;
+      imgTranslate = 'translate(0 27.13)';
+      info = ynInfo;
+      sitMap = ynSitMap;
+      text = ynText;
+      imgUrl =imgStatic.biz.ynMap;
+  break;
+  default:
+      imgWidth = 988;
+      imgHeight = 519;
+      imgTranslate = 'translate(0 27.13)';
+      info = '';
+      sitMap = '';
+      text = '';
+      imgUrl =imgStatic.biz.shmMap;
+}
+
+
+
+
+// const imgWidth = projectName==='shm'?988:1009;
+// const imgHeight = projectName==='shm'?519:568;
+// const imgTranslate = projectName==='shm'?'translate(0 27.13)':'translate(0 9.13)';
+
+// const imgWidth = projectName==='sn'?988:1009;
+// const imgHeight = projectName==='sn'?519:568;
+// const imgTranslate = projectName==='sn'?'translate(0 27.13)':'translate(0 9.13)';
+
+// const info = projectName==='sn'?snInfo:ynInfo;
+// const sitMap = projectName==='sn'?snSitMap:ynSitMap;
+// const text = projectName==='sn'?snText:ynText;
+// const imgUrl = projectName==='sn'?imgStatic.biz.snMap:imgStatic.biz.ynMap;
+
+// const info = projectName==='shm'?shmInfo:ynInfo;
+// const sitMap = projectName==='shm'?shmSitMap:ynSitMap;
+// const text = projectName==='shm'?shmText:ynText;
+// const imgUrl = projectName==='shm'?imgStatic.biz.shmMap:imgStatic.biz.ynMap;
+
+
 /**
  * 态势图
  * @desciption created by af sinppets

threeres/models/sn/index.json

@@ -12,6 +12,9 @@
 	  { "objName": "ground_02.obj", "mtlName": "ground_02.mtl", "modelLevel": "Park"},
     { "objName": "guandao_02.obj", "mtlName": "guandao_02.mtl", "modelLevel": "Park" },
     
+    { "objName": "gis.obj", "mtlName": "gis.mtl", "modelLevel": "Building" },
+    { "objName": "gis_guandao.obj", "mtlName": "gis_guandao.mtl", "modelLevel": "Building" },
+
     { "objName": "valve-hall_01.obj", "mtlName": "valve-hall_01.mtl", "modelLevel": "Building", "foreignKey": "valve-hall_01" },
     { "objName": "valve-hall_02.obj", "mtlName": "valve-hall_02.mtl", "modelLevel": "Building", "foreignKey": "valve-hall_02" },
     { "objName": "valve-hall_03.obj", "mtlName": "valve-hall_03.mtl", "modelLevel": "Building", "foreignKey": "valve-hall_03" }
@@ -83,6 +86,8 @@
     { "objName": "hlb_03.obj", "mtlName": "hlb_03.mtl", "modelLevel": "Building" },
     { "objName": "hlb_04.obj", "mtlName": "hlb_04.mtl", "modelLevel": "Building" },
 
+   
+    
     { "objName": "fkl_01.obj", "mtlName": "fkl_01.mtl", "modelLevel": "Building" },
     { "objName": "fkl_02.obj", "mtlName": "fkl_02.mtl", "modelLevel": "Building" },
     { "objName": "fklt_01.obj", "mtlName": "fklt_01.mtl", "modelLevel": "Building" },