调整部分目录结构

wj-data-vision/src/components/Standard/map/index.vue → wj-data-vision/src/components/Standard/mapboxMap.vue

@@ -5,11 +5,7 @@
 </template>
 
 <script>
-import {Scene} from "@antv/l7";
-import {Mapbox} from "@antv/l7-maps";
-
-let map, scene;
-// Point MultiPoint LineString MultiLineString Polygon MultiPolygon
+let map
 export default {
   name: "wMap",
   props: ["mapId"],
@@ -30,21 +26,8 @@ export default {
         maxZoom: map_config.MAX_ZOOM,
         pitch: map_config.MAP_PITCH,
       });
-      scene = new Scene({
-        logoVisible: false,
-        id: this.mapId,
-        map: new Mapbox({
-          mapInstance: map,
-        }),
-      });
       map.rotateTo(map_config.MAP_ROTATE);
-      // map.on('load', () => {
-      //   map.addControl(new mapboxgl.NavigationControl({showZoom: false}), 'top-right');
-      // })
-      // setTimeout(() => {
-      //   map.flyTo({zoom: map_config.MAP_ZOOM})
-      // }, 10000)
-      return [map, scene];
+      return map;
     }
   },
   computed: {},

wj-data-vision/src/components/Standard/map/modelMapC.vue → wj-data-vision/src/components/Standard/modelMap.vue

@@ -5,11 +5,8 @@
 </template>
 
 <script>
-import {Scene} from "@antv/l7";
-import {Mapbox} from "@antv/l7-maps";
 
-let map, scene;
-// Point MultiPoint LineString MultiLineString Polygon MultiPolygon
+let map;
 export default {
   name: "modelMapC",
   props: ["mapId"],
@@ -29,21 +26,7 @@ export default {
         zoom: 21,
         pitch: 0,
       });
-      scene = new Scene({
-        logoVisible: false,
-        id: this.mapId,
-        map: new Mapbox({
-          mapInstance: map,
-        }),
-      });
-      // map.rotateTo(map_config.MAP_ROTATE);
-      // map.on('load', () => {
-      //   map.addControl(new mapboxgl.NavigationControl({showZoom: false}), 'top-right');
-      // })
-      // setTimeout(() => {
-      //   map.flyTo({zoom: map_config.MAP_ZOOM})
-      // }, 10000)
-      return [map, scene];
+      return map;
     }
   },
   computed: {},

wj-data-vision/src/components/map/index.vue

-<template>
-  <div class="map_main">
-    <div :id="mapId" style="height: 100%;width:100%;"></div>
-  </div>
-</template>
-
-<script>
-let map;
-// Point MultiPoint LineString MultiLineString Polygon MultiPolygon
-export default {
-  name: "wMap",
-  props: ["mapId"],
-  components: {},
-  data() {
-    return {};
-  },
-  mounted() {},
-  methods: {
-    initMap(option) {
-      let options = Object.assign(
-        {},
-        {
-          container: this.mapId,
-          style: map_config.MAP_STYLE,
-          center: map_config.MAP_CENTER,
-          zoom: map_config.MAP_ZOOM,
-          maxZoom: map_config.MAX_ZOOM,
-          pitch: map_config.MAP_PITCH,
-        },
-        option
-      );
-      map = new mapboxgl.Map(options);
-      return map;
-    },
-    destroyMap() {
-      map?.remove;
-      map = null;
-    },
-  },
-  computed: {},
-  beforeDestroy() {},
-};
-</script>
-
-<style scoped>
-.map_main {
-  height: 100%;
-  width: 100%;
-  position: relative;
-  background-color: #040d1c
-}
-</style>
-<style>
-.mapboxgl-ctrl-attrib {
-  display: none;
-}
-</style>

wj-data-vision/src/views/accidentScene/index.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import wMap from "../../components/map/index.vue";
+import wMap from "../../components/Standard/mapboxMap.vue";
 import { initWs } from "../../utils/websocket";
 import dict from "../../config/holo/dictionary";
 import * as mapTools from "../../utils/mapboxTools";

