From 738368fb3b6071b85f57f96c5459abbe03cac5c5 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 21 Jul 2025 11:16:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.196.74.78:10010/r/drone/drone-web-manage into dev
---
src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue | 60 ++++++++++-------------------
src/views/tickets/ticket.vue | 8 ++--
src/views/job/components/TaskTop/TaskIndustry.vue | 12 +++---
3 files changed, 31 insertions(+), 49 deletions(-)
diff --git a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
index 38d6221..5b3a96a 100644
--- a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -61,43 +61,25 @@
<el-table-column prop="creator_name" label="创建人" align="center" show-overflow-tooltip />
<el-table-column label="操作" width="200" align="center">
<template #default="scope">
- <div
- v-if="scope.row.status === 2"
- class="btnItem"
- link
- type="primary"
- @click="turnBack(scope.row)"
- >
+ <!-- <el-button type="text" @click="rejectDetail(row.id)">驳回原因</el-button> -->
+ <el-button icon="el-icon-back" v-if="scope.row.status === 2" type="text"
+ @click="turnBack(scope.row)">
返航
- </div>
- <div
- v-if="scope.row.status === 1"
- class="btnItem"
- link
- type="primary"
- @click="cancelTask(scope.row)"
- >
+ </el-button>
+ <el-button icon="el-icon-close" v-if="scope.row.status === 1" type="text"
+ @click="cancelTask(scope.row)">
取消任务
- </div>
- <div class="btnItem" link type="primary" @click="handleDetail(scope.row)">查看</div>
+ </el-button>
+ <el-button icon="el-icon-view" type="text" @click="handleDetail(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="pagination">
- <el-pagination
- class="ztzf-pagination"
- popper-class="custom-pagination-dropdown"
- background
- :page-sizes="[10, 20, 30, 40,50,100]"
- :size="size"
- v-model:current-page="jobListParams.current"
- v-model:page-size="jobListParams.size"
- layout="total, sizes, prev, pager, next, jumper"
- :total="total"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
+ <el-pagination class="ztzf-pagination" popper-class="custom-pagination-dropdown" background
+ :page-sizes="[10, 20, 30, 40, 50, 100]" :size="size" v-model:current-page="jobListParams.current"
+ v-model:page-size="jobListParams.size" layout="total, sizes, prev, pager, next, jumper" :total="total"
+ @size-change="handleSizeChange" @current-change="handleCurrentChange" />
</div>
</div>
<!-- 添加任务 -->
@@ -124,7 +106,7 @@
import DeviceJobDetails from '../DeviceJobDetails.vue'
import CancelTaskDialog from '../CancelTaskDialog.vue'
import { useStore } from 'vuex'
-import { cloneDeep } from 'lodash';
+import { cloneDeep } from 'lodash'
const store = useStore()
const singleUavHome = computed(() => store.state.home.singleUavHome)
const jobListParams = reactive({
@@ -141,14 +123,14 @@
// 获取任务列表
const getJobList = () => {
- const apiParams = {
- ...cloneDeep(jobListParams),
- searchParams: {
- ...cloneDeep(jobListParams.searchParams),
- status_list: jobListParams.searchParams.status || undefined,
- status: undefined,
- },
- }
+ const apiParams = {
+ ...cloneDeep(jobListParams),
+ searchParams: {
+ ...cloneDeep(jobListParams.searchParams),
+ status_list: jobListParams.searchParams.status || undefined,
+ status: undefined,
+ },
+ }
jobList(apiParams).then(res => {
if (res.data.code !== 0) return
jobListData.value = res.data.data.records
diff --git a/src/views/job/components/TaskTop/TaskIndustry.vue b/src/views/job/components/TaskTop/TaskIndustry.vue
index 3d36176..bd2ae82 100644
--- a/src/views/job/components/TaskTop/TaskIndustry.vue
+++ b/src/views/job/components/TaskTop/TaskIndustry.vue
@@ -39,24 +39,24 @@
name: '机巢事件统计',
type: 'pie',
// roseType: 'radius',
- radius: ['40%', '70%'],
+ radius: ['36%', '60%'],
// center: ['50%', '45%'],
// radius: '70%', // 设置饼图的半径
- center: ['50%', '50%'], // 调整饼图位置
+ center: ['50%', '36%'], // 调整饼图位置
data: [],
label: {
show: true,
position: 'outside',
formatter: '{c}',
fontSize: 12,
- color: '#fff',
+ color: '#000',
},
labelLine: {
show: true,
- length: 5,
- length2: 8,
+ length: 10,
+ length2: 10,
lineStyle: {
- color: '#fff',
+ color: '#000',
},
},
},
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index 0e388df..7c6466e 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -1457,10 +1457,10 @@
if (status === -1 || status === '-1') return ''
// 状态颜色映射
const colorMap = {
- 0: '#ffb6b6', // 待处理-淡红
- 3: '#e57373', // 处理中-更淡红
- 2: '#faad14', // 待审核-橙色
- 4: '#a0cfff', // 已完成-淡蓝
+ 0: '#FF7411', // 待处理-淡红
+ 3: '#FFC300', // 处理中-更淡红
+ 2: '#FF472F', // 待审核-橙色
+ 4: '#0291A1', // 已完成-淡蓝
}
return colorMap[String(status)] || ''
},
--
Gitblit v1.9.3