船舶船舶净吨位字段添加

src/api/homePage.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取企业首页信息
 export function carListInforma(query) {
   return request({
-    url: '/car-info/list-all',
+    url: '/enterprise-info/index-info',
     method: 'get',
     params: query
   })

src/views/index.vue

@@ -20,21 +20,57 @@
         />
       </baidu-map>
     </div>
-    <div style="padding-left: 20px; width: 30%; height: 100%; vertical-align: top; display: inline-block">
-      <div style="display: contents">
-        <div style=" height: 33%">
-          <el-card style="height: 100%; padding-bottom: 10px">
-            1
+    <div class="list-content">
+      <div class="list-content-group">
+        <div class="list-content-group-item">
+          <el-card class="list-card-first">
+            <div class="tltle-content">
+              <div class="title-span">最新公告</div>
+              <div class="more-span">更多 ></div>
+            </div>
+            <div class="list-table">
+              <el-table
+                  :data="tableData"
+                  border
+              >
+                <el-table-column prop="date" label="标题">
+                </el-table-column>
+                <el-table-column prop="name" label="日期">
+                </el-table-column>
+              </el-table>
+            </div>
           </el-card>
         </div>
-        <div style=" height: 33%; padding: 10px 0px">
-          <el-card style="height: 100%">
-            2
+        <div class="list-content-group-item-second">
+          <el-card class="list-card-second">
+            <div>最新政策法规</div>
+            <div class="list-table">
+              <el-table
+                  :data="tableData"
+                  border
+              >
+                <el-table-column prop="date" label="标题">
+                </el-table-column>
+                <el-table-column prop="name" label="日期">
+                </el-table-column>
+              </el-table>
+            </div>
           </el-card>
         </div>
-        <div style=" height: 33%">
-          <el-card style="height: 100%; padding-top: 10px">
-            3
+        <div class="list-content-group-item">
+          <el-card class="list-card-three">
+            <div>最新问题反馈</div>
+            <div class="list-table">
+              <el-table
+                  :data="tableData"
+                  border
+              >
+                <el-table-column prop="date" label="标题">
+                </el-table-column>
+                <el-table-column prop="name" label="日期">
+                </el-table-column>
+              </el-table>
+            </div>
           </el-card>
         </div>
       </div>
@@ -51,13 +87,35 @@ export default {
       zoom: 11,
       BMap: null,
       map: null,
-      markerPoint: []
+      markerPoint: [],
+      tableData: [{
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市'
+      },{
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市'
+      },{
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市'
+      },{
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市'
+      },{
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市'
+      }
+      ]
     }
   },
   mounted() {
     // this.markerPoint = [{ lng: '117.777222', lat: '39.004369' }]
     this.getCarList() // 获取全部车辆信息
-    this.getInformation()
+    this.getInformation() // 获取企业信息
   },
   methods: {
     get() {
@@ -89,7 +147,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .home {
   width: 100%;
   height: 100vh;
@@ -153,7 +211,71 @@ export default {
       }
     }
   }
-  .bm-view {
+  .list-content {
+    padding-left: 20px;
+    width: 30%;
+    height: 100%;
+    vertical-align: top;
+    display: inline-block;
+    .list-content-group {
+      display: contents;
+      .list-content-group-item {
+        height: 33%;
+        .list-card-first {
+          height: 100%;
+          padding-bottom: 10px;
+          .tltle-content {
+            display: flex;
+            justify-content: space-between;
+            .title-span {
+              font-weight: bold;
+              font-size: 16px;
+              color: #1890FF;
+            }
+            .more-span {
+              font-size: 14px;
+              color: #676A6C;
+            }
+          }
+          .list-table {
+            height: inherit;
+            overflow-y: scroll
+          }
+        }
+        .list-card-three {
+          height: 100%;
+          padding-top: 10px;
+          .list-table {
+            height: inherit;
+            overflow-y: scroll
+          }
+        }
+      }
+      .list-content-group-item-second {
+        height: 33%;
+        padding: 10px 0px;
+        .list-card-second {
+          height: 100%;
+          .list-table {
+            height: inherit;
+            overflow-y: scroll
+          }
+        }
+      }
+    }
+  }
+  ::v-deep .el-card .el-card__body {
+    height: inherit;
+  }
+  // 隐藏滚动条
+  ::-webkit-scrollbar {
+    width: 0px;
+  }
+  // 列表行高内边距
+  ::v-deep .el-table--medium .el-table__cell {
+    padding: 6px 0;
+  }
+    .bm-view {
     width: 100%;
     height: 100%;
   }

src/views/informationReport/shipping/index.vue

@@ -177,8 +177,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="船舶净吨位" prop="shipCheckRegisterNum">
-              <el-input v-model="form.shipCheckRegisterNum" placeholder="请输入船舶净吨位" />
+            <el-form-item label="船舶净吨位" prop="shipNetTonnage">
+              <el-input v-model="form.shipNetTonnage" placeholder="请输入船舶净吨位" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -362,6 +362,20 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        shipName: '',
+        navigateArea: '',
+        operationStatus: '',
+        shipType: '',
+        unit: '',
+        quota: '',
+        portName: '',
+        shipLength: '',
+        shipWidth: '',
+        shipTotalTonnage: '',
+        completedDate: '',
+        shipRegisterNum: '',
+        shipCheckRegisterNum: '',
+        shipNetTonnage: ''
       }
       this.resetForm('form')
     }