Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release

src/api/task/index.js

@@ -115,3 +115,13 @@ export const uploadFlightUrl = data => request({
   method: 'PUT',
   data
 })
+
+/**
+ * 平台列表
+ * @param {*} params
+ * @returns
+ */
+export const PilotPlatform = () => request({
+  url: '/PilotPlatform/index',
+  method: 'GET'
+})

src/layout/components/Header/index.vue

@@ -2,6 +2,7 @@
   <n-layout-header class="layout__header" bordered>
     <div class="header__logo">
       <n-image height="18" src="/logo.png" preview-disabled />
+      <span class="sp">欢迎回来, {{ getUserInfo.realname }}</span>
     </div>
 
     <n-dropdown v-if="getUserInfo.hasLogin" trigger="hover" :options="options" @select="handleSelect">
@@ -97,6 +98,10 @@ export default defineComponent({
 .header__logo{
   height: 18px;
 }
+.sp {
+  font-size: 14px;
+  font-weight: blod;
+}
 .user_msg {
   display: flex;
   justify-content: flex-end;

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

@@ -123,7 +123,7 @@
     <div class="title">飞行文件</div>
 
     <UploadVod
-      v-if="data.photographyWay === 1 && !data.videoUrl"
+      v-if="data.photographyWay === 1 && roleId === data.flightHandId && !data.videoUrl"
       ref="videoRefs"
       :upload-name="'视频'"
       :limit="1"
@@ -131,7 +131,7 @@
       @upload-status="vodStatusVideo"
     />
     <fileOss
-      v-if="data.photographyWay === 1 && data.videoUrl"
+      v-if="data.photographyWay === 1 && roleId === data.flightHandId && data.videoUrl"
       :file-type="'video'"
       :btn-name="'视频'"
       :limit="1"
@@ -140,7 +140,7 @@
     />
 
     <fileOss
-      v-if="data.photographyWay === 1"
+      v-if="data.photographyWay === 1 && roleId === data.flightHandId"
       ref="srtRefs"
       :file-type="'srt'"
       :key-name="'srtUrl'"
@@ -171,7 +171,7 @@
     />
 
     <n-button
-      v-if="data.photographyWay === 1 && !data.videoUrl"
+      v-if="data.photographyWay === 1 && roleId === data.flightHandId && !data.videoUrl"
       type="primary"
       class="btn"
       :loading="loading"

src/views/task-manage/index.vue

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

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

@@ -1,5 +1,8 @@
 import { ref, reactive, computed } from 'vue'
 import { TASK_STATUS } from '@/utils/dictionary'
+import { PilotPlatform } from '@/api/task/index'
+
+const platformList = ref([])
 
 export const search = reactive({
   search: [
@@ -14,16 +17,18 @@ export const search = reactive({
     },
     {
       label: '平台名称',
+      type: 'select',
       key: 'platformName',
       props: {
-        placeholder: '请输入平台名称'
+        placeholder: '请输入平台名称',
+        options: platformList
       }
     },
     {
-      label: '租户名称',
+      label: '客户名称',
       key: 'tenantName',
       props: {
-        placeholder: '请输入租户名称'
+        placeholder: '请输入客户名称'
       }
     },
     {
@@ -44,3 +49,13 @@ export const search = reactive({
   ]
 })
 
+export const getPlatform = () => {
+  PilotPlatform().then(({ data }) => {
+    platformList.value = data?.records.map(it => ({
+      ...it,
+      label: it.platformName,
+      value: it.platformName
+    }))
+  })
+}
+

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

@@ -73,18 +73,23 @@ const data = reactive({
       key: 'taskCode',
       align: 'center'
     },
+    {
+      title: '平台名称',
+      key: 'platformName',
+      align: 'center'
+    },
     {
       title: '任务名称',
       key: 'taskName',
       align: 'center'
     },
     {
-      title: '租户名称',
+      title: '客户名称',
       key: 'tenantName',
       align: 'center'
     },
     {
-      title: '期望执行时间',
+      title: '任务发起时间',
       key: 'taskStartTime',
       align: 'center'
     },
@@ -99,7 +104,7 @@ const data = reactive({
       align: 'center'
     },
     {
-      title: '飞手姓名',
+      title: '飞手',
       key: 'flightHandName',
       align: 'center'
     },