From d46953fb97893833d027ee1aabf783d20e3207a1 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 27 Sep 2025 18:03:55 +0800
Subject: [PATCH] Merge branch 'feature/v6.0/6.0.3' into prod

---
 src/views/tickets/orderLog.vue |   45 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 9b7ac72..49f24ea 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -298,6 +298,15 @@
               </el-select>
             </el-form-item>
           </el-col>
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="安全返航真高" prop="rth_altitude">-->
+<!--              <el-input-number-->
+<!--                v-model="form.rth_altitude"-->
+<!--                :min="30"-->
+<!--                :max="300"-->
+<!--              ></el-input-number>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
@@ -395,9 +404,9 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="danger" @click="submitForm(1)">发起</el-button>
-          <el-button type="primary" @click="submitForm(0)">存草稿</el-button>
-          <el-button @click="dialogVisible = false" :icon="CircleClose">取消</el-button>
+          <el-button type="danger" @click="submitForm(1)" icon="el-icon-position">发起</el-button>
+          <el-button type="primary" @click="submitForm(0)" icon="el-icon-document-add">存草稿</el-button>
+          <el-button @click="dialogVisible = false" icon="el-icon-circle-close">取消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -589,12 +598,14 @@
             type="danger"
             v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
             @click="submitForm(1)"
+            icon="el-icon-position"
           >发布</el-button
           >
           <el-button
             type="primary"
             v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
             @click="submitForm(0)"
+            icon="el-icon-plus"
           >保存</el-button
           >
           <!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
@@ -794,6 +805,7 @@
           type="danger"
           v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
           @click="submitForm(1)"
+          icon="el-icon-position"
         >发布</el-button
         >
         <!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
@@ -803,15 +815,17 @@
           type="primary"
           v-if="form.status == 1 && hasPaddingBtnPermission()"
           @click="orderLogPass(form.id)"
+          icon="el-icon-check"
         >通过</el-button
         >
         <el-button
           type="danger"
           v-if="form.status == 1 && hasRejectionBtnPermission()"
           @click="orderLogReject(form.id)"
+          icon="el-icon-close"
         >驳回</el-button
         >
-        <el-button @click="detailVisibleCopy = false">取消</el-button>
+        <el-button @click="detailVisibleCopy = false" icon="el-icon-circle-close">取消</el-button>
       </div>
         </template>
     </el-dialog>
@@ -834,7 +848,7 @@
 } from '@/api/tickets/orderLog';
 import { getTicketInfo } from '@/api/tickets/ticket';
 import { getDictionaryByCode } from '@/api/system/dictbiz';
-import { getWaylineFileListByArea } from '@/api/resource/wayline';
+import { getWaylineFileListByArea, newGetWorkspacesPage } from '@/api/resource/wayline';
 import { export_json_to_excel } from '@/utils/exportExcel';
 import { getFlyingNestBy } from '@/api/device/device';
 import { mapGetters } from 'vuex';
@@ -846,7 +860,7 @@
 import 'dayjs/locale/zh-cn'; // 导入中文语言包
 import weekday from 'dayjs/plugin/weekday';
 import elTooltipCopy from '@/components/ElTooltipCopy.vue';
-import { CircleClose } from '@element-plus/icons-vue';
+import { CircleClose, Promotion, Select } from '@element-plus/icons-vue';
 
 dayjs.extend(weekday);
 dayjs.locale('zh-cn');
@@ -1559,8 +1573,15 @@
     },
     //获取航线列表
     async asyncgetWaylineFileListByArea(name) {
-      var wayLineListResponse = await getWaylineFileListByArea(this.userInfo.detail.areaCode);
-      this.wayLineList = wayLineListResponse.data.data;
+      const formData = {
+        name: '',
+        waylineType: undefined,
+        current: 1,
+        size: 99999999,
+        descs: 'update_time',
+      }
+      var wayLineListResponse = await newGetWorkspacesPage(formData);
+      this.wayLineList =  wayLineListResponse.data.data.records
 
       this.initMapLine();
     },
@@ -1597,7 +1618,7 @@
 
         //按照航线来
         const params = {
-          type: [2, 4, 5].includes(currentLine.wayline_type) ? 2 : 0,
+          type: ['2', '4', '5'].includes(currentLine.wayline_type) ? 2 : 0,
           wayline_id: waylineId,
           polygon,
         };
@@ -1669,6 +1690,12 @@
 </script>
 
 <style lang="scss" scoped>
+:deep(.el-input-number) {
+  width: 200px;
+}
+:deep(.el-form-item__label) {
+  width: 100px !important;
+}
 ::v-deep(.el-tabs) {
   height: 100%;
   display: flex;

--
Gitblit v1.9.3