Merge branch 'wudi' of gitadmin/tuoheng_pilot_web into develop

src/layout/components/Header/index.vue

@@ -1,7 +1,7 @@
 <template>
   <n-layout-header class="layout__header" bordered>
     <div class="header__logo">
-      <n-image height="18" src="/logo.png" preview-disabled />
+      <n-image height="18" :src="logo" preview-disabled />
       <span class="sp">欢迎回来, {{ getUserInfo.realname }}</span>
     </div>
 
@@ -27,6 +27,8 @@ import { renderIcon } from '@/utils'
 import { useUserStore } from '@/store/modules/user.js'
 import { useSettingStore } from '@/store/modules/setting.js'
 import { signinRedirect, signoutRedirect } from '@/utils/oidc/index.js'
+import logo from './logo.png'
+
 export default defineComponent({
   name: 'LayoutHeader',
   setup() {
@@ -82,7 +84,8 @@ export default defineComponent({
       getLogoWidth,
       getUserInfo,
       handleSelect,
-      handleLogin
+      handleLogin,
+      logo
     }
   }
 })
@@ -99,8 +102,10 @@ export default defineComponent({
   height: 18px;
 }
 .sp {
+  margin-left: 8px;
   font-size: 14px;
   font-weight: blod;
+  vertical-align: top;
 }
 .user_msg {
   display: flex;

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

@@ -150,7 +150,7 @@
       :class="{'uploads': remBtn}"
     />
     <fileOss
-      v-if="data.photographyWay === 2"
+      v-if="data.photographyWay === 2 && roleId === data.flightHandId"
       :file-type="'tif'"
       :key-name="'orthoUrl'"
       :btn-name="'正射影像'"
@@ -160,7 +160,7 @@
       @upload-status="statusfile"
     />
     <fileOss
-      v-if="data.photographyWay === 3"
+      v-if="data.photographyWay === 3 && roleId === data.flightHandId"
       :file-type="'tif'"
       :key-name="'inclinedUrl'"
       :show-upload-btn="true"
@@ -220,7 +220,7 @@ 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, roleType) // 调试id
+// console.log(roleId, data.flightHandId, roleType) // 调试id
 
 const formRef = ref() // 表格refs - 分配飞手
 const formRefOrder = ref() // 表格refs - 飞手接单

src/views/task-manage/tools/form.js

@@ -19,9 +19,9 @@ export const form = reactive({
     patrolLocation: '',
     endValue: '',
     taskStartTime: null,
-    flightHandId: '',
-    equipmentId: '',
-    equipmentMountId: '',
+    flightHandId: null,
+    equipmentId: null,
+    equipmentMountId: null,
     photographyWay: null,
     remark: ''
   },

src/views/task-manage/tools/table.js

@@ -89,7 +89,7 @@ const data = reactive({
       align: 'center'
     },
     {
-      title: '任务发起时间',
+      title: '期望执行时间',
       key: 'taskStartTime',
       align: 'center'
     },