Browse Source

Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release

tags/v1.0.0
zhangtao 2 years ago
parent
commit
e3b303f0ae
7 changed files with 47 additions and 11 deletions
  1. +10
    -0
      src/api/task/index.js
  2. +5
    -0
      src/layout/components/Header/index.vue
  3. BIN
      src/layout/components/Header/logo.png
  4. +4
    -4
      src/views/task-manage/components/DrawComp.vue
  5. +2
    -1
      src/views/task-manage/index.vue
  6. +18
    -3
      src/views/task-manage/tools/search.js
  7. +8
    -3
      src/views/task-manage/tools/table.js

+ 10
- 0
src/api/task/index.js View File

method: 'PUT', method: 'PUT',
data data
}) })

/**
* 平台列表
* @param {*} params
* @returns
*/
export const PilotPlatform = () => request({
url: '/PilotPlatform/index',
method: 'GET'
})

+ 5
- 0
src/layout/components/Header/index.vue View File

<n-layout-header class="layout__header" bordered> <n-layout-header class="layout__header" bordered>
<div class="header__logo"> <div class="header__logo">
<n-image height="18" src="/logo.png" preview-disabled /> <n-image height="18" src="/logo.png" preview-disabled />
<span class="sp">欢迎回来, {{ getUserInfo.realname }}</span>
</div> </div>


<n-dropdown v-if="getUserInfo.hasLogin" trigger="hover" :options="options" @select="handleSelect"> <n-dropdown v-if="getUserInfo.hasLogin" trigger="hover" :options="options" @select="handleSelect">
.header__logo{ .header__logo{
height: 18px; height: 18px;
} }
.sp {
font-size: 14px;
font-weight: blod;
}
.user_msg { .user_msg {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;

BIN
src/layout/components/Header/logo.png View File

Before After
Width: 21  |  Height: 20  |  Size: 447B

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

<div class="title">飞行文件</div> <div class="title">飞行文件</div>


<UploadVod <UploadVod
v-if="data.photographyWay === 1 && !data.videoUrl"
v-if="data.photographyWay === 1 && roleId === data.flightHandId && !data.videoUrl"
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 && data.videoUrl"
v-if="data.photographyWay === 1 && roleId === data.flightHandId && data.videoUrl"
:file-type="'video'" :file-type="'video'"
:btn-name="'视频'" :btn-name="'视频'"
:limit="1" :limit="1"
/> />


<fileOss <fileOss
v-if="data.photographyWay === 1"
v-if="data.photographyWay === 1 && roleId === data.flightHandId"
ref="srtRefs" ref="srtRefs"
:file-type="'srt'" :file-type="'srt'"
:key-name="'srtUrl'" :key-name="'srtUrl'"
/> />


<n-button <n-button
v-if="data.photographyWay === 1 && !data.videoUrl"
v-if="data.photographyWay === 1 && roleId === data.flightHandId && !data.videoUrl"
type="primary" type="primary"
class="btn" class="btn"
:loading="loading" :loading="loading"

+ 2
- 1
src/views/task-manage/index.vue View File

</template> </template>


<script> <script>
import { search } from './tools/search.js'
import { search, getPlatform } from './tools/search.js'
import table from './tools/table.js' import table from './tools/table.js'
import headSearch from '@/components/Search/index.vue' import headSearch from '@/components/Search/index.vue'
import dataTable from '@/components/DataTable/index.vue' import dataTable from '@/components/DataTable/index.vue'
name: 'TaskManage', name: 'TaskManage',
components: { dataTable, UserModal, headSearch, DrawComp }, components: { dataTable, UserModal, headSearch, DrawComp },
setup() { setup() {
getPlatform()
const data = reactive({ const data = reactive({
...toRefs(table), ...toRefs(table),
...toRefs(search) ...toRefs(search)

+ 18
- 3
src/views/task-manage/tools/search.js View File

import { ref, reactive, computed } from 'vue' import { ref, reactive, computed } from 'vue'
import { TASK_STATUS } from '@/utils/dictionary' import { TASK_STATUS } from '@/utils/dictionary'
import { PilotPlatform } from '@/api/task/index'

const platformList = ref([])


export const search = reactive({ export const search = reactive({
search: [ search: [
}, },
{ {
label: '平台名称', label: '平台名称',
type: 'select',
key: 'platformName', key: 'platformName',
props: { props: {
placeholder: '请输入平台名称'
placeholder: '请输入平台名称',
options: platformList
} }
}, },
{ {
label: '户名称',
label: '户名称',
key: 'tenantName', key: 'tenantName',
props: { props: {
placeholder: '请输入户名称'
placeholder: '请输入户名称'
} }
}, },
{ {
] ]
}) })


export const getPlatform = () => {
PilotPlatform().then(({ data }) => {
platformList.value = data?.records.map(it => ({
...it,
label: it.platformName,
value: it.platformName
}))
})
}


+ 8
- 3
src/views/task-manage/tools/table.js View File

key: 'taskCode', key: 'taskCode',
align: 'center' align: 'center'
}, },
{
title: '平台名称',
key: 'platformName',
align: 'center'
},
{ {
title: '任务名称', title: '任务名称',
key: 'taskName', key: 'taskName',
align: 'center' align: 'center'
}, },
{ {
title: '户名称',
title: '户名称',
key: 'tenantName', key: 'tenantName',
align: 'center' align: 'center'
}, },
{ {
title: '期望执行时间',
title: '任务发起时间',
key: 'taskStartTime', key: 'taskStartTime',
align: 'center' align: 'center'
}, },
align: 'center' align: 'center'
}, },
{ {
title: '飞手姓名',
title: '飞手',
key: 'flightHandName', key: 'flightHandName',
align: 'center' align: 'center'
}, },

Loading…
Cancel
Save