合并

src/views/voyage/voyageDetail.vue

@@ -73,114 +73,6 @@
         ></el-input>
       </div>
     </div> -->
-<<<<<<< HEAD
-    <div class="line">
-      <div class="info-line">
-        <div class="info-line-title">船舶名称</div>
-        <el-input
-          class="info-line-text"
-          v-model="voyage.shipName"
-          disabled
-        ></el-input>
-      </div>
-      <div
-        class="info-gap"
-        v-if="shipAudits.length"
-        @click="isCertsVisable = true"
-      >
-        汇很多认证
-      </div>
-      <el-dialog
-        @open="showCerts"
-        v-model="isCertsVisable"
-        destroy-on-close
-        width="30%"
-      >
-        <Certs ref="certs"></Certs>
-      </el-dialog>
-      <div class="info-line">
-        <div class="info-line-title">MMSI</div>
-        <el-input
-          class="info-line-text"
-          v-model="voyage.shipMmsi"
-          disabled
-        ></el-input>
-      </div>
-    </div>
-    <div id="map-container" class="map-container"></div>
-    <div class="line" style="margin-top: 30px">
-      <div class="info-line">
-        <div class="info-line-title">开始时间</div>
-        <el-input
-          class="info-line-text"
-          v-model="voyage.startTime"
-          disabled
-        ></el-input>
-      </div>
-      <div class="info-line">
-        <div class="info-line-title">结束时间</div>
-        <el-input
-          class="info-line-text"
-          v-model="voyage.endTime"
-          disabled
-        ></el-input>
-      </div>
-    </div>
-    <div class="line">
-      <div class="info-line">
-        <div class="info-line-title">装货港</div>
-        <el-input
-          class="info-line-text"
-          v-model="voyage.loadPort"
-          disabled
-        ></el-input>
-      </div>
-      <div class="info-line">
-        <div class="info-line-title">卸货港</div>
-        <el-input
-          class="info-line-text"
-          v-model="voyage.dischargeProt"
-          disabled
-        ></el-input>
-      </div>
-    </div>
-    <div class="line">
-      <div class="info-line">
-        <div class="info-line-title">货种</div>
-        <el-input
-          class="info-line-text"
-          v-model="voyage.cargo"
-          disabled
-        ></el-input>
-      </div>
-      <div class="info-line">
-        <div style="width: 120px !important" class="info-line-title">货量</div>
-        <el-input
-          style="width: 100px !important"
-          class="info-line-text"
-          v-model="voyage.tons"
-          disabled
-        ></el-input>
-        <span class="unit">吨</span>
-        <el-input
-          style="width: 80px !important"
-          class="info-line-text"
-          v-model="voyage.Pieces"
-          disabled
-        ></el-input>
-        <span class="unit">件</span>
-      </div>
-    </div>
-    <div class="container-second-title df aic jcsb mt40">
-      <div>船舶运输记录详情</div>
-      <div style="margin-right: 20px">
-        信息更新时间 :
-        <span style="font-size: 18px"> {{ voyage.infoUpdateTime }}</span>
-      </div>
-    </div>
-    <div class="line-container-p24">
-=======
->>>>>>> 1b717e7e0e79c90d381e93ca5580221949efd6be
       <div class="line">
         <div class="info-line">
           <div class="info-line-title">船舶名称</div>