fix

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

@@ -1,4 +1,4 @@
-<template>
+<template xmlns="http://www.w3.org/1999/html">
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
       <el-row type="flex">
@@ -172,9 +172,25 @@
             </el-option>
           </el-select>
         </el-col>
-        <el-col :span="1">
+        <el-col :span="2">
+          <el-form-item label="违规类型" prop="illegalStatus" style="float:right">
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-select v-model="queryParams.illegalStatus" clearable placeholder="请选择违规类型">
+            <el-option
+              v-for="item in illegalStatusOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-col>
+      </el-row>
+      <el-row type="flex">
+        <el-col :span="0">
         </el-col>
-        <el-radio-group v-model="queryParams.filterMmsi">
+        <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>
@@ -187,7 +203,7 @@
       <!--       </el-form-item>-->
 
 
-      <el-form-item style="margin-left:1rem">
+      <el-form-item style="margin-left:1rem;margin-top:2rem;">
         <el-button icon="el-icon-search" size="mini" @click="getLiuLists" class="search">查询</el-button>
         <!--        <el-button icon="el-icon-upload2" size="mini" @click="" class="export">导出</el-button>-->
         <el-button icon="el-icon-setting" size="mini" @click="dialogVisible = true" class="export">阈值</el-button>
@@ -346,6 +362,18 @@ export default {
       },
       jianceOptions: [],
       orgOptions: [],
+      illegalStatusOptions: [
+        {
+          value: '',
+          label: '全部'
+        }, {
+          value: 1,
+          label: '正常'
+        }, {
+          value: 2,
+          label: '嫌疑'
+        }
+      ],
       illegalTypeOptions: [{
         value: 'guangpu',
         label: '光谱'

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

@@ -56,11 +56,11 @@
       </el-row>
       <el-row type="flex">
         <el-col :span="2">
-          <el-form-item label="海船/内河船" prop="name" style="float:right">
+          <el-form-item label="船舶类型" prop="name" style="float:right">
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-select v-model="queryParams.shipRegionType" clearable placeholder="请选择">
+          <el-select v-model="queryParams.shipRegionType" clearable placeholder="请选择海船/内河船">
             <el-option
               v-for="item in typeOptions"
               :key="item.value"
@@ -85,11 +85,11 @@
         </el-col>
 
         <el-col :span="2">
-          <el-form-item label="黑度等级" prop="rcgSoot" style="float:right">
+          <el-form-item label="黑度等级" prop="rcgSoots" style="float:right">
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-select v-model="queryParams.rcgSoot" clearable placeholder="请选择">
+          <el-select v-model="queryParams.rcgSoots" multiple clearable placeholder="请选择">
             <el-option
               v-for="item in rcgSootOptions"
               :key="item.value"
@@ -98,15 +98,31 @@
             </el-option>
           </el-select>
         </el-col>
-        <el-col :span="1">
+        <el-col :span="2">
+          <el-form-item label="违规类型" prop="illegalStatus" style="float:right">
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-select v-model="queryParams.illegalStatus" clearable placeholder="请选择违规类型">
+            <el-option
+              v-for="item in illegalStatusOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
         </el-col>
-        <el-radio-group v-model="queryParams.filterMmsi">
+      </el-row>
+      <el-row type="flex">
+        <el-col :span="0">
+        </el-col>
+        <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>
       </el-row>
 
-      <el-form-item style="margin-left:1rem">
+      <el-form-item style="margin-left:1rem;margin-top:2rem;">
         <el-button icon="el-icon-search" size="mini" @click="getBlackList" class="search">查询</el-button>
         <!--        <el-button icon="el-icon-upload2" size="mini" class="export">导出</el-button>-->
       </el-form-item>
@@ -253,7 +269,7 @@ export default {
         pageSize: 10,
         shipName: undefined,
         monitorPointName: undefined,
-        rcgSoot: undefined,
+        rcgSoots: undefined,
         mmsi: undefined,
         beginTime: undefined,
         endTime: undefined,
@@ -270,6 +286,18 @@ export default {
           label: '海船'
         }
       ],
+      illegalStatusOptions: [
+        {
+          value: '',
+          label: '全部'
+        }, {
+          value: 1,
+          label: '正常'
+        }, {
+          value: 3,
+          label: '违规'
+        }
+      ],
       rcgSootOptions: [
         {
           value: '1',