Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer

mods/components/3dviewConvertor/threeres/marker-models/risk/fengxiandian.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:02.06.2020 14:49:09
+
+newmtl 24___Default
+	Ns 22.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 1.0000 0.0000 0.0000
+	Kd 1.0000 0.0000 0.0000
+	Ks 0.8010 0.8010 0.8010
+	Ke 0.0000 0.0000 0.0000

mods/components/3dviewConvertor/threeres/marker-models/risk/fengxiandian.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:02.06.2020 14:49:09
+
+mtllib fengxiandian.mtl
+
+#
+# object fengxiandian
+#
+
+v  0.0382 2.2800 0.1326
+v  0.0678 2.2710 0.1326
+v  0.0678 2.2710 -0.1326
+v  0.0382 2.2800 -0.1326
+v  0.0078 2.2842 0.1326
+v  0.0078 2.2842 -0.1326
+v  -0.0228 2.2837 0.1326
+v  -0.0228 2.2837 -0.1326
+v  -0.0531 2.2784 0.1326
+v  -0.0531 2.2784 -0.1326
+v  -0.0824 2.2684 0.1326
+v  -0.0824 2.2684 -0.1326
+v  -0.1101 2.2537 0.1326
+v  -0.1101 2.2537 -0.1326
+v  -0.7117 1.8848 0.1326
+v  -0.7117 1.8848 -0.1326
+v  -0.7373 1.8657 0.1326
+v  -0.7373 1.8657 -0.1326
+v  -0.7597 1.8434 0.1326
+v  -0.7597 1.8434 -0.1326
+v  -0.7785 1.8183 0.1326
+v  -0.7785 1.8183 -0.1326
+v  -0.7936 1.7909 0.1326
+v  -0.7936 1.7909 -0.1326
+v  -0.8046 1.7616 0.1326
+v  -0.8046 1.7616 -0.1326
+v  -0.8114 1.7307 0.1326
+v  -0.8114 1.7307 -0.1326
+v  -0.8137 1.6988 0.1326
+v  -0.8137 1.6988 -0.1326
+v  -0.8137 1.0746 0.1326
+v  -0.8137 1.0746 -0.1326
+v  -0.8113 1.0428 0.1326
+v  -0.8113 1.0428 -0.1326
+v  -0.8044 1.0122 0.1326
+v  -0.8044 1.0122 -0.1326
+v  -0.7932 0.9831 0.1326
+v  -0.7932 0.9831 -0.1326
+v  -0.7779 0.9560 0.1326
+v  -0.7779 0.9560 -0.1326
+v  -0.7587 0.9314 0.1326
+v  -0.7587 0.9314 -0.1326
+v  -0.7361 0.9096 0.1326
+v  -0.7361 0.9096 -0.1326
+v  -0.7101 0.8912 0.1326
+v  -0.7101 0.8912 -0.1326
+v  -0.3076 0.6488 0.1326
+v  -0.3076 0.6488 -0.1326
+v  -0.2798 0.6302 0.1326
+v  -0.2798 0.6302 -0.1326
+v  -0.2542 0.6091 0.1326
+v  -0.2542 0.6091 -0.1326
+v  -0.2309 0.5856 0.1326
+v  -0.2309 0.5856 -0.1326
+v  -0.2100 0.5601 0.1326
+v  -0.2100 0.5601 -0.1326
+v  -0.1916 0.5326 0.1326
+v  -0.1916 0.5326 -0.1326
+v  -0.1760 0.5033 0.1326
+v  -0.1760 0.5033 -0.1326
+v  -0.1632 0.4724 0.1326
+v  -0.1632 0.4724 -0.1326
+v  -0.0764 0.0583 0.1326
+v  -0.0764 0.0583 -0.1326
+v  -0.0624 0.0335 0.1326
+v  -0.0624 0.0335 -0.1326
+v  -0.0421 0.0164 0.1326
+v  -0.0421 0.0164 -0.1326
+v  -0.0180 0.0072 0.1326
+v  -0.0180 0.0072 -0.1326
+v  0.0077 0.0058 0.1326
+v  0.0077 0.0058 -0.1326
+v  0.0327 0.0126 0.1326
+v  0.0327 0.0126 -0.1326
+v  0.0546 0.0275 0.1326
+v  0.0546 0.0275 -0.1326
+v  0.0711 0.0507 0.1326
+v  0.0711 0.0507 -0.1326
+v  0.1459 0.4717 0.1326
+v  0.1459 0.4717 -0.1326
+v  0.1617 0.5015 0.1326
+v  0.1617 0.5015 -0.1326
+v  0.1798 0.5298 0.1326
+v  0.1798 0.5298 -0.1326
+v  0.2001 0.5565 0.1326
+v  0.2001 0.5565 -0.1326
+v  0.2225 0.5813 0.1326
+v  0.2225 0.5813 -0.1326
+v  0.2469 0.6043 0.1326
+v  0.2469 0.6043 -0.1326
+v  0.2732 0.6252 0.1326
+v  0.2732 0.6252 -0.1326
+v  0.3012 0.6440 0.1326
+v  0.3012 0.6440 -0.1326
+v  0.7045 0.8905 0.1326
+v  0.7045 0.8905 -0.1326
+v  0.7305 0.9091 0.1326
+v  0.7305 0.9091 -0.1326
+v  0.7532 0.9310 0.1326
+v  0.7532 0.9310 -0.1326
+v  0.7723 0.9558 0.1326
+v  0.7723 0.9558 -0.1326
+v  0.7877 0.9829 0.1326
+v  0.7877 0.9829 -0.1326
+v  0.7990 1.0121 0.1326
+v  0.7990 1.0121 -0.1326
+v  0.8061 1.0428 0.1326
+v  0.8061 1.0428 -0.1326
+v  0.8087 1.0746 0.1326
+v  0.8087 1.0746 -0.1326
+v  0.8137 1.6988 0.1326
+v  0.8137 1.6988 -0.1326
+v  0.8116 1.7305 0.1326
+v  0.8116 1.7305 -0.1326
+v  0.8048 1.7611 0.1326
+v  0.8048 1.7611 -0.1326
+v  0.7936 1.7901 0.1326
+v  0.7936 1.7901 -0.1326
+v  0.7784 1.8171 0.1326
+v  0.7784 1.8171 -0.1326
+v  0.7593 1.8416 0.1326
+v  0.7593 1.8416 -0.1326
+v  0.7365 1.8631 0.1326
+v  0.7365 1.8631 -0.1326
+v  0.7105 1.8813 0.1326
+v  0.7105 1.8813 -0.1326
+v  0.0961 2.2572 0.1326
+v  0.0961 2.2572 -0.1326
+# 128 vertices
+
+vn 0.2149 0.9766 -0.0000
+vn 0.3655 0.9308 -0.0000
+vn 0.0606 0.9982 -0.0000
+vn -0.0946 0.9955 -0.0000
+vn -0.2481 0.9687 -0.0000
+vn -0.3971 0.9178 -0.0000
+vn -0.4959 0.8684 -0.0000
+vn -0.5605 0.8282 -0.0000
+vn -0.6533 0.7571 -0.0000
+vn -0.7550 0.6558 -0.0000
+vn -0.8404 0.5419 -0.0000
+vn -0.9087 0.4175 -0.0000
+vn -0.9587 0.2843 -0.0000
+vn -0.9896 0.1442 -0.0000
+vn -0.9993 0.0362 -0.0000
+vn -0.9993 -0.0372 0.0000
+vn -0.9890 -0.1478 0.0000
+vn -0.9566 -0.2913 0.0000
+vn -0.9041 -0.4274 0.0000
+vn -0.8325 -0.5540 0.0000
+vn -0.7431 -0.6692 0.0000
+vn -0.6369 -0.7709 0.0000
+vn -0.5474 -0.8369 0.0000
+vn -0.5369 -0.8437 0.0000
+vn -0.5976 -0.8018 0.0000
+vn -0.6732 -0.7395 0.0000
+vn -0.7421 -0.6703 0.0000
+vn -0.8038 -0.5949 0.0000
+vn -0.8580 -0.5137 0.0000
+vn -0.9041 -0.4272 0.0000
+vn -0.9555 -0.2950 0.0000
+vn -0.9353 -0.3538 0.0000
+vn -0.7689 -0.6394 0.0000
+vn -0.5081 -0.8613 0.0000
+vn -0.2069 -0.9784 0.0000
+vn 0.1063 -0.9943 0.0000
+vn 0.4178 -0.9085 0.0000
+vn 0.6999 -0.7143 0.0000
+vn 0.9222 -0.3868 0.0000
+vn 0.9457 -0.3251 0.0000
+vn 0.8640 -0.5035 0.0000
+vn 0.8196 -0.5730 0.0000
+vn 0.7697 -0.6384 0.0000
+vn 0.7147 -0.6995 0.0000
+vn 0.6548 -0.7558 0.0000
+vn 0.5903 -0.8072 0.0000
+vn 0.5391 -0.8423 0.0000
+vn 0.5524 -0.8335 0.0000
+vn 0.6403 -0.7681 0.0000
+vn 0.7447 -0.6674 0.0000
+vn 0.8327 -0.5537 0.0000
+vn 0.9033 -0.4290 0.0000
+vn 0.9555 -0.2950 0.0000
+vn 0.9881 -0.1536 0.0000
+vn 0.9990 -0.0446 0.0000
+vn 0.9996 0.0298 -0.0000
+vn 0.9898 0.1424 -0.0000
+vn 0.9575 0.2884 -0.0000
+vn 0.9044 0.4268 -0.0000
+vn 0.8316 0.5553 -0.0000
+vn 0.7404 0.6721 -0.0000
+vn 0.6319 0.7750 -0.0000
+vn 0.5471 0.8370 -0.0000
+vn 0.4806 0.8770 -0.0000
+vn 0.0000 -0.0000 -1.0000
+vn -0.0000 -0.0000 -1.0000
+vn 0.0000 0.0000 -1.0000
+vn -0.0000 0.0000 -1.0000
+vn 0.0000 -0.0000 1.0000
+vn -0.0000 -0.0000 1.0000
+vn 0.0000 0.0000 1.0000
+# 71 vertex normals
+
+g fengxiandian
+usemtl 24___Default
+s 1
+f 1//1 2//2 3//2 4//1 
+s 3
+f 5//3 1//1 4//1 6//3 
+s 2
+f 7//4 5//3 6//3 8//4 
+f 9//5 7//4 8//4 10//5 
+f 11//6 9//5 10//5 12//6 
+f 13//7 11//6 12//6 14//7 
+f 15//8 13//7 14//7 16//8 
+f 17//9 15//8 16//8 18//9 
+f 19//10 17//9 18//9 20//10 
+f 21//11 19//10 20//10 22//11 
+f 23//12 21//11 22//11 24//12 
+f 25//13 23//12 24//12 26//13 
+f 27//14 25//13 26//13 28//14 
+f 29//15 27//14 28//14 30//15 
+f 31//16 29//15 30//15 32//16 
+f 33//17 31//16 32//16 34//17 
+f 35//18 33//17 34//17 36//18 
+f 37//19 35//18 36//18 38//19 
+f 39//20 37//19 38//19 40//20 
+f 41//21 39//20 40//20 42//21 
+f 43//22 41//21 42//21 44//22 
+f 45//23 43//22 44//22 46//23 
+f 47//24 45//23 46//23 48//24 
+f 49//25 47//24 48//24 50//25 
+f 51//26 49//25 50//25 52//26 
+f 53//27 51//26 52//26 54//27 
+f 55//28 53//27 54//27 56//28 
+f 57//29 55//28 56//28 58//29 
+f 59//30 57//29 58//29 60//30 
+f 61//31 59//30 60//30 62//31 
+f 63//32 61//31 62//31 64//32 
+f 65//33 63//32 64//32 66//33 
+f 67//34 65//33 66//33 68//34 
+f 69//35 67//34 68//34 70//35 
+f 71//36 69//35 70//35 72//36 
+f 73//37 71//36 72//36 74//37 
+f 75//38 73//37 74//37 76//38 
+f 77//39 75//38 76//38 78//39 
+f 79//40 77//39 78//39 80//40 
+f 81//41 79//40 80//40 82//41 
+f 83//42 81//41 82//41 84//42 
+f 85//43 83//42 84//42 86//43 
+f 87//44 85//43 86//43 88//44 
+f 89//45 87//44 88//44 90//45 
+f 91//46 89//45 90//45 92//46 
+f 93//47 91//46 92//46 94//47 
+f 95//48 93//47 94//47 96//48 
+f 97//49 95//48 96//48 98//49 
+f 99//50 97//49 98//49 100//50 
+f 101//51 99//50 100//50 102//51 
+f 103//52 101//51 102//51 104//52 
+f 105//53 103//52 104//52 106//53 
+f 107//54 105//53 106//53 108//54 
+f 109//55 107//54 108//54 110//55 
+f 111//56 109//55 110//55 112//56 
+f 113//57 111//56 112//56 114//57 
+f 115//58 113//57 114//57 116//58 
+f 117//59 115//58 116//58 118//59 
+f 119//60 117//59 118//59 120//60 
+f 121//61 119//60 120//60 122//61 
+f 123//62 121//61 122//61 124//62 
+f 125//63 123//62 124//62 126//63 
+f 127//64 125//63 126//63 128//64 
+s 3
+f 2//2 127//64 128//64 3//2 
+s 16
+f 8//65 6//65 4//65 10//65 
+f 12//65 10//65 4//65 3//65 
+f 12//65 3//65 128//65 14//65 
+f 16//65 14//65 128//65 18//65 
+f 20//65 18//65 128//65 22//65 
+f 24//65 22//65 128//65 26//65 
+f 28//65 26//65 128//65 30//65 
+f 32//65 30//65 128//65 34//65 
+f 36//65 34//65 128//65 38//65 
+f 40//65 38//65 128//65 42//65 
+f 44//65 42//65 128//65 46//66 
+f 46//66 128//65 126//66 124//66 
+f 46//66 124//66 122//66 120//66 
+f 46//66 120//66 118//66 116//66 
+f 46//66 116//66 114//66 112//66 
+f 46//66 112//66 110//66 108//66 
+f 46//66 108//66 106//66 104//66 
+f 46//66 104//66 102//66 100//66 
+f 46//66 100//66 98//66 96//66 
+f 48//66 46//66 96//66 94//66 
+f 50//66 48//66 94//66 92//66 
+f 52//66 50//66 92//66 90//66 
+f 52//66 90//66 88//66 54//66 
+f 54//66 88//66 86//66 56//66 
+f 56//66 86//66 84//66 58//66 
+f 58//66 84//66 82//66 60//66 
+f 60//66 82//66 80//66 62//66 
+f 64//67 62//66 80//66 66//67 
+f 68//67 66//67 80//66 70//67 
+f 72//68 70//67 80//66 74//68 
+f 76//68 74//68 80//66 78//68 
+f 75//69 77//69 79//70 73//69 
+f 1//71 5//71 7//71 9//71 
+f 1//71 9//71 11//71 2//71 
+f 127//71 2//71 11//71 13//71 
+f 127//71 13//71 15//71 17//71 
+f 127//71 17//71 19//71 21//71 
+f 127//71 21//71 23//71 25//71 
+f 127//71 25//71 27//71 29//71 
+f 127//71 29//71 31//71 33//71 
+f 127//71 33//71 35//71 37//71 
+f 127//71 37//71 39//71 41//71 
+f 127//71 41//71 43//71 45//71 
+f 125//71 127//71 45//71 123//71 
+f 121//71 123//71 45//71 119//71 
+f 117//71 119//71 45//71 115//71 
+f 113//71 115//71 45//71 111//71 
+f 109//71 111//71 45//71 107//71 
+f 105//71 107//71 45//71 103//71 
+f 101//71 103//71 45//71 99//71 
+f 97//71 99//71 45//71 95//71 
+f 95//71 45//71 47//71 93//71 
+f 93//71 47//71 49//71 91//71 
+f 91//71 49//71 51//71 89//71 
+f 87//71 89//71 51//71 53//71 
+f 85//71 87//71 53//71 55//71 
+f 83//71 85//71 55//71 57//71 
+f 81//71 83//71 57//71 59//71 
+f 79//70 81//71 59//71 61//70 
+f 79//70 61//70 63//70 65//70 
+f 79//70 65//70 67//70 69//70 
+f 79//70 69//70 71//69 73//69 
+# 126 polygons
+

