Merge branch 'master' of http://git.xt.wenhq.top:8083/liwei19941102/cbwqpf

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

@@ -8,18 +8,18 @@
         <i class="el-icon-close" style="font-size:9rem;margin-top:2rem;float:right" @click="deviceShow=false"></i>
       </div>
       <div style="padding—left:10rem" class="shipContent">
-            <el-row :gutter="3" style="margin-top:3rem">
+            <el-row :gutter="3" style="margin-top:13rem">
               <el-col :span="4">
-                <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">设备类型:</div>
+                <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">{{deviceName}}</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">
@@ -27,13 +27,27 @@
                 <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>
+                <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">
+              <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">2021-09-30 10:12:11</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">118.32,32.04</div>
               </el-col>
             </el-row>
             <!-- <el-row :gutter="3" style="margin-top:3rem">
@@ -278,7 +292,7 @@ import { Style, Icon,Stroke } from "ol/style";
 import { Vector as LayerVec } from "ol/layer";
 
 let ispro = process.env.NODE_ENV === "production";
-//  ispro = false;
+ ispro = false;
 export default {
   props: {
     src: {
@@ -351,9 +365,11 @@ export default {
                if(tadata.type == "ship"){
                     console.log(111111);
                      that.shipShow = true;
+                     that.deviceShow = false;
                      that.shipName = tadata.data
                }else if(tadata.type == "device"){
                      that.deviceShow = true;
+                     that.shipShow = false;
                      that.deviceName = tadata.data
                }
               //  alert("我是点："+tadata.data)
@@ -598,12 +614,16 @@ export default {
 .ol-zoom {
   display: none;
 }
+.contentFont{
+      font-size: 6rem;
+    line-height: 16rem;
+}
 
 .shipDiv {
   position: absolute;
   top: 250rem;
   left: 140rem;
-  width: 220rem;
+  width: 240rem;
   height: 130rem;
   background-color: white;
 }

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

@@ -9,8 +9,8 @@
         <el-col :span="3">
           <el-date-picker
             v-model="queryParams.startTime"
-            type="datetime"
-            placeholder="选择日期时间">
+            type="date"
+            placeholder="选择日期">
           </el-date-picker>
         </el-col>
         <el-col :span="2">
@@ -20,8 +20,8 @@
         <el-col :span="3">
           <el-date-picker
             v-model="queryParams.endTime"
-            type="datetime"
-            placeholder="选择日期时间">
+            type="date"
+            placeholder="选择日期">
           </el-date-picker>
         </el-col>
         <el-col :span="2">
@@ -31,7 +31,7 @@
         <el-col :span="3">
           <el-input
             v-model="queryParams.shipName"
-            placeholder="船舶名"
+            placeholder="请输入船名"
             clearable
             size="small"
             style="width: 80rem"
@@ -45,7 +45,7 @@
         <el-col :span="3">
           <el-input
             v-model="queryParams.mmsi"
-            placeholder="请输入关键字"
+            placeholder="请输入MMSI"
             clearable
             size="small"
             style="width: 100rem"
@@ -61,7 +61,7 @@
           </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 shipTypeOptions"
               :key="item.value"
@@ -75,7 +75,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-select v-model="queryParams.monitorPointName" clearable placeholder="请选择">
+          <el-select v-model="queryParams.monitorPointName" clearable placeholder="请选择监测点">
             <el-option
               v-for="item in jianceOptions"
               :key="item.dictValue"
@@ -92,7 +92,7 @@
         <el-col :span="3">
           <el-input
             v-model="queryParams.destination"
-            placeholder="目的港"
+            placeholder="请输入目的港"
             clearable
             size="small"
             style="width: 80rem"
@@ -103,7 +103,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-select v-model="queryParams.orgName" clearable placeholder="请选择">
+          <el-select v-model="queryParams.orgName" clearable placeholder="请选择管辖机构">
             <el-option
               v-for="item in orgOptions"
               :key="item.dictValue"
@@ -116,11 +116,25 @@
 
       <el-row type="flex">
         <el-col :span="2">
+          <el-form-item label="设备类型" prop="deviceType" style="float:right">
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-select v-model="queryParams.illegalType" clearable placeholder="请选择设备类型">
+            <el-option
+              v-for="item in illegalTypeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-col>
+        <el-col :span="2">
           <el-form-item label="处置结果" prop="name" style="float:right">
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-select v-model="queryParams.dealResult" clearable placeholder="请选择">
+          <el-select v-model="queryParams.dealResult" clearable placeholder="请选择处置结果">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -134,7 +148,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-select v-model="queryParams.fastResult" clearable placeholder="请选择">
+          <el-select v-model="queryParams.fastResult" clearable placeholder="请选择快检结果">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -149,7 +163,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-select v-model="queryParams.uploadResult" clearable placeholder="请选择">
+          <el-select v-model="queryParams.uploadResult" clearable placeholder="请选择送检结果">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -324,6 +338,13 @@ export default {
       },
       jianceOptions: [],
       orgOptions: [],
+      illegalTypeOptions: [{
+        value: 'guangpu',
+        label: '光谱'
+      }, {
+        value: 'xiutan',
+        label: '嗅探'
+      }],
       shipTypeOptions: [{
         value: '0',
         label: '内河船'