Browse Source

bug

tags/v1.0.0
吴迪 2 years ago
parent
commit
43dc5b3905
3 changed files with 11 additions and 13 deletions
  1. +0
    -5
      src/views/dashboard/index.vue
  2. +3
    -0
      src/views/login/index.vue
  3. +8
    -8
      src/views/task-manage/components/DrawComp.vue

+ 0
- 5
src/views/dashboard/index.vue View File

import HeadComp from './components/HeadComp.vue' import HeadComp from './components/HeadComp.vue'
import ContComp from './components/ContComp.vue' import ContComp from './components/ContComp.vue'
import FootComp from './components/FootComp.vue' import FootComp from './components/FootComp.vue'
import { updateLoginTime } from '@/api/dashboard/index'

updateLoginTime().then(res => {
console.log(res)
})


</script> </script>
<style scoped lang='scss'> <style scoped lang='scss'>

+ 3
- 0
src/views/login/index.vue View File

import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
import { signinRedirectCallback, signoutRedirectCallback, signoutRedirect, getPath, removePath } from '@/utils/oidc/index.js' import { signinRedirectCallback, signoutRedirectCallback, signoutRedirect, getPath, removePath } from '@/utils/oidc/index.js'
import { updateLoginTime } from '@/api/dashboard/index'

export default { export default {
name: 'LoginPage', name: 'LoginPage',
setup() { setup() {
const userStore = useUserStore() const userStore = useUserStore()
if (route.query?.code && route.query?.state) { if (route.query?.code && route.query?.state) {
signinRedirectCallback().then(res => { signinRedirectCallback().then(res => {
updateLoginTime().then(res => {})
// router.push({ path: getPath() }) // router.push({ path: getPath() })
// removePath() // removePath()
// userStore.getUserInfos() // userStore.getUserInfos()

+ 8
- 8
src/views/task-manage/components/DrawComp.vue View File

</div> </div>


<!-- 飞行信息 - 待分配飞手:状态为5 --> <!-- 飞行信息 - 待分配飞手:状态为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> <div class="title">飞行信息</div>
<n-form <n-form
ref="formRef" ref="formRef"
</div> </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="设备/影像基本信息"> <n-descriptions label-placement="left" label-align="right" :column="4" title="设备/影像基本信息">
<template v-for="(it, i) in equipmentInfo" :key="i + it.label"> <template v-for="(it, i) in equipmentInfo" :key="i + it.label">
<n-descriptions-item v-if="it?.isLive !== data.isLive" :label="it.label"> <n-descriptions-item v-if="it?.isLive !== data.isLive" :label="it.label">
</div> </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> <div class="title">飞行信息</div>
<n-form <n-form
ref="formRefOrder" ref="formRefOrder"
</n-descriptions-item> </n-descriptions-item>
</template> </template>
</n-descriptions> </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> </div>


<!-- 设备/影响基本信息 - 执行中: 管理员 --> <!-- 设备/影响基本信息 - 执行中: 管理员 -->
</n-descriptions-item> </n-descriptions-item>
</template> </template>
</n-descriptions> </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>


<div v-if="current === 5" class="cont"> <div v-if="current === 5" class="cont">
<div class="title">飞行文件</div> <div class="title">飞行文件</div>


<UploadVod <UploadVod
v-if="data.photographyWay === 1 && roleId === data.id"
v-if="data.photographyWay === 1 && roleId === data.flightHandId"
ref="videoRefs" ref="videoRefs"
:upload-name="'视频'" :upload-name="'视频'"
:limit="1" :limit="1"
@upload-status="vodStatusVideo" @upload-status="vodStatusVideo"
/> />
<fileOss <fileOss
v-if="data.photographyWay === 1 && roleId !== data.id"
v-if="data.photographyWay === 1 && roleId !== data.flightHandId"
:file-type="'video'" :file-type="'video'"
:btn-name="'视频'" :btn-name="'视频'"
:limit="1" :limit="1"
@upload-status="statusfile" @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> <n-icon>
<UploadOutlined /> <UploadOutlined />
</n-icon> </n-icon>

Loading…
Cancel
Save