Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release

src/views/system-manage/banner-manage/BannerModal.vue

@@ -91,7 +91,7 @@ export default defineComponent({
     })
 
     function handleUploadStatus(status, list) {
-      console.log('status', status, list)
+      // console.log('status', status, list)
       data.form.cover = status
       data.form.list = list
     }
@@ -99,12 +99,6 @@ export default defineComponent({
     const formRef = ref()
     const ossRefs = ref()
     function handleConfirm() {
-      // if (data.form.cover === 'upload') {
-      //   $message.error('未上传或正在上传')
-      //   handleClose()
-      //   return
-      // }
-      // if (data.form.cover === 'success') {
       formRef.value.validate().then(() => {
         if (data.form.cover === 'success') {
           const params = {

src/views/task-manage/components/DrawComp.vue

@@ -23,7 +23,7 @@
   </div>
 
   <!-- 飞行信息 - 待分配飞手：状态为5 -->
-  <div v-if="current === 1 && roleId === data.flightHandId" class="cont">
+  <div v-if="current === 1 && roleType === 1" class="cont">
     <div class="title">飞行信息</div>
     <n-form
       ref="formRef"
@@ -218,8 +218,9 @@ form.userForm = data
 const current = data.pilotStatus / 5 // 当前状态
 
 const roleId = useUserStore().userInfo.id || '00a5a13322fc088cc1c4ba4c40d22fcs' // 默认为管理员id
+const roleType = useUserStore().userInfo.type || 1 // 默认为管理员id
 // const roleId = '00a5a13322fc088cc1c4ba4c40d22fcs' // 调试id
-// console.log(roleId, data.flightHandId) // 调试id
+console.log(roleId, data.flightHandId, roleType) // 调试id
 
 const formRef = ref() // 表格refs - 分配飞手
 const formRefOrder = ref() // 表格refs - 飞手接单

src/views/task-manage/components/MapComp.vue

@@ -29,7 +29,18 @@ GMap.then((AMap) => {
     poiPicker.on('poiPicked', ({ item }) => {
       const inp = document.getElementById('pickerInput')
       inp.value = item.name
-      map.setCenter(item.location) // 移动到中心位置
+      // map.setCenter(item.location) // 移动到中心位置
+      if (marker) map.remove(marker)
+      marker = new AMap.Marker({
+        title: item.address,
+        icon: '//vdata.amap.com/icons/b18/1/2.png'
+      })
+
+      marker.setMap(map)
+      marker.setPosition(item.location)
+      map.setCenter(item.location)
+
+      emit('mapEmit', item.location)
     })
   })
   map.on('click', ({ lnglat }) => {