Merge branch 'demo' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_w...

husq

2023-09-25 3e790728c7439d07b7cb28b7cdb1d29d7642db53

 src/components/task/TaskPanel.vue

@@ -1,128 +1,135 @@
<template>
  <!--  <div class="header">计划库</div>-->
  <!--搜索栏-->
  <div class="search-panel-wrapper">
    <div class="search-part">
      <a-range-picker :size="searchPanelOptions.size" :format="searchPanelOptions.dateFormat" :valueFormat="searchPanelOptions.valueFormat" v-model:value="timeRangeArr.data" @change="dateChange" style="width: 300px" />

    <div class="search-panel-wrapper">
      <div class="search-part">
        <a-range-picker :size="searchPanelOptions.size" :format="searchPanelOptions.dateFormat"
                        :valueFormat="searchPanelOptions.valueFormat" v-model:value="timeRangeArr.data"
                        @change="dateChange" style="width: 300px"/>
      </div>

      <div class="search-part">
        <a-select :size="searchPanelOptions.size" @change="selectChange" ref="select"
                  v-model:value="searchQuery.taskType" style="width: 300px">
          <a-select-option value="">所有类型</a-select-option>
          <a-select-option :value="item.value" v-for="(item) in TaskTypeOptions" :key="item.value">{{ item.label }}
          </a-select-option>
        </a-select>
      </div>

      <div class="search-part">
        <a-select v-model:value="statusArr" allowClear @change="selectMultipleChange" :options="TaskStatusOptions"
                  :maxTagCount="searchPanelOptions.maxTagCount" mode="multiple"
                  :size="searchPanelOptions.size" placeholder="全部状态" style="width: 300px">
        </a-select>
      </div>

      <div class="search-part">
        <a-input-search :size="searchPanelOptions.size" v-model:value="searchQuery.name" @change="inputChange"
                        placeholder="按航线或计划名搜索" style="width: 300px"/>
      </div>
    </div>

    <div class="search-part">
      <a-select :size="searchPanelOptions.size" @change="selectChange" ref="select" v-model:value="searchQuery.taskType" style="width: 300px">
        <a-select-option value="">所有类型</a-select-option>
        <a-select-option :value="item.value" v-for="(item) in TaskTypeOptions" :key="item.value">{{ item.label }}
        </a-select-option>
      </a-select>
    </div>

    <div class="search-part">
      <a-select v-model:value="statusArr" allowClear @change="selectMultipleChange"  :options="TaskStatusOptions" :maxTagCount="searchPanelOptions.maxTagCount" mode="multiple"
                :size="searchPanelOptions.size" placeholder="全部状态" style="width: 300px">
      </a-select>
    </div>

    <div class="search-part">
      <a-input-search  :size="searchPanelOptions.size" v-model:value="searchQuery.name"  @change="inputChange" placeholder="按航线或计划名搜索" style="width: 300px"/>
    </div>

  </div>

  <!--表格-->
  <div class="plan-panel-wrapper">
    <a-table :loading="tableLoading" class="plan-table" :columns="columns" :data-source="plansData.data" row-key="job_id"
             :pagination="paginationProp" :scroll="{ x: '100%', y: 600 }" @change="refreshData">
      <!-- 执行时间 -->
      <template #duration="{ record }">
        <div class="flex-row" style="white-space: pre-wrap">
    <!--表格-->
    <div class="plan-panel-wrapper">
      <a-table :loading="tableLoading" class="plan-table" :columns="columns" :data-source="plansData.data"
               row-key="job_id"
               :pagination="paginationProp" :scroll="{ x: '100%', y: 600 }" @change="refreshData">
        <!-- 执行时间 -->
        <template #duration="{ record }">
          <div class="flex-row" style="white-space: pre-wrap">
            <div>
              <div>{{ formatTaskTime(record.begin_time) }}</div>
              <div>{{ formatTaskTime(record.end_time) }}</div>
            </div>
            <div class="ml10">
              <div>{{ formatTaskTime(record.execute_time) }}</div>
              <div>{{ formatTaskTime(record.completed_time) }}</div>
            </div>
          </div>
        </template>
        <!-- 状态 -->
        <template #status="{ record }">
          <div>
            <div>{{ formatTaskTime(record.begin_time) }}</div>
            <div>{{ formatTaskTime(record.end_time) }}</div>
            <div class="flex-display flex-align-center">
              <span class="circle-icon" :style="{backgroundColor: formatTaskStatus(record).color}"></span>
              {{ formatTaskStatus(record).text }}
              <a-tooltip v-if="!!record.code" placement="bottom" arrow-point-at-center>
                <template #title>
                  <div>{{ getCodeMessage(record.code) }}</div>
                </template>
                <exclamation-circle-outlined class="ml5" :style="{color: commonColor.WARN, fontSize: '16px' }"/>
              </a-tooltip>
            </div>
            <div v-if="record.status === TaskStatus.Carrying">
              <a-progress :percent="record.progress || 0"/>
            </div>
          </div>
          <div class="ml10">
            <div>{{ formatTaskTime(record.execute_time) }}</div>
            <div>{{ formatTaskTime(record.completed_time) }}</div>
        </template>
        <!-- 任务类型 -->
        <template #taskType="{ record }">
          <div>{{ formatTaskType(record) }}</div>
        </template>
        <!-- 失控动作 -->
        <template #lostAction="{ record }">
          <div>{{ formatLostAction(record) }}</div>
        </template>
        <!-- 媒体上传状态 -->
        <template #media_upload="{ record }">
          <div>
            <div class="flex-display flex-align-center">
              <span class="circle-icon" :style="{backgroundColor: formatMediaTaskStatus(record).color}"></span>
              {{ formatMediaTaskStatus(record).text }}
            </div>
            <div class="pl15">
              {{ formatMediaTaskStatus(record).number }}
              <a-tooltip v-if="formatMediaTaskStatus(record).status === MediaStatus.ToUpload" placement="bottom"
                         arrow-point-at-center>
                <template #title>
                  <div>Upload now</div>
                </template>
                <UploadOutlined class="ml5" :style="{color: commonColor.BLUE, fontSize: '16px' }"
                                @click="onUploadMediaFileNow(record.job_id)"/>
              </a-tooltip>
            </div>
          </div>
        </div>
      </template>
      <!-- 状态 -->
      <template #status="{ record }">
        <div>
          <div class="flex-display flex-align-center">
            <span class="circle-icon" :style="{backgroundColor: formatTaskStatus(record).color}"></span>
            {{ formatTaskStatus(record).text }}
            <a-tooltip v-if="!!record.code" placement="bottom" arrow-point-at-center>
              <template #title>
                <div>{{ getCodeMessage(record.code) }}</div>
              </template>
              <exclamation-circle-outlined class="ml5" :style="{color: commonColor.WARN, fontSize: '16px' }"/>
            </a-tooltip>
        </template>
        <!-- 操作 -->
        <template #action="{ record }">
          <div class="action-area">
            <a-popconfirm
                v-if="record.status === TaskStatus.Wait"
                title="你确定要删除该计划吗?"
                ok-text="确定"
                cancel-text="取消"
                @confirm="onDeleteTask(record.job_id)"
            >
              <a-button type="primary" size="small">删除</a-button>
            </a-popconfirm>
            <a-popconfirm
                v-if="record.status === TaskStatus.Carrying"
                title="你确定要暂停该任务吗?"
                ok-text="确定"
                cancel-text="取消"
                @confirm="onSuspendTask(record.job_id)"
            >
              <a-button type="primary" size="small">暂停</a-button>
            </a-popconfirm>
            <a-popconfirm
                v-if="record.status === TaskStatus.Paused"
                title="你确定要重新开始吗?"
                ok-text="确定"
                cancel-text="取消"
                @confirm="onResumeTask(record.job_id)"
            >
              <a-button type="primary" size="small">重新开始</a-button>
            </a-popconfirm>
          </div>
          <div v-if="record.status === TaskStatus.Carrying">
            <a-progress :percent="record.progress || 0"/>
          </div>
        </div>
      </template>
      <!-- 任务类型 -->
      <template #taskType="{ record }">
        <div>{{ formatTaskType(record) }}</div>
      </template>
      <!-- 失控动作 -->
      <template #lostAction="{ record }">
        <div>{{ formatLostAction(record) }}</div>
      </template>
      <!-- 媒体上传状态 -->
      <template #media_upload="{ record }">
        <div>
          <div class="flex-display flex-align-center">
            <span class="circle-icon" :style="{backgroundColor: formatMediaTaskStatus(record).color}"></span>
            {{ formatMediaTaskStatus(record).text }}
          </div>
          <div class="pl15">
            {{ formatMediaTaskStatus(record).number }}
            <a-tooltip v-if="formatMediaTaskStatus(record).status === MediaStatus.ToUpload" placement="bottom"
                       arrow-point-at-center>
              <template #title>
                <div>Upload now</div>
              </template>
              <UploadOutlined class="ml5" :style="{color: commonColor.BLUE, fontSize: '16px' }"
                              @click="onUploadMediaFileNow(record.job_id)"/>
            </a-tooltip>
          </div>
        </div>
      </template>
      <!-- 操作 -->
      <template #action="{ record }">
        <div class="action-area">
          <a-popconfirm
              v-if="record.status === TaskStatus.Wait"
              title="你确定要删除该计划吗?"
              ok-text="确定"
              cancel-text="取消"
              @confirm="onDeleteTask(record.job_id)"
          >
            <a-button type="primary" size="small">删除</a-button>
          </a-popconfirm>
          <a-popconfirm
              v-if="record.status === TaskStatus.Carrying"
              title="你确定要暂停该任务吗?"
              ok-text="确定"
              cancel-text="取消"
              @confirm="onSuspendTask(record.job_id)"
          >
            <a-button type="primary" size="small">暂停</a-button>
          </a-popconfirm>
          <a-popconfirm
              v-if="record.status === TaskStatus.Paused"
              title="你确定要重新开始吗?"
              ok-text="确定"
              cancel-text="取消"
              @confirm="onResumeTask(record.job_id)"
          >
            <a-button type="primary" size="small">重新开始</a-button>
          </a-popconfirm>
        </div>
      </template>
    </a-table>
  </div>
        </template>
      </a-table>
    </div>

</template>

<script setup lang="ts">
@@ -131,6 +138,7 @@
import { TableState } from 'ant-design-vue/lib/table/interface'
import { computed, onMounted } from 'vue'
import { IPage } from '/@/api/http/type'
import 'moment/dist/locale/zh-cn'
import {
  deleteTask,
  updateTaskStatus,
@@ -163,7 +171,6 @@
const workspaceId = localStorage.getItem(ELocalStorageKey.WorkspaceId)!

const dockSns = computed(() => store.state.common.dockSns)

// 监听设备选择
watch(
  () => dockSns.value,
@@ -316,7 +323,7 @@
  getPlans()
})

function dateChange (value:any) {
function dateChange (value: any) {
  searchQuery.startTime = value[0]
  searchQuery.endTime = value[1]
  getPlans()
@@ -326,11 +333,11 @@
  getPlans()
}

function selectChange (value:any) {
function selectChange (value: any) {
  getPlans()
}

function selectMultipleChange (value:any) {
function selectMultipleChange (value: any) {
  searchQuery.status = value.join(',')
  getPlans()
}
@@ -453,7 +460,7 @@
  display: flex;
  align-items: center;

  .search-part{
  .search-part {
    margin-right: 10px;
  }