数据检索筛选功能修改完成

src/views/dataSearch.vue

@@ -100,7 +100,7 @@
         <div class="left4" v-if="radio == '航次'">
           <div v-for="(item, index) in dataList" :key="index" class="left4_1" @click="turnDeatilPage(item)">
             <div class="left4_top">
-              <p>{{ item.voyage_name }} <span class="mileage">{{ item.voyage_mileage }}海里</span></p>
+              <p :style="currentVoyage === item.tsy_id ? 'color: #409eff' : ''">{{ item.voyage_name }} <span class="mileage">{{ item.voyage_mileage }}海里</span></p>
               <span class="org">{{ item.funding_org }}</span>
             </div>
             <div class="left4_list">
@@ -216,6 +216,7 @@ export default {
       job: '',
       chooseStation: null,
       chooseLine: null,
+      currentVoyage: null, // 当前选中的航次
       // 地图图层基础地址
       CesiumHostAddr: ''
     }
@@ -384,7 +385,7 @@ export default {
           res2.array.forEach(point => {
             points.push(Number(point.nav_lon), Number(point.nav_lat))
           })
-          this.drawLine(index, item.tsy_id, points)
+          this.drawLine(index, item.tsy_id, points, '航次航线')
           // 将坐标点添加到航次列表中
           item.points = points
         })
@@ -404,7 +405,7 @@ export default {
             // 格式化坐标点
             res.array.forEach(line => {
               if (line.start_lon && line.start_lat && line.end_lon && line.end_lat) {
-                this.drawLine(index, line.tsy_id, [Number(line.start_lon), Number(line.start_lat), Number(line.end_lon), Number(line.end_lat)])
+                this.drawLine(index, line.tsy_id, [Number(line.start_lon), Number(line.start_lat), Number(line.end_lon), Number(line.end_lat)], '样品航线')
               }
             })
           })
@@ -430,7 +431,7 @@ export default {
           res.array.forEach(point => {
             points.push(Number(point.track_lon), Number(point.track_lat))
           })
-          this.drawLine(index, item.tsy_id, points)
+          this.drawLine(index, item.tsy_id, points, '数据样品集航线')
           // 将坐标点添加到航次列表中
           item.points = points
         })
@@ -484,14 +485,17 @@ export default {
         const pickedObject = this.viewer.scene.pick(click.position);
         this.currenSample = pickedObject.id._id
         const type = pickedObject.id._type
-        if (type === 'line') {
-          this.job = '测线作业'
-        } else {
+        if (type === 'point') {
           this.job = '站位作业'
+        } else {
+          this.job = '测线作业'
         }
         this.onSample({
           tsy_id: pickedObject.id._id
         })
+        if (type === '航次航线') {
+          this.currentVoyage = pickedObject.id._id
+        }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
 
       // 叠加叠加影像服务
@@ -532,10 +536,10 @@ export default {
       this.viewer.imageryLayers.addImageryProvider(shipline)
     },
     /* cesium 绘制线 */
-    drawLine(index, id, degreeArr) {
+    drawLine(index, id, degreeArr, type) {
       this.viewer.entities.add({
         id: id,
-        type: 'line',
+        type: type,
         polyline: { //polyline折线实体
           positions: Cesium.Cartesian3.fromDegreesArray(degreeArr),//位置
           clampToGround: true, //地表层高度模式,

src/views/dataTransfer/sampleViews/formViews/DataType.vue

@@ -1,5 +1,8 @@
 <template>
   <div>
+    <div class="upload-bar" v-if="id && form.job_type === '测线作业'">
+      <el-button type="primary" @click="onNext">上传测线轨迹</el-button>
+    </div>
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="200px">
       <el-row>
         <el-col :span="8">
@@ -10,7 +13,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="16">
-          <el-form-item label="样品类型" prop="data_id">
+          <el-form-item label="数据样品类型" prop="data_id">
             <el-select v-model="form.data_id" filterable placeholder="" :disabled="disabled" style="width: 100%;">
               <el-option v-for="item in dataDicts" :key="item.tsy_id" :label="`${item.data_name}(${item.data_alias})`" :value="item.tsy_id"/>
             </el-select>
@@ -134,6 +137,11 @@ export default {
 </script>
 
 <style scoped>
+.upload-bar {
+  display: flex;
+  justify-content: right;
+  margin-bottom: 20px;
+}
 .submit-box {
   text-align: center;
 }

src/views/dataTransfer/sampleViews/formViews/Equipment.vue

@@ -12,7 +12,7 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="设备定标时间" prop="equipment_time">
+          <el-form-item label="设备标定时间" prop="equipment_time">
             <el-date-picker v-model="form.equipment_time" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%;"/>
           </el-form-item>
         </el-col>

src/views/dataTransfer/voyageReg.vue

@@ -24,6 +24,7 @@
           :show-file-list="false"
           :http-request="uploadReg"
           :before-upload="beforeUploadReg"
+          accept=".xlsx"
         >
           <el-button :loading="loadingRegBtn">{{ textReg }}</el-button>
         </el-upload>