fix

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

@@ -453,6 +453,7 @@ export default {
     }
     mapv = this.map;
 
+
     this.map.on("click", function (e) {
       console.log(e)
       var feature = that.map.forEachFeatureAtPixel(e.pixel,
@@ -499,11 +500,13 @@ export default {
     //  this.addpoint();
     //  this.addline();
 
-    // setTimeout(function(){
-    //   // alert(11);
-    //   that.$refs.VueAliplayerV2.play();
+    setTimeout(function(){
+      // alert(11);
+      that.closevideo();
+
+    },1000)
+
 
-    // },4000)
 
 
   },
@@ -511,7 +514,7 @@ export default {
     //[[1111,1111]]
     closevideo(){
       this.showvideos = false;
-      that.$refs.VueAliplayerV2.pause();
+      this.$refs.VueAliplayerV2.pause();
     },
     handleClick1: function (tab, event) {
 
@@ -870,13 +873,15 @@ export default {
       this.linevectorLayer = new LayerVec({
         source: new SourceVec({
           features: [line] //要绘制多段线，直接push到这里面就行了
-        })
+        }),
+        zIndex: 2
       });
       this.map.addLayer(this.linevectorLayer); //这里是执行，执行之后点就出来了
 
+
     },
 
-    addpoint: function (addrArry, data, img, type, rotation = 0, zindex = 2) {
+    addpoint: function (addrArry, data, img, type, rotation = 0, zindex = 3) {
       var lnglat = this.transpoints(addrArry, 0)[0];
       var lnglats = null;
 

ruoyi-ui/src/views/components/table/homeTable.vue

@@ -203,7 +203,7 @@ export default {
       ],
       allship:[],
       ship: [
-        {"name": "一号船", "mmsi": "s", "locations": [[118.639711, 31.98602]], 'type': 1, "head": 0, "lnglats": [[118.649711, 31.98602], [118.639711, 31.98602], [118.629711, 31.98602], [118.619711, 31.98602]]},
+        {"name": "一号船", "mmsi": "s", "locations": [[118.643133, 31.969894]], 'type': 1, "head": 0, "lnglats": [[118.649711, 31.98602], [118.639711, 31.98602], [118.629711, 31.98602], [118.619711, 31.98602]]},
         // {"name": "二号船", "locations": [[118.639711, 31.96602]], 'type': 2,"head":60},
         {"name": "三号船", "mmsi": "s1", "locations": [[118.639711, 31.96622]], 'type': 1, "head": 90},
         {"name": "三号船", "mmsi": "s2", "locations": [[118.639711, 31.93662]], 'type': 1, "head": 180},
@@ -231,6 +231,7 @@ export default {
     }, 5*60*1000);
 
     this.getThresholdList();
+
     // this.addDevicePoint();
     // this.addAisPoint();
     // this.addSo2Point();
@@ -295,7 +296,7 @@ export default {
           ship["type"] = ship.illegalStatus;
           shipdatalist.push(ship);
         }
-        this.ship = shipdatalist;
+        // this.ship = shipdatalist;
         this.addshipPoint();
       });
 
@@ -348,7 +349,7 @@ export default {
         } else if (obj.type == 3) {
           img = 'wg.png'
         }
-        this.$refs.mapv.addpoint(obj.locations, obj, img, 'ship', ((obj.head == null ? 0 : parseFloat(obj.head)) - 90) * Math.PI / 180);
+        this.$refs.mapv.addpoint(obj.locations, obj, img, 'ship', ((obj.head == null ? 0 : parseFloat(obj.head)) - 90) * Math.PI / 180,1);
       }
     },
 
@@ -361,7 +362,7 @@ export default {
         } else if (obj.type == 3) {
           img = 'wg.png'
         }
-        this.$refs.mapv.addpoint(obj.locations, obj, img, 'ship', ((obj.head == null ? 0 : parseFloat(obj.head)) - 90) * Math.PI / 180);
+        this.$refs.mapv.addpoint(obj.locations, obj, img, 'ship', ((obj.head == null ? 0 : parseFloat(obj.head)) - 90) * Math.PI / 180,1);
       }
     },
     getSo2Time() {

ruoyi-ui/src/views/components/table/liuTable.vue

@@ -48,9 +48,9 @@
             placeholder="请输入MMSI"
             clearable
             size="small"
-            style="width: 100rem"
             @keyup.enter.native="handleQuery"
           />
+          <el-checkbox v-model="isselect" style="position: absolute;right: 56rem;top: 2rem;">MMSI不为空</el-checkbox>
         </el-col>
       </el-row>
 
@@ -187,10 +187,10 @@
           </el-select>
         </el-col>
       </el-row>
-      <el-row type="flex">
+      <el-row type="flex" v-show="false">
         <el-col :span="0">
         </el-col>
-        <el-radio-group v-model="queryParams.filterMmsi" size="small">
+        <el-radio-group v-model="queryParams.filterMmsi" size="small" >
           <el-radio label="" border>全部</el-radio>
           <el-radio label="!0" border>MMSI不为空</el-radio>
         </el-radio-group>
@@ -342,6 +342,7 @@ export default {
       liuCount: 0.3,
       dialogShow: true,
       liuCountId: '',
+      isselect:false,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -452,7 +453,7 @@ export default {
     },
     getLiuLists() {
       this.loading = true;
-
+      this.queryParams.filterMmsi = this.isselect?"!0":"";
 
       var dateRange = '';
       if (this.queryParams.startTime != undefined && this.queryParams.startTime != "" && this.queryParams.endTime != undefined && this.queryParams.endTime != "") {
@@ -527,4 +528,11 @@ export default {
   border: 1rem solid #e1e1e1;
   border-radius: 2rem;
 }
+
+.el-date-editor.el-input, .el-date-editor.el-input__inner{
+  width: auto !important;
+}
+.el-input--small .el-input__inner{
+  height: 36px !important;
+}
 </style>

ruoyi-ui/src/views/components/table/xtTable.vue

@@ -49,9 +49,10 @@
             placeholder="请输入MMSI"
             clearable
             size="small"
-            style="width: 100rem"
+
             @keyup.enter.native="handleQuery"
           />
+           <el-checkbox v-model="isselect" style="position: absolute;right: 56rem;top: 2rem;">MMSI不为空</el-checkbox>
         </el-col>
       </el-row>
       <el-row type="flex">
@@ -79,7 +80,7 @@
             placeholder="请输入抓拍地点"
             clearable
             size="small"
-            style="width: 90rem"
+
             @keyup.enter.native="handleQuery"
           />
         </el-col>
@@ -113,7 +114,7 @@
           </el-select>
         </el-col>
       </el-row>
-      <el-row type="flex">
+      <el-row type="flex" v-show="false">
         <el-col :span="0">
         </el-col>
         <el-radio-group v-model="queryParams.filterMmsi" size="small">
@@ -264,6 +265,7 @@ export default {
     return {
       total: 0,
       showSearch: true,
+      isselect:false,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -326,6 +328,7 @@ export default {
     getBlackList() {
       // console.log('1'+this.queryParams);
       this.loading = true;
+       this.queryParams.filterMmsi = this.isselect?"!0":"";
 
       var dateRange = '';
       if (this.queryParams.beginTime != undefined && this.queryParams.beginTime != "" && this.queryParams.endTime != undefined && this.queryParams.endTime != "") {
@@ -441,4 +444,10 @@ export default {
   border: 1rem solid #e1e1e1;
   border-radius: 2rem;
 }
+.el-date-editor.el-input, .el-date-editor.el-input__inner{
+  width: auto !important;
+}
+.el-input--small .el-input__inner{
+  height: 36px !important;
+}
 </style>