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

mods/components/3dviewConvertor/consts/imgStatic.js

@@ -127,7 +127,7 @@ export default {
     shmMap: require('../assets/convertor/situation/background-shm.png'),
     snMap: require('../assets/convertor/situation/background-sn.png'),
     ynMap: require('../assets/convertor/situation/background-yn.png'),
-    // hainanMap: require('../assets/convertor/situation/background-hainan.png')
+    hainanMap: require('../assets/convertor/situation/background-hainan.png')
   },
 
   region: {

mods/components/3dviewConvertor/consts/urlConsts.js

@@ -19,12 +19,12 @@ export const FscSerUrl = {
   view3dInitUrl: completePrefix(view3dURI, 'api/view3d/init3dViewNode?type={type}&riskSourceId={riskSourceId}'), // 初始化三维视图 get
   view3dInitLinkUrl: completePrefix(view3dURI, 'view3d/initViewLink'), // 初始化三维视图 获取link get
   searchRegionListUrl: completePrefix(patrolURI, 'api/group/queryDept'), //右侧菜单-检索-区域集合
-  searchViewUrl: completePrefix(view3dURI, 'api/view3d/retrieve/all?inputText={inputText}&dataLevel={dataLevel}&orgCode={orgCode}&nodeState={nodeState}&type={type}&current={page}&pageSize={pageSize}&routeName={routeName}&protectObjName={protectObjName}'), // 右侧菜单-检索
+  searchViewUrl: completePrefix(view3dURI, 'api/view3d/retrieve/all'), // 右侧菜单-检索
   searchLinkUrl: completePrefix(view3dURI, 'view3d/link/searchView?linkId={linkId}'), // 根据单条巡检线 检索节点与线路 get
   monitorRegionListUrl: completePrefix(view3dURI, 'monitorRegionListUrl'), //右侧菜单-监控-区域集合
   monitorUrl: completePrefix(view3dURI, 'monitorUrl?current={page}&pageSize={size}'), //右侧菜单-监控
   recordStatusListUrl: completePrefix(patrolURI, 'api/spc/check/state'), //右侧菜单-记录-状态集合
-  recordUrl: completePrefix(patrolURI, 'api/check/list?current={page}&pageSize={size}'), //右侧菜单-记录
+  recordUrl: completePrefix(patrolURI, 'api/check/list?pageNumber={page}&pageSize={size}'), //右侧菜单-记录
   trajectoryPersonListUrl: completePrefix(patrolURI, 'api/spc/queryConditions/init/{type}'), //右侧菜单-轨迹-人员集合
   trajectoryUrl: completePrefix(patrolURI, 'api/spc/trajectory/list?current={page}&pageSize={size}'), //右侧菜单-轨迹
   msgCategoryListUrl: completePrefix(view3dURI, 'msgCategoryListUrl'), //右侧菜单-消息-类别集合

mods/components/3dviewConvertor/services/3dService.js

@@ -52,7 +52,7 @@ export const searchRegionListAction = () => {
  * 右侧菜单-检索
  */
 export const searchAction = (inputText, dataLevel, orgCode, nodeState, protectObjName, routeName, type, page, pageSize) => {
-  return commonGet(formatUrl(FscSerUrl.searchViewUrl, { inputText, dataLevel, orgCode, nodeState, protectObjName, routeName, type, page, pageSize }));
+  return commonPost(FscSerUrl.searchViewUrl, { inputText, dataLevel, orgCode, nodeState, protectObjName, routeName, type, current: page, pageSize });
 };
 
 /**

mods/components/3dviewConvertor/styles/index.scss

@@ -37,6 +37,8 @@
 
 #app>div{
   height: 100%;
+  overflow: hidden;
+  
   >div{
     height: 100%;
   }

mods/components/3dviewConvertor/styles/searchpane.scss

@@ -93,6 +93,7 @@
             background-color: #13428f;
             border-radius: 5px;
             float: left;
+            padding: 0 2em 0 0.6em !important;
         }
 
         .params-input-img{
@@ -101,6 +102,7 @@
             width: 28px;
             height: 28px;
             right: 14px;
+            cursor: pointer;
 
         }
         .params-input-img1{
@@ -108,6 +110,7 @@
             width: 28px;
             height: 28px;
             right: 160px;
+            cursor: pointer;
         }
         // .params-datePicker{
             .ant-input{

mods/components/3dviewConvertor/styles/view/panoramic/statistical.scss

@@ -14,15 +14,14 @@
   flex-direction: column;
 
   .equipStatusList {
-    padding-left: 97px;
-    padding-top: 10px;
-    flex-grow: 1;
+    margin-left: 87px;
+    margin-top: 13px;
+    height: 21.7%;
     overflow-y: auto;
 
     .title-child{
       width: 100%;
-      height: 55px;
-      //margin-top: 5px;
+      margin-bottom: 5px;
     }
     .title-date{
       height: 20px;
@@ -35,12 +34,26 @@
 
 
   ::-webkit-scrollbar {
-    /* 隐藏滚轮 */
+    height: 3px;
+    width: 3px;
+  }
+  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background: rgba(255, 0, 0, 0.466);
+  }
+  ::-webkit-scrollbar-track {
+    border-radius:10px;
+    background: #0000006e;
+  }
+  ::-webkit-scrollbar-button{
+    display: none;
+  }
+  ::-webkit-scrollbar-corner{
     display: none;
   }
 
     .safetyExecuteList{
-      flex: 2;
+      height: 45%;
       margin-left: 37px;
       .up{
         height: 90px;
@@ -73,12 +86,11 @@
         }
       }
       .down{
-        width: 98%;
-        height: 245px;
+        height: calc(100% - 90px);
+        margin-left: 20px;
         background-image: url('/mods/components/3dviewConvertor/assets/panoramic/main_bg_warning.png');
         background-repeat: repeat;
         background-size: 100% 100%;
-        margin-top: 10px;
 
         .title{
           text-align: left;
@@ -102,7 +114,7 @@
             position: absolute;
             width: 70px;
             margin-top: -5px;
-            margin-left: 60px;
+            margin-left: 36px;
             font-size: 16px;
             color: rgba(240,223,45,1);
           }
@@ -116,8 +128,9 @@
         }
 
         .content{
-          padding-left: 30px;
-          width: 90%;
+          padding: 0px 30px;
+          height: calc(100% - 60px);
+          overflow: auto;
 
           span{
             margin-top: 3px;
@@ -126,8 +139,8 @@
           }
 
           .title-child{
-            height: 35px;
             border-bottom: 1px solid rgba(196,86,86,0.3);
+            padding-top: 7px;
           }
         }
       }
@@ -144,7 +157,7 @@
       display: flex;
       margin-left: 37px;
       padding-top: 65px;