wj-data-vision/src/views/accidentScene/right/index.vue

@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import CesiumMap from "../../../components/Standard/cesiumMap.vue";
+import CesiumMap from "../../../components/Standard/mapCesium.vue";
 import MsgCard from "../../../components/Standard/msg-card.vue";
 import CameraVideo from "../../../components/Standard/cameraVideo.vue";
 import LocalCamera from "../../../components/Standard/localCamera.vue";

wj-data-vision/src/views/accidentScene/right/indexbak.vue

@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import CesiumMap from "../../../components/Standard/cesiumMap.vue";
+import CesiumMap from "../../../components/Standard/mapCesium.vue";
 import MsgCard from "../../../components/Standard/msg-card.vue";
 
 let topViewer, bottomViewer;
@@ -92,10 +92,6 @@ export default {
   margin: 0
 }
 
-::v-deep .msg-card-content {
-
-}
-
 .top-left {
   position: absolute;
   left: -1px;

wj-data-vision/src/views/dangerousDriving/index.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import wMap from "../../components/map/index.vue";
+import wMap from "../../components/Standard/mapboxMap.vue";
 import { initWs } from "../../utils/websocket";
 import dict from "../../config/holo/dictionary";
 import * as mapTools from "../../utils/mapboxTools";

wj-data-vision/src/views/dangerousDriving/right/index.vue

@@ -74,7 +74,7 @@
 </template>
 
 <script>
-import CesiumMap from "../../../components/Standard/cesiumMap.vue";
+import CesiumMap from "../../../components/Standard/mapCesium.vue";
 import MsgCard from "../../../components/Standard/msg-card.vue";
 import CameraVideo from "../../../components/Standard/cameraVideo.vue";
 import CrossControl from "../../../components/CrossControl/crossControl.vue";

wj-data-vision/src/views/drones/index.vue

@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import wMap from "../../components/map/index.vue";
+import wMap from "../../components/Standard/mapboxMap.vue";
 import { initWs } from "../../utils/websocket";
 import dict from "../../config/holo/dictionary";
 import * as mapTools from "../../utils/mapboxTools";

wj-data-vision/src/views/drones/right/index.vue

@@ -9,14 +9,14 @@
 </template>
 
 <script>
-import CesiumMap from "../../../components/Standard/cesiumMap.vue";
-import MsgCard from "../../../components/Standard/msg-card.vue";
+import CesiumMap from "../../../components/Standard/mapCesium.vue";
+import MsgCard from "../../../components/Standard/msg-card.vue"; 
 import CameraVideo from "../../../components/Standard/cameraVideo.vue";
 import CrossControl from "../../../components/CrossControl/crossControl.vue";
 import LocalCamera from "../../../components/Standard/localCamera.vue";
 
 let topViewer, bottomViewer;
-
+ 
 export default {
   name: "homeRight",
   components: {LocalCamera, CrossControl, CameraVideo, MsgCard, CesiumMap},

wj-data-vision/src/views/intersectionGroups/index.vue

@@ -7,14 +7,14 @@
     element-loading-background="rgba(0, 0, 0, 0.8)"
   >
     <div class="shadow-mask"></div>
-    <local-camera
+    <!-- <local-camera
       :border="true"
       ref="groupViewPointCamera"
       video-data="lkqz_0"
       class="main-cameraVideo"
       :class="!boxesShow ? 'main-cameraVideoHidden' : ''"
     >
-    </local-camera>
+    </local-camera> -->
     <wMap :mapId="'situation-map'" ref="wMap" />
     <!--左右图表组件-->
     <message-boxes :show="boxesShow" />
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import wMap from "../../components/map/index.vue";
+import wMap from "../../components/Standard/mapboxMap.vue";
 import { initWs } from "../../utils/websocket";
 import dict from "../../config/holo/dictionary";
 import * as mapTools from "../../utils/mapboxTools";
@@ -89,17 +89,6 @@ export default {
     };
   },
   watch: {
-    // boxesShow(val) {
-    //   if (val) {
-    //     document
-    //       .getElementsByClassName("mapboxgl-ctrl-bottom-right")[0]
-    //       .classList.remove("mapboxgl-ctrl-bottom-right-hide-box");
-    //   } else {
-    //     document
-    //       .getElementsByClassName("mapboxgl-ctrl-bottom-right")[0]
-    //       .classList.add("mapboxgl-ctrl-bottom-right-hide-box");
-    //   }
-    // },
   },
   mounted() {
     this.initDictAndLoad();
@@ -721,12 +710,12 @@ export default {
   top: 0;
   z-index: 9;
   pointer-events: none;
-  background: linear-gradient(
-      180deg,
-      rgba(0, 0, 0, 0.01) 0%,
-      rgba(0, 0, 0, 0.3) 100%
-    ),
-    radial-gradient(50% 48.61%, rgba(0, 0, 0, 0.01) 0%, rgba(0, 0, 0, 0.2) 100%);
+  // background: linear-gradient(
+  //     180deg,
+  //     rgba(0, 0, 0, 0.01) 0%,
+  //     rgba(0, 0, 0, 0.3) 100%
+  //   ),
+  //   radial-gradient(50% 48.61%, rgba(0, 0, 0, 0.01) 0%, rgba(0, 0, 0, 0.2) 100%);
 }
 
 .timeCenter {

wj-data-vision/src/views/mobileBaseStation/index.vue

@@ -9,18 +9,18 @@
     <wMap :mapId="'situation-map'" ref="wMap" />
     <home-left ref="leftVideo" />
     <home-right ref="rightVideo" />
-    <model-map class="modelMap" />
+    <mobile-model class="modelMap" />
   </div>
 </template>
 
 <script>
-import wMap from "../../components/map/index.vue";
+import wMap from "../../components/Standard/mapboxMap.vue";
 import { initWs } from "../../utils/websocket";
 import dict from "../../config/holo/dictionary";
 import * as mapTools from "../../utils/mapboxTools";
 import mapAssets from "../../config/holo/mapAssets";
 
-import ModelMap from "./left/modelMap.vue";
+import MobileModel from "./left/mobileModel.vue";
 import HomeLeft from "./left/index.vue";
 import HomeRight from "./right/index.vue";
 
@@ -33,7 +33,7 @@ let map,
 export default {
   name: "mobileBaseStation",
   components: {
-    ModelMap,
+    MobileModel,
     HomeRight,
     HomeLeft,
     wMap,

wj-data-vision/src/views/mobileBaseStation/left/index.vue

@@ -13,11 +13,11 @@
 import CameraVideo from "../../../components/Standard/cameraVideo.vue";
 import MsgCard from "../../../components/Standard/msg-card.vue";
 import {getCameraListByType} from "../../../dao/api";
-import WMap from "../../../components/Standard/map/index.vue";
+import WMap from "../../../components/Standard/mapboxMap.vue";
 import dict from "../../../config/holo/dictionary";
 import LocalCamera from "../../../components/Standard/localCamera.vue";
 
-let map, scene
+let map
 export default {
   name: "homeLeft",
   components: {LocalCamera, WMap, MsgCard, CameraVideo},

wj-data-vision/src/views/mobileBaseStation/left/modelMap.vue → wj-data-vision/src/views/mobileBaseStation/left/mobileModel.vue

 <template>
   <div class="model_map">
-    <model-map-c ref="modelMap" map-id="model_map"/>
+    <model-map ref="modelMap" map-id="model_map"/>
   </div>
 </template>
 
 <script>
-import WMap from "../../../components/Standard/map/index.vue";
-import dict from "../../../config/holo/dictionary";
-import ModelMapC from "../../../components/Standard/map/modelMapC.vue";
+import WMap from "../../../components/Standard/mapboxMap.vue";
+import ModelMap from "../../../components/Standard/modelMap.vue";
 
-let scene, map
+let map
 export default {
-  name: "modelMap",
-  components: {ModelMapC, WMap},
+  components: {ModelMap, WMap},
   computed: {},
   data() {
     return {
@@ -21,7 +19,7 @@ export default {
     };
   },
   mounted() {
-    [map, scene] = this.$refs.modelMap.initMap()
+    map = this.$refs.modelMap.initMap()
     map.on('load', () => {
       map.setCenter([41.00025957469552, 20.999984837534015])
       map.setZoom(18.4818298651229)

wj-data-vision/src/views/mobileBaseStation/right/index.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import CesiumMap from "../../../components/Standard/cesiumMap.vue";
+import CesiumMap from "../../../components/Standard/mapCesium.vue";
 import MsgCard from "../../../components/Standard/msg-card.vue";
 import CameraVideo from "../../../components/Standard/cameraVideo.vue";
 import CrossControl from "../../../components/CrossControl/crossControl.vue";

wj-data-vision/src/views/phaseAirPlay/index.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import wMap from "../../components/map/index.vue";
+import wMap from "../../components/Standard/mapboxMap.vue";
 import { initWs } from "../../utils/websocket";
 import dict from "../../config/holo/dictionary";
 import * as mapTools from "../../utils/mapboxTools";

wj-data-vision/src/views/phaseAirPlay/right/index.vue

@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import CesiumMap from "../../../components/Standard/cesiumMap.vue";
+import CesiumMap from "../../../components/Standard/mapCesium.vue";
 import MsgCard from "../../../components/Standard/msg-card.vue";
 import CameraVideo from "../../../components/Standard/cameraVideo.vue";
 import CrossControl from "../../../components/CrossControl/crossControl.vue";

wj-data-vision/src/views/slowTraffic/index.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import wMap from "../../components/map/index.vue";
+import wMap from "../../components/Standard/mapboxMap.vue";
 import { initWs } from "../../utils/websocket";
 import dict from "../../config/holo/dictionary";
 import * as mapTools from "../../utils/mapboxTools";

wj-data-vision/src/views/slowTraffic/right/index.vue

@@ -53,7 +53,7 @@
 </template>
 
 <script>
-import CesiumMap from "../../../components/Standard/cesiumMap.vue";
+import CesiumMap from "../../../components/Standard/mapCesium.vue";
 import MsgCard from "../../../components/Standard/msg-card.vue";
 import CameraVideo from "../../../components/Standard/cameraVideo.vue";
 import CrossControl from "../../../components/CrossControl/crossControl.vue";

wj-data-vision/src/views/slowTraffic/right/indexbak.vue

@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import CesiumMap from "../../../components/Standard/cesiumMap.vue";
+import CesiumMap from "../../../components/Standard/mapCesium.vue";
 import MsgCard from "../../../components/Standard/msg-card.vue";
 
 let topViewer, bottomViewer;
@@ -92,9 +92,6 @@ export default {
   margin: 0
 }
 
-::v-deep .msg-card-content {
-
-}
 
 .top-left {
   position: absolute;

wj-data-vision/src/views/straightLeftConflict/index.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import wMap from "../../components/map/index.vue";
+import wMap from "../../components/Standard/mapboxMap.vue";
 import { initWs } from "../../utils/websocket";
 import dict from "../../config/holo/dictionary";
 import * as mapTools from "../../utils/mapboxTools";

wj-data-vision/src/views/straightLeftConflict/right/index.vue

@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import CesiumMap from "../../../components/Standard/cesiumMap.vue";
+import CesiumMap from "../../../components/Standard/mapCesium.vue";
 import MsgCard from "../../../components/Standard/msg-card.vue";
 import CameraVideo from "../../../components/Standard/cameraVideo.vue";
 import CrossControl from "../../../components/CrossControl/crossControl.vue";