页面修改

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

ruoyi-ui/.env.production

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

ruoyi-ui/.env.staging

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

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

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

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 }
       }

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;
         }
 

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

@@ -1,83 +1,104 @@
 <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-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-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-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-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="datetime"
+                        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="datetime"
+                            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="请输入关键字"
+                            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" placeholder="请选择">
+                        <el-option
+                          v-for="item in typeOptions"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                          </el-option>
+                          </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-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" placeholder="请选择">
+                          <el-option
+                            v-for="item in rcgSootOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                            </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>
@@ -92,6 +113,11 @@
       :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="船名"
@@ -118,13 +144,13 @@
         prop="rcgSoot"
         label="黑度等级">
       </el-table-column>
-        <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> -->
         <!-- <el-table-column
         prop="address"
         label="管辖海事机构">

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: 100% 100%;
 }
 
 .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
 }

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 // 端口
 
@@ -34,7 +34,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://localhost:8080`,
-        target: `http://192.168.100.35:8080`,
+        target: `http://cbwq.xt.wenhq.top:8083/prod-api`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''