6 changed files with 29 additions and 128 deletions
--- a/src/views/aircraft/aircraftDetail/components/InsuranceRecord.vue
+++ b/src/views/aircraft/aircraftDetail/components/InsuranceRecord.vue
@ -139,7 +139,6 @@
 import { mapGetters } from 'vuex'
 import { upload } from '@/utils/upload'
 import { addInsurance, getInsuranceDetail, deleteInsurance, editInsurance } from '@/api/aircraft'
-import { get as getDictDetail } from '@/api/system/dictDetail'

 export default {
  name: "InsuranceRecord",
@ -183,7 +182,11 @@ export default {
        edit: ['admin', 'aircraftDetail:edit'],
        delete: ['admin', 'aircraftDetail:delete']
      },
-      insuranceTypes: [],
+      insuranceTypes: [
+        { value: 0, label: "三方险" },
+        { value: 1, label: "设备险" },
+        { value: 2, label: "运营险" },
+      ],
      rules: {
        name: [{ required: true, message: "请输入保险名称", trigger: "blur" }],
        insuranceType: [
@ -198,23 +201,7 @@ export default {
      },
    };
  },
-  created() {
-    this.getInsuranceTypes()
-  },
  methods: {
-    async getInsuranceTypes() {
-      try {
-        const res = await getDictDetail('insurance_type')
-        this.insuranceTypes = res.content.map(item => ({
-          value: item.dictSort,
-          label: item.value
-        }))
-        console.log(this.insuranceTypes)
-      } catch (error) {
-        console.error('获取保险类型失败:', error)
-        this.$message.error('获取保险类型失败')
-      }
-    },
    getInsuranceTypeName(type) {
      const found = this.insuranceTypes.find(t => t.value === type)
      return found ? found.label : '未知类型'
--- a/src/views/aircraft/aircraftDetail/index.vue
+++ b/src/views/aircraft/aircraftDetail/index.vue
@ -32,7 +32,6 @@
 <script>
 import { mapGetters } from 'vuex'
 import { getDeviceDetail, getMaintenanceRecords, getInsuranceRecords } from '@/api/aircraft'
-import { get } from "@/api/system/dictDetail";
 import BasicInfo from './components/BasicInfo'
 import MaintenanceRecord from './components/MaintenanceRecord'
 import InsuranceRecord from './components/InsuranceRecord'
@ -48,18 +47,17 @@ export default {
  data() {
    return {
      form: {
-        name: '',
-        model: '',
-        useType: '',
-        areaName: '',
-        scenicName: '',
-        username: '',
-        remark: '',
+        name: '大疆',
+        model: 'T100',
+        useType: '载人飞行',
+        areaName: '北京',
+        scenicName: '白云山',
+        username: '小明',
+        remark: '设备状态良好',
        deviceImages: [
          'https://axure-file.lanhuapp.com/md5__f344f816278c2a3f5164e4571c580ad9.png'
        ]
      },
-      typeOptions: [], // 飞行类型选项
      maintenanceData: [],
      insuranceData: [],
      maintenancePage: {
@ -81,36 +79,17 @@ export default {
    ])
  },
  created() {
-    this.getFlightTypes()
    const id = this.$route.query.id
    const rowData = this.$route.query.data ? JSON.parse(this.$route.query.data) : null
    if (rowData) {
-      setTimeout(() => {
-        this.getDetail(id, rowData)
-      }, 0)
+      this.getDetail(id, rowData)
    }else {
-      setTimeout(() => {
-        this.getDetail(id)
-      }, 0)
+      this.getDetail(id)
    }
    this.loadMaintenanceRecords()
    this.loadInsuranceRecords()
  },
  methods: {
-    // 获取飞行类型
-    async getFlightTypes() {
-      try {
-        const res = await get('user_qualification');
-        if (res && res.content) {
-          this.typeOptions = res.content;
-        }
-      } catch (error) {
-        console.error("获取飞行类型失败:", error);
-        this.$message.error("获取飞行类型失败");
-        this.typeOptions = [];
-      }
-    },
-
    getDetail(id, rowData = null) {
      getDeviceDetail(id).then(response => {
        this.form = response
@ -119,8 +98,7 @@ export default {
          this.form.scenicName = rowData.scenicName
          this.form.username = rowData.username
        }
-        const type = this.typeOptions.find(t => t.dictSort === this.form.useType);
-        this.form.useType = type ? type.label : '未知';
+        this.form.useType = this.form.useType === 0 ? '载物飞行' : this.form.useType === 1 ? '载人飞行' : '其他'
        // 确保设备图片数据格式统一
        this.form.deviceImages = this.form.deviceImages.map((image, index) => {
          if (typeof image === 'string') {
--- a/src/views/aircraft/index.vue
+++ b/src/views/aircraft/index.vue
@ -86,12 +86,9 @@
        </el-form-item>
        <el-form-item label="类型" prop="useType">
          <el-select v-model="form.useType" style="width: 150px">
-            <el-option
-              v-for="item in typeOptions"
-              :key="item.dictSort"
-              :value="item.dictSort"
-              :label="item.label"
-            />
+            <el-option :value="0" label="载物飞行" />
+            <el-option :value="1" label="载人飞行" />
+            <el-option :value="2" label="其他" />
          </el-select>
        </el-form-item>
        <el-form-item label="区域" prop="areaId">
@ -218,7 +215,13 @@
      <el-table-column label="型号" prop="model" />
      <el-table-column label="类型" prop="useType">
        <template slot-scope="scope">
-          {{ typeOptions.find(t => t.dictSort === scope.row.useType)?typeOptions.find(t => t.dictSort === scope.row.useType).label : '未知' }}
+          {{
+            scope.row.useType === 0
+              ? "载物飞行"
+              : scope.row.useType === 1
+              ? "载人飞行"
+              : "其他"
+          }}
        </template>
      </el-table-column>
      <el-table-column label="负责人" prop="username" />
@ -274,7 +277,6 @@ import crudAircraft from "@/api/aircraft";
 import { allAreas } from "@/api/system/area";
 import { getList, getDetail } from "@/api/system/pilot";
 import { allScenic } from "@/api/system/scenic";
-import { get } from "@/api/system/dictDetail";
 import { upload } from "@/utils/upload";
 import { mapGetters } from "vuex";
 import rrOperation from "@crud/RR.operation";
@ -284,7 +286,7 @@ const defaultForm = {
  name: null,
  brand: null,
  model: null,
-  useType: 1,
+  useType: 0,
  areaId: null,
  scenicId: null,
  employeesId: null,
@ -358,7 +360,6 @@ export default {
      areaOptions: [],
      scenicOptions: [],
      employeeOptions: [],
-      typeOptions: [], // 飞行类型选项
      // 默认数据
      query: {
        name: "",
@ -406,8 +407,6 @@ export default {
    this.getAreas();
    // 获取飞行员列表
    this.getEmployees();
-    // 获取飞行类型
-    this.getFlightTypes();
  },
  methods: {
    // 获取区域列表
@ -444,20 +443,6 @@ export default {
      });
    },

-    // 获取飞行类型
-    async getFlightTypes() {
-      try {
-        const res = await get('user_qualification');
-        if (res && res.content) {
-          this.typeOptions = res.content.sort((a, b) => a.dictSort - b.dictSort);
-        }
-      } catch (error) {
-        this.$message.error("获取飞行类型失败");
-        console.error("获取飞行类型失败:", error);
-        this.typeOptions = [];
-      }
-    },
-
    // 获取负责人列表
    async getEmployees() {
      try {
--- a/src/views/order/loadOrder/index.vue
+++ b/src/views/order/loadOrder/index.vue
@ -122,7 +122,6 @@ import { getOrderList } from "@/api/order";
 import { allAreas } from "@/api/system/area";
 import { allScenic } from "@/api/system/scenic";
 import { allCustomer } from "@/api/system/customer";
-import { get } from "@/api/system/dictDetail";
 import { getList } from "@/api/system/pilot";
 import { getOrderDetail } from "@/api/order";
 import { getUser } from "@/api/system/user";
@ -136,7 +135,6 @@ export default {
    this.getScenics();
    this.getPilots();
    this.getCustomers();
-    this.getFlightTypes();
    // this.getList();
  },
  data() {
@ -156,7 +154,6 @@ export default {
      scenicOptions: [],
      customerOptions: [],
      pilotOptions: [],
-      typeOptions: [], // 飞行类型选项
      tableData: [],
      selection: [],
    };
@ -166,20 +163,6 @@ export default {
    getSettlementStatusText,
    getOrderStatusClass,
    getSettlementStatusClass,
-    // 获取飞行类型
-    async getFlightTypes() {
-      try {
-        const res = await get('user_qualification');
-        if (res && res.content) {
-          this.typeOptions = res.content.sort((a, b) => a.dictSort - b.dictSort);
-        }
-      } catch (error) {
-        this.$message.error("获取飞行类型失败");
-        console.error("获取飞行类型失败:", error);
-        this.typeOptions = [];
-      }
-    },
-
    getList() {
      this.loading = true;
      const params = {
@ -211,7 +194,7 @@ export default {
              scenicName: scenic ? scenic.name : "未知景区",
              route: record.routeName,
              initiator: initiator ? initiator.name : "未知发起人",
-              type: this.typeOptions.find(t => t.dictSort === record.orderType).label || '未知',
+              type: record.orderType === 1 ? "载物飞行" : "载人飞行",
              mainOrderStatus: record.mainOrderStatus,
              settlementStatus: record.settlementStatus,
              id: record.id,
--- a/src/views/order/settlementOrder/generateOrder/index.vue
+++ b/src/views/order/settlementOrder/generateOrder/index.vue
@ -139,7 +139,6 @@
 import { getOrderList, getGenerateSettleOrderConfirmList, generateSettlementOrder } from "@/api/order";
 import { allAreas } from "@/api/system/area";
 import { allScenic } from "@/api/system/scenic";
-import { get } from "@/api/system/dictDetail";
 import { allCustomer } from "@/api/system/customer";
 import { getList } from "@/api/system/pilot";
 import { getUser } from "@/api/system/user";
@ -152,7 +151,6 @@ export default {
    this.getScenics();
    this.getCustomers();
    this.getPilots();
-    this.getFlightTypes();
    this.getList();
  },
  data() {
@ -179,7 +177,6 @@ export default {
      scenicAreaOptions: [],
      customerOptions: [],
      pilotOptions: [],
-      typeOptions: [], // 飞行类型选项
      tableData: [],
      selection: []
    }
@ -189,19 +186,6 @@ export default {
    getSettlementStatusText,
    getOrderStatusClass,
    getSettlementStatusClass,
-    // 获取飞行类型
-    async getFlightTypes() {
-      try {
-        const res = await get('user_qualification');
-        if (res && res.content) {
-          this.typeOptions = res.content.sort((a, b) => a.dictSort - b.dictSort);
-        }
-      } catch (error) {
-        this.$message.error("获取飞行类型失败");
-        console.error("获取飞行类型失败:", error);
-        this.typeOptions = [];
-      }
-    },
    getList() {
      this.loading = true;
      const params = {
@ -233,7 +217,7 @@ export default {
              scenicArea: scenic ? scenic.name : "未知景区",
              route: record.routeName,
              initiator: initiator ? initiator.name : "未知发起人",
-              orderType: this.typeOptions.find(t => t.dictSort === record.orderType).label || '未知',
+              orderType: record.orderType === 1 ? "载物飞行" : "载人飞行",
              mainOrderStatus: record.mainOrderStatus,
              settlementStatus: record.settlementStatus,
            };
--- a/src/views/order/settlementOrder/orderDetail/index.vue
+++ b/src/views/order/settlementOrder/orderDetail/index.vue
@ -80,7 +80,7 @@
          align="center"
        >
          <template slot-scope="scope">
-            <span>{{ typeOptions.find(t => t.dictSort === scope.row.orderType).label || '未知' }}</span>
+            <span>{{ scope.row.orderType === 1 ? '载物飞行' : '载人飞行' }}</span>
          </template>
        </el-table-column>
        <el-table-column
@ -161,7 +161,6 @@
 import { getOrderStatusText, getSettlementStatusText, getOrderStatusClass, getSettlementStatusClass } from "@/utils/orderStatus";
 import { getSettleOrderDetail, updateSettleOrderStatus, printSettleOrderData } from '@/api/order'
 import { getDetail } from "@/api/system/pilot";
-import { get } from "@/api/system/dictDetail";
 import { getCustomerId } from '@/api/system/customer'
 import { getScenicValue } from '@/api/dropdown'
 import SettlementPdf from './settlementPdf.vue'
@ -176,7 +175,6 @@ export default {
      orderId: '',
      loading: false,
      scenicAreaOptions: [],
-      typeOptions: [], // 飞行类型选项
      settlementStatus: 0,
      currentOrder: null,
      originalData: [], // 存储原始数据，用于筛选
@ -217,26 +215,12 @@ export default {
    } else {
      this.$message.error('没有提供订单ID')
    }
-    this.getFlightTypes()
  },
  methods: {
    getOrderStatusText,
    getSettlementStatusText,
    getOrderStatusClass,
    getSettlementStatusClass,
-    // 获取飞行类型
-    async getFlightTypes() {
-      try {
-        const res = await get('user_qualification');
-        if (res && res.content) {
-          this.typeOptions = res.content.sort((a, b) => a.dictSort - b.dictSort);
-        }
-      } catch (error) {
-        console.error("获取飞行类型失败:", error);
-        this.$message.error("获取飞行类型失败");
-        this.typeOptions = [];
-      }
-    },
    async getOrderDetail(orderId) {
      try {
        const settleOrderDetail = await getSettleOrderDetail(orderId)