소스 검색

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

* 'master' of http://git.xt.wenhq.top:8083/liwei19941102/cbwqpf:
  黑烟优化
  硫
  页面修改

# Conflicts:
#	ruoyi-ui/vue.config.js
温红权 3 년 전
부모
커밋
73c1b88610

+ 2 - 2
ruoyi-ui/.env.development

@@ -1,11 +1,11 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 江苏海事局船舶尾气排放遥感监测系统
 
 # 开发环境配置
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = ''
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

+ 1 - 1
ruoyi-ui/.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 江苏海事局船舶尾气排放遥感监测系统
 
 # 生产环境配置
 ENV = 'production'

+ 1 - 1
ruoyi-ui/.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 江苏海事局船舶尾气排放遥感监测系统
 
 NODE_ENV = production
 

+ 14 - 6
ruoyi-ui/src/api/data/liuData.js

@@ -11,9 +11,17 @@ export function getThresholdList(query) {
 
 // 修改阈值
 export function getThresholdEdit(query) {
-    return request({
-      url: 'threshold/edit',
-      method: 'put',
-      data: query
-    })
-  }
+  return request({
+    url: 'threshold/edit',
+    method: 'put',
+    data: query
+  })
+}
+
+export function getLiuList(query) {
+  return request({
+    url: 'so2/list',
+    method: 'get',
+    params: query
+  })
+}

+ 1 - 1
ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '若依管理系统',
+      title: '江苏海事局船舶尾气排放遥感监测系统',
       logo: logoImg
     }
   }

+ 1 - 1
ruoyi-ui/src/router/index.js

