fix

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

@@ -95,13 +95,13 @@
                 <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">MMSI:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">11111</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">3202342354</div>
               </el-col>
               <el-col :span="4">
                 <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">监测点:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">11111</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">南京三桥</div>
               </el-col>
             </el-row>
             <el-row :gutter="3" style="margin-top:3rem">
@@ -109,13 +109,13 @@
                 <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">经度:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">11111</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">182.78</div>
               </el-col>
               <el-col :span="4">
                 <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">纬度:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">11111</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">32.04</div>
               </el-col>
             </el-row>
             <el-row :gutter="3" style="margin-top:3rem">
@@ -123,13 +123,13 @@
                 <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">对地航速:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">11111</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">20 km/h</div>
               </el-col>
               <el-col :span="4">
                 <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">对地航向:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">11111</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">东南</div>
               </el-col>
             </el-row>
             <el-row :gutter="3" style="margin-top:3rem">
@@ -137,13 +137,13 @@
                 <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">风向:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">11111</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">北</div>
               </el-col>
               <el-col :span="4">
                 <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">风速:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">11111</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">3 m/s</div>
               </el-col>
             </el-row>
             <el-button style="margin-top:5rem;margin-left:10rem;background-color:#0d25a5;color:white;font-size:7rem" icon="el-icon-location-information">历史轨迹</el-button>
@@ -290,25 +290,25 @@ export default {
       activeName:'first',
        tableData: [{
         date: '2016-05-02',
-        name: '王小虎',
+        name: '南京四桥',
         address: '上海市普陀区金沙江路 1518 弄',
         value: 0.19,
         count: 1.9,
       }, {
         date: '2016-05-04',
-        name: '王小虎',
+        name: '南京四桥',
         value: 0.1,
         count: 1.3,
         address: '上海市普陀区金沙江路 1517 弄'
       }, {
         date: '2016-05-01',
-        name: '王小虎',
+        name: '南京四桥',
         value: 0.2,
         count: 2,
         address: '上海市普陀区金沙江路 1519 弄'
       }, {
         date: '2016-05-03',
-        name: '王小虎',
+        name: '南京四桥',
         value: 0.08,
         count: 0.6,
         address: '上海市普陀区金沙江路 1516 弄'
@@ -600,9 +600,12 @@ export default {
   top: 250rem;
   left: 140rem;
   width: 240rem;
-  height: 130rem;
+  min-height: 130rem;
   background-color: white;
 }
+ .el-tabs__header{
+    margin: 0!important;
+  }
 
 .shipTitle {
   padding-top: 4rem;

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

@@ -413,6 +413,12 @@ export default {
     },
     getLiuLists() {
       this.loading = true;
+      if(this.queryParams.startTime!=undefined && this.queryParams.startTime!=""){
+ this.queryParams["params"]["beginTime"]=this.queryParams.startTime;
+      this.queryParams["params"]["endTime"]=this.queryParams.endTime;
+      }
+
+
       getLiuList(this.queryParams).then(response => {
         for (var i in response.rows) {
           response.rows[i].shipRegionType = '内河船'