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

amos.config.js

@@ -47,7 +47,7 @@
           delayTime: 10 // 屏保出现时间(单位：秒) 10s
         },
         //三维模型配置 yinan 沂南站 shm 上海庙站  sn 苏南 hainan 海南站
-        view3dFile:'/mods/components/3dviewConvertor/threeres/models/shm/index_dev.json',
+        view3dFile:'/mods/components/3dviewConvertor/threeres/models/yinan/index.json',
       }
     }
   };

mods/components/3dviewConvertor/threeres/models/shm/index.json

 {
   "sceneName": "station-shanghai-temple",
-  "basePath": "/threeres/models/shm/",
+  "basePath":  "/mods/components/3dviewConvertor/threeres/models/shm/",
   "models": [
 	  { "objName": "ground.obj", "mtlName": "ground.mtl", "modelLevel": "Park" },
 	  { "objName": "ji1diduanfatingshi.obj", "mtlName": "ji1diduanfatingshi.mtl", "modelLevel": "Building", "foreignKey": "valve-hall_01" },

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

@@ -61,9 +61,11 @@ export default function marker3DFactory(WrappedComponent = 'div', options) {
     componentWillReceiveProps = nextProps => {
       if (nextProps.isEditMode) {
         this.markersCache.eachValue(obj => {
-          // this.setTopCardConf(obj, obj.extData);
+
           if (nextProps.selectPoints.type === obj.extData.type && nextProps.selectPoints.id === obj.extData.id) {
-            this.setTwinkleConf(obj);
+            this.selectTwinkleConf(obj,1,'#FF0000');
+          } else {
+            this.selectTwinkleConf(obj,null,null);
           }
         });
       }
@@ -126,6 +128,18 @@ export default function marker3DFactory(WrappedComponent = 'div', options) {
           pulsePeriod: pulsePeriod.toFixed(2)
         });
     };
+    selectTwinkleConf = (obj, mark,selectColor)=> {
+      let pulsePeriod = mark;
+      let color = selectColor;
+      if (!obj.baseObjHelper.outlineHelper) {
+        obj.baseObjHelper.setOutlineHelper(this.outlineHelper);
+      }
+      obj.baseObjHelper.style.outlineColor = color;
+      pulsePeriod &&
+        obj.baseObjHelper.outlineHelper.setConfig({
+          pulsePeriod: pulsePeriod.toFixed(2)
+        });
+    };
 
     setTopCardConf = (obj, extData) => {
       const { title, name } = extData;