From 6127f9b5df355703ef6af449def53e5ab7a51afe Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 16 Sep 2025 16:29:59 +0800
Subject: [PATCH] feat:更新飞行日志和运营
---
src/api/logs.js | 18 +++
src/api/airspace/airspace.js | 33 +++++
src/views/operatingIncome/operatingIncome.vue | 219 +++++++++++++++++++++++-------------
src/views/flightLog/flightLog.vue | 87 +++++---------
4 files changed, 221 insertions(+), 136 deletions(-)
diff --git a/src/api/airspace/airspace.js b/src/api/airspace/airspace.js
index 5ff6871..0641b00 100644
--- a/src/api/airspace/airspace.js
+++ b/src/api/airspace/airspace.js
@@ -94,4 +94,37 @@
url: '/drone-device-core/airgrid/delete/' + data,
method: 'delete',
})
+}
+
+// ----------运营收益相关接口调用----------
+
+export const operatingIncomePage = params => {
+ return request({
+ url: '/drone-device-core/revenue/page',
+ method: 'get',
+ params
+ })
+}
+
+export const operatingIncomeUpdate = data => {
+ return request({
+ url: '/drone-device-core/revenue/update',
+ method: 'put',
+ data: data,
+ })
+}
+
+export const operatingIncomeAdd= data => {
+ return request({
+ url: '/drone-device-core/revenue/add',
+ method: 'post',
+ data: data,
+ })
+}
+
+export const operatingIncomeDelete= data => {
+ return request({
+ url: '/drone-device-core/revenue/delete/' + data,
+ method: 'delete',
+ })
}
\ No newline at end of file
diff --git a/src/api/logs.js b/src/api/logs.js
index 5bea0df..30b53f4 100644
--- a/src/api/logs.js
+++ b/src/api/logs.js
@@ -71,3 +71,21 @@
params
})
}
+// 导出飞行日志
+export const exportFlyLog = data => {
+ return request({
+ url: '/drone-device-core/log/droneFlightLogInfo/export',
+ method: 'post',
+ data
+ })
+}
+// 收藏
+export const addStar = data => {
+ return request({
+ url: '/drone-device-core/log/favorite/add',
+ method: 'post',
+ data
+ })
+}
+
+
diff --git a/src/views/flightLog/flightLog.vue b/src/views/flightLog/flightLog.vue
index f63b9a4..0bc63c2 100644
--- a/src/views/flightLog/flightLog.vue
+++ b/src/views/flightLog/flightLog.vue
@@ -42,8 +42,8 @@
<template #default="scope">
<!-- <el-button icon="el-icon-view" type="text" @click="handleDetail(scope.row)">查看</el-button> -->
<!-- <el-button icon="el-icon-delete" type="text" @click="handleDelete">删除</el-button> -->
- <el-button type="text" @click="handleStart"><el-icon><Star /></el-icon>收藏</el-button>
- <el-button type="text" @click="handleExport"><el-icon><Download /></el-icon>导出</el-button>
+ <el-button type="text" @click="handleStar(scope.row)"><el-icon><Star /></el-icon>收藏</el-button>
+ <el-button type="text" @click="handleExport(scope.row)"><el-icon><Download /></el-icon>导出</el-button>
</template>
</el-table-column>
</el-table>
@@ -84,11 +84,12 @@
</el-dialog> -->
</template>
<script setup>
-import { getHistoryTrack } from '@/api/logs';
+import { getHistoryTrack, exportFlyLog, addStar } from '@/api/logs';
+import { downloadXls } from '@/utils/util';
const total = ref(0)
const params = ref({
- workspaceId: '6566662f-17c5-44f1-89d2-f09b37b81794',
+ // workspaceId: '6566662f-17c5-44f1-89d2-f09b37b81794',
page: '1',
page_size: '10',
});
@@ -111,47 +112,6 @@
event_type: '',
remark: ''
})
-const rules = reactive({
- qua_rate: [
- { required: true, message: '请输入最低准确率', trigger: 'blur' },
- {
- validator: (rule, value, callback) => {
- if (!/^\d+(\.\d+)?$/.test(value)) {
- callback(new Error('请输入有效的数字（整数或小数）'));
- } else if (parseFloat(value) < 0.4) {
- callback(new Error('最低准确率不能小于0.4'));
- } else if (parseFloat(value) >= parseFloat(editParams.value.pass_rate)) {
- callback(new Error('最低准确率必须小于最高准确率'));
- } else {
- callback();
- }
- },
- trigger: 'blur'
- }
- ],
- pass_rate: [
- { required: true, message: '请输入最低准确率', trigger: 'blur' },
- {
- validator: (rule, value, callback) => {
- if (!/^\d+(\.\d+)?$/.test(value)) {
- callback(new Error('请输入有效的数字（整数或小数）'));
- } else if (parseFloat(value) > 0.8) {
- callback(new Error('最高准确率不能大于0.8'));
- } else {
- callback();
- }
- },
- trigger: 'blur'
- }
- ],
- event_type: [
- {
- required: true,
- message: '请选择事件生成类型',
- trigger: 'change',
- },
- ],
-})
function timeFormatConvert(time) {
const date = new Date(time);
@@ -173,17 +133,17 @@
total.value = res.data.data.pagination.total || 0
})
}
-function handleDetail(row) {
- isShowView.value = true
- rowView.value = row
-}
-function handleDelete(row) {
- console.log(row)
-}
-function handleAdd(row) {
- isShowEditView.value = true
- // editParams.value = { ...row }
-}
+// function handleDetail(row) {
+// isShowView.value = true
+// rowView.value = row
+// }
+// function handleDelete(row) {
+// console.log(row)
+// }
+// function handleAdd(row) {
+// isShowEditView.value = true
+// // editParams.value = { ...row }
+// }
function handleAll() {
tabType.value = '全部'
@@ -205,6 +165,21 @@
})
}
+// 收藏
+function handleStar(row) {
+ addStar({ flight_log_id: row.id }).then(res => {
+ getList()
+ })
+}
+
+// 导出
+function handleExport(row) {
+ exportFlyLog({ flight_id: row.id }).then(res => {
+ console.log(res)
+ downloadXls(res.data.data, `${row.job_name}.xls`);
+ })
+}
+
function handleSizeChange(val) {
params.value.page_size = val
getList()
diff --git a/src/views/operatingIncome/operatingIncome.vue b/src/views/operatingIncome/operatingIncome.vue
index caadddb..a67900b 100644
--- a/src/views/operatingIncome/operatingIncome.vue
+++ b/src/views/operatingIncome/operatingIncome.vue
@@ -2,7 +2,7 @@
<template>
<div class="operatingIncome">
<div class="search-box">
- <el-form :model="params" inline>
+ <!-- <el-form :model="params" inline>
<el-form-item label="空域名称:">
<el-input v-model="params.algName" placeholder="请输入空域名称" clearable />
</el-form-item>
@@ -10,7 +10,7 @@
<el-button type="primary" @click="getList">搜索</el-button>
<el-button @click="cancelSearch">取消</el-button>
</el-form-item>
- </el-form>
+ </el-form> -->
<div>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
</div>
@@ -18,15 +18,18 @@
<div class="mange-table">
<el-table border :data="tableList" class="custom-header">
<el-table-column label="序号" type="index" width="60"></el-table-column>
- <el-table-column prop="model_name" label="营业收入" align="center" show-overflow-tooltip></el-table-column>
- <el-table-column prop="alg_type" label="综合总成本费用" align="center"></el-table-column>
- <el-table-column prop="alg_type" label="净利润" align="center"></el-table-column>
- <el-table-column prop="alg_type" label="财务内部收益率" align="center"></el-table-column>
- <el-table-column prop="alg_type" label="市场空间" align="center"></el-table-column>
+ <el-table-column prop="operating_income" label="营业收入" align="center"></el-table-column>
+ <el-table-column prop="total_cost" label="综合总成本费用" align="center"></el-table-column>
+ <el-table-column prop="net_profit" label="净利润" align="center"></el-table-column>
+ <el-table-column prop="financial_irr" label="财务内部收益率" align="center"></el-table-column>
+ <el-table-column prop="market_space" label="市场空间" align="center" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="create_time" label="创建时间" align="center"></el-table-column>
+ <el-table-column prop="nick_name" label="创建人" align="center"></el-table-column>
<el-table-column label="操作" width="180" align="center">
<template #default="scope">
- <el-button icon="el-icon-view" type="text" @click="handleDetail(scope.row)">查看</el-button>
- <el-button icon="el-icon-edit" type="text" @click="handleDelete">删除</el-button>
+ <!-- <el-button icon="el-icon-view" type="text" @click="handleDetail(scope.row)">查看</el-button> -->
+ <el-button icon="el-icon-edit" type="text" @click="handleEdit(scope.row)">编辑</el-button>
+ <el-button icon="el-icon-edit" type="text" @click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -38,7 +41,7 @@
@size-change="handleSizeChange" @current-change="handleCurrentChange" />
</div>
</div>
- <el-dialog class="ztzf-dialog" append-to-body v-model="isShowView" title="查看"
+ <!-- <el-dialog class="ztzf-dialog" append-to-body v-model="isShowView" title="查看"
:width="pxToRem(600)" :close-on-click-modal="false" :destroy-on-close="true">
<div class="content">
<table class="view-table" border>
@@ -50,78 +53,66 @@
</tr>
</table>
</div>
- </el-dialog>
- <el-dialog class="ztzf-dialog" append-to-body v-model="isShowEditView" title="新增"
- :width="pxToRem(800)" :close-on-click-modal="false" :destroy-on-close="true">
+ </el-dialog> -->
+ <el-dialog class="ztzf-dialog" append-to-body v-model="isShowEditView" :title="txtTitle"
+ :width="pxToRem(800)" :close-on-click-modal="false" :destroy-on-close="true" @close="handleClose">
<div class="content-edit">
<el-form ref="ruleFormRef" :model="editParams" :rules="rules" inline>
- <el-form-item label="空域名称">
- <el-input v-model="editParams.model_name" />
+ <el-form-item label="营业收入" prop="operating_income">
+ <el-input v-model="editParams.operating_income" />
</el-form-item>
- <el-form-item label="空域名称">
- <el-input v-model="editParams.model_name" />
+ <el-form-item label="综合总成本费用">
+ <el-input v-model="editParams.total_cost" />
</el-form-item>
- <el-form-item label="空域名称">
- <el-input v-model="editParams.model_name" />
+ <el-form-item label="净利润">
+ <el-input v-model="editParams.net_profit" />
</el-form-item>
- <el-form-item label="空域名称">
- <el-input v-model="editParams.model_name" />
+ <el-form-item label="财务内部收益率">
+ <el-input v-model="editParams.financial_irr" />
</el-form-item>
- <el-form-item label="空域名称">
- <el-input v-model="editParams.model_name" />
- </el-form-item>
- <el-form-item label="空域名称">
- <el-input v-model="editParams.model_name" />
+ <el-form-item label="市场空间">
+ <el-input v-model="editParams.market_space" />
</el-form-item>
<div class="btns">
- <el-button type="primary" @click="submit(ruleFormRef)">确认</el-button>
- <el-button @click="isShowEditView = false">取消</el-button>
+ <el-button v-if="titleTxt === '新增'" type="primary" @click="submit(ruleFormRef)"><el-icon><CirclePlus /></el-icon>确认</el-button>
+ <el-button v-else type="primary" @click="submit(ruleFormRef)"><el-icon><CircleCheck /></el-icon>修改</el-button>
+ <el-button @click="isShowEditView = false"><el-icon><CircleClose /></el-icon>取消</el-button>
</div>
</el-form>
</div>
</el-dialog>
</template>
<script setup>
-import { getAlgorithmManageList, algorithmManageEdit } from '@/api/airspace/airspace';
-import { getDictionaryByCode } from '@/api/system/dictbiz';
+import { ElMessage, ElMessageBox, ElLoading } from 'element-plus';
+import { operatingIncomePage, operatingIncomeUpdate, operatingIncomeAdd, operatingIncomeDelete } from '@/api/airspace/airspace';
+let titleTxt = ref('新增')
const total = ref(0)
const params = ref({
current: 1,
size: 10,
- algName: '',
- algTypeCode: '',
});
let tableList = ref([])
-let isShowView = ref(false)
-
-let rowView = ref({})
-
let isShowEditView = ref(false)
-let sfTypes = ref([])
const ruleFormRef = ref()
let editParams = ref({
- model_name: '',
- alg_type: '',
- qua_rate: '',
- pass_rate: '',
- event_type: '',
- remark: ''
+ id: '',
+ operating_income: '',
+ total_cost: '',
+ net_profit: '',
+ financial_irr: '',
+ market_space: '',
})
const rules = reactive({
- qua_rate: [
- { required: true, message: '请输入最低准确率', trigger: 'blur' },
+ operating_income: [
+ { required: true, message: '请输入营业收入', trigger: 'blur' },
{
validator: (rule, value, callback) => {
if (!/^\d+(\.\d+)?$/.test(value)) {
callback(new Error('请输入有效的数字（整数或小数）'));
- } else if (parseFloat(value) < 0.4) {
- callback(new Error('最低准确率不能小于0.4'));
- } else if (parseFloat(value) >= parseFloat(editParams.value.pass_rate)) {
- callback(new Error('最低准确率必须小于最高准确率'));
} else {
callback();
}
@@ -129,14 +120,12 @@
trigger: 'blur'
}
],
- pass_rate: [
- { required: true, message: '请输入最低准确率', trigger: 'blur' },
+ total_cost: [
+ { required: false, message: '请输入综合总成本费用', trigger: 'blur' },
{
validator: (rule, value, callback) => {
if (!/^\d+(\.\d+)?$/.test(value)) {
callback(new Error('请输入有效的数字（整数或小数）'));
- } else if (parseFloat(value) > 0.8) {
- callback(new Error('最高准确率不能大于0.8'));
} else {
callback();
}
@@ -144,12 +133,31 @@
trigger: 'blur'
}
],
- event_type: [
+ net_profit: [
+ { required: false, message: '请输入净利润', trigger: 'blur' },
{
- required: true,
- message: '请选择事件生成类型',
- trigger: 'change',
- },
+ validator: (rule, value, callback) => {
+ if (!/^\d+(\.\d+)?$/.test(value)) {
+ callback(new Error('请输入有效的数字（整数或小数）'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }
+ ],
+ financial_irr: [
+ { required: false, message: '请输入财务内部收益率', trigger: 'blur' },
+ {
+ validator: (rule, value, callback) => {
+ if (!/^\d+(\.\d+)?$/.test(value)) {
+ callback(new Error('请输入有效的数字（整数或小数）'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }
],
})
@@ -162,43 +170,93 @@
}
function getList() {
- getAlgorithmManageList(params.value).then(res => {
+ operatingIncomePage(params.value).then(res => {
tableList.value = res.data.data.records || []
total.value = res.data.data.total || 0
})
}
-function getSFType() {
- getDictionaryByCode('WORK_ORDER_TYPE').then(res => {
- sfTypes.value = res.data.data.WORK_ORDER_TYPE || []
- });
-}
-function handleDetail(row) {
- isShowView.value = true
- rowView.value = row
-}
-function handleDelete(row) {
- console.log(row)
-}
-function handleAdd(row) {
+// function handleDetail(row) {
+// isShowView.value = true
+// rowView.value = row
+// }
+function handleEdit(row) {
+ titleTxt.value = '编辑'
isShowEditView.value = true
- // editParams.value = { ...row }
+ editParams.value = { ...row }
+}
+function handleDelete (row) {
+ ElMessageBox.confirm('确定删除吗?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(() => {
+ operatingIncomeDelete(row.id).then(res => {
+ ElMessage.success('删除成功')
+ getList()
+ }).catch(error => {
+ ElMessage.error('删除失败');
+ });
+ })
+ .catch(() => {
+ ElMessage({
+ type: 'info',
+ message: '已取消删除',
+ })
+ });
+}
+
+function handleAdd(row) {
+ titleTxt.value = '新增'
+ isShowEditView.value = true
+}
+
+function handleSizeChange(val) {
+ params.value.size = val
+ getList()
+}
+
+function handleCurrentChange(val) {
+ params.value.current = val
+ getList()
}
async function submit(formValidate) {
if (!formValidate) return
await formValidate.validate((valid, fields) => {
if (valid) {
- algorithmManageEdit(editParams.value).then(res => {
- isShowEditView.value = false
- getList()
- })
- }
+ if (titleTxt.value === '新增') {
+ operatingIncomeAdd(editParams.value).then(res => {
+ isShowEditView.value = false
+ ElMessage.success('新增成功')
+ getList()
+ })
+ } else {
+ operatingIncomeUpdate(editParams.value).then(res => {
+ isShowEditView.value = false
+ ElMessage.success('操作成功')
+ getList()
+ })
+ }
+
+ }
})
+}
+
+function handleClose() {
+ // 清除表单内容
+ editParams.value = {
+ id: '',
+ operating_income: '',
+ total_cost: '',
+ net_profit: '',
+ financial_irr: '',
+ market_space: '',
+ }
}
onMounted(() => {
getList()
- getSFType()
})
</script>
@@ -213,7 +271,8 @@
display: flex;
flex-direction: column;
.search-box {
- height: 80px;
+ margin-top: 20px;
+ height: 40px;
}
:deep(.el-input) {
--
Gitblit v1.9.3