拉取develop代码

src/api/task/index.js

@@ -61,7 +61,7 @@ export function implement(id) {
 }
 
 /**
- * @description: 获取任务详情
+ * @description: 获取问题列表
  * @param {*} id 任务id
  * @return {*}
  */
@@ -72,6 +72,18 @@ export function getQuestionList(params) {
     params
   })
 }
+/**
+ * @description: 获取问题列表
+ * @param {*} params
+ * @return {*}
+ */
+export function getDistributed(params) {
+  return request({
+    url: '/question/distributed',
+    method: 'GET',
+    params
+  })
+}
 /**
  * @description: 获取问题类型
  * @return {*}

src/components/PositionMsg/index.vue

@@ -38,7 +38,7 @@ export default {
     },
     type: {
       type: String,
-      default: ''
+      default: 'look'
     }
   },
   emits: {},

src/views/dashboard/components/AirCard.vue

@@ -1,7 +1,8 @@
 <template>
   <n-card>
     <div class="card__title">
-      <p>
+      <p class="card__title--left">机场状态</p>
+      <p class="card__title--right">
         <n-form
           inline
           :label-width="80"
@@ -103,16 +104,14 @@ export default {
 
     const getVideoOptions = computed(() => {
       const row = data.airOptionsAll.find((item) => { return item.id === data.videoForm.airportId })
-      const live1 = 'https://live.play.t-aaron.com/live/THSBa_hd.m3u8'
-      const video1 = 'https://vod.play.t-aaron.com/af2f261d45fe4468bee5d4e501097405/53f0276aadc741909fd06c94484cd217-7184ea23b102c31c4a5e31d65206f539-fd.mp4'
-      const video2 = 'https://vod.play.t-aaron.com/408a38ee77ad4672b2b607e20a4e11d1/6d0d2ac3044a4992b4f2fe8563f75f20-0e1dfeb4f87ab08b10522d261f973f0d-fd.mp4'
       return {
         inner: {
           id: 'video-inner',
           width: '100%',
           height: '100%',
-          // source: row?.internalMonitorUrl,
-          source: row?.id === 2 ? live1 : video2,
+          // source: row?.externalMonitorUrl,
+          source: 'http://101.43.84.72:8080/live/34020000001320000001@34020000001320000001.flv',
+          // source: row?.id === 2 ? live1 : video2,
           isLive: true
         }
         // outer: {
@@ -141,10 +140,17 @@ export default {
   line-height: 20px;
   display: flex;
   align-items: center;
+  justify-content: space-between;
   margin-bottom: 15px;
-  flex-direction: row-reverse;
-  .n-select{
-    width: 160px;
+  .card__title--left{
+    font-size: 18px;
+    padding-left: 8px;
+    border-left: 4px solid rgba(24, 144, 255, 1);
+  }
+  .card__title--right{
+    .n-select{
+      width: 160px;
+    }
   }
 }
 .card__video{

src/views/dashboard/components/VideoCard.vue

@@ -86,7 +86,7 @@ export default {
     }
 
     function handleVideoChange(value) {
-
+      // 1
     }
 
     const getVideoOptions = computed(() => {

src/views/question-manage/question-distribution/index.vue

@@ -1,37 +1,70 @@
 <template>
-  <div class="question-container">
-    <HeadSearch :info="search" @search="handleSearch" @reset="handleSearch" />
-    <position-msg :data="dataList" :type="positionType" />
+  <div>
+    <n-card>
+      <div class="question__container">
+        <HeadSearch :info="search" @search="handleSearch" @reset="handleSearch" />
+        <div class="question__position">
+          <PositionMsg :data="questionList" />
+        </div>
+      </div>
+    </n-card>
   </div>
 </template>
 
 <script>
-import { reactive, toRefs } from '@vue/reactivity'
+import { reactive, toRefs, onMounted } from 'vue'
 import search from './tools/search.js'
 import HeadSearch from '@/components/Search/index.vue'
 import PositionMsg from '@/components/PositionMsg/index.vue'
+import { getDistributed } from '@/api/task/index.js'
 export default {
   name: 'QuestionDistribution',
   components: { PositionMsg, HeadSearch },
   setup() {
     const data = reactive({
       search,
-      dataList: [
-        { lng: '118.32002', lat: '32.345623' }
-      ],
-      positionType: 'look'
+      questionList: []
+    })
+
+    async function handleSearch(searchs) {
+      let params = { ...searchs }
+      if (searchs?.time?.length) {
+        params = {
+          ...searchs,
+          startTime: searchs.time[0],
+          endTime: searchs.time[1]
+        }
+      }
+      delete params.time
+      const res = await getDistributed(params)
+      if (res.code === 0) {
+        data.questionList = res.data
+      }
+    }
+
+    onMounted(() => {
+      handleSearch()
     })
 
     return {
-      ...toRefs(data)
+      ...toRefs(data),
+      handleSearch
     }
   }
 }
 
 </script>
 <style scoped lang='scss'>
-.question-container {
-  width: 100%;
-  height: 100%;
+.n-card{
+  height: calc(100vh - 80px);
+  .question__container {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    .question__position{
+      flex: 1;
+    }
+  }
 }
+
 </style>

src/views/question-manage/question-distribution/tools/search.js

@@ -14,7 +14,7 @@ const data = reactive([
   },
   {
     label: '搜索任务',
-    key: 'name',
+    key: 'missionName',
     props: {
       placeholder: '请输入任务名称'
     }

src/views/question-manage/question-distribution/tools/table.js

@@ -1,118 +0,0 @@
-import { QUESTION_TYPE } from '@/utils/dictionary.js'
-import TableImage from '@/components/DataTable/tools/Image.vue'
-import TableTags from '@/components/DataTable/tools/Tags.vue'
-import TableAction from '@/components/DataTable/tools/Action.vue'
-import { h, ref, reactive } from 'vue'
-
-/* 注册table */
-const tableRef = ref()
-const searchParams = ref()
-
-function handleSearch(params) {
-  searchParams.value = { ...params }
-  if (params?.time?.length) {
-    searchParams.value = {
-      startTime: params.time[0],
-      endTime: params.time[1]
-    }
-  }
-  delete searchParams.value.time
-  tableRef.value.reFetch({ searchParams })
-}
-
-/* 位置 */
-function handlePositionDrawer(row) {
-  data.rowData = row
-  data.positionDrawer = true
-}
-
-const data = reactive({
-  tableRef,
-  searchParams,
-  rowData: {},
-  positionDrawer: false,
-  handleSearch,
-
-  columns: [
-    {
-      title: '序号',
-      key: 'key',
-      render: (_, index) => {
-        return `${index + 1}`
-      },
-      align: 'center'
-    },
-    {
-      title: '问题类型',
-      key: 'type',
-      align: 'center',
-      render(row) {
-        return h(TableTags, {
-          data: row.type,
-          filters: QUESTION_TYPE
-        })
-      }
-    },
-    {
-      title: '问题图片',
-      key: 'fileMarkerUrl',
-      align: 'center',
-      render(row) {
-        return h(TableImage, {
-          images: {
-            width: 36,
-            height: 36,
-            src: row.fileMarkerUrl
-            // previewDisabled: true
-            // onClick: handleImgPreview.bind(null, row)
-          }
-        })
-      }
-    },
-    {
-      title: '经纬度',
-      key: 'name',
-      align: 'center',
-      render(row) {
-        return h(TableTags, {
-          data: [{ name: row.lng }, { name: row.lat }]
-        })
-      }
-    },
-    {
-      title: '位置',
-      key: 'position',
-      align: 'center',
-      render(row) {
-        return h(TableAction, {
-          actions: [
-            {
-              label: '图片位置',
-              type: 'button',
-              props: {
-                type: 'primary',
-                text: true,
-                onClick: handlePositionDrawer.bind(null, row)
-              },
-              auth: 'basic_list'
-            }
-          ],
-          align: 'center'
-        })
-      }
-    },
-    {
-      title: '备注',
-      key: 'note',
-      align: 'center'
-    },
-    {
-      title: '所属任务',
-      key: 'note',
-      align: 'center'
-    }
-
-  ]
-})
-
-export default data

