Merge branch 'master' of http://121.42.8.157:13000/zengminguo/D-MAP

src/uwb-sample.js

@@ -816,7 +816,8 @@ export function uwbMain(domId, modelWidth, modelHeight, finalMode, callback) {
             let bFirst = true;
             let bool = false;
             let bool1 = false;
-            intersects.forEach(m => {
+            for (let z = 0; z < intersects.length; z++) {
+              let m = intersects[z];
               if (m && m.object && (m.object.userData.type == 'water')) {
                 console.log('===== bench selected =====')
                 window.store.dispatch('benchList/setMouseOverBench', {
@@ -825,15 +826,18 @@ export function uwbMain(domId, modelWidth, modelHeight, finalMode, callback) {
                   pageY: event.y,
                   status: true
                 })
+                break;
               } else {
-                window.store.dispatch('benchList/setMouseOverBench', {
-                  bench_id: m.object.userData.benchId,
-                  pageX: event.x,
-                  pageY: event.y,
-                  status: false
-                })
+                if (m.object.userData.benchId) {
+                  window.store.dispatch('benchList/setMouseOverBench', {
+                    bench_id: m.object.userData.benchId,
+                    pageX: event.x,
+                    pageY: event.y,
+                    status: false
+                  })
+                }
               }
-            })
+            }
             bool = false;
             bool1 = false;
           }