@@ -66,7 +66,7 @@ export const constantRoutes = [
     children: [
       {
         path: 'index',
-        component: (resolve) => require(['@/views/index'], resolve),
+        component: (resolve) => require(['@/views/home'], resolve),
         name: '首页',
         meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
       }

+ 15 - 11
ruoyi-ui/src/views/components/table/homeTable.vue

@@ -44,7 +44,7 @@
                                       <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></el-col>
                                   </el-row>
-                                  <el-button @click="dialogVisibleShip = true" style="margin-top:5rem;margin-left:10rem;background-color:#0d25a5;color:white;font-size:7rem" icon="el-icon-location-information">历史轨迹</el-button>
+                                  <el-button  style="margin-top:5rem;margin-left:10rem;background-color:#0d25a5;color:white;font-size:7rem" icon="el-icon-location-information">历史轨迹</el-button>
                           </el-tab-pane>
                           <el-tab-pane label="监测数据" name="second">
                                    <el-table
@@ -135,7 +135,7 @@
 
         <div class="shipInCount">
                <img src="@/assets/picture/img_wgcb.png"  style="margin-top:5rem;margin-left:5rem"/>
-               <div style="margin-top:5rem">
+               <div style="margin-top:5rem" @click="dialogVisibleShip = true">
                    <div style="float:left">
                     <div class="lcbBackground">
                           <div style="margin-top:12rem"> 
@@ -163,7 +163,7 @@
                         <i class="el-icon-pie-chart" style="font-size:9rem;float:left;margin-left:5rem"/>
                         <span style="font-size:6rem;float:left;margin-left:5rem">总数</span>
                   </div>
-                   <div style="float:right;font-size:9rem;margin-top:1rem">111个</div>
+                   <div style="float:right;font-size:9rem;margin-top:1rem">{{deviceTotal}}个</div>
                </div>
                <div style="padding-left:5rem;padding-top:1rem">
                      <div style="color:white" @click="dialogVisible = true">
@@ -180,9 +180,9 @@
 
         <div class="shipInformation">
               <img src="@/assets/picture/img_xycbxx.png"  style="margin-top:5rem;margin-left:5rem"/>
-              <!-- <scroll></scroll> -->
+              <scroll></scroll>
               <img src="@/assets/picture/img_wgcbxx.png"  style="margin-top:5rem;margin-left:5rem"/>
-              <!-- <scroll></scroll> -->
+              <scroll></scroll>
         </div>
 
         <div class="equipmentContent">
@@ -270,6 +270,7 @@
           dialogVisibleShip:false,
           beginTime:'',
           endTime:'',
+          deviceTotal:0,
           queryParams: {
             pageNum: 1,
             pageSize: 10,
@@ -351,9 +352,12 @@
           },
           getStaticDevice(){
             getStaticDevice().then(response => {
+                console.log(response);
                 let nameArry = [];
                 let dataArry = [];
-                for (var key in response.data) {  
+                this.deviceTotal = 0;
+                for (var key in response.data) { 
+                    this.deviceTotal += response.data[key]
                     nameArry.push(key);
                     dataArry.push(response.data[key]);
             }
@@ -371,7 +375,7 @@
                 var option = {
                                 xAxis: {
                                     type: 'category',
-                                    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+                                    data: ['2021-01', '2021-02', '2021-03', '2021-04', '2021-05', '2021-06', '2021-07'],
                                       axisLabel:{
                                               show:true,  //这里的show用于设置是否显示x轴下的字体 默认为true
                                          interval:0,  //可以设置成 0 强制显示所有标签。如果设置为 1,表示『隔一个标签显示一个标签』,如果值为 2,表示隔两个标签显示一个标签,以此类推。
@@ -670,9 +674,9 @@
            background: url("./assets/bg_information.png") no-repeat;
            background-size: 100% 100%;
            width:120rem;
-           height:150rem;
+           height:160rem;
            position: absolute; 
-           top:230rem;
+           top:225rem;
            right:30rem;
         }
 
@@ -680,9 +684,9 @@
            background: url("./assets/bg_count.png") no-repeat;
            background-size: 100% 100%;
            width:120rem;
-           height:150rem;
+           height:160rem;
            position: absolute; 
-           top:70rem;
+           top:55rem;
            right:30rem;
         }
 

+ 283 - 269
ruoyi-ui/src/views/components/table/liuTable.vue

@@ -1,65 +1,65 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
-        <el-form-item label="开始时间">
-              <el-date-picker
-              v-model="queryParams.startTime"
-              type="datetime"
-              placeholder="选择日期时间">
-            </el-date-picker>
+      <el-form-item label="开始时间">
+        <el-date-picker
+          v-model="queryParams.startTime"
+          type="date"
+          placeholder="选择日期时间">
+        </el-date-picker>
       </el-form-item>
-        <el-form-item label="结束时间">
-              <el-date-picker
-              v-model="queryParams.endTime"
-              type="datetime"
-              placeholder="选择日期时间">
-            </el-date-picker>
+      <el-form-item label="结束时间">
+        <el-date-picker
+          v-model="queryParams.endTime"
+          type="date"
+          placeholder="选择日期时间">
+        </el-date-picker>
       </el-form-item>
-       <el-form-item label="船舶名" prop="name">
-         <el-input
-          v-model="queryParams.name"
+      <el-form-item label="船舶名" prop="name">
+        <el-input
+          v-model="queryParams.shipName"
           placeholder="船舶名"
           clearable
           size="small"
           style="width: 100rem"
         />
       </el-form-item>
-      <el-form-item label="MMsi" prop="mmsi">
+      <el-form-item label="MMSI" prop="mmsi">
         <el-input
           v-model="queryParams.mmsi"
-          placeholder="请输入权限字符"
+          placeholder="请输入MMSI"
           clearable
           size="small"
           style="width: 100rem"
         />
       </el-form-item>
-    
+
       <br/>
-       <el-form-item label="海船/内河船" prop="name">
-          <el-select v-model="queryParams.type" placeholder="请选择">
+      <el-form-item label="海船/内河船" prop="name">
+        <el-select v-model="queryParams.shipRegionType" clearable placeholder="请选择">
           <el-option
-            v-for="item in options"
+            v-for="item in shipTypeOptions"
             :key="item.value"
             :label="item.label"
             :value="item.value">
-            </el-option>
-            </el-select>
-       </el-form-item>
-
-        <el-form-item label="监测点" prop="monitorPointName">
-            <el-select v-model="queryParams.monitorPointName" placeholder="请选择">
-            <el-option
-              v-for="item in jianceOptions"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue">
-              </el-option>
-              </el-select>
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="监测点" prop="monitorPointName">
+        <el-select v-model="queryParams.monitorPointName" clearable placeholder="请选择">
+          <el-option
+            v-for="item in jianceOptions"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
 
       <el-form-item label="目的港" prop="name">
-         <el-input
-          v-model="queryParams.name"
+        <el-input
+          v-model="queryParams.destination"
           placeholder="目的港"
           clearable
           size="small"
@@ -67,142 +67,137 @@
         />
       </el-form-item>
 
-      <el-form-item label="受否中国国籍" prop="name">
-          <el-radio v-model="queryParams.radio" label="1">是</el-radio>
-          <el-radio v-model="queryParams.radio" label="2">否</el-radio>
-       </el-form-item>
-
-      <br/>
+      <!--      <el-form-item label="受否中国国籍" prop="name">-->
+      <!--          <el-radio v-model="queryParams.radio" label="1">是</el-radio>-->
+      <!--          <el-radio v-model="queryParams.radio" label="2">否</el-radio>-->
+      <!--       </el-form-item>-->
 
       <el-form-item label="管辖机构" prop="name">
-          <el-select v-model="queryParams.type" placeholder="请选择">
+        <el-select v-model="queryParams.orgName" clearable placeholder="请选择">
           <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-            </el-option>
-            </el-select>
-       </el-form-item>
-
-       <el-form-item label="处置结果" prop="name">
-          <el-select v-model="queryParams.type" placeholder="请选择">
+            v-for="item in orgOptions"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <br/>
+      <el-form-item label="处置结果" prop="name">
+        <el-select v-model="queryParams.dealResult" clearable placeholder="请选择">
           <el-option
             v-for="item in options"
             :key="item.value"
             :label="item.label"
             :value="item.value">
-            </el-option>
-            </el-select>
-       </el-form-item>
+          </el-option>
+        </el-select>
+      </el-form-item>
 
-       <el-form-item label="快检结果" prop="name">
-          <el-select v-model="queryParams.type" placeholder="请选择">
+      <el-form-item label="快检结果" prop="name">
+        <el-select v-model="queryParams.fastResult" clearable placeholder="请选择">
           <el-option
             v-for="item in options"
             :key="item.value"
             :label="item.label"
             :value="item.value">
-            </el-option>
-            </el-select>
-       </el-form-item>
+          </el-option>
+        </el-select>
+      </el-form-item>
 
-       <el-form-item label="送检结果" prop="name">
-          <el-select v-model="queryParams.type" placeholder="请选择">
+      <el-form-item label="送检结果" prop="name">
+        <el-select v-model="queryParams.uploadResult" clearable placeholder="请选择">
           <el-option
             v-for="item in options"
             :key="item.value"
             :label="item.label"
             :value="item.value">
-            </el-option>
-            </el-select>
-       </el-form-item>
+          </el-option>
+        </el-select>
+      </el-form-item>
 
-       <br/>
+      <br/>
 
       <el-form-item style="margin-left:10rem">
-          <el-button icon="el-icon-search" size="mini" @click="getThresholdList" 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>
+        <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>
       </el-form-item>
 
 
-      </el-form>
+    </el-form>
 
 
-  <el-radio-group v-model="tableShow" style="margin-bottom: 30px;" @change="tabChange">
-    <el-radio-button label="1" >嫌疑船舶管理</el-radio-button>
-    <el-radio-button label="2" >处置流程管理</el-radio-button>
-  </el-radio-group>
+    <el-radio-group v-model="tableShow" style="margin-bottom: 30px;" @change="tabChange">
+      <el-radio-button label="1">嫌疑船舶管理</el-radio-button>
+      <el-radio-button label="2">处置流程管理</el-radio-button>
+    </el-radio-group>
 
 
-  <el-table
+    <el-table
       :data="tableData"
       :header-cell-style="{ background: 'linear-gradient(white, #ccebf9)'}"
       style="width: 100%">
       <el-table-column
-        prop="date"
+        prop="shipName"
         label="船名"
         width="180">
       </el-table-column>
       <el-table-column
-        prop="name"
+        prop="mmsi"
         label="MMSI"
         width="180">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="shipRegionType"
         label="内河船/海船">
       </el-table-column>
-        <el-table-column
-        prop="address"
+      <el-table-column
+        prop="monitorPointName"
         label="监测点">
       </el-table-column>
-        <el-table-column
-        prop="address"
+      <el-table-column
+        prop="orgName"
+        label="管辖机构" v-if="tableShow == 1">
+      </el-table-column>
+      <el-table-column
+        prop="createTime"
         label="监测时间">
       </el-table-column>
-        <el-table-column
+      <el-table-column
+        prop="so2Concentration"
+        label="监测值" v-if="tableShow == 1">
+      </el-table-column>
+      <el-table-column
         prop="address"
         label="发送短信"
-        v-if="tableShow != 1">
-          <template slot-scope="scope">
-                <el-button type="warning" icon="el-icon-chat-line-square">发送</el-button> 
-          </template>
+        v-if="false">
+        <template slot-scope="scope">
+          <el-button type="warning" icon="el-icon-chat-line-square">发送</el-button>
+        </template>
       </el-table-column>
-        <el-table-column
+      <el-table-column
         prop="address"
         label="快检结果"
         v-if="tableShow != 1">
-         </el-table-column>
-        <el-table-column
+      </el-table-column>
+      <el-table-column
         prop="address"
         label="送检结果"
         v-if="tableShow != 1">
       </el-table-column>
-        <el-table-column
+      <el-table-column
         prop="address"
         label="处置结果"
         v-if="tableShow != 1">
       </el-table-column>
-       <el-table-column
-        prop="address"
-        label="预警标识"
-        v-if="tableShow == 1"
-        >
-      </el-table-column>
-       <el-table-column
-        prop="address"
-        label="预警状态"
-        v-if="tableShow == 1">
-      </el-table-column>
-       <el-table-column
-        prop="address"
+      <el-table-column
+        prop="destination"
         label="目的港"
         v-if="tableShow == 1">
       </el-table-column>
-       <el-table-column
-        prop="address"
+      <el-table-column
+        prop="berthName"
         label="锚铂计划"
         v-if="tableShow == 1">
       </el-table-column>
@@ -213,174 +208,193 @@
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
+      @pagination="getLiuLists"
     />
-     
-     <div class="dialogContent">
-     <el-dialog
+
+    <div class="dialogContent">
+      <el-dialog
         title=""
         :visible.sync="dialogVisible">
-           <div class="dialogDiv" v-show="dialogShow">
-                <span class="dialogFont" style="margin-left:10rem">燃油硫含量报警阈值(%)</span>
-                <span class="dialogFont" style="margin-left:40rem">{{liuCount}}</span>
-                <button style="margin-left:40rem;" class="dialogButton" @click="dialogShow=false">修改</button>
-           </div>
-
-            <div class="dialogDiv" v-show="!dialogShow">
-                <span class="dialogFont" style="margin-left:10rem">燃油硫含量报警阈值(%)</span>
-                <el-input v-model="liuCount" placeholder="请输入内容" style="width:30rem;margin-left:15rem"></el-input>
-                <button style="margin-left:13rem;" class="dialogButton" @click="getThresholdEdit">保存</button>
-                <button style="margin-left:7rem;" class="dialogButton" @click="dialogShow=true">取消</button>
-           </div>
+        <div class="dialogDiv" v-show="dialogShow">
+          <span class="dialogFont" style="margin-left:10rem">燃油硫含量报警阈值(%)</span>
+          <span class="dialogFont" style="margin-left:40rem">{{ liuCount }}</span>
+          <button style="margin-left:40rem;" class="dialogButton" @click="dialogShow=false">修改</button>
+        </div>
+
+        <div class="dialogDiv" v-show="!dialogShow">
+          <span class="dialogFont" style="margin-left:10rem">燃油硫含量报警阈值(%)</span>
+          <el-input v-model="liuCount" placeholder="请输入内容" style="width:30rem;margin-left:15rem"></el-input>
+          <button style="margin-left:13rem;" class="dialogButton" @click="getThresholdEdit">保存</button>
+          <button style="margin-left:7rem;" class="dialogButton" @click="dialogShow=true">取消</button>
+        </div>
       </el-dialog>
-     </div>
+    </div>
 
   </div>
 
-  </template>
-
-  <script>
-  import { getThresholdList,getThresholdEdit } from "@/api/data/liuData";
-  import { getDicts } from "@/api/system/dict/data";
-
-    export default {
-      name: "xtTable",
-      data() {
-        return {
-          total:100,
-          dialogVisible:false,
-          showSearch:true,
-        //   tabPosition: 'left',
-          tableShow:1,
-          liuCount:0.3,
-          dialogShow:true,
-          liuCountId:'',
-          queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            dateRange: undefined,
-            roleName: undefined,
-            roleKey: undefined,
-            status: undefined,
-            mmsi:undefined,
-            startTime:undefined,
-            endTime:undefined,
-            monitorPointName:undefined,
-            type:1,
-            radio:1
-          },
-          jianceOptions:[
-
-          ],
-           options: [{
-          value: '选项1',
-          label: '黄金糕'
-        }, {
-          value: '选项2',
-          label: '双皮奶'
-        }, {
-          value: '选项3',
-          label: '蚵仔煎'
-        }, {
-          value: '选项4',
-          label: '龙须面'
-        }, {
-          value: '选项5',
-          label: '北京烤鸭'
-        }],
-          tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-          }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-          }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-          }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-          }]
-        }
-      },
-      mounted(){
-             this.getThresholdList();
-             this.getDicts();
+</template>
+
+<script>
+import {getLiuList, getThresholdEdit, getThresholdList} from "@/api/data/liuData";
+import {getDicts} from "@/api/system/dict/data";
+
+export default {
+  name: "xtTable",
+  data() {
+    return {
+      total: 0,
+      dialogVisible: false,
+      showSearch: true,
+      //   tabPosition: 'left',
+      tableShow: 1,
+      liuCount: 0.3,
+      dialogShow: true,
+      liuCountId: '',
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dateRange: '',
+        mmsi: '',
+        shipName: '',
+        shipRegionType: '',
+        destination: '',
+        orgName: '',
+        illegalStatus: '',
+        dealResult: '',
+        fastResult: '',
+        uploadResult: '',
+        startTime: '',
+        endTime: '',
+        monitorPointName: '',
       },
-      methods:{
-           getDicts(){
-                getDicts('so2_snap_pos').then(data =>{
-                        this.jianceOptions = data.data
-                });
-            },
-           tabChange(){
-               console.log(this.tableShow);
-           },
-           getThresholdList(){
-             getThresholdList({type:'so2'}).then(response =>{
-                   this.liuCount = response.rows[0].configValue;
-                   this.liuCountId = response.rows[0].configId;
-                   
-             });
-           },getThresholdEdit(){
-                   getThresholdEdit({'configId':this.liuCountId,'configValue':this.liuCount}).then(response =>{
-                               this.dialogShow=true
-                   });
-           }
-
-      }
+      jianceOptions: [],
+      orgOptions: [],
+      shipTypeOptions: [{
+        value: '0',
+        label: '内河船'
+      }, {
+        value: '1',
+        label: '海船'
+      }],
+      options: [{
+        value: '选项1',
+        label: '未处置'
+      }, {
+        value: '选项2',
+        label: '已处置'
+      }],
+      tableData: [{
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-04',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1517 弄'
+      }, {
+        date: '2016-05-01',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1519 弄'
+      }, {
+        date: '2016-05-03',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1516 弄'
+      }]
+    }
+  },
+  mounted() {
+    this.getLiuLists();
+    this.getThresholdList();
+    this.getDicts();
+  },
+  methods: {
+    getDicts() {
+      getDicts('so2_snap_pos').then(data => {
+        this.jianceOptions = data.data
+      });
+      getDicts('cb_org').then(data => {
+        this.orgOptions = data.data
+      });
+    },
+    tabChange() {
+      console.log(this.tableShow);
+    },
+    getThresholdList() {
+      getThresholdList({type: 'so2'}).then(response => {
+        this.liuCount = response.rows[0].configValue;
+        this.liuCountId = response.rows[0].configId;
+
+      });
+    }, getThresholdEdit() {
+      getThresholdEdit({'configId': this.liuCountId, 'configValue': this.liuCount}).then(response => {
+        this.dialogShow = true
+      });
+    },
+    getLiuLists() {
+      this.loading = true;
+      getLiuList(this.queryParams).then(response => {
+        for (var i in response.rows) {
+          response.rows[i].shipRegionType = '内河船'
+          response.rows[i].destination = '无'
+          response.rows[i].berthName = '无'
+        }
+        this.tableData = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     }
-  </script>
-
-  <style scoped>
-    .dialogContent >>> .el-dialog{
-          background: url("./assets/pop_yzsz.png") no-repeat;
-          background-size: 100% 100%;
-          height:150rem;
-          width:250rem;
-          border:none;
-          top:100rem;
-     }
-
-     .dialogDiv{
-          background-color: #1E2E51;
-          height:25rem;
-          width:220rem;
-          margin-left:3rem;
-          padding-top:6rem;
-     }
-
-     .dialogFont{
-         color:#fff;
-         font-size: 7rem;
-     }
-
-     .dialogButton{
-         color:black;
-         background-color:#00BFFF;
-         border-radius: 2rem;
-     }
-
-      .dialogContent >>>.el-input--medium .el-input__inner{
-         height:10rem;
-         text-align: center
-     }
-
-     .search{
-       
-        opacity: 1;
-        background: linear-gradient(0deg,#098cf1 0%, #14eaef 100%);
-        border-radius: 2rem;
-        color:white
-      }
-      .export{
-       
-        opacity: 1;
-        background: #ffffff;
-        border: 1rem solid #e1e1e1;
-        border-radius: 2rem;
-      }
-  </style>
+
+  }
+}
+</script>
+
+<style scoped>
+.dialogContent >>> .el-dialog {
+  background: url("./assets/pop_yzsz.png") no-repeat;
+  background-size: 100% 100%;
+  height: 150rem;
+  width: 250rem;
+  border: none;
+  top: 100rem;
+}
+
+.dialogDiv {
+  background-color: #1E2E51;
+  height: 25rem;
+  width: 220rem;
+  margin-left: 3rem;
+  padding-top: 6rem;
+}
+
+.dialogFont {
+  color: #fff;
+  font-size: 7rem;
+}
+
+.dialogButton {
+  color: black;
+  background-color: #00BFFF;
+  border-radius: 2rem;
+}
+
+.dialogContent >>> .el-input--medium .el-input__inner {
+  height: 10rem;
+  text-align: center
+}
+
+.search {
+
+  opacity: 1;
+  background: linear-gradient(0deg, #098cf1 0%, #14eaef 100%);
+  border-radius: 2rem;
+  color: white
+}
+
+.export {
+
+  opacity: 1;
+  background: #ffffff;
+  border: 1rem solid #e1e1e1;
+  border-radius: 2rem;
+}
+</style>

+ 239 - 225
ruoyi-ui/src/views/components/table/xtTable.vue

@@ -1,98 +1,124 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
-           <el-form-item label="开始时间">
-              <el-date-picker
-              v-model="queryParams.beginTime"
-              type="datetime"
-              placeholder="选择日期时间">
-            </el-date-picker>
-        </el-form-item>
-          <el-form-item label="结束时间">
-                <el-date-picker
-                v-model="queryParams.endTime"
-                type="datetime"
-                placeholder="选择日期时间">
-              </el-date-picker>
-        </el-form-item>
-      <el-form-item label="船名" prop="aisShipName">
-         <el-input
-          v-model="queryParams.aisShipName"
-          placeholder="船舶名"
-          clearable
-          size="small"
-          style="width: 100rem"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> 
-      <el-form-item label="MMsi" prop="aisMmsi">
-        <el-input
-          v-model="queryParams.aisMmsi"
-          placeholder="请输入关键字"
-          clearable
-          size="small"
-          style="width: 100rem"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <br/>
-  
 
-       <el-form-item label="海船/内河船" prop="name">
-          <el-select v-model="queryParams.type" placeholder="请选择">
-          <el-option
-            v-for="item in typeOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
+      <el-row type="flex">
+        <el-col :span="2">
+          <el-form-item label="开始时间" style="float:right">
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-date-picker
+            v-model="queryParams.beginTime"
+            type="date"
+            placeholder="选择日期时间">
+          </el-date-picker>
+        </el-col>
+        <el-col :span="2">
+          <el-form-item label="结束时间" style="float:right">
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-date-picker
+            v-model="queryParams.endTime"
+            type="date"
+            placeholder="选择日期时间">
+          </el-date-picker>
+        </el-col>
+        <el-col :span="2">
+          <el-form-item label="船名" prop="aisShipName" style="float:right">
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-input
+            v-model="queryParams.aisShipName"
+            placeholder="请输入船舶名称"
+            clearable
+            size="small"
+            style="width: 80rem"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-col>
+        <el-col :span="2">
+          <el-form-item label="MMSI" prop="aisMmsi" style="float:right">
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-input
+            v-model="queryParams.aisMmsi"
+            placeholder="请输入MMSI"
+            clearable
+            size="small"
+            style="width: 100rem"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-col>
+      </el-row>
+      <el-row type="flex">
+        <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.type" clearable placeholder="请选择">
+            <el-option
+              v-for="item in typeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
             </el-option>
-            </el-select>
-       </el-form-item>
-
-      <el-form-item label="抓拍地点" prop="snapPos">
-         <el-input
-          v-model="queryParams.snapPos"
-          placeholder="请输入关键字"
-          clearable
-          size="small"
-          style="width: 100rem"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+          </el-select>
+        </el-col>
+        <el-col :span="2">
+          <el-form-item label="抓拍地点" prop="snapPos" style="float:right">
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-input
+            v-model="queryParams.snapPos"
+            placeholder="请输入抓拍地点"
+            clearable
+            size="small"
+            style="width: 90rem"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-col>
 
-  
-       <el-form-item label="黑度等级" prop="rcgSoot">
-          <el-select v-model="queryParams.rcgSoot" placeholder="请选择">
-          <el-option
-            v-for="item in rcgSootOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
+        <el-col :span="2">
+          <el-form-item label="黑度等级" prop="rcgSoot" style="float:right">
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-select v-model="queryParams.rcgSoot" clearable placeholder="请选择">
+            <el-option
+              v-for="item in rcgSootOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
             </el-option>
-            </el-select>
-       </el-form-item>
-
-        <el-form-item label="受否中国国籍" prop="name">
-          <el-radio v-model="queryParams.radio" label="1">是</el-radio>
-          <el-radio v-model="queryParams.radio" label="2">否</el-radio>
-       </el-form-item>
-
-       <br/>
+          </el-select>
+        </el-col>
+      </el-row>
 
       <el-form-item style="margin-left:1rem">
-          <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-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>
-       
-      </el-form>
 
+    </el-form>
 
-  <el-table
+
+    <el-table
       :data="tableData"
       :header-cell-style="{ background: 'linear-gradient(white, #ccebf9)'}"
       style="width: 100%"
       height=520>
       <el-table-column
+        label='序号'
+        type="index"
+        width="50">
+      </el-table-column>
+      <el-table-column
         prop="aisShipName"
         label="船名"
         width="180">
@@ -106,29 +132,29 @@
         prop="aisShipType"
         label="内河船/海船">
       </el-table-column>
-        <el-table-column
+      <el-table-column
         prop="snapPos"
         label="抓拍地点">
       </el-table-column>
-        <el-table-column
+      <el-table-column
         prop="snapTimeFmt"
         label="抓拍时间">
       </el-table-column>
-        <el-table-column
+      <el-table-column
         prop="rcgSoot"
         label="黑度等级">
       </el-table-column>
-        <el-table-column
-        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>
-          </template>
-      </el-table-column>
-        <!-- <el-table-column
-        prop="address"
-        label="管辖海事机构">
-      </el-table-column> -->
+      <!-- <el-table-column
+      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>
+        </template>
+    </el-table-column> -->
+      <!-- <el-table-column
+      prop="address"
+      label="管辖海事机构">
+    </el-table-column> -->
     </el-table>
 
     <pagination
@@ -141,143 +167,131 @@
 
   </div>
 
-    <!-- <el-table
-      :data="tableData"
-      style="width: 100%">
+  <!-- <el-table
+    :data="tableData"
+    style="width: 100%">
+    <el-table-column
+      prop="date"
+      label="船名"
+      width="180">
+    </el-table-column>
+    <el-table-column
+      prop="name"
+      label="MMSI"
+      width="180">
+    </el-table-column>
+    <el-table-column
+      prop="address"
+      label="内河船/海船">
+    </el-table-column>
       <el-table-column
-        prop="date"
-        label="船名"
-        width="180">
-      </el-table-column>
+      prop="address"
+      label="抓拍地点">
+    </el-table-column>
       <el-table-column
-        prop="name"
-        label="MMSI"
-        width="180">
-      </el-table-column>
+      prop="address"
+      label="抓怕时间">
+    </el-table-column>
+       </el-table-column>
       <el-table-column
-        prop="address"
-        label="内河船/海船">
-      </el-table-column>
-        <el-table-column
-        prop="address"
-        label="抓拍地点">
-      </el-table-column>
-        <el-table-column
-        prop="address"
-        label="抓怕时间">
-      </el-table-column>
-         </el-table-column>
-        <el-table-column
-        prop="address"
-        label="黑度登记">
-      </el-table-column>
-         </el-table-column>
-        <el-table-column
-        prop="address"
-        label="详情">
-      </el-table-column>
-         </el-table-column>
-        <el-table-column
-        prop="address"
-        label="管辖海事机构">
-      </el-table-column>
-    </el-table> -->
-  </template>
+      prop="address"
+      label="黑度登记">
+    </el-table-column>
+       </el-table-column>
+      <el-table-column
+      prop="address"
+      label="详情">
+    </el-table-column>
+       </el-table-column>
+      <el-table-column
+      prop="address"
+      label="管辖海事机构">
+    </el-table-column>
+  </el-table> -->
+</template>
 
-  <script>
- import { getBlackList } from "@/api/data/blackData";
+<script>
+import {getBlackList} from "@/api/data/blackData";
 
-    export default {
-      name: "xtTable",
-      data() {
-        return {
-          total:100,
-          showSearch:true,
-          queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            aisShipName: undefined,
-            snapPos: undefined,
-            rcgSoot: undefined,
-            aisMmsi:undefined,
-            beginTime:undefined,
-            endTime:undefined,
-            radio:1
-          },
-          typeOptions:[
-            {
-              value: '1',
-              label: '内河船'
-            },{
-              value: '2',
-              label: '海船'
-            }
-          ],
-          rcgSootOptions:[
-            {
-              value: '1',
-              label: '1'
-            },{
-              value: '2',
-              label: '2'
-            }, {
-              value: '3',
-              label: '3'
-            },{
-              value: '4',
-              label: '4'
-            },{
-              value: '5',
-              label: '5'
-            }
-          ],
-          tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-          }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-          }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-          }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-          }]
-        }
+export default {
+  name: "xtTable",
+  data() {
+    return {
+      total: 0,
+      showSearch: true,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        aisShipName: undefined,
+        snapPos: undefined,
+        rcgSoot: undefined,
+        aisMmsi: undefined,
+        beginTime: undefined,
+        endTime: undefined,
+        shipRegionType: undefined,
+        illegalStatus: '',
       },
-      created(){
-             this.getBlackList();              
-      }, 
-      methods:{
-          getBlackList(){
-                // console.log('1'+this.queryParams);
-                getBlackList(this.queryParams).then(response =>{
-                     this.tableData = response.rows;
-                     this.total = response.total;
-                        console.log(response);
-                });
-          }
-      }
+      typeOptions: [
+        {
+          value: '1',
+          label: '内河船'
+        }, {
+          value: '2',
+          label: '海船'
+        }
+      ],
+      rcgSootOptions: [
+        {
+          value: '1',
+          label: '1'
+        }, {
+          value: '2',
+          label: '2'
+        }, {
+          value: '3',
+          label: '3'
+        }, {
+          value: '4',
+          label: '4'
+        }, {
+          value: '5',
+          label: '5'
+        }
+      ],
+      tableData: []
     }
-  </script>
-  <style>
-      .search{
-       
-        opacity: 1;
-        background: linear-gradient(0deg,#098cf1 0%, #14eaef 100%);
-        border-radius: 2rem;
-        color:white
-      }
-      .export{
-       
-        opacity: 1;
-        background: #ffffff;
-        border: 1rem solid #e1e1e1;
-        border-radius: 2rem;
-      }
-  </style>
+  },
+  created() {
+    this.getBlackList();
+  },
+  methods: {
+    getBlackList() {
+      // console.log('1'+this.queryParams);
+      this.loading = true;
+      getBlackList(this.queryParams).then(response => {
+        this.tableData = response.rows;
+        this.total = response.total;
+        console.log(response);
+        this.loading = false;
+      });
+    }
+  }
+}
+</script>
+<style>
+.search {
+
+  opacity: 1;
+  background: linear-gradient(0deg, #098cf1 0%, #14eaef 100%);
+  border-radius: 2rem;
+  color: white
+}
+
+.export {
+
+  opacity: 1;
+  background: #ffffff;
+  border: 1rem solid #e1e1e1;
+  border-radius: 2rem;
+}
+</style>

+ 6 - 6
ruoyi-ui/src/views/home.vue

@@ -115,15 +115,15 @@
       <liuTable v-if="showTable==6"></liuTable>
       <roleTable v-if="showTable==7"></roleTable>
       <homeTable v-if="showTable==8"></homeTable>
-      <iframe style="height:330rem;width:100%" v-show="showTable==9" marginwidth="0" marginheight="0" vspace="0"
+      <iframe style="height:350rem;width:100%" v-show="showTable==9" marginwidth="0" marginheight="0" vspace="0"
               hspace="0" allowtransparency="true" scrolling="no" allowfullscreen="true" frameborder="0" name="showHere"
               src="http://119.45.121.229:8090/?opt=1"
       ></iframe>
-      <iframe style="height:330rem;width:100%" v-show="showTable==10" marginwidth="0" marginheight="0" vspace="0"
+      <iframe style="height:350rem;width:100%" v-show="showTable==10" marginwidth="0" marginheight="0" vspace="0"
               hspace="0" allowtransparency="true" scrolling="no" allowfullscreen="true" frameborder="0" name="showHere"
               src="http://101.133.159.237:8087/device.html?opt=1"
       ></iframe>
-      <iframe style="height:330rem;width:100%" v-show="showTable==11" marginwidth="0" marginheight="0" vspace="0"
+      <iframe style="height:350rem;width:100%" v-show="showTable==11" marginwidth="0" marginheight="0" vspace="0"
               hspace="0" allowtransparency="true" scrolling="no" allowfullscreen="true" frameborder="0" name="showHere"
               src="http://47.92.161.189:81/index.html?opt=1"
       ></iframe>
@@ -199,14 +199,14 @@ export default {
 
 <style lang="scss">
 .header {
-  height: 58rem;
+  height: 45rem;
   width: 100%;
   background: url("../assets/picture/title.png") no-repeat;
   background-size: contain;
 }
 
 .left_content {
-  height: 337rem;
+  height: 350rem;
   width: 87rem;
   //    src\assets\picture\bg_menu_1.png
   background: url("../assets/picture/bg_menu_1.png") no-repeat;
@@ -235,7 +235,7 @@ export default {
 .center_content {
   background-color: white;
   width: 670rem;
-  height: 330rem;
+  height: 350rem;
   float: right;
   margin-right: 20rem
 }

+ 29 - 1
ruoyi-ui/vue.config.js

@@ -5,7 +5,7 @@ function resolve(dir) {
     return path.join(__dirname, dir)
 }
 
-const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '江苏海事局船舶尾气排放遥感监测系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -13,6 +13,7 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
 // 这里只列一部分,具体配置参考文档
 module.exports = {
+<<<<<<< HEAD
     // 部署生产环境和开发环境下的URL。
     // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上
     // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
@@ -49,6 +50,33 @@ module.exports = {
             alias: {
                 "@": resolve("src")
             }
+=======
+  // 部署生产环境和开发环境下的URL。
+  // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上
+  // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
+  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+  // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist)
+  outputDir: 'dist',
+  // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)
+  assetsDir: 'static',
+  // 是否开启eslint保存检测,有效值:ture | false | 'error'
+  lintOnSave: process.env.NODE_ENV === 'development',
+  // 如果你不需要生产环境的 source map,可以将其设置为 false 以加速生产环境构建。
+  productionSourceMap: false,
+  // webpack-dev-server 相关配置
+  devServer: {
+    host: '0.0.0.0',
+    port: port,
+    open: true,
+    proxy: {
+      // detail: https://cli.vuejs.org/config/#devserver-proxy
+      [process.env.VUE_APP_BASE_API]: {
+        // target: `http://localhost:8080`,
+        target: `http://cbwq.xt.wenhq.top:8083/prod-api`,
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + process.env.VUE_APP_BASE_API]: ''
+>>>>>>> c750477c13a563d6c0d2ab6df70f41812680db2d
         }
     },
     chainWebpack(config) {