wenhongquan 2 年之前
父节点
当前提交
76ddd18dc7
共有 2 个文件被更改,包括 15 次插入7 次删除
  1. 6 6
      index.html
  2. 9 1
      src/components/MarkerMap/index.tsx

+ 6 - 6
index.html

@@ -15,19 +15,19 @@
     <script src="./lib/jsencrypt.min.js"></script>
     <!-- <script src="./flexible.js"></script> -->
     <script src="./login.js?time=2"></script>
-    <script src="./webClient/defaultConfig.js?time=113"></script>
-    <script src="./webClient/initWebSocket.js?time=124"></script>
-    <script src="./webClient/webClient_initWnd.js?time=1221"></script>
+    <script src="./webClient/defaultConfig.js?time=114"></script>
+    <script src="./webClient/initWebSocket.js?time=125"></script>
+    <script src="./webClient/webClient_initWnd.js?time=1222"></script>
 
 
 
     <!--    <script src="../webClient/defaultConfig.js"></script>-->
     <!--    <script src="../webClient/initWebSocket.js"></script>-->
     <!--    <script src="../webClient/webClient_initWnd.js"></script>-->
-    <script src="./js/common.js?time=3"></script>
+    <script src="./js/common.js?time=4"></script>
 
-    <script src="./meeting.js?time=42"></script>
-    <script src="./js/videoplay.js?time=2"></script>
+    <script src="./meeting.js?time=43"></script>
+    <script src="./js/videoplay.js?time=3"></script>
 
     <!-- <script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.g6-3.1.1/build/g6.js"></script> -->
     <link rel="stylesheet" href="<%- mapurl %>/minemapapi/v2.1.0/minemap.css">

+ 9 - 1
src/components/MarkerMap/index.tsx

@@ -1010,7 +1010,15 @@ export default defineComponent({
 
       const locations = state.positions
         .filter(
-          (i) => i.indexOf('0E-12') == -1 && parseFloat(i.split(',')[0]) > 100,
+          (i) => {
+            var res = true;
+            var x = parseFloat(i.split(',')[0]);
+            var y = parseFloat(i.split(',')[1]);
+            if (x > 119 || x < 116 || y > 36 || y < 31) { res = false; }
+            if (i.indexOf('0E-12') !== -1) { res = false; }
+
+            return res;
+          }
         )
         .map((i) => i.split(',').map(Number));