mods/components/3dviewConvertor/view/View3D.js

@@ -1326,7 +1326,10 @@ class View3D extends Component {
 
   getExceptionAreasList = () => {
     exceptionRegionListAction().then(data=>{
-      this.setState({ exceptionAreas: data });
+      const exceptionAreas = data.filter(e=>{
+        return e.routePath && e.routePath.routePath && e.routePath.routePath.length > 0;
+      });
+      this.setState({ exceptionAreas });
     });
   }
 
@@ -1344,7 +1347,7 @@ class View3D extends Component {
     };
     return exceptionAreas.map((area,index) =>{
       const { routePath: points = [] } = area.routePath;
-      return points.length > 0 && <PolygonRegion key={area.id} {...regionConf} points={points} onCreated={e=>this.onRectCreated(e,area,index)} />;
+      return <PolygonRegion key={area.id} {...regionConf} points={points} onCreated={e=>this.onRectCreated(e,area,index)} />;
     });
   }
 

mods/components/3dviewConvertor/view/panoramic/statistical/SafetyIndex.js

@@ -7,6 +7,7 @@ import { warnController } from './conf';
 import { getIcon } from './../../../utils/request';
 
 const panoramicIcon = imgStatic.panoramicIcon;
+const colorLevel =  { 1: 'red',2: 'yellow',3: 'blue', 4: 'blue' };
 
 /**
  * 今日安全指数
@@ -82,12 +83,15 @@ export default class SafetyIndex extends Component {
             width: 5
           },
           title: {
-            show: false
+            show: true,
+            offsetCenter: ['5%','55%'],
+            color: colorLevel[safetyIndexData.level] || 'yellow',
+            fontSize: 15
           },
           detail: {
             show: false
           },
-          data: [{ value: safetyIndexData.safetyIndex, name: '今日安全指数' }]
+          data: [{ value: safetyIndexData.safetyIndex, name: safetyIndexData.safetyTips }]
         }
       ]
     }