修改船舶动态表

src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -3,7 +3,7 @@
     <div class="shipReport">
       <div class="title">船舶动态表</div>
       <div class="top">
-        <el-input
+        <!-- <el-input
           class="el-input"
           placeholder="请输入品名"
           v-model="input"
@@ -12,7 +12,10 @@
         </el-input>
         <el-button type="primary" class="btn" @click="onclick">
           <i class="el-icon-search"></i>查询
-        </el-button>
+        </el-button> -->
+         <el-button type="primary" class="btn" @click="reflush">
+          <i class="el-icon-search"></i>刷新
+         </el-button>
         <el-button type="primary" class="btn" @click="getPdfs()">
           <i class="el-icon-download"></i>下载PDF
         </el-button>
@@ -54,10 +57,6 @@ export default {
           prop: "tonnage",
           label: "下游港口吨位"
         },
-        {
-          prop: "tonnage1",
-          label: "二程船吨位"
-        },
         {
           label: "未到闸船舶",
           children: [
@@ -171,6 +170,9 @@ export default {
     // console.log(this.$refs.excelDom);
   },
   methods: {
+    reflush(){
+      this.$router.go(0);
+    },
     onclick() {
       this.axios
         .post("/api/v1/tms/selectAllShipDynamaics?con=" + this.input)

src/views/statisticalReport/components/tableItem.vue

@@ -624,15 +624,6 @@ export default {
           colspan: _col
         }
       }
-      if (columnIndex === 4) {
-        // this.tableData  修改
-        const _row = this.flitterData(this.tableData).one[rowIndex]
-        const _col = _row > 0 ? 1 : 0
-        return {
-          rowspan: _row,
-          colspan: _col
-        }
-      }
       if (columnIndex === 2) {
         // this.tableData  修改
         const _row = this.flitterData(this.tableData).one[rowIndex]