Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/components/map/index.vue

@@ -366,7 +366,7 @@ import { Feature } from "ol";
 import { LineString, Point } from "ol/geom";
 import { Icon, Stroke, Style } from "ol/style";
 import { Vector as LayerVec } from "ol/layer";
-import { queryShipByDeviceId, queryDatabymmsi,getdeviceList } from "@/api/data/deviceData";
+import { queryShipByDeviceId, queryDatabymmsi } from "@/api/data/deviceData";
 
 let ispro = process.env.NODE_ENV === "production";
 let that = null;
@@ -434,12 +434,14 @@ export default {
                         if (tadata.type == "ship") {
                             that.shipShow = true;
                             that.deviceShow = false;
+                            that.deviceTableShow = false
                             that.shipName = tadata.data;
                             that.activeName = "first";
 
                         } else if (tadata.type == "device") {
                             that.deviceShow = true;
                             that.shipShow = false;
+                            that.deviceTableShow = false
                             that.deviceData = tadata.data;
                             that.d_activeName = 'd_first';