From 0b4b0802b24257520d24c4a2aa9331b21bee604b Mon Sep 17 00:00:00 2001 From: Double-_-Z <2492419643@qq.com> Date: Thu, 21 Aug 2025 10:59:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=B5=8B=E8=AF=95=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80=EF=BC=8C=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E8=AE=A2=E5=8D=95=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 4 +- src/api/aircraft.js | 10 ++++- src/views/analysis/orderAnalysis/index.vue | 4 +- src/views/analysis/taskAnalysis/index.vue | 43 ++++++++++++++++------ 5 files changed, 46 insertions(+), 17 deletions(-) diff --git a/.env.development b/.env.development index c27b157..1100f03 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ ENV = 'development' # 接口地址 # VUE_APP_BASE_API = 'http://localhost:8000' -VUE_APP_BASE_API = 'http://8.138.171.103/aerocraftAdminApi' +VUE_APP_BASE_API = 'http://8.130.155.168/aerocraftAdminApi' # VUE_APP_BASE_API = 'https://webapi.aishangfeixing.com/aerocraftAdminApi/' # VUE_APP_BASE_API = 'https://eladmin.vip' # VUE_APP_WS_API = 'ws://localhost:8000' diff --git a/.env.production b/.env.production index 805bbcf..8cf4378 100644 --- a/.env.production +++ b/.env.production @@ -2,10 +2,10 @@ ENV = 'production' # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http -VUE_APP_BASE_API = 'http://8.138.171.103/aerocraftAdminApi' +VUE_APP_BASE_API = 'http://8.130.155.168/aerocraftAdminApi' # VUE_APP_BASE_API = 'https://webapi.aishangfeixing.com/aerocraftAdminApi/' # 运行基本路径 -VUE_APP_BASE_PATH = 'http://8.138.171.103/aerocraftAdmin' +VUE_APP_BASE_PATH = 'http://8.130.155.168/aerocraftAdmin' # VUE_APP_BASE_PATH = 'https://admin.aishangfeixing.com' # 如果接口是 http 形式， wss 需要改为 ws VUE_APP_WS_API = 'wss://eladmin.vip' diff --git a/src/api/aircraft.js b/src/api/aircraft.js index 3989119..5b887e0 100644 --- a/src/api/aircraft.js +++ b/src/api/aircraft.js @@ -9,6 +9,14 @@ export function get(params) { }) } +// 查询全部飞行器设备 +export function allAircraft() { + return request({ + url: 'api/dataDropdown/obtainDeviceList', + method: 'get', + }) +} + // 删除飞行器设备 export function del(id) { return request({ @@ -95,4 +103,4 @@ export function editInsurance(data) { }) } -export default { get, del, add, edit, getMaintenanceRecords, getInsuranceRecords, addInsurance, getInsuranceDetail, deleteInsurance, editInsurance, getDeviceDetail } +export default { get, allAircraft, del, add, edit, getMaintenanceRecords, getInsuranceRecords, addInsurance, getInsuranceDetail, deleteInsurance, editInsurance, getDeviceDetail } diff --git a/src/views/analysis/orderAnalysis/index.vue b/src/views/analysis/orderAnalysis/index.vue index adf2bcb..5a845ee 100644 --- a/src/views/analysis/orderAnalysis/index.vue +++ b/src/views/analysis/orderAnalysis/index.vue @@ -572,8 +572,8 @@ export default { const params = { startDate: this.filter.startDate, endDate: this.filter.endDate, - pageNum: this.pagination.currentPage, - pageSize: this.pagination.pageSize, + size: this.pagination.pageSize, + page: this.pagination.currentPage, ...(this.filter.sortField && { sortField: this.filter.sortField, sortOrder: this.filter.sortOrder diff --git a/src/views/analysis/taskAnalysis/index.vue b/src/views/analysis/taskAnalysis/index.vue index b1b21d8..0685827 100644 --- a/src/views/analysis/taskAnalysis/index.vue +++ b/src/views/analysis/taskAnalysis/index.vue @@ -92,8 +92,12 @@ class="task-detail-table" v-loading="loading" > - - + + + + { + this.deviceMap = res.reduce((obj, item) => ({...obj,[item.key]: item.value}), {})||{}; + }); + }, + getOperatorName(operatorId) { if (operatorId === null || operatorId === undefined || operatorId === '') { return '未分配' @@ -320,7 +336,7 @@ export default { } } - return operator && operator.name ? operator.name : `操作员(${operatorId})` + return operator && operator.name ? operator.name : `-` }, // 状态筛选方法 @@ -331,8 +347,10 @@ export default { getStatusTagType(status) { const typeMap = { 0: 'info', + 1: 'primary', 2: 'success', - 3: 'danger' + 3: 'danger', + 4: 'warning' } return typeMap[status] || 'info' }, @@ -340,10 +358,12 @@ export default { getStatusText(status) { const textMap = { 0: '未开始', + 1: '进行中', 2: '已完成', - 3: '已失败' + 3: '已取消', + 4: '待确认' } - return textMap[status] || '未知状态' + return textMap[status] || '-' }, initDefaultDateRange() { @@ -386,12 +406,13 @@ export default { const analysisData = await this.getAnalysisData() this.orderDetailList = analysisData.orderDetailList || [] + const { pageNum, pageSize, total } = analysisData.pageInfo; // 确保分页数据是数字类型 this.pagination = { - currentPage: Number(analysisData.currentPage) || Number(analysisData.pageNum) || 1, - pageSize: Number(analysisData.pageSize) || Number(analysisData.size) || 10, - total: Number(analysisData.total) || this.orderDetailList.length + currentPage: pageNum || 1, + pageSize: pageSize || 10, + total: Number(total) || this.orderDetailList.length } this.stats = {