-      flex: 1;
+      height: 33.3%;
 
       .safetyIndex-icon {
         width: 36px;
@@ -213,7 +226,6 @@
     position: absolute;
     height: 100%;
     width: 355px;
-    //float: right;
     padding-top: 40px;
     right: 0;
     top: 0;
@@ -231,9 +243,19 @@
 
     .titleIcon {
       display: inline-block;
-      height: 20px;
-      width: 20px;
+      height: 18px;
+      width: 14px;
+      vertical-align: middle;
+      margin-right: 7px;
+      margin-top: -4px;
+    }
+
+    .titleIcon-check{
+      display: inline-block;
+      height: 22px;
+      width: 22px;
       vertical-align: middle;
+      margin-right: 7px;
       margin-top: -4px;
     }
 
@@ -506,7 +528,7 @@
       height: 88%;
       margin-top: 5px;
       text-align: center;
-      flex: 1;
+      width: 33.3%;
 
       &-img {
         height: 30px;
@@ -520,12 +542,13 @@
 
       .model-content {
         height: calc(100% - 60px);
-        padding-left: 10px;
+        padding: 0 17px;
+        margin-left: 5px;
+        margin-right: 3px;
         overflow: auto;
 
         .content-div {
           min-width: 80px;
-          min-height: 120px;
           padding-top: 20px;
           text-align: left;
 
@@ -547,6 +570,11 @@
             .row {
               display: inline-block;
               height: 28px;
+              >span{
+                display: block;
+                white-space: nowrap;
+                margin-right: 15px;
+              }
             }
 
             .date {

mods/components/3dviewConvertor/threeres/marker-models/fireChamber.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 11:01:58
+
+newmtl fireChamber
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka fireChamber.png
+	map_Kd fireChamber.png
+	map_d fireChamber.png

mods/components/3dviewConvertor/threeres/marker-models/fireChamber.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 11:01:58
+
+mtllib fireChamber.mtl
+
+#
+# object fireChamber
+#
+
+v  -34.4348 33.0200 0.0000
+v  -33.6163 33.0200 0.0000
+v  -33.6163 33.9408 0.0000
+v  -34.4348 33.9408 0.0000
+v  -32.7977 33.0200 0.0000
+v  -32.7977 33.9408 0.0000
+v  -31.9792 33.0200 0.0000
+v  -31.9792 33.9408 0.0000
+v  -31.1607 33.0200 0.0000
+v  -31.1607 33.9408 0.0000
+v  -33.6163 34.8617 0.0000
+v  -34.4348 34.8617 0.0000
+v  -32.7977 34.8617 0.0000
+v  -31.9792 34.8617 0.0000
+v  -31.1607 34.8617 0.0000
+v  -33.6163 35.7825 0.0000
+v  -34.4348 35.7825 0.0000
+v  -32.7977 35.7825 0.0000
+v  -31.9792 35.7825 0.0000
+v  -31.1607 35.7825 0.0000
+v  -33.6163 36.7034 0.0000
+v  -34.4348 36.7034 0.0000
+v  -32.7977 36.7034 0.0000
+v  -31.9792 36.7034 0.0000
+v  -31.1607 36.7034 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.0000 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g fireChamber
+usemtl fireChamber
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 2/2/1 5/5/1 6/6/1 3/3/1 
+f 5/5/1 7/7/1 8/8/1 6/6/1 
+f 7/7/1 9/9/1 10/10/1 8/8/1 
+f 4/4/1 3/3/1 11/11/1 12/12/1 
+f 3/3/1 6/6/1 13/13/1 11/11/1 
+f 6/6/1 8/8/1 14/14/1 13/13/1 
+f 8/8/1 10/10/1 15/15/1 14/14/1 
+f 12/12/1 11/11/1 16/16/1 17/17/1 
+f 11/11/1 13/13/1 18/18/1 16/16/1 
+f 13/13/1 14/14/1 19/19/1 18/18/1 
+f 14/14/1 15/15/1 20/20/1 19/19/1 
+f 17/17/1 16/16/1 21/21/1 22/22/1 
+f 16/16/1 18/18/1 23/23/1 21/21/1 
+f 18/18/1 19/19/1 24/24/1 23/23/1 
+f 19/19/1 20/20/1 25/25/1 24/24/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/fireChamber/fireChamber.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 11:01:58
+
+newmtl fireChamber
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka fireChamber.png
+	map_Kd fireChamber.png
+	map_d fireChamber.png

mods/components/3dviewConvertor/threeres/marker-models/fireChamber/fireChamber.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 11:01:58
+
+mtllib fireChamber.mtl
+
+#
+# object fireChamber
+#
+
+v  -34.4348 33.0200 0.0000
+v  -33.6163 33.0200 0.0000
+v  -33.6163 33.9408 0.0000
+v  -34.4348 33.9408 0.0000
+v  -32.7977 33.0200 0.0000
+v  -32.7977 33.9408 0.0000
+v  -31.9792 33.0200 0.0000
+v  -31.9792 33.9408 0.0000
+v  -31.1607 33.0200 0.0000
+v  -31.1607 33.9408 0.0000
+v  -33.6163 34.8617 0.0000
+v  -34.4348 34.8617 0.0000
+v  -32.7977 34.8617 0.0000
+v  -31.9792 34.8617 0.0000
+v  -31.1607 34.8617 0.0000
+v  -33.6163 35.7825 0.0000
+v  -34.4348 35.7825 0.0000
+v  -32.7977 35.7825 0.0000
+v  -31.9792 35.7825 0.0000
+v  -31.1607 35.7825 0.0000
+v  -33.6163 36.7034 0.0000
+v  -34.4348 36.7034 0.0000
+v  -32.7977 36.7034 0.0000
+v  -31.9792 36.7034 0.0000
+v  -31.1607 36.7034 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.0000 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g fireChamber
+usemtl fireChamber
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 2/2/1 5/5/1 6/6/1 3/3/1 
+f 5/5/1 7/7/1 8/8/1 6/6/1 
+f 7/7/1 9/9/1 10/10/1 8/8/1 
+f 4/4/1 3/3/1 11/11/1 12/12/1 
+f 3/3/1 6/6/1 13/13/1 11/11/1 
+f 6/6/1 8/8/1 14/14/1 13/13/1 
+f 8/8/1 10/10/1 15/15/1 14/14/1 
+f 12/12/1 11/11/1 16/16/1 17/17/1 
+f 11/11/1 13/13/1 18/18/1 16/16/1 
+f 13/13/1 14/14/1 19/19/1 18/18/1 
+f 14/14/1 15/15/1 20/20/1 19/19/1 
+f 17/17/1 16/16/1 21/21/1 22/22/1 
+f 16/16/1 18/18/1 23/23/1 21/21/1 
+f 18/18/1 19/19/1 24/24/1 23/23/1 
+f 19/19/1 20/20/1 25/25/1 24/24/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/fireDetector/fireDetector.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 11:47:57
+
+newmtl fireDetector
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka fireDetector.png
+	map_Kd fireDetector.png
+	map_d fireDetector.png

mods/components/3dviewConvertor/threeres/marker-models/fireDetector/fireDetector.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 11:47:57
+
+mtllib fireDetector.mtl
+
+#
+# object fireDetector
+#
+
+v  -1.6371 -0.5656 0.0000
+v  -0.8185 -0.5656 0.0000
+v  -0.8185 0.3553 0.0000
+v  -1.6371 0.3553 0.0000
+v  0.0000 -0.5656 0.0000
+v  0.0000 0.3553 0.0000
+v  0.8185 -0.5656 0.0000
+v  0.8185 0.3553 0.0000
+v  1.6371 -0.5656 0.0000
+v  1.6371 0.3553 0.0000
+v  -0.8185 1.2761 0.0000
+v  -1.6371 1.2761 0.0000
+v  0.0000 1.2761 0.0000
+v  0.8185 1.2761 0.0000
+v  1.6371 1.2761 0.0000
+v  -0.8185 2.1970 0.0000
+v  -1.6371 2.1970 0.0000
+v  0.0000 2.1970 0.0000
+v  0.8185 2.1970 0.0000
+v  1.6371 2.1970 0.0000
+v  -0.8185 3.1178 0.0000
+v  -1.6371 3.1178 0.0000
+v  0.0000 3.1178 0.0000
+v  0.8185 3.1178 0.0000
+v  1.6371 3.1178 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.0000 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g fireDetector
+usemtl fireDetector
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 2/2/1 5/5/1 6/6/1 3/3/1 
+f 5/5/1 7/7/1 8/8/1 6/6/1 
+f 7/7/1 9/9/1 10/10/1 8/8/1 
+f 4/4/1 3/3/1 11/11/1 12/12/1 
+f 3/3/1 6/6/1 13/13/1 11/11/1 
+f 6/6/1 8/8/1 14/14/1 13/13/1 
+f 8/8/1 10/10/1 15/15/1 14/14/1 
+f 12/12/1 11/11/1 16/16/1 17/17/1 
+f 11/11/1 13/13/1 18/18/1 16/16/1 
+f 13/13/1 14/14/1 19/19/1 18/18/1 
+f 14/14/1 15/15/1 20/20/1 19/19/1 
+f 17/17/1 16/16/1 21/21/1 22/22/1 
+f 16/16/1 18/18/1 23/23/1 21/21/1 
+f 18/18/1 19/19/1 24/24/1 23/23/1 
+f 19/19/1 20/20/1 25/25/1 24/24/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/fireEquip/fireEquip.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 11:50:46
+
+newmtl fireEquip
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka fireEquip.png
+	map_Kd fireEquip.png
+	map_d fireEquip.png

mods/components/3dviewConvertor/threeres/marker-models/fireEquip/fireEquip.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 11:50:46
+
+mtllib fireEquip.mtl
+
+#
+# object fireEquip
+#
+
+v  -1.6371 -0.5656 0.0000
+v  -0.8185 -0.5656 0.0000
+v  -0.8185 0.3553 0.0000
+v  -1.6371 0.3553 0.0000
+v  0.0000 -0.5656 0.0000
+v  0.0000 0.3553 0.0000
+v  0.8185 -0.5656 0.0000
+v  0.8185 0.3553 0.0000
+v  1.6371 -0.5656 0.0000
+v  1.6371 0.3553 0.0000
+v  -0.8185 1.2761 0.0000
+v  -1.6371 1.2761 0.0000
+v  0.0000 1.2761 0.0000
+v  0.8185 1.2761 0.0000
+v  1.6371 1.2761 0.0000
+v  -0.8185 2.1970 0.0000
+v  -1.6371 2.1970 0.0000
+v  0.0000 2.1970 0.0000
+v  0.8185 2.1970 0.0000
+v  1.6371 2.1970 0.0000
+v  -0.8185 3.1178 0.0000
+v  -1.6371 3.1178 0.0000
+v  0.0000 3.1178 0.0000
+v  0.8185 3.1178 0.0000
+v  1.6371 3.1178 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.0000 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g fireEquip
+usemtl fireEquip
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 2/2/1 5/5/1 6/6/1 3/3/1 
+f 5/5/1 7/7/1 8/8/1 6/6/1 
+f 7/7/1 9/9/1 10/10/1 8/8/1 
+f 4/4/1 3/3/1 11/11/1 12/12/1 
+f 3/3/1 6/6/1 13/13/1 11/11/1 
+f 6/6/1 8/8/1 14/14/1 13/13/1 
+f 8/8/1 10/10/1 15/15/1 14/14/1 
+f 12/12/1 11/11/1 16/16/1 17/17/1 
+f 11/11/1 13/13/1 18/18/1 16/16/1 
+f 13/13/1 14/14/1 19/19/1 18/18/1 
+f 14/14/1 15/15/1 20/20/1 19/19/1 
+f 17/17/1 16/16/1 21/21/1 22/22/1 
+f 16/16/1 18/18/1 23/23/1 21/21/1 
+f 18/18/1 19/19/1 24/24/1 23/23/1 
+f 19/19/1 20/20/1 25/25/1 24/24/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/fireFoam/fireFoam.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 11:52:49
+
+newmtl fireFoam
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka fireFoam.png
+	map_Kd fireFoam.png
+	map_d fireFoam.png

mods/components/3dviewConvertor/threeres/marker-models/fireFoam/fireFoam.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 11:52:49
+
+mtllib fireFoam.mtl
+
+#
+# object fireFoam
+#
+
+v  -1.6371 -0.5656 0.0000
+v  -0.8185 -0.5656 0.0000
+v  -0.8185 0.3553 0.0000
+v  -1.6371 0.3553 0.0000
+v  0.0000 -0.5656 0.0000
+v  0.0000 0.3553 0.0000
+v  0.8185 -0.5656 0.0000
+v  0.8185 0.3553 0.0000
+v  1.6371 -0.5656 0.0000
+v  1.6371 0.3553 0.0000
+v  -0.8185 1.2761 0.0000
+v  -1.6371 1.2761 0.0000
+v  0.0000 1.2761 0.0000
+v  0.8185 1.2761 0.0000
+v  1.6371 1.2761 0.0000
+v  -0.8185 2.1970 0.0000
+v  -1.6371 2.1970 0.0000
+v  0.0000 2.1970 0.0000
+v  0.8185 2.1970 0.0000
+v  1.6371 2.1970 0.0000
+v  -0.8185 3.1178 0.0000
+v  -1.6371 3.1178 0.0000
+v  0.0000 3.1178 0.0000
+v  0.8185 3.1178 0.0000
+v  1.6371 3.1178 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.0000 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g fireFoam
+usemtl fireFoam
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 2/2/1 5/5/1 6/6/1 3/3/1 
+f 5/5/1 7/7/1 8/8/1 6/6/1 
+f 7/7/1 9/9/1 10/10/1 8/8/1 
+f 4/4/1 3/3/1 11/11/1 12/12/1 
+f 3/3/1 6/6/1 13/13/1 11/11/1 
+f 6/6/1 8/8/1 14/14/1 13/13/1 
+f 8/8/1 10/10/1 15/15/1 14/14/1 
+f 12/12/1 11/11/1 16/16/1 17/17/1 
+f 11/11/1 13/13/1 18/18/1 16/16/1 
+f 13/13/1 14/14/1 19/19/1 18/18/1 
+f 14/14/1 15/15/1 20/20/1 19/19/1 
+f 17/17/1 16/16/1 21/21/1 22/22/1 
+f 16/16/1 18/18/1 23/23/1 21/21/1 
+f 18/18/1 19/19/1 24/24/1 23/23/1 
+f 19/19/1 20/20/1 25/25/1 24/24/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/hydrant/hydrant.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:38:11
+
+newmtl hydrant
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka hydrant.png
+	map_Kd hydrant.png
+	map_d hydrant.png

mods/components/3dviewConvertor/threeres/marker-models/hydrant/hydrant.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:38:11
+
+mtllib hydrant.mtl
+
+#
+# object hydrant
+#
+
+v  -1.6371 -0.5656 0.0000
+v  -0.8185 -0.5656 0.0000
+v  -0.8185 0.3553 0.0000
+v  -1.6371 0.3553 0.0000
+v  0.0000 -0.5656 0.0000
+v  0.0000 0.3553 0.0000
+v  0.8185 -0.5656 0.0000
+v  0.8185 0.3553 0.0000
+v  1.6371 -0.5656 0.0000
+v  1.6371 0.3553 0.0000
+v  -0.8185 1.2761 0.0000
+v  -1.6371 1.2761 0.0000
+v  0.0000 1.2761 0.0000
+v  0.8185 1.2761 0.0000
+v  1.6371 1.2761 0.0000
+v  -0.8185 2.1970 0.0000
+v  -1.6371 2.1970 0.0000
+v  0.0000 2.1970 0.0000
+v  0.8185 2.1970 0.0000
+v  1.6371 2.1970 0.0000
+v  -0.8185 3.1178 0.0000
+v  -1.6371 3.1178 0.0000
+v  0.0000 3.1178 0.0000
+v  0.8185 3.1178 0.0000
+v  1.6371 3.1178 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.0000 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g hydrant
+usemtl hydrant
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 2/2/1 5/5/1 6/6/1 3/3/1 
+f 5/5/1 7/7/1 8/8/1 6/6/1 
+f 7/7/1 9/9/1 10/10/1 8/8/1 
+f 4/4/1 3/3/1 11/11/1 12/12/1 
+f 3/3/1 6/6/1 13/13/1 11/11/1 
+f 6/6/1 8/8/1 14/14/1 13/13/1 
+f 8/8/1 10/10/1 15/15/1 14/14/1 
+f 12/12/1 11/11/1 16/16/1 17/17/1 
+f 11/11/1 13/13/1 18/18/1 16/16/1 
+f 13/13/1 14/14/1 19/19/1 18/18/1 
+f 14/14/1 15/15/1 20/20/1 19/19/1 
+f 17/17/1 16/16/1 21/21/1 22/22/1 
+f 16/16/1 18/18/1 23/23/1 21/21/1 
+f 18/18/1 19/19/1 24/24/1 23/23/1 
+f 19/19/1 20/20/1 25/25/1 24/24/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/impEquip/impEquip.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:39:28
+
+newmtl impEquip
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka impEquip.png
+	map_Kd impEquip.png
+	map_d impEquip.png

mods/components/3dviewConvertor/threeres/marker-models/impEquip/impEquip.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:39:28
+
+mtllib impEquip.mtl
+
+#
+# object impEquip
+#
+
+v  -1.6371 -0.5656 0.0000
+v  -0.8185 -0.5656 0.0000
+v  -0.8185 0.3553 0.0000
+v  -1.6371 0.3553 0.0000
+v  0.0000 -0.5656 0.0000
+v  0.0000 0.3553 0.0000
+v  0.8185 -0.5656 0.0000
+v  0.8185 0.3553 0.0000
+v  1.6371 -0.5656 0.0000
+v  1.6371 0.3553 0.0000
+v  -0.8185 1.2761 0.0000
+v  -1.6371 1.2761 0.0000
+v  0.0000 1.2761 0.0000
+v  0.8185 1.2761 0.0000
+v  1.6371 1.2761 0.0000
+v  -0.8185 2.1970 0.0000
+v  -1.6371 2.1970 0.0000
+v  0.0000 2.1970 0.0000
+v  0.8185 2.1970 0.0000
+v  1.6371 2.1970 0.0000
+v  -0.8185 3.1178 0.0000
+v  -1.6371 3.1178 0.0000
+v  0.0000 3.1178 0.0000
+v  0.8185 3.1178 0.0000
+v  1.6371 3.1178 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.0000 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g impEquip
+usemtl impEquip
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 2/2/1 5/5/1 6/6/1 3/3/1 
+f 5/5/1 7/7/1 8/8/1 6/6/1 
+f 7/7/1 9/9/1 10/10/1 8/8/1 
+f 4/4/1 3/3/1 11/11/1 12/12/1 
+f 3/3/1 6/6/1 13/13/1 11/11/1 
+f 6/6/1 8/8/1 14/14/1 13/13/1 
+f 8/8/1 10/10/1 15/15/1 14/14/1 
+f 12/12/1 11/11/1 16/16/1 17/17/1 
+f 11/11/1 13/13/1 18/18/1 16/16/1 
+f 13/13/1 14/14/1 19/19/1 18/18/1 
+f 14/14/1 15/15/1 20/20/1 19/19/1 
+f 17/17/1 16/16/1 21/21/1 22/22/1 
+f 16/16/1 18/18/1 23/23/1 21/21/1 
+f 18/18/1 19/19/1 24/24/1 23/23/1 
+f 19/19/1 20/20/1 25/25/1 24/24/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/monitorEquip/monitorEquip.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:40:47
+
+newmtl monitorEquip
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka monitorEquip.png
+	map_Kd monitorEquip.png
+	map_d monitorEquip.png

mods/components/3dviewConvertor/threeres/marker-models/monitorEquip/monitorEquip.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:40:47
+
+mtllib monitorEquip.mtl
+
+#
+# object monitorEquip
+#
+
+v  -1.6371 -0.5656 0.0000
+v  -0.8185 -0.5656 0.0000
+v  -0.8185 0.3553 0.0000
+v  -1.6371 0.3553 0.0000
+v  0.0000 -0.5656 0.0000
+v  0.0000 0.3553 0.0000
+v  0.8185 -0.5656 0.0000
+v  0.8185 0.3553 0.0000
+v  1.6371 -0.5656 0.0000
+v  1.6371 0.3553 0.0000
+v  -0.8185 1.2761 0.0000
+v  -1.6371 1.2761 0.0000
+v  0.0000 1.2761 0.0000
+v  0.8185 1.2761 0.0000
+v  1.6371 1.2761 0.0000
+v  -0.8185 2.1970 0.0000
+v  -1.6371 2.1970 0.0000
+v  0.0000 2.1970 0.0000
+v  0.8185 2.1970 0.0000
+v  1.6371 2.1970 0.0000
+v  -0.8185 3.1178 0.0000
+v  -1.6371 3.1178 0.0000
+v  0.0000 3.1178 0.0000
+v  0.8185 3.1178 0.0000
+v  1.6371 3.1178 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.0000 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g monitorEquip
+usemtl monitorEquip
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 2/2/1 5/5/1 6/6/1 3/3/1 
+f 5/5/1 7/7/1 8/8/1 6/6/1 
+f 7/7/1 9/9/1 10/10/1 8/8/1 
+f 4/4/1 3/3/1 11/11/1 12/12/1 
+f 3/3/1 6/6/1 13/13/1 11/11/1 
+f 6/6/1 8/8/1 14/14/1 13/13/1 
+f 8/8/1 10/10/1 15/15/1 14/14/1 
+f 12/12/1 11/11/1 16/16/1 17/17/1 
+f 11/11/1 13/13/1 18/18/1 16/16/1 
+f 13/13/1 14/14/1 19/19/1 18/18/1 
+f 14/14/1 15/15/1 20/20/1 19/19/1 
+f 17/17/1 16/16/1 21/21/1 22/22/1 
+f 16/16/1 18/18/1 23/23/1 21/21/1 
+f 18/18/1 19/19/1 24/24/1 23/23/1 
+f 19/19/1 20/20/1 25/25/1 24/24/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/patrol/patrol-0.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:44:22
+
+newmtl pa_0
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka pa-0.png
+	map_Kd pa-0.png
+	map_d pa-0.png

mods/components/3dviewConvertor/threeres/marker-models/patrol/patrol-0.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:44:22
+
+mtllib pa-0.mtl
+
+#
+# object pa_0
+#
+
+v  -1.2000 0.0069 -0.0000
+v  -1.2000 -0.5931 -0.0000
+v  -0.6000 -0.5931 -0.0000
+v  -0.6000 0.0069 -0.0000
+v  0.0000 -0.5931 -0.0000
+v  0.0000 0.0069 -0.0000
+v  0.6000 -0.5931 -0.0000
+v  0.6000 0.0069 -0.0000
+v  1.2000 -0.5931 -0.0000
+v  1.2000 0.0069 -0.0000
+v  -1.2000 0.6069 0.0000
+v  -0.6000 0.6069 0.0000
+v  0.0000 0.6069 0.0000
+v  0.6000 0.6069 0.0000
+v  1.2000 0.6069 0.0000
+v  -1.2000 1.2069 0.0000
+v  -0.6000 1.2069 0.0000
+v  0.0000 1.2069 0.0000
+v  0.6000 1.2069 0.0000
+v  1.2000 1.2069 0.0000
+v  -1.2000 1.8069 0.0000
+v  -0.6000 1.8069 0.0000
+v  0.0000 1.8069 0.0000
+v  0.6000 1.8069 0.0000
+v  1.2000 1.8069 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.2500 0.0000
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g pa_0
+usemtl pa_0
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 4/4/1 3/3/1 5/5/1 6/6/1 
+f 6/6/1 5/5/1 7/7/1 8/8/1 
+f 8/8/1 7/7/1 9/9/1 10/10/1 
+f 11/11/1 1/1/1 4/4/1 12/12/1 
+f 12/12/1 4/4/1 6/6/1 13/13/1 
+f 13/13/1 6/6/1 8/8/1 14/14/1 
+f 14/14/1 8/8/1 10/10/1 15/15/1 
+f 16/16/1 11/11/1 12/12/1 17/17/1 
+f 17/17/1 12/12/1 13/13/1 18/18/1 
+f 18/18/1 13/13/1 14/14/1 19/19/1 
+f 19/19/1 14/14/1 15/15/1 20/20/1 
+f 21/21/1 16/16/1 17/17/1 22/22/1 
+f 22/22/1 17/17/1 18/18/1 23/23/1 
+f 23/23/1 18/18/1 19/19/1 24/24/1 
+f 24/24/1 19/19/1 20/20/1 25/25/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/patrol/patrol-1.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:46:01
+
+newmtl pa_1
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka pa-1.png
+	map_Kd pa-1.png
+	map_d pa-1.png

mods/components/3dviewConvertor/threeres/marker-models/patrol/patrol-1.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:46:01
+
+mtllib pa-1.mtl
+
+#
+# object pa_1
+#
+
+v  -1.2000 0.0069 -0.0000
+v  -1.2000 -0.5931 -0.0000
+v  -0.6000 -0.5931 -0.0000
+v  -0.6000 0.0069 -0.0000
+v  0.0000 -0.5931 -0.0000
+v  0.0000 0.0069 -0.0000
+v  0.6000 -0.5931 -0.0000
+v  0.6000 0.0069 -0.0000
+v  1.2000 -0.5931 -0.0000
+v  1.2000 0.0069 -0.0000
+v  -1.2000 0.6069 0.0000
+v  -0.6000 0.6069 0.0000
+v  0.0000 0.6069 0.0000
+v  0.6000 0.6069 0.0000
+v  1.2000 0.6069 0.0000
+v  -1.2000 1.2069 0.0000
+v  -0.6000 1.2069 0.0000
+v  0.0000 1.2069 0.0000
+v  0.6000 1.2069 0.0000
+v  1.2000 1.2069 0.0000
+v  -1.2000 1.8069 0.0000
+v  -0.6000 1.8069 0.0000
+v  0.0000 1.8069 0.0000
+v  0.6000 1.8069 0.0000
+v  1.2000 1.8069 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.2500 0.0000
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g pa_1
+usemtl pa_1
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 4/4/1 3/3/1 5/5/1 6/6/1 
+f 6/6/1 5/5/1 7/7/1 8/8/1 
+f 8/8/1 7/7/1 9/9/1 10/10/1 
+f 11/11/1 1/1/1 4/4/1 12/12/1 
+f 12/12/1 4/4/1 6/6/1 13/13/1 
+f 13/13/1 6/6/1 8/8/1 14/14/1 
+f 14/14/1 8/8/1 10/10/1 15/15/1 
+f 16/16/1 11/11/1 12/12/1 17/17/1 
+f 17/17/1 12/12/1 13/13/1 18/18/1 
+f 18/18/1 13/13/1 14/14/1 19/19/1 
+f 19/19/1 14/14/1 15/15/1 20/20/1 
+f 21/21/1 16/16/1 17/17/1 22/22/1 
+f 22/22/1 17/17/1 18/18/1 23/23/1 
+f 23/23/1 18/18/1 19/19/1 24/24/1 
+f 24/24/1 19/19/1 20/20/1 25/25/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/patrol/patrol-2.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:47:04
+
+newmtl pa_2
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka pa-2.png
+	map_Kd pa-2.png
+	map_d pa-2.png

mods/components/3dviewConvertor/threeres/marker-models/patrol/patrol-2.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:47:04
+
+mtllib pa-2.mtl
+
+#
+# object pa_2
+#
+
+v  -1.2000 0.0069 -0.0000
+v  -1.2000 -0.5931 -0.0000
+v  -0.6000 -0.5931 -0.0000
+v  -0.6000 0.0069 -0.0000
+v  0.0000 -0.5931 -0.0000
+v  0.0000 0.0069 -0.0000
+v  0.6000 -0.5931 -0.0000
+v  0.6000 0.0069 -0.0000
+v  1.2000 -0.5931 -0.0000
+v  1.2000 0.0069 -0.0000
+v  -1.2000 0.6069 0.0000
+v  -0.6000 0.6069 0.0000
+v  0.0000 0.6069 0.0000
+v  0.6000 0.6069 0.0000
+v  1.2000 0.6069 0.0000
+v  -1.2000 1.2069 0.0000
+v  -0.6000 1.2069 0.0000
+v  0.0000 1.2069 0.0000
+v  0.6000 1.2069 0.0000
+v  1.2000 1.2069 0.0000
+v  -1.2000 1.8069 0.0000
+v  -0.6000 1.8069 0.0000
+v  0.0000 1.8069 0.0000
+v  0.6000 1.8069 0.0000
+v  1.2000 1.8069 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.2500 0.0000
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g pa_2
+usemtl pa_2
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 4/4/1 3/3/1 5/5/1 6/6/1 
+f 6/6/1 5/5/1 7/7/1 8/8/1 
+f 8/8/1 7/7/1 9/9/1 10/10/1 
+f 11/11/1 1/1/1 4/4/1 12/12/1 
+f 12/12/1 4/4/1 6/6/1 13/13/1 
+f 13/13/1 6/6/1 8/8/1 14/14/1 
+f 14/14/1 8/8/1 10/10/1 15/15/1 
+f 16/16/1 11/11/1 12/12/1 17/17/1 
+f 17/17/1 12/12/1 13/13/1 18/18/1 
+f 18/18/1 13/13/1 14/14/1 19/19/1 
+f 19/19/1 14/14/1 15/15/1 20/20/1 
+f 21/21/1 16/16/1 17/17/1 22/22/1 
+f 22/22/1 17/17/1 18/18/1 23/23/1 
+f 23/23/1 18/18/1 19/19/1 24/24/1 
+f 24/24/1 19/19/1 20/20/1 25/25/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/patrol/patrol-3.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:48:12
+
+newmtl pa_3
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka pa-3.png
+	map_Kd pa-3.png
+	map_d pa-3.png

mods/components/3dviewConvertor/threeres/marker-models/patrol/patrol-3.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:48:12
+
+mtllib pa-3.mtl
+
+#
+# object pa_3
+#
+
+v  -1.2000 0.0069 -0.0000
+v  -1.2000 -0.5931 -0.0000
+v  -0.6000 -0.5931 -0.0000
+v  -0.6000 0.0069 -0.0000
+v  0.0000 -0.5931 -0.0000
+v  0.0000 0.0069 -0.0000
+v  0.6000 -0.5931 -0.0000
+v  0.6000 0.0069 -0.0000
+v  1.2000 -0.5931 -0.0000
+v  1.2000 0.0069 -0.0000
+v  -1.2000 0.6069 0.0000
+v  -0.6000 0.6069 0.0000
+v  0.0000 0.6069 0.0000
+v  0.6000 0.6069 0.0000
+v  1.2000 0.6069 0.0000
+v  -1.2000 1.2069 0.0000
+v  -0.6000 1.2069 0.0000
+v  0.0000 1.2069 0.0000
+v  0.6000 1.2069 0.0000
+v  1.2000 1.2069 0.0000
+v  -1.2000 1.8069 0.0000
+v  -0.6000 1.8069 0.0000
+v  0.0000 1.8069 0.0000
+v  0.6000 1.8069 0.0000
+v  1.2000 1.8069 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.2500 0.0000
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g pa_3
+usemtl pa_3
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 4/4/1 3/3/1 5/5/1 6/6/1 
+f 6/6/1 5/5/1 7/7/1 8/8/1 
+f 8/8/1 7/7/1 9/9/1 10/10/1 
+f 11/11/1 1/1/1 4/4/1 12/12/1 
+f 12/12/1 4/4/1 6/6/1 13/13/1 
+f 13/13/1 6/6/1 8/8/1 14/14/1 
+f 14/14/1 8/8/1 10/10/1 15/15/1 
+f 16/16/1 11/11/1 12/12/1 17/17/1 
+f 17/17/1 12/12/1 13/13/1 18/18/1 
+f 18/18/1 13/13/1 14/14/1 19/19/1 
+f 19/19/1 14/14/1 15/15/1 20/20/1 
+f 21/21/1 16/16/1 17/17/1 22/22/1 
+f 22/22/1 17/17/1 18/18/1 23/23/1 
+f 23/23/1 18/18/1 19/19/1 24/24/1 
+f 24/24/1 19/19/1 20/20/1 25/25/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/pool/pool.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:49:18
+
+newmtl pool
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka pool.png
+	map_Kd pool.png
+	map_d pool.png

mods/components/3dviewConvertor/threeres/marker-models/pool/pool.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:49:18
+
+mtllib pool.mtl
+
+#
+# object pool
+#
+
+v  -1.6371 -0.5656 0.0000
+v  -0.8185 -0.5656 0.0000
+v  -0.8185 0.3553 0.0000
+v  -1.6371 0.3553 0.0000
+v  0.0000 -0.5656 0.0000
+v  0.0000 0.3553 0.0000
+v  0.8185 -0.5656 0.0000
+v  0.8185 0.3553 0.0000
+v  1.6371 -0.5656 0.0000
+v  1.6371 0.3553 0.0000
+v  -0.8185 1.2761 0.0000
+v  -1.6371 1.2761 0.0000
+v  0.0000 1.2761 0.0000
+v  0.8185 1.2761 0.0000
+v  1.6371 1.2761 0.0000
+v  -0.8185 2.1970 0.0000
+v  -1.6371 2.1970 0.0000
+v  0.0000 2.1970 0.0000
+v  0.8185 2.1970 0.0000
+v  1.6371 2.1970 0.0000
+v  -0.8185 3.1178 0.0000
+v  -1.6371 3.1178 0.0000
+v  0.0000 3.1178 0.0000
+v  0.8185 3.1178 0.0000
+v  1.6371 3.1178 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.0000 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g pool
+usemtl pool
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 2/2/1 5/5/1 6/6/1 3/3/1 
+f 5/5/1 7/7/1 8/8/1 6/6/1 
+f 7/7/1 9/9/1 10/10/1 8/8/1 
+f 4/4/1 3/3/1 11/11/1 12/12/1 
+f 3/3/1 6/6/1 13/13/1 11/11/1 
+f 6/6/1 8/8/1 14/14/1 13/13/1 
+f 8/8/1 10/10/1 15/15/1 14/14/1 
+f 12/12/1 11/11/1 16/16/1 17/17/1 
+f 11/11/1 13/13/1 18/18/1 16/16/1 
+f 13/13/1 14/14/1 19/19/1 18/18/1 
+f 14/14/1 15/15/1 20/20/1 19/19/1 
+f 17/17/1 16/16/1 21/21/1 22/22/1 
+f 16/16/1 18/18/1 23/23/1 21/21/1 
+f 18/18/1 19/19/1 24/24/1 23/23/1 
+f 19/19/1 20/20/1 25/25/1 24/24/1 
+# 16 polygons
+

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

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 11:44:55
+
+newmtl _fengxiandian24___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
+# ļ:03.06.2020 11:44:55
+
+mtllib fengxiandian.mtl
+
+#
+# object fengxiandian
+#
+
+v  -0.1139 2.9302 0.5978
+v  -0.1139 2.9302 0.9399
+v  -0.0757 2.9418 0.9399
+v  -0.0757 2.9418 0.5978
+v  -0.0365 2.9472 0.9399
+v  -0.0365 2.9472 0.5978
+v  0.0030 2.9465 0.9399
+v  0.0030 2.9465 0.5978
+v  0.0421 2.9397 0.9399
+v  0.0421 2.9397 0.5978
+v  0.0799 2.9268 0.9399
+v  0.0799 2.9268 0.5978
+v  0.1157 2.9078 0.9399
+v  0.1157 2.9078 0.5978
+v  0.8919 2.4319 0.9399
+v  0.8919 2.4319 0.5978
+v  0.9249 2.4072 0.9399
+v  0.9249 2.4072 0.5978
+v  0.9538 2.3784 0.9399
+v  0.9538 2.3784 0.5978
+v  0.9781 2.3461 0.9399
+v  0.9781 2.3461 0.5978
+v  0.9975 2.3107 0.9399
+v  0.9975 2.3107 0.5978
+v  1.0117 2.2729 0.9399
+v  1.0117 2.2729 0.5978
+v  1.0205 2.2330 0.9399
+v  1.0205 2.2330 0.5978
+v  1.0235 2.1919 0.9399
+v  1.0235 2.1919 0.5978
+v  1.0235 1.3865 0.9399
+v  1.0235 1.3865 0.5978
+v  1.0204 1.3455 0.9399
+v  1.0204 1.3455 0.5978
+v  1.0115 1.3060 0.9399
+v  1.0115 1.3060 0.5978
+v  0.9970 1.2684 0.9399
+v  0.9970 1.2684 0.5978
+v  0.9773 1.2335 0.9399
+v  0.9773 1.2335 0.5978
+v  0.9525 1.2017 0.9399
+v  0.9525 1.2017 0.5978
+v  0.9234 1.1736 0.9399
+v  0.9234 1.1736 0.5978
+v  0.8898 1.1499 0.9399
+v  0.8898 1.1499 0.5978
+v  0.3705 0.8371 0.9399
+v  0.3705 0.8371 0.5978
+v  0.3346 0.8131 0.9399
+v  0.3346 0.8131 0.5978
+v  0.3016 0.7859 0.9399
+v  0.3016 0.7859 0.5978
+v  0.2715 0.7556 0.9399
+v  0.2715 0.7556 0.5978
+v  0.2446 0.7227 0.9399
+v  0.2446 0.7227 0.5978
+v  0.2208 0.6872 0.9399
+v  0.2208 0.6872 0.5978
+v  0.2007 0.6494 0.9399
+v  0.2007 0.6494 0.5978
+v  0.1842 0.6095 0.9399
+v  0.1842 0.6095 0.5978
+v  0.0722 0.0752 0.9399
+v  0.0722 0.0752 0.5978
+v  0.0541 0.0432 0.9399
+v  0.0541 0.0432 0.5978
+v  0.0279 0.0212 0.9399
+v  0.0279 0.0212 0.5978
+v  -0.0032 0.0093 0.9399
+v  -0.0032 0.0093 0.5978
+v  -0.0363 0.0075 0.9399
+v  -0.0363 0.0075 0.5978
+v  -0.0686 0.0163 0.9399
+v  -0.0686 0.0163 0.5978
+v  -0.0968 0.0355 0.9399
+v  -0.0968 0.0355 0.5978
+v  -0.1181 0.0654 0.9399
+v  -0.1181 0.0654 0.5978
+v  -0.2146 0.6086 0.9399
+v  -0.2146 0.6086 0.5978
+v  -0.2350 0.6471 0.9399
+v  -0.2350 0.6471 0.5978
+v  -0.2584 0.6836 0.9399
+v  -0.2584 0.6836 0.5978
+v  -0.2846 0.7180 0.9399
+v  -0.2846 0.7180 0.5978
+v  -0.3135 0.7500 0.9399
+v  -0.3135 0.7500 0.5978
+v  -0.3450 0.7797 0.9399
+v  -0.3450 0.7797 0.5978
+v  -0.3789 0.8067 0.9399
+v  -0.3789 0.8067 0.5978
+v  -0.4150 0.8309 0.9399
+v  -0.4150 0.8309 0.5978
+v  -0.9354 1.1490 0.9399
+v  -0.9354 1.1490 0.5978
+v  -0.9689 1.1730 0.9399
+v  -0.9689 1.1730 0.5978
+v  -0.9982 1.2012 0.9399
+v  -0.9982 1.2012 0.5978
+v  -1.0229 1.2332 0.9399
+v  -1.0229 1.2332 0.5978
+v  -1.0427 1.2682 0.9399
+v  -1.0427 1.2682 0.5978
+v  -1.0573 1.3059 0.9399
+v  -1.0573 1.3059 0.5978
+v  -1.0665 1.3455 0.9399
+v  -1.0665 1.3455 0.5978
+v  -1.0698 1.3865 0.9399
+v  -1.0698 1.3865 0.5978
+v  -1.0763 2.1919 0.9399
+v  -1.0763 2.1919 0.5978
+v  -1.0736 2.2328 0.9399
+v  -1.0736 2.2328 0.5978
+v  -1.0648 2.2723 0.9399
+v  -1.0648 2.2723 0.5978
+v  -1.0503 2.3097 0.9399
+v  -1.0503 2.3097 0.5978
+v  -1.0307 2.3445 0.9399
+v  -1.0307 2.3445 0.5978
+v  -1.0061 2.3761 0.9399
+v  -1.0061 2.3761 0.5978
+v  -0.9767 2.4039 0.9399
+v  -0.9767 2.4039 0.5978
+v  -0.9431 2.4273 0.9399
+v  -0.9431 2.4273 0.5978
+v  -0.1504 2.9124 0.9399
+v  -0.1504 2.9124 0.5978
+# 128 vertices
+
+vn -0.3655 0.9308 -0.0000
+vn -0.2149 0.9766 -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
+# 66 vertex normals
+
+g fengxiandian
+usemtl _fengxiandian24___Default
+s 1
+f 1//1 2//1 3//2 4//2 
+s 3
+f 4//2 3//2 5//3 6//3 
+s 2
+f 6//3 5//3 7//4 8//4 
+f 8//4 7//4 9//5 10//5 
+f 10//5 9//5 11//6 12//6 
+f 12//6 11//6 13//7 14//7 
+f 14//7 13//7 15//8 16//8 
+f 16//8 15//8 17//9 18//9 
+f 18//9 17//9 19//10 20//10 
+f 20//10 19//10 21//11 22//11 
+f 22//11 21//11 23//12 24//12 
+f 24//12 23//12 25//13 26//13 
+f 26//13 25//13 27//14 28//14 
+f 28//14 27//14 29//15 30//15 
+f 30//15 29//15 31//16 32//16 
+f 32//16 31//16 33//17 34//17 
+f 34//17 33//17 35//18 36//18 
+f 36//18 35//18 37//19 38//19 
+f 38//19 37//19 39//20 40//20 
+f 40//20 39//20 41//21 42//21 
+f 42//21 41//21 43//22 44//22 
+f 44//22 43//22 45//23 46//23 
+f 46//23 45//23 47//24 48//24 
+f 48//24 47//24 49//25 50//25 
+f 50//25 49//25 51//26 52//26 
+f 52//26 51//26 53//27 54//27 
+f 54//27 53//27 55//28 56//28 
+f 56//28 55//28 57//29 58//29 
+f 58//29 57//29 59//30 60//30 
+f 60//30 59//30 61//31 62//31 
+f 62//31 61//31 63//32 64//32 
+f 64//32 63//32 65//33 66//33 
+f 66//33 65//33 67//34 68//34 
+f 68//34 67//34 69//35 70//35 
+f 70//35 69//35 71//36 72//36 
+f 72//36 71//36 73//37 74//37 
+f 74//37 73//37 75//38 76//38 
+f 76//38 75//38 77//39 78//39 
+f 78//39 77//39 79//40 80//40 
+f 80//40 79//40 81//41 82//41 
+f 82//41 81//41 83//42 84//42 
+f 84//42 83//42 85//43 86//43 
+f 86//43 85//43 87//44 88//44 
+f 88//44 87//44 89//45 90//45 
+f 90//45 89//45 91//46 92//46 
+f 92//46 91//46 93//47 94//47 
+f 94//47 93//47 95//48 96//48 
+f 96//48 95//48 97//49 98//49 
+f 98//49 97//49 99//50 100//50 
+f 100//50 99//50 101//51 102//51 
+f 102//51 101//51 103//52 104//52 
+f 104//52 103//52 105//53 106//53 
+f 106//53 105//53 107//54 108//54 
+f 108//54 107//54 109//55 110//55 
+f 110//55 109//55 111//56 112//56 
+f 112//56 111//56 113//57 114//57 
+f 114//57 113//57 115//58 116//58 
+f 116//58 115//58 117//59 118//59 
+f 118//59 117//59 119//60 120//60 
+f 120//60 119//60 121//61 122//61 
+f 122//61 121//61 123//62 124//62 
+f 124//62 123//62 125//63 126//63 
+f 126//63 125//63 127//64 128//64 
+s 3
+f 128//64 127//64 2//1 1//1 
+s 16
+f 5//65 3//65 9//65 7//65 
+f 9//65 3//65 2//65 11//65 
+f 2//65 127//65 13//65 11//65 
+f 13//65 127//65 17//65 15//65 
+f 17//65 127//65 21//65 19//65 
+f 21//65 127//65 25//65 23//65 
+f 25//65 127//65 29//65 27//65 
+f 29//65 127//65 33//65 31//65 
+f 33//65 127//65 37//65 35//65 
+f 37//65 127//65 41//65 39//65 
+f 41//65 127//65 45//65 43//65 
+f 127//65 125//65 123//65 45//65 
+f 123//65 121//65 119//65 45//65 
+f 119//65 117//65 115//65 45//65 
+f 115//65 113//65 111//65 45//65 
+f 111//65 109//65 107//65 45//65 
+f 107//65 105//65 103//65 45//65 
+f 103//65 101//65 99//65 45//65 
+f 99//65 97//65 95//65 45//65 
+f 45//65 95//65 93//65 47//65 
+f 47//65 93//65 91//65 49//65 
+f 49//65 91//65 89//65 51//65 
+f 89//65 87//65 53//65 51//65 
+f 87//65 85//65 55//65 53//65 
+f 85//65 83//65 57//65 55//65 
+f 57//65 83//65 81//65 59//65 
+f 59//65 81//65 79//65 61//65 
+f 61//65 79//65 65//65 63//65 
+f 65//65 79//65 69//65 67//65 
+f 69//65 79//65 73//65 71//65 
+f 73//65 79//65 77//65 75//65 
+f 78//66 80//66 74//66 76//66 
+f 6//66 8//66 10//66 4//66 
+f 10//66 12//66 1//66 4//66 
+f 1//66 12//66 14//66 128//66 
+f 14//66 16//66 18//66 128//66 
+f 18//66 20//66 22//66 128//66 
+f 22//66 24//66 26//66 128//66 
+f 26//66 28//66 30//66 128//66 
+f 30//66 32//66 34//66 128//66 
+f 34//66 36//66 38//66 128//66 
+f 38//66 40//66 42//66 128//66 
+f 42//66 44//66 46//66 128//66 
+f 128//66 46//66 124//66 126//66 
+f 124//66 46//66 120//66 122//66 
+f 120//66 46//66 116//66 118//66 
+f 116//66 46//66 112//66 114//66 
+f 112//66 46//66 108//66 110//66 
+f 108//66 46//66 104//66 106//66 
+f 104//66 46//66 100//66 102//66 
+f 100//66 46//66 96//66 98//66 
+f 46//66 48//66 94//66 96//66 
+f 48//66 50//66 92//66 94//66 
+f 50//66 52//66 90//66 92//66 
+f 90//66 52//66 54//66 88//66 
+f 88//66 54//66 56//66 86//66 
+f 86//66 56//66 58//66 84//66 
+f 82//66 84//66 58//66 60//66 
+f 80//66 82//66 60//66 62//66 
+f 62//66 64//66 66//66 80//66 
+f 66//66 68//66 70//66 80//66 
+f 70//66 72//66 74//66 80//66 
+# 126 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/riskSource/riskSource-0.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:52:02
+
+newmtl risk_0
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka risk-0.png
+	map_Kd risk-0.png
+	map_d risk-0.png

mods/components/3dviewConvertor/threeres/marker-models/riskSource/riskSource-0.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:52:02
+
+mtllib risk-0.mtl
+
+#
+# object risk_0
+#
+
+v  -1.6000 -0.0000 -0.0000
+v  -0.8000 -0.0000 -0.0000
+v  -0.8000 0.8000 -0.0000
+v  -1.6000 0.8000 -0.0000
+v  0.0000 -0.0000 -0.0000
+v  0.0000 0.8000 -0.0000
+v  0.8000 -0.0000 -0.0000
+v  0.8000 0.8000 -0.0000
+v  1.6000 -0.0000 -0.0000
+v  1.6000 0.8000 -0.0000
+v  -0.8000 1.6000 0.0000
+v  -1.6000 1.6000 0.0000
+v  0.0000 1.6000 0.0000
+v  0.8000 1.6000 0.0000
+v  1.6000 1.6000 0.0000
+v  -0.8000 2.4000 0.0000
+v  -1.6000 2.4000 0.0000
+v  0.0000 2.4000 0.0000
+v  0.8000 2.4000 0.0000
+v  1.6000 2.4000 0.0000
+v  -0.8000 3.2000 0.0000
+v  -1.6000 3.2000 0.0000
+v  0.0000 3.2000 0.0000
+v  0.8000 3.2000 0.0000
+v  1.6000 3.2000 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.0000 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g risk_0
+usemtl risk_0
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 2/2/1 5/5/1 6/6/1 3/3/1 
+f 5/5/1 7/7/1 8/8/1 6/6/1 
+f 7/7/1 9/9/1 10/10/1 8/8/1 
+f 4/4/1 3/3/1 11/11/1 12/12/1 
+f 3/3/1 6/6/1 13/13/1 11/11/1 
+f 6/6/1 8/8/1 14/14/1 13/13/1 
+f 8/8/1 10/10/1 15/15/1 14/14/1 
+f 12/12/1 11/11/1 16/16/1 17/17/1 
+f 11/11/1 13/13/1 18/18/1 16/16/1 
+f 13/13/1 14/14/1 19/19/1 18/18/1 
+f 14/14/1 15/15/1 20/20/1 19/19/1 
+f 17/17/1 16/16/1 21/21/1 22/22/1 
+f 16/16/1 18/18/1 23/23/1 21/21/1 
+f 18/18/1 19/19/1 24/24/1 23/23/1 
+f 19/19/1 20/20/1 25/25/1 24/24/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/riskSource/riskSource-1.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:53:04
+
+newmtl risk_1
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka risk-1.png
+	map_Kd risk-1.png
+	map_d risk-1.png

mods/components/3dviewConvertor/threeres/marker-models/riskSource/riskSource-1.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:53:04
+
+mtllib risk-1.mtl
+
+#
+# object risk_1
+#
+
+v  -1.6000 -0.0000 -0.0000
+v  -0.8000 -0.0000 -0.0000
+v  -0.8000 0.8000 -0.0000
+v  -1.6000 0.8000 -0.0000
+v  0.0000 -0.0000 -0.0000
+v  0.0000 0.8000 -0.0000
+v  0.8000 -0.0000 -0.0000
+v  0.8000 0.8000 -0.0000
+v  1.6000 -0.0000 -0.0000
+v  1.6000 0.8000 -0.0000
+v  -0.8000 1.6000 0.0000
+v  -1.6000 1.6000 0.0000
+v  0.0000 1.6000 0.0000
+v  0.8000 1.6000 0.0000
+v  1.6000 1.6000 0.0000
+v  -0.8000 2.4000 0.0000
+v  -1.6000 2.4000 0.0000
+v  0.0000 2.4000 0.0000
+v  0.8000 2.4000 0.0000
+v  1.6000 2.4000 0.0000
+v  -0.8000 3.2000 0.0000
+v  -1.6000 3.2000 0.0000
+v  0.0000 3.2000 0.0000
+v  0.8000 3.2000 0.0000
+v  1.6000 3.2000 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.0000 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g risk_1
+usemtl risk_1
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 2/2/1 5/5/1 6/6/1 3/3/1 
+f 5/5/1 7/7/1 8/8/1 6/6/1 
+f 7/7/1 9/9/1 10/10/1 8/8/1 
+f 4/4/1 3/3/1 11/11/1 12/12/1 
+f 3/3/1 6/6/1 13/13/1 11/11/1 
+f 6/6/1 8/8/1 14/14/1 13/13/1 
+f 8/8/1 10/10/1 15/15/1 14/14/1 
+f 12/12/1 11/11/1 16/16/1 17/17/1 
+f 11/11/1 13/13/1 18/18/1 16/16/1 
+f 13/13/1 14/14/1 19/19/1 18/18/1 
+f 14/14/1 15/15/1 20/20/1 19/19/1 
+f 17/17/1 16/16/1 21/21/1 22/22/1 
+f 16/16/1 18/18/1 23/23/1 21/21/1 
+f 18/18/1 19/19/1 24/24/1 23/23/1 
+f 19/19/1 20/20/1 25/25/1 24/24/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/riskSource/riskSource-2.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:54:06
+
+newmtl risk_2
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka risk-2.png
+	map_Kd risk-2.png
+	map_d risk-2.png

mods/components/3dviewConvertor/threeres/marker-models/riskSource/riskSource-2.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:54:06
+
+mtllib risk-2.mtl
+
+#
+# object risk_2
+#
+
+v  -1.6000 -0.0000 -0.0000
+v  -0.8000 -0.0000 -0.0000
+v  -0.8000 0.8000 -0.0000
+v  -1.6000 0.8000 -0.0000
+v  0.0000 -0.0000 -0.0000
+v  0.0000 0.8000 -0.0000
+v  0.8000 -0.0000 -0.0000
+v  0.8000 0.8000 -0.0000
+v  1.6000 -0.0000 -0.0000
+v  1.6000 0.8000 -0.0000
+v  -0.8000 1.6000 0.0000
+v  -1.6000 1.6000 0.0000
+v  0.0000 1.6000 0.0000
+v  0.8000 1.6000 0.0000
+v  1.6000 1.6000 0.0000
+v  -0.8000 2.4000 0.0000
+v  -1.6000 2.4000 0.0000
+v  0.0000 2.4000 0.0000
+v  0.8000 2.4000 0.0000
+v  1.6000 2.4000 0.0000
+v  -0.8000 3.2000 0.0000
+v  -1.6000 3.2000 0.0000
+v  0.0000 3.2000 0.0000
+v  0.8000 3.2000 0.0000
+v  1.6000 3.2000 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.0000 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g risk_2
+usemtl risk_2
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 2/2/1 5/5/1 6/6/1 3/3/1 
+f 5/5/1 7/7/1 8/8/1 6/6/1 
+f 7/7/1 9/9/1 10/10/1 8/8/1 
+f 4/4/1 3/3/1 11/11/1 12/12/1 
+f 3/3/1 6/6/1 13/13/1 11/11/1 
+f 6/6/1 8/8/1 14/14/1 13/13/1 
+f 8/8/1 10/10/1 15/15/1 14/14/1 
+f 12/12/1 11/11/1 16/16/1 17/17/1 
+f 11/11/1 13/13/1 18/18/1 16/16/1 
+f 13/13/1 14/14/1 19/19/1 18/18/1 
+f 14/14/1 15/15/1 20/20/1 19/19/1 
+f 17/17/1 16/16/1 21/21/1 22/22/1 
+f 16/16/1 18/18/1 23/23/1 21/21/1 
+f 18/18/1 19/19/1 24/24/1 23/23/1 
+f 19/19/1 20/20/1 25/25/1 24/24/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/riskSource/riskSource-3.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:54:54
+
+newmtl risk_3
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka risk-3.png
+	map_Kd risk-3.png
+	map_d risk-3.png

mods/components/3dviewConvertor/threeres/marker-models/riskSource/riskSource-3.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:54:54
+
+mtllib risk-3.mtl
+
+#
+# object risk_3
+#
+
+v  -1.6000 -0.0000 -0.0000
+v  -0.8000 -0.0000 -0.0000
+v  -0.8000 0.8000 -0.0000
+v  -1.6000 0.8000 -0.0000
+v  0.0000 -0.0000 -0.0000
+v  0.0000 0.8000 -0.0000
+v  0.8000 -0.0000 -0.0000
+v  0.8000 0.8000 -0.0000
+v  1.6000 -0.0000 -0.0000
+v  1.6000 0.8000 -0.0000
+v  -0.8000 1.6000 0.0000
+v  -1.6000 1.6000 0.0000
+v  0.0000 1.6000 0.0000
+v  0.8000 1.6000 0.0000
+v  1.6000 1.6000 0.0000
+v  -0.8000 2.4000 0.0000
+v  -1.6000 2.4000 0.0000
+v  0.0000 2.4000 0.0000
+v  0.8000 2.4000 0.0000
+v  1.6000 2.4000 0.0000
+v  -0.8000 3.2000 0.0000
+v  -1.6000 3.2000 0.0000
+v  0.0000 3.2000 0.0000
+v  0.8000 3.2000 0.0000
+v  1.6000 3.2000 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.0000 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g risk_3
+usemtl risk_3
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 2/2/1 5/5/1 6/6/1 3/3/1 
+f 5/5/1 7/7/1 8/8/1 6/6/1 
+f 7/7/1 9/9/1 10/10/1 8/8/1 
+f 4/4/1 3/3/1 11/11/1 12/12/1 
+f 3/3/1 6/6/1 13/13/1 11/11/1 
+f 6/6/1 8/8/1 14/14/1 13/13/1 
+f 8/8/1 10/10/1 15/15/1 14/14/1 
+f 12/12/1 11/11/1 16/16/1 17/17/1 
+f 11/11/1 13/13/1 18/18/1 16/16/1 
+f 13/13/1 14/14/1 19/19/1 18/18/1 
+f 14/14/1 15/15/1 20/20/1 19/19/1 
+f 17/17/1 16/16/1 21/21/1 22/22/1 
+f 16/16/1 18/18/1 23/23/1 21/21/1 
+f 18/18/1 19/19/1 24/24/1 23/23/1 
+f 19/19/1 20/20/1 25/25/1 24/24/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/riskSource/riskSource-4.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:55:41
+
+newmtl risk_4
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka risk-4.png
+	map_Kd risk-4.png
+	map_d risk-4.png

mods/components/3dviewConvertor/threeres/marker-models/riskSource/riskSource-4.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:55:41
+
+mtllib risk-4.mtl
+
+#
+# object risk_4
+#
+
+v  -1.6000 -0.0000 -0.0000
+v  -0.8000 -0.0000 -0.0000
+v  -0.8000 0.8000 -0.0000
+v  -1.6000 0.8000 -0.0000
+v  0.0000 -0.0000 -0.0000
+v  0.0000 0.8000 -0.0000
+v  0.8000 -0.0000 -0.0000
+v  0.8000 0.8000 -0.0000
+v  1.6000 -0.0000 -0.0000
+v  1.6000 0.8000 -0.0000
+v  -0.8000 1.6000 0.0000
+v  -1.6000 1.6000 0.0000
+v  0.0000 1.6000 0.0000
+v  0.8000 1.6000 0.0000
+v  1.6000 1.6000 0.0000
+v  -0.8000 2.4000 0.0000
+v  -1.6000 2.4000 0.0000
+v  0.0000 2.4000 0.0000
+v  0.8000 2.4000 0.0000
+v  1.6000 2.4000 0.0000
+v  -0.8000 3.2000 0.0000
+v  -1.6000 3.2000 0.0000
+v  0.0000 3.2000 0.0000
+v  0.8000 3.2000 0.0000
+v  1.6000 3.2000 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.0000 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g risk_4
+usemtl risk_4
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 2/2/1 5/5/1 6/6/1 3/3/1 
+f 5/5/1 7/7/1 8/8/1 6/6/1 
+f 7/7/1 9/9/1 10/10/1 8/8/1 
+f 4/4/1 3/3/1 11/11/1 12/12/1 
+f 3/3/1 6/6/1 13/13/1 11/11/1 
+f 6/6/1 8/8/1 14/14/1 13/13/1 
+f 8/8/1 10/10/1 15/15/1 14/14/1 
+f 12/12/1 11/11/1 16/16/1 17/17/1 
+f 11/11/1 13/13/1 18/18/1 16/16/1 
+f 13/13/1 14/14/1 19/19/1 18/18/1 
+f 14/14/1 15/15/1 20/20/1 19/19/1 
+f 17/17/1 16/16/1 21/21/1 22/22/1 
+f 16/16/1 18/18/1 23/23/1 21/21/1 
+f 18/18/1 19/19/1 24/24/1 23/23/1 
+f 19/19/1 20/20/1 25/25/1 24/24/1 
+# 16 polygons
+

mods/components/3dviewConvertor/threeres/marker-models/video/video.mtl

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:50:12
+
+newmtl video
+	Ns 10.0000
+	Ni 1.5000
+	d 1.0000
+	Tr 0.0000
+	Tf 1.0000 1.0000 1.0000 
+	illum 2
+	Ka 0.5880 0.5880 0.5880
+	Kd 0.5880 0.5880 0.5880
+	Ks 0.0000 0.0000 0.0000
+	Ke 0.0000 0.0000 0.0000
+	map_Ka video.png
+	map_Kd video.png
+	map_d video.png

mods/components/3dviewConvertor/threeres/marker-models/video/video.obj

+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# ļ:03.06.2020 13:50:12
+
+mtllib video.mtl
+
+#
+# object video
+#
+
+v  -1.6371 -0.5656 0.0000
+v  -0.8185 -0.5656 0.0000
+v  -0.8185 0.3553 0.0000
+v  -1.6371 0.3553 0.0000
+v  0.0000 -0.5656 0.0000
+v  0.0000 0.3553 0.0000
+v  0.8185 -0.5656 0.0000
+v  0.8185 0.3553 0.0000
+v  1.6371 -0.5656 0.0000
+v  1.6371 0.3553 0.0000
+v  -0.8185 1.2761 0.0000
+v  -1.6371 1.2761 0.0000
+v  0.0000 1.2761 0.0000
+v  0.8185 1.2761 0.0000
+v  1.6371 1.2761 0.0000
+v  -0.8185 2.1970 0.0000
+v  -1.6371 2.1970 0.0000
+v  0.0000 2.1970 0.0000
+v  0.8185 2.1970 0.0000
+v  1.6371 2.1970 0.0000
+v  -0.8185 3.1178 0.0000
+v  -1.6371 3.1178 0.0000
+v  0.0000 3.1178 0.0000
+v  0.8185 3.1178 0.0000
+v  1.6371 3.1178 0.0000
+# 25 vertices
+
+vn 0.0000 -0.0000 1.0000
+# 1 vertex normals
+
+vt 0.0000 0.0000 0.0000
+vt 0.2500 0.0000 0.0000
+vt 0.2500 0.2500 0.0000
+vt 0.0000 0.2500 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 0.2500 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 0.2500 0.0000
+vt 1.0000 0.0000 0.0000
+vt 1.0000 0.2500 0.0000
+vt 0.2500 0.5000 0.0000
+vt 0.0000 0.5000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.7500 0.5000 0.0000
+vt 1.0000 0.5000 0.0000
+vt 0.2500 0.7500 0.0000
+vt 0.0000 0.7500 0.0000
+vt 0.5000 0.7500 0.0000
+vt 0.7500 0.7500 0.0000
+vt 1.0000 0.7500 0.0000
+vt 0.2500 1.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+# 25 texture coords
+
+g video
+usemtl video
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 
+f 2/2/1 5/5/1 6/6/1 3/3/1 
+f 5/5/1 7/7/1 8/8/1 6/6/1 
+f 7/7/1 9/9/1 10/10/1 8/8/1 
+f 4/4/1 3/3/1 11/11/1 12/12/1 
+f 3/3/1 6/6/1 13/13/1 11/11/1 
+f 6/6/1 8/8/1 14/14/1 13/13/1 
+f 8/8/1 10/10/1 15/15/1 14/14/1 
+f 12/12/1 11/11/1 16/16/1 17/17/1 
+f 11/11/1 13/13/1 18/18/1 16/16/1 
+f 13/13/1 14/14/1 19/19/1 18/18/1 
+f 14/14/1 15/15/1 20/20/1 19/19/1 
+f 17/17/1 16/16/1 21/21/1 22/22/1 
+f 16/16/1 18/18/1 23/23/1 21/21/1 
+f 18/18/1 19/19/1 24/24/1 23/23/1 
+f 19/19/1 20/20/1 25/25/1 24/24/1 
+# 16 polygons
+

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

@@ -1354,7 +1354,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 });
     });
   }
 
