From dd07f6ff6946d7f15904cfa51b59e2f398abf040 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 09 Oct 2024 13:51:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/odm/task.vue | 393 +++++++++++++++++++++++++++++++++++++++++++++++++
src/api/odm/task.js | 49 ++++++
src/option/job/jobinfo.js | 2
3 files changed, 443 insertions(+), 1 deletions(-)
diff --git a/src/api/odm/task.js b/src/api/odm/task.js
new file mode 100644
index 0000000..1621d5c
--- /dev/null
+++ b/src/api/odm/task.js
@@ -0,0 +1,49 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+ return request({
+ url: '/drone-odm/odmTaskInfo/odmTaskInfo/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ },
+ });
+};
+
+export const remove = ids => {
+ return request({
+ url: '/drone-odm/odmTaskInfo/odmTaskInfo/remove',
+ method: 'post',
+ params: {
+ ids,
+ },
+ });
+};
+
+export const add = row => {
+ return request({
+ url: '/drone-odm/odmTaskInfo/odmTaskInfo/add',
+ method: 'post',
+ data: row,
+ });
+};
+
+export const update = row => {
+ return request({
+ url: '/drone-odm/odmTaskInfo/odmTaskInfo/update',
+ method: 'post',
+ data: row,
+ });
+};
+
+export const createOdmTask = jobId => {
+ return request({
+ url: '/drone-odm/odmTaskInfo/odmTaskInfo/createOdmTask',
+ method: 'post',
+ params: {
+ jobId,
+ },
+ });
+ };
diff --git a/src/option/job/jobinfo.js b/src/option/job/jobinfo.js
index 18e3516..ee43614 100644
--- a/src/option/job/jobinfo.js
+++ b/src/option/job/jobinfo.js
@@ -125,7 +125,7 @@
index: true,
viewBtn: true,
selection: true,
- grid: true,
+ // grid: true,
labelWidth: 180,
menuWidth: 350,
dialogWidth: 1200,
diff --git a/src/views/odm/task.vue b/src/views/odm/task.vue
new file mode 100644
index 0000000..64758ae
--- /dev/null
+++ b/src/views/odm/task.vue
@@ -0,0 +1,393 @@
+<template>
+ <basic-container>
+ <avue-crud
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ v-model:page="page"
+ ref="crud"
+ @row-del="rowDel"
+ v-model="form"
+ :permission="permissionList"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ :before-open="beforeOpen"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ >
+ <template #menu-left>
+ <!-- <el-button
+ type="danger"
+ icon="el-icon-delete"
+ plain
+ v-if="permission.odm_task_delete"
+ @click="handleDelete"
+ >删 除
+ </el-button> -->
+ </template>
+ <template #runningProgress="{ row }">
+ <el-progress :percentage="row.runningProgress * 100"></el-progress>
+ </template>
+ <template #processingTime="{ row }">
+ {{ formatSeconds(row.processingTime) }}
+ </template>
+ <template #menu="scope">
+ <el-button
+ type="primary"
+ text
+ icon="el-icon-guide"
+ v-if="permission.odm_task_handle && scope.row.taskId == null"
+ @click.stop="atHandle(scope.row, scope.index)"
+ >立即启动
+ </el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+import { getList, remove, update, add,createOdmTask } from '@/api/odm/task';
+import { mapGetters } from 'vuex';
+
+export default {
+ data() {
+ return {
+ form: {},
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ selectionList: [],
+ option: {
+ height: 'auto',
+ calcHeight: 32,
+ dialogWidth: 950,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ viewBtn: true,
+ selection: true,
+ addBtn: false,
+ editBtn: false,
+ excelBtn: false,
+ dialogClickModal: false,
+ grid: false,
+ menuWidth: 260,
+ column: [
+ {
+ label: '任务名称',
+ prop: 'taskName',
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: '请输入任务名称',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '任务编号',
+ prop: 'taskId',
+ hide: true,
+ rules: [
+ {
+ required: true,
+ message: '请输入任务编号',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '任务类型',
+ prop: 'waylineType',
+ type: 'select',
+ search: true,
+ searchSpan: 4,
+ dicData: [
+ {
+ label: '航测',
+ value: 2,
+ },
+ {
+ label: '正射举证',
+ value: 4,
+ },
+ ],
+ },
+ {
+ label: '所在机场名称',
+ prop: 'airportName',
+ labelWidth: 130,
+ },
+ {
+ label: '图片数量',
+ prop: 'imageCount',
+ width:100,
+ },
+ {
+ label: '拼图耗时',
+ prop: 'processingTime',
+ width:100,
+ },
+ {
+ label: '进度',
+ prop: 'runningProgress',
+ },
+ {
+ label: '任务状态',
+ prop: 'status',
+ type: 'select',
+ search: true,
+ searchSpan: 4,
+ width:100,
+ dicData: [
+ {
+ label: '待启动',
+ value: 0,
+ },
+ {
+ label: '待处理',
+ value: 10,
+ },
+ {
+ label: '处理中',
+ value: 20,
+ },
+ {
+ label: '失败',
+ value: 30,
+ },
+ {
+ label: '已完成',
+ value: 40,
+ },
+ {
+ label: '已取消',
+ value: 50,
+ },
+ ],
+ },
+
+ {
+ label: '任务创建时间',
+ prop: 'createTime',
+ type: 'date',
+ addDisplay: false,
+ editDisplay: false,
+ labelWidth: 130,
+ width: 160,
+ format: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ }
+ ],
+ },
+ data: [],
+ };
+ },
+ computed: {
+ ...mapGetters(['permission']),
+ permissionList() {
+ return {
+ viewBtn: this.validData(this.permission.odm_task_view, true),
+ delBtn: this.validData(this.permission.odm_task_delete, true),
+ // editBtn: this.validData(this.permission.workspace_edit, true),
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach(ele => {
+ ids.push(ele.id);
+ });
+ return ids.join(',');
+ },
+ },
+ methods: {
+ // 立即处理
+ atHandle(row) {
+ console.log(row, 888);
+ createOdmTask(row.waylineJobId).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: 'success',
+ message: '操作成功!',
+ });
+ done();
+ },
+ error => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ // 时间格式化
+ formatSeconds(value) {
+ // 如果value不是数字或者小于0，则直接返回'00:00:00'
+ if (isNaN(value) || value < 0) {
+ return '00:00:00';
+ }
+
+ // 计算小时、分钟和秒
+ let seconds = Math.floor(value / 1000);
+ let minutes = Math.floor(seconds / 60);
+ let hours = Math.floor(minutes / 60);
+
+ // 格式化为两位数字的字符串
+ seconds %= 60;
+ minutes %= 60;
+
+ const formattedTime = `${this.padZero(hours)}:${this.padZero(minutes)}:${this.padZero(
+ seconds
+ )}`;
+
+ // 返回格式化后的时间字符串
+ return formattedTime;
+ },
+ // 函数用于在数字不足两位数时，在前面补零
+ padZero(value) {
+ return String(value).padStart(2, '0');
+ },
+ rowSave(row, done, loading) {
+ add(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: 'success',
+ message: '操作成功!',
+ });
+ done();
+ },
+ error => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ rowUpdate(row, index, done, loading) {
+ update(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: 'success',
+ message: '操作成功!',
+ });
+ done();
+ },
+ error => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ rowDel(row) {
+ this.$confirm('确定将选择数据删除?', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(() => {
+ return remove(row.id);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: 'success',
+ message: '操作成功!',
+ });
+ });
+ },
+ searchReset() {
+ this.query = {};
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning('请选择至少一条数据');
+ return;
+ }
+ this.$confirm('确定将选择数据删除?', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: 'success',
+ message: '操作成功!',
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ beforeOpen(done, type) {
+ // if (['edit', 'view'].includes(type)) {
+ // getDetail(this.form.id).then(res => {
+ // this.form = res.data.data;
+ // });
+ // }
+ done();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ const { releaseTimeRange } = this.query;
+ let values = {
+ ...params,
+ ...this.query,
+ };
+ if (releaseTimeRange) {
+ values = {
+ ...values,
+ releaseTime_datege: releaseTimeRange[0],
+ releaseTime_datelt: releaseTimeRange[1],
+ };
+ values.releaseTimeRange = null;
+ }
+ this.loading = true;
+ getList(page.currentPage, page.pageSize, values).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ });
+ },
+ },
+};
+</script>
+
+<style></style>
--
Gitblit v1.9.3