更换测试环境接口地址，完善订单分析

.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'

.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'

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 }

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,
+    size: this.pagination.pageSize,
-    pageSize: this.pagination.pageSize,
+    page: this.pagination.currentPage,
     ...(this.filter.sortField && {
       sortField: this.filter.sortField,
       sortOrder: this.filter.sortOrder

src/views/analysis/taskAnalysis/index.vue

@@ -92,8 +92,12 @@
               class="task-detail-table"
               v-loading="loading"
             >
-              <el-table-column prop="orderId" label="订单编号" min-width="150" />
+              <el-table-column sortable prop="orderNo" label="订单编号" min-width="150" />
-              <el-table-column prop="deviceId" label="设备名称" min-width="150" show-overflow-tooltip />
+              <el-table-column prop="deviceId" label="设备名称" min-width="150"  show-overflow-tooltip>
+                <template #default="{row}">
+                  {{ deviceMap[row.deviceId] || '-' }}
+                </template>
+              </el-table-column>
               <el-table-column prop="createTime" label="创建时间" min-width="160" />
               <el-table-column prop="operatorName" label="操作员" min-width="150" />
               <el-table-column 
@@ -146,12 +150,14 @@ import {
   getYearlyOrderAnalysis 
 } from '@/api/analysis/taskAnalysis'
 import { getAllPilots } from '@/api/system/pilot'
+import { allAircraft } from "@/api/aircraft";
 
 export default {
   name: 'taskAnalysis',
   data() {
     return {
       operatorsMap: {},
+      deviceMap: {},
       pagination: {
         currentPage: 1,
         pageSize: 10,
@@ -211,9 +217,11 @@ export default {
     // 状态筛选器配置
     statusFilters() {
       return [
-        { text: '未开始', value: 0 },
+        { text: '未进行', value: 0 },
+        { text: '进行中', value: 1 },
         { text: '已完成', value: 2 },
-        { text: '已失败', value: 3 }
+        { text: '已取消', value: 3 },
+        { text: '待确认', value: 4 },
       ]
     },
     datePickerType() {
@@ -242,6 +250,7 @@ export default {
     this.initDefaultDateRange()
     this.fetchData()
     this.initChart()
+    this.getAllAircraft();
     window.addEventListener('resize', this.handleResize)
   },
   beforeDestroy() {
@@ -301,6 +310,13 @@ export default {
       }
     },
 
+    getAllAircraft(){
+      // 设备映射
+      allAircraft().then(res => {
+        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,
+          currentPage: pageNum || 1,
-          pageSize: Number(analysisData.pageSize) || Number(analysisData.size) || 10,
+          pageSize: pageSize || 10,
-          total: Number(analysisData.total) || this.orderDetailList.length
+          total: Number(total) || this.orderDetailList.length
         }
 
         this.stats = {