src/views/question-manage/question-list/components/MapDrawer.vue

@@ -0,0 +1,67 @@
+<template>
+  <n-drawer v-bind="getDrawerOptions" @update:show="handleDrawerColse">
+    <n-drawer-content closable title="轨迹回放">
+      <PositionMsg :data="getPostionOptions" />
+    </n-drawer-content>
+  </n-drawer>
+</template>
+
+<script>
+import PositionMsg from '@/components/PositionMsg/index.vue'
+import { defineComponent, computed, reactive, toRefs } from 'vue'
+
+export default defineComponent({
+  name: 'LiveDrawer',
+  components: { PositionMsg },
+  props: {
+    /* 可见 */
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    /* 选中的数据 */
+    data: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  emits: {
+    'update:visible': null
+  },
+  setup(props, { emit }) {
+    const data = reactive({
+
+    })
+
+    /* 获取抽屉的信息 */
+    const getDrawerOptions = computed(() => {
+      return {
+        show: props.visible,
+        width: '100%',
+        placement: 'right'
+      }
+    })
+
+    const getPostionOptions = computed(() => {
+      return [props.data]
+    })
+
+    function handleDrawerColse() {
+      emit('update:visible', false)
+    }
+
+    return {
+      ...toRefs(data),
+      getDrawerOptions,
+      getPostionOptions,
+      handleDrawerColse
+    }
+  }
+})
+</script>
+
+<style scoped lang='scss'>
+.n-button+.n-button{
+  margin-left: 30px;
+}
+</style>

src/views/question-manage/question-list/index.vue

@@ -12,6 +12,7 @@
     </n-card>
   </div>
 
+  <MapDrawer v-model:visible="mapDrawer" :data="rowData" />
 </template>
 
 <script>
@@ -19,18 +20,18 @@ import table from './tools/table.js'
 import search from './tools/search.js'
 import HeadSearch from '@/components/Search/index.vue'
 import DataTable from '@/components/DataTable/index.vue'
+import MapDrawer from './components/MapDrawer.vue'
 import { reactive, unref, toRefs } from 'vue'
 import { getQuestionList } from '@/api/task/index.js'
 
 export default {
   name: 'QuestionList',
-  components: { HeadSearch, DataTable },
+  components: { HeadSearch, DataTable, MapDrawer },
   setup() {
     const data = reactive({
       search,
       ...toRefs(table)
     })
-
     /**
      * @description: 加载表格数据
      * @param {*} res

src/views/question-manage/question-list/tools/table.js

@@ -12,6 +12,7 @@ function handleSearch(params) {
   searchParams.value = { ...params }
   if (params?.time?.length) {
     searchParams.value = {
+      ...params,
       startTime: params.time[0],
       endTime: params.time[1]
     }
@@ -23,14 +24,14 @@ function handleSearch(params) {
 /* 位置 */
 function handlePositionDrawer(row) {
   data.rowData = row
-  data.positionDrawer = true
+  data.mapDrawer = true
 }
 
 const data = reactive({
   tableRef,
   searchParams,
   rowData: {},
-  positionDrawer: false,
+  mapDrawer: false,
   handleSearch,
 
   columns: [
@@ -69,6 +70,11 @@ const data = reactive({
         })
       }
     },
+    {
+      title: '所属任务',
+      key: 'missionName',
+      align: 'center'
+    },
     {
       title: '经纬度',
       key: 'name',
@@ -105,11 +111,6 @@ const data = reactive({
       title: '备注',
       key: 'note',
       align: 'center'
-    },
-    {
-      title: '所属任务',
-      key: 'note',
-      align: 'center'
     }
 
   ]

src/views/task-manage/all-task/components/DemandDrawer.vue

@@ -42,6 +42,7 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 import { defineComponent, computed, reactive, toRefs, onMounted, ref, watch } from 'vue'
 import { Map, View, Feature } from 'ol'
 import 'ol/ol.css'
@@ -56,6 +57,10 @@ import { Draw } from 'ol/interaction'
 import { toRaw } from '@vue/reactivity'
 import * as control from 'ol/control'
 import { styleList } from '../tools/style.js'
+=======
+import BaseMap from './BaseMap.vue'
+import { defineComponent, computed, reactive, toRefs } from 'vue'
+>>>>>>> 1762facaae24878e796d6ef485ffabf56b51a3c8
 
 // 视频组件
 import VideoPlayer from '@/components/VideoPlayer/index.vue'

src/views/task-manage/all-task/components/TaskModal.vue

@@ -55,6 +55,9 @@ export default defineComponent({
   },
   setup(props, { emit }) {
     getAirOptions()
+    if (props?.data?.id) {
+      getLineOptions(props.data.droneId)
+    }
     const MODAL_TYPE = {
       'create': '新建任务',
       'preview': '任务详情',
@@ -78,8 +81,8 @@ export default defineComponent({
         show: props.visible,
         title: MODAL_TYPE[props.type],
         width: 700,
-        negativeText: '取消',
-        positiveText: '确认'
+        negativeText: props.type !== 'preview' ? '取消' : '',
+        positiveText: props.type !== 'preview' ? '确认' : ''
       }
     })
 
@@ -91,8 +94,10 @@ export default defineComponent({
 
     watch(() => data.taskForm.airportId,
       (val) => {
+        const { airOptions } = getOptions()
+        const item = airOptions.value.find((item) => { return item.id === val })
         data.taskForm.inspectionLine = ''
-        getLineOptions(val)
+        getLineOptions(item.droneId)
       })
 
     /**
@@ -152,4 +157,11 @@ export default defineComponent({
 .n-date-picker{
   width: 100%;
 }
+::v-deep(.n-date-picker--disabled){
+  .n-input .n-input-wrapper .n-input__input {
+    .n-input__input-el{
+      text-decoration-color: transparent !important;
+    }
+  }
+}
 </style>

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

@@ -48,13 +48,13 @@ function disableTime(ts) {
 
 export const form = reactive({
   taskForm: {
-    name: '',
-    inspectionType: '',
-    airportId: '',
-    inspectionLine: '',
-    type: '',
+    name: null,
+    inspectionType: null,
+    airportId: null,
+    inspectionLine: null,
+    type: null,
     executionStartTime: null,
-    note: ''
+    note: null
   },
   taskRules: {
     name: [{ required: true, message: '请输入任务名称', trigger: 'blur' }],
@@ -77,7 +77,7 @@ export const form = reactive({
 
 export const getAirOptions = async function() {
   const res = await airportList()
-  airOptions.value = dataToSelect(res.data, { label: 'name', value: 'droneId' })
+  airOptions.value = dataToSelect(res.data, { label: 'name', value: 'id' })
 }
 
 // 获取角色列表

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

@@ -66,12 +66,13 @@ export const search = reactive({
 
 export const getAirOptions = async function() {
   const res = await airportList()
-  airOptions.value = dataToSelect(res.data, { label: 'name', value: 'droneId' })
+  airOptions.value = dataToSelect(res.data, { label: 'name', value: 'id' })
 }
 
 // 获取角色列表
 export const getLineOptions = async function(id) {
-  const res = await airportLine(id)
+  const item = airOptions.value.find((item) => { return item.id === id })
+  const res = await airportLine(item.droneId)
   lineOptions.value = dataToSelect(res.data, { label: 'name', value: 'id' })
 }
 

src/views/task-manage/question/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <HeadSearch :info="search" />
+  <HeadSearch :info="search" @search="handleSearch" @reset="handleSearch" />
   <DataTable
     ref="tableRef"
     :columns="columns"
@@ -18,7 +18,7 @@
     </template>
     <template #toolbar>
       <n-button @click="handleReported">
-        {{ isReported ? '修改并生成报告': '提交并生成报告' }}
+        {{ reportStatus ? '修改并生成报告': '提交并生成报告' }}
       </n-button>
     </template>
   </DataTable>
@@ -53,7 +53,7 @@ export default {
       search,
       ...toRefs(table),
       pageData: [],
-      isReported: props.data?.isReported || false
+      isReported: props.data?.reportStatus === 1 || false
     })
 
     /**