Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release

src/views/dashboard/index.vue

@@ -14,11 +14,6 @@
 import HeadComp from './components/HeadComp.vue'
 import ContComp from './components/ContComp.vue'
 import FootComp from './components/FootComp.vue'
-import { updateLoginTime } from '@/api/dashboard/index'
-
-updateLoginTime().then(res => {
-  console.log(res)
-})
 
 </script>
 <style scoped lang='scss'>

src/views/login/index.vue

@@ -12,6 +12,8 @@
 import { useRoute, useRouter } from 'vue-router'
 import { useUserStore } from '@/store/modules/user'
 import { signinRedirectCallback, signoutRedirectCallback, signoutRedirect, getPath, removePath } from '@/utils/oidc/index.js'
+import { updateLoginTime } from '@/api/dashboard/index'
+
 export default {
   name: 'LoginPage',
   setup() {
@@ -20,6 +22,7 @@ export default {
     const userStore = useUserStore()
     if (route.query?.code && route.query?.state) {
       signinRedirectCallback().then(res => {
+        updateLoginTime().then(res => {})
         // router.push({ path: getPath() })
         // removePath()
         // userStore.getUserInfos()

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

@@ -23,7 +23,7 @@
   </div>
 
   <!-- 飞行信息 - 待分配飞手：状态为5 -->
-  <div v-if="current === 1 && roleId === data.id" class="cont">
+  <div v-if="current === 1 && roleId === data.flightHandId" class="cont">
     <div class="title">飞行信息</div>
     <n-form
       ref="formRef"
@@ -54,7 +54,7 @@
   </div>
 
   <!-- 设备/影响基本信息 - 飞手接单: 管理员 -->
-  <div v-if="current == 2 && roleId !== data.id" class="cont">
+  <div v-if="current == 2 && roleId !== data.flightHandId" class="cont">
     <n-descriptions label-placement="left" label-align="right" :column="4" title="设备/影像基本信息">
       <template v-for="(it, i) in equipmentInfo" :key="i + it.label">
         <n-descriptions-item v-if="it?.isLive !== data.isLive" :label="it.label">
@@ -65,7 +65,7 @@
   </div>
 
   <!-- 飞手接单: 飞手 -->
-  <div v-if="current === 2 && roleId === data.id" class="cont">
+  <div v-if="current === 2 && roleId === data.flightHandId" class="cont">
     <div class="title">飞行信息</div>
     <n-form
       ref="formRefOrder"
@@ -93,7 +93,7 @@
         </n-descriptions-item>
       </template>
     </n-descriptions>
-    <n-button v-if="roleId === data.id" type="info" class="btn" @click="startFly">开始飞行</n-button>
+    <n-button v-if="roleId === data.flightHandId" type="info" class="btn" @click="startFly">开始飞行</n-button>
   </div>
 
   <!-- 设备/影响基本信息 - 执行中: 管理员 -->
@@ -105,21 +105,21 @@
         </n-descriptions-item>
       </template>
     </n-descriptions>
-    <n-button v-if="roleId === data.id" type="Error" class="btn" @click="endFly">结束飞行</n-button>
+    <n-button v-if="roleId === data.flightHandId" type="Error" class="btn" @click="endFly">结束飞行</n-button>
   </div>
 
   <div v-if="current === 5" class="cont">
     <div class="title">飞行文件</div>
 
     <UploadVod
-      v-if="data.photographyWay === 1 && roleId === data.id"
+      v-if="data.photographyWay === 1 && roleId === data.flightHandId"
       ref="videoRefs"
       :upload-name="'视频'"
       :limit="1"
       @upload-status="vodStatusVideo"
     />
     <fileOss
-      v-if="data.photographyWay === 1 && roleId !== data.id"
+      v-if="data.photographyWay === 1 && roleId !== data.flightHandId"
       :file-type="'video'"
       :btn-name="'视频'"
       :limit="1"
@@ -157,7 +157,7 @@
       @upload-status="statusfile"
     />
 
-    <n-button v-if="data.photographyWay === 1 && roleId === data.id" type="primary" class="btn" :loading="loading" @click="submitFile">
+    <n-button v-if="data.photographyWay === 1 && roleId === data.flightHandId" type="primary" class="btn" :loading="loading" @click="submitFile">
       <n-icon>
         <UploadOutlined />
       </n-icon>