修改页面传递参数

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

@@ -328,7 +328,7 @@ export default {
         shipRegionType: '',
         destination: '',
         orgName: '',
-        illegalStatus: '',
+        illegalStatus: 2,
         dealResult: '',
         fastResult: '',
         uploadResult: '',
@@ -415,13 +415,12 @@ export default {
       this.loading = true;
 
 
-     var dateRange = '';
-    if(this.queryParams.startTime!=undefined && this.queryParams.startTime!="" &&this.queryParams.endTime!=undefined && this.queryParams.endTime!=""){
+      var dateRange = '';
+      if (this.queryParams.startTime != undefined && this.queryParams.startTime != "" && this.queryParams.endTime != undefined && this.queryParams.endTime != "") {
         dateRange = [];
         dateRange.push(this.queryParams.startTime.toJSON().split("T")[0]);
         dateRange.push(this.queryParams.endTime.toJSON().split("T")[0]);
-    }
-
+      }
 
 
       getLiuList(this.addDateRange(this.queryParams, dateRange)).then(response => {

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

@@ -26,12 +26,12 @@
           </el-date-picker>
         </el-col>
         <el-col :span="2">
-          <el-form-item label="船名" prop="aisShipName" style="float:right">
+          <el-form-item label="船名" prop="shipName" style="float:right">
           </el-form-item>
         </el-col>
         <el-col :span="3">
           <el-input
-            v-model="queryParams.aisShipName"
+            v-model="queryParams.shipName"
             placeholder="请输入船舶名称"
             clearable
             size="small"
@@ -40,12 +40,12 @@
           />
         </el-col>
         <el-col :span="2">
-          <el-form-item label="MMSI" prop="aisMmsi" style="float:right">
+          <el-form-item label="MMSI" prop="mmsi" style="float:right">
           </el-form-item>
         </el-col>
         <el-col :span="3">
           <el-input
-            v-model="queryParams.aisMmsi"
+            v-model="queryParams.mmsi"
             placeholder="请输入MMSI"
             clearable
             size="small"
@@ -70,12 +70,12 @@
           </el-select>
         </el-col>
         <el-col :span="2">
-          <el-form-item label="抓拍地点" prop="snapPos" style="float:right">
+          <el-form-item label="抓拍地点" prop="monitorPointName" style="float:right">
           </el-form-item>
         </el-col>
         <el-col :span="3">
           <el-input
-            v-model="queryParams.snapPos"
+            v-model="queryParams.monitorPointName"
             placeholder="请输入抓拍地点"
             clearable
             size="small"
@@ -119,12 +119,12 @@
         width="50">
       </el-table-column>
       <el-table-column
-        prop="aisShipName"
+        prop="shipName"
         label="船名"
         width="180">
       </el-table-column>
       <el-table-column
-        prop="aisMmsi"
+        prop="mmsi"
         label="MMSI"
         width="180">
       </el-table-column>
@@ -133,7 +133,7 @@
         label="内河船/海船">
       </el-table-column>
       <el-table-column
-        prop="snapPos"
+        prop="monitorPointName"
         label="抓拍地点">
       </el-table-column>
       <el-table-column
@@ -145,16 +145,16 @@
         label="黑度等级">
       </el-table-column>
       <el-table-column
-      prop="address"
-      label="详情">
+        prop="address"
+        label="详情">
         <template slot-scope="scope">
-              <!-- <video style="width:40rem;height:40rem" controls="" autoplay="" name="media"><source src="http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4" type="video/mp4"></video> -->
+          <!-- <video style="width:40rem;height:40rem" controls="" autoplay="" name="media"><source src="http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4" type="video/mp4"></video> -->
         </template>
-    </el-table-column>
+      </el-table-column>
       <el-table-column
-      prop="orgName"
-      label="管辖海事机构">
-    </el-table-column>
+        prop="orgName"
+        label="管辖海事机构">
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -222,21 +222,21 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        aisShipName: undefined,
-        snapPos: undefined,
+        shipName: undefined,
+        monitorPointName: undefined,
         rcgSoot: undefined,
-        aisMmsi: undefined,
+        mmsi: undefined,
         beginTime: undefined,
         endTime: undefined,
         shipRegionType: undefined,
-        illegalStatus: '',
+        illegalStatus: 3,
       },
       typeOptions: [
         {
-          value: '1',
+          value: '0',
           label: '内河船'
         }, {
-          value: '2',
+          value: '1',
           label: '海船'
         }
       ],
@@ -269,12 +269,12 @@ export default {
       // console.log('1'+this.queryParams);
       this.loading = true;
 
-       var dateRange = '';
-    if(this.queryParams.beginTime!=undefined && this.queryParams.beginTime!="" &&this.queryParams.endTime!=undefined && this.queryParams.endTime!=""){
+      var dateRange = '';
+      if (this.queryParams.beginTime != undefined && this.queryParams.beginTime != "" && this.queryParams.endTime != undefined && this.queryParams.endTime != "") {
         dateRange = [];
         dateRange.push(this.queryParams.beginTime.toJSON().split("T")[0]);
         dateRange.push(this.queryParams.endTime.toJSON().split("T")[0]);
-    }
+      }
 
       getBlackList(this.addDateRange(this.queryParams, dateRange)).then(response => {
         this.tableData = response.rows;