@@ -1372,7 +1375,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/ModelContent.js

@@ -52,8 +52,8 @@ export default class ModelContent extends Component {
         {(content || []).map(itemA => {
           return (
             <div className='row'>
-              <span>{itemA.name}</span>
-              <span className='date'>{this.formatData(itemA.changeDate)}</span>
+              <span>{itemA.name}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{this.formatData(itemA.changeDate)}</span>
+              {/* <span className='date'>{this.formatData(itemA.changeDate)}</span> */}
             </div>
           );
         })}

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 }]
         }
       ]
     }

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

@@ -161,28 +161,28 @@ class StatisticsCheck extends Component {
           <div className="content-xj-bottom" >
             <div className="green-div">
               <div className="green-div-content">
-                <span className='titleIcon' style={this.rederStyle('check_hege')}></span><span className="content-week-font"> 合格
+                <span className='titleIcon-check' style={this.rederStyle('check_hege')}></span><span className="content-week-font"> 合格
                   <span className="content-font-number">{hege}个</span>
                 </span>
               </div>
             </div>
             <div className="grey-div">
               <div className="grey-div-content">
-                <span className='titleIcon' style={this.rederStyle('check_weizhixing')}></span><span className="content-week-font"> 未开始
+                <span className='titleIcon-check' style={this.rederStyle('check_weizhixing')}></span><span className="content-week-font"> 未开始
                   <span className="content-font-number"> {weikaishi}个</span>
                 </span>
               </div>
             </div>
             <div className="red-div">
               <div className="red-div-content">
-                <span className='titleIcon' style={this.rederStyle('check_louyan')}></span><span className="content-week-font"> 漏检
+                <span className='titleIcon-check' style={this.rederStyle('check_louyan')}></span><span className="content-week-font"> 漏检
                   <span className="content-font-number"> {loujian}个</span>
                 </span>
               </div>
             </div>
             <div className="yellow-div">
               <div className="yellow-div-content">
-                <span className='titleIcon' style={this.rederStyle('check_buhege')}></span><span className="content-week-font"> 不合格
+                <span className='titleIcon-check' style={this.rederStyle('check_buhege')}></span><span className="content-week-font"> 不合格
                   <span className="content-font-number"> {buhege}个</span>
                 </span>
               </div>

mods/components/3dviewConvertor/view/points/index.js

@@ -18,7 +18,14 @@ class BasicPoint extends Component {
  */
 export const RiskPoint = marker3DFactory(BasicPoint,
   {
-    markerType: 'riskSource'
+    markerType: 'riskSource',
+    markerParams: {
+      useModel: true,
+      objPath: '/mods/components/3dviewConvertor/threeres/marker-models/riskSource/{url}.obj',
+      mtlPath: '/mods/components/3dviewConvertor/threeres/marker-models/riskSource/{url}.mtl'
+      // objPath: '/mods/components/3dviewConvertor/threeres/marker-models/riskSource/riskSource-1.obj',
+      // mtlPath: '/mods/components/3dviewConvertor/threeres/marker-models/riskSource/riskSource-1.mtl'
+    }
   }
 );
 
@@ -27,7 +34,12 @@ export const RiskPoint = marker3DFactory(BasicPoint,
  */
 export const PatrolPoint = marker3DFactory(BasicPoint,
   {
-    markerType: 'patrol'
+    markerType: 'patrol',
+    markerParams: {
+      useModel: true,
+      objPath: '/mods/components/3dviewConvertor/threeres/marker-models/patrol/{url}.obj',
+      mtlPath: '/mods/components/3dviewConvertor/threeres/marker-models/patrol/{url}.mtl'
+    }
   }
 );
 
@@ -45,7 +57,12 @@ export const PersonPoint = markerFactory(BasicPoint,
  */
 export const MonitorPoint = marker3DFactory(BasicPoint,
   {
-    markerType: 'video'
+    markerType: 'video',
+    markerParams: {
+      useModel: true,
+      objPath: '/mods/components/3dviewConvertor/threeres/marker-models/video/video.obj',
+      mtlPath: '/mods/components/3dviewConvertor/threeres/marker-models/video/video.mtl'
+    }
   }
 );
 
@@ -54,7 +71,12 @@ export const MonitorPoint = marker3DFactory(BasicPoint,
  */
 export const ProbePoint = marker3DFactory(BasicPoint,
   {
-    markerType: 'monitorEquipment'
+    markerType: 'monitorEquipment',
+    markerParams: {
+      useModel: true,
+      objPath: '/mods/components/3dviewConvertor/threeres/marker-models/monitorEquip/monitorEquip.obj',
+      mtlPath: '/mods/components/3dviewConvertor/threeres/marker-models/monitorEquip/monitorEquip.mtl'
+    }
   }
 );
 
@@ -69,7 +91,12 @@ export const FireResourcePoint = markerFactory(BasicPoint,
 
 export const EquipmentPoint = marker3DFactory(BasicPoint,
   {
-    markerType: 'impEquipment'
+    markerType: 'impEquipment',
+    markerParams: {
+      useModel: true,
+      objPath: '/mods/components/3dviewConvertor/threeres/marker-models/impEquip/impEquip.obj',
+      mtlPath: '/mods/components/3dviewConvertor/threeres/marker-models/impEquip/impEquip.mtl'
+    }
   }
 );
 

mods/components/3dviewConvertor/view/points/marker3DFactory.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { utils, deepCopy} from 'amos-tool';
 import { Markers } from 'amos-3d/lib/designer';
 import { BaseObjHelper } from 'base-r3d/lib/factory';
+import formatUrl from 'amos-processor/lib/utils/urlFormat';
 import { CONSTS } from './../../consts/storageConsts';
 import PointDialog from './PointDialog';
 import { tirggerPlanTopic } from './../dataProcessor';
@@ -26,7 +27,11 @@ const buildMarkerOptions = (markers, markerType, defaultParams = {}) => {
         position = Object.values(m.position);
       }
       for (let k of Object.keys(defaultParams)) {
-        m[k] = defaultParams[k];
+        if((markerType === 'riskSource' || markerType === 'patrol' ) && k != 'useModel'){
+          m[k] = formatUrl(defaultParams[k], { url: `${markerType}-${m.level}` });
+        }else{
+          m[k] = defaultParams[k];
+        }
       }
       m.key = m.key || m.id;
       m.url = url;

mods/components/3dviewConvertor/view/searchPane/index.js

@@ -103,7 +103,6 @@ class SearchPane extends Component {
       dataList: [],
       retrieveType: undefined,
       totalCount: 0,
-      filter: [],
       msgDataList: [],
       recordDataList: [],
       trajectoryDataList: []
@@ -156,7 +155,7 @@ class SearchPane extends Component {
     }else if(value === 'trajectory'){
       this.fetchTrajectoryData()
     }
-    this.setState({ activeKey:value });
+    this.setState({ activeKey:value ,filter: []});
   }
 
   getPanelHeight = () => {

mods/components/3dviewConvertor/view/searchPane/paramsHeader.js

@@ -54,6 +54,18 @@ class paramsHeader extends Component {
     recordStatusListAction().then(d => this.setState({ statusList: d || [] }));
   }
 
+  componentWillReceiveProps(nextProps) {
+    if (this.props.activeKey !== nextProps.activeKey){
+      this.setState({
+        textValue: undefined,
+        msgTextValue: undefined,
+        recordTextValue: undefined,
+        filter: [],
+        recordFilter: [],
+      })
+    }
+}
+
   onChange = (e) => {
     this.setState({ value: e.target.value });
   }
@@ -73,12 +85,6 @@ class paramsHeader extends Component {
 
   onPamarmsChange = (name,value) => {
     let { filter } = this.state;
-    if(name === 'inputText'){
-      this.setState({ textValue: value });
-    }
-    if(name === 'title'){
-      this.setState({ msgTextValue: value });
-    }
     if(name === 'time'){
       value = value == null ? '' : moment(value).format("YYYY-MM-DD");
     }
@@ -93,21 +99,17 @@ class paramsHeader extends Component {
     } else {
       filter = filter.filter(e => e.name !== name);
     }
-    this.setState({ filter }, this.props.paramsOnChange(filter));
+    if(name === 'inputText'){
+      this.setState({ textValue: value,filter });
+    }else if(name === 'title'){
+      this.setState({ msgTextValue: value,filter });
+    }else{
+      this.setState({ filter }, this.props.paramsOnChange(filter));
+    }
   }
   
   paramsTypeonChange = (name,value,type,key) => {
     let {recordFilter} = this.state;
-    if(name === 'contingencyName'){
-      this.setState({recordTextValue:value})
-    }
-    if(name === 'pointName'){
-      if(key === 'record'){
-        this.setState({ recordTextValue:value });
-      }else{
-        this.setState({ trajectoryTextValue: value });
-      }
-    }
     if(name === 'checkTime'){
       value = value == null ? '' : moment(value).format("YYYY-MM-DD");
     }
@@ -123,11 +125,22 @@ class paramsHeader extends Component {
     } else {
       recordFilter = recordFilter.filter(e => e.name !== name);
     }
-    this.setState({ recordFilter }, this.props.paramsOnChange(recordFilter));
+    debugger;
+    if(name === 'contingencyName'){
+      this.setState({recordTextValue:value,recordFilter})
+    }else if(name === 'pointName'){
+      if(key === 'record'){
+        this.setState({ recordTextValue:value,recordFilter });
+      }else{
+        this.setState({ trajectoryTextValue: value,recordFilter });
+      }
+    }else{//不为input时直接查询
+      this.setState({ recordFilter }, this.props.paramsOnChange(recordFilter));
+    }
   }
 
   getSearchContent = () => {
-    const { showRiskLevel, showImpEquiList, impEquiList  } = this.state;
+    const { showRiskLevel, showImpEquiList, impEquiList,filter  } = this.state;
     let levelStyle = { width: '20%', minWidth: '15%', height: '28px', marginRight:'14px' };
     let implStyle = { width: '35%', minWidth: '20%', height: '28px', marginRight:'14px' };
     return (<Group style={groupStyle}>
@@ -146,7 +159,7 @@ class paramsHeader extends Component {
           onChange={(e) => this.onPamarmsChange('inputText',e.target.value)}
           placeholder="输入关键字"
         />
-        <img className="params-input-img" src={imgStatic.datapane.searchPane} alt="" />
+        <img className="params-input-img" src={imgStatic.datapane.searchPane} alt="" onClick={() => this.props.paramsOnChange(filter)}/>
       </div>
       {
         showRiskLevel && 
@@ -175,7 +188,7 @@ class paramsHeader extends Component {
   }
 
   getMessageContent = () => {
-    
+    const { filter } = this.state;
     return (<Group style={groupStyle}>
       <Select
         key="messageType"
@@ -192,7 +205,7 @@ class paramsHeader extends Component {
           onChange={(e) => this.onPamarmsChange('title',e.target.value)}
           placeholder="输入关键字"
         />
-        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" />
+        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={() => this.props.paramsOnChange(filter)}/>
       </div>
       <DatePicker
         key="time"
@@ -208,7 +221,7 @@ class paramsHeader extends Component {
   }
 
   getRecordContent = () =>{
-    const { impEquiList  } = this.state;
+    const { recordFilter } = this.state;
     return (<Group style={groupStyle}>
       {/* <Select
         key="recordImpl"
@@ -225,7 +238,7 @@ class paramsHeader extends Component {
           onChange={(e) => this.paramsTypeonChange('pointName', e.target.value, SingleQueryEnum.LIKE,'record')}
           placeholder="输入关键字"
         />
-        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" />
+        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={()=> this.props.paramsOnChange(recordFilter)}/>
       </div>
       <DatePicker
         key="createTime"
@@ -239,7 +252,7 @@ class paramsHeader extends Component {
   }
 
   getTrajectoryContent = () => {
-    const { statusList } = this.state;
+    const { statusList,recordFilter } = this.state;
     return (<Group style={groupStyle}>
       <Select
         key="statusSel"
@@ -256,7 +269,7 @@ class paramsHeader extends Component {
           onChange={(e) => this.paramsTypeonChange('pointName', e.target.value, SingleQueryEnum.LIKE)}
           placeholder="输入关键字"
         />
-        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" />
+        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={()=>this.props.paramsOnChange(recordFilter)}/>
       </div>
       <DatePicker
         key="createTime"