Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management

张含笑

2025-09-01 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b

 src/views/tickets/orderLog.vue

@@ -1,13 +1,4 @@
<!--
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2025-04-15 20:02:29
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2025-04-28 11:38:16
 * @FilePath: \drone-web-manage\src\views\tickets\orderLog.vue
 * @Description:
 *
 * Copyright (c) 2025 by shuishen, All Rights Reserved.
-->

<template>
  <basic-container>
    <el-tabs v-model="activeTab" @tab-click="handleTabChange">
@@ -21,40 +12,40 @@
                  @keyup.enter="handleSearch" />
              </div>

              <div class="search-bar-box-item">
                <el-select placeholder="请选择所属单位" v-model="filters.create_dept" clearable>
                  <el-option v-for="dept in departments" :key="dept.value" :label="dept.label" :value="dept.value" />
                </el-select>
              </div>
<!--              <div class="search-bar-box-item">-->
<!--                <el-select placeholder="请选择所属单位" v-model="filters.create_dept" clearable>-->
<!--                  <el-option v-for="dept in departments" :key="dept.value" :label="dept.label" :value="dept.value" />-->
<!--                </el-select>-->
<!--              </div>-->

              <div class="search-bar-box-item">
                <el-date-picker v-model="filters.dateRange" type="daterange" range-separator="至"
                <el-date-picker @change="handleSearch" v-model="filters.dateRange" type="daterange" range-separator="至"
                  start-placeholder="开始日期" end-placeholder="结束日期" :default-value="datePickerDefaultVal" />
              </div>

              <div class="search-bar-box-item">
                <el-select v-model="filters.file_id" placeholder="请选择关联航线" clearable>
                <el-select @change="handleSearch" v-model="filters.file_id" placeholder="请选择关联航线" filterable clearable>
                  <el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
                    :value="item.wayline_id" />
                </el-select>
              </div>

              <div class="search-bar-box-item">
                <el-select v-model="filters.ai_types" placeholder="关联算法" clearable>
                <el-select @change="handleSearch" v-model="filters.ai_types" placeholder="关联算法" clearable>
                  <el-option v-for="item in ai_types" :key="item.dictKey" :label="item.dictValue"
                    :value="item.dictKey" />
                </el-select>
              </div>

              <div class="search-bar-box-item">
              <!-- <div class="search-bar-box-item">
                <el-select v-model="filters.type" placeholder="请选择工单类型" clearable>
                  <el-option v-for="item in types" :key="item.dictValue" :label="item.dictValue"
                    :value="item.dictKey" />
                </el-select>
              </div>
              </div> -->

              <div class="search-bar-box-item">
                <el-select v-model="filters.status" placeholder="请选择工单状态" clearable>
                <el-select @change="handleSearch" v-model="filters.status" placeholder="请选择工单状态" clearable :disabled="activeTab !== 'all'">
                  <el-option v-for="item in statuses" :key="item.value" :label="item.label" :value="item.value" />
                </el-select>
              </div>
@@ -62,18 +53,18 @@

            <div class="search-bar-box">
              <div class="search-bar-box-item flex-2">
                <el-date-picker v-model="filters.cycleDateRange" type="daterange" range-separator="至"
                <el-date-picker @change="handleSearch" v-model="filters.cycleDateRange" type="daterange" range-separator="至"
                  start-placeholder="工单周期开始日期" end-placeholder="工单周期结束日期" :default-value="datePickerDefaultVal" />
              </div>

              <div class="search-bar-box-item">
                <el-select v-model="filters.rep_fre_type" placeholder="请选择频次">
                <el-select @change="handleSearch" v-model="filters.rep_fre_type" placeholder="请选择频次" clearable>
                  <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
                </el-select>
              </div>

              <div class="search-bar-box-item">
                <el-time-picker v-model="filters.deal_time" placeholder="请选择执行时间" prop="deal_time" value-format="HH:mm"
                <el-time-picker @change="handleSearch" v-model="filters.deal_time" placeholder="请选择执行时间" prop="deal_time" value-format="HH:mm"
                  :picker-options="{
                    selectableRange: '00:00 - 23:59',
                  }" />
@@ -90,9 +81,21 @@
          </div>

          <!-- 表格部分 -->
          <avue-crud :data="tableData" :option="option" v-model:page="page" ref="crud" :table-loading="loading"
            @current-change="currentChange" @refresh-change="refreshChange" @on-load="onLoad"
            @search-change="searchChange" @size-change="sizeChange" v-if="activeTab === tab.name">
          <avue-crud class="ztzf-public-general-avue-crud" :data="tableData" :option="option" v-model:page="page"
            ref="crud" :table-loading="loading" @current-change="currentChange" @refresh-change="refreshChange"
            @on-load="onLoad" @search-change="searchChange" @size-change="sizeChange" v-if="activeTab === tab.name">
            <template #job_info_num="{row}">
              <el-tooltip-copy :content="row.job_info_num" :showCopyText="true" textAlign="left">
                {{ row.job_info_num }}
              </el-tooltip-copy>
            </template>

            <template #name="{ row }">
              <el-tooltip-copy :content="row.name" :showCopyText="true" textAlign="left">
                {{ row.name }}
              </el-tooltip-copy>
            </template>

            <template #menu-left>
              <el-button v-if="hasAddBtnPermission() && activeTab != 'WAIT_AUDIT'" type="primary" icon="el-icon-plus"
                @click="handleAdd">新建工单</el-button>
@@ -102,8 +105,7 @@
            <template #menu="{ row }">
              <div class="menu-custom-box">
                <template v-if="row.status == 1">
                  <el-button v-if="hasPaddingBtnPermission()" type="text" icon="el-icon-view"
                    @click="handleCheckDetail(row)">审核</el-button>
                  <el-button v-if="hasPaddingBtnPermission()" type="text" icon="el-icon-view" @click="handleCheckDetail(row)">审核</el-button>
                </template>
                <!-- v-if="
                    (userInfo.user_id == row.create_user || hasRecallPaddingBtnPermission()) &&
@@ -113,12 +115,13 @@
                  <!--待审核状态-->
                  <el-button type="text" icon="el-icon-warning" v-if="hasRecallPaddingBtnPermission()"
                    @click="orderLogRecall(row.id)">撤回</el-button>
                  <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button>
                  <!-- <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button> -->
                </template>
                <!--已驳回-->
                <template v-if="row.status == 2">
                  <el-button type="text" icon="el-icon-warning" @click="rejectDetail(row.id)">驳回原因</el-button>
                  <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button>
                  <el-button v-if="userInfo.user_id == row.create_user" type="text" icon="el-icon-view" @click="handleViewDetail(row)">编辑</el-button>
                  <el-button v-else type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button>
                </template>
                <!-- 已通过 -->
                <template v-if="row.status == 3">
@@ -156,7 +159,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="关联航线" prop="file_id">
              <el-select v-model="form.file_id" placeholder="请选择航线" @change="getFlyingNestBy">
              <el-select v-model="form.file_id" placeholder="请选择航线" filterable @change="getFlyingNestBy">
                <el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
                  :value="item.wayline_id" />
              </el-select>
@@ -166,7 +169,7 @@
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="关联机巢" prop="device_sns">
              <el-select v-model="form.device_sns" placeholder="请选择机巢" multiple>
              <el-select v-model="form.device_sns" placeholder="请选择机巢" multiple :disabled="!device_sns.length">
                <el-option v-for="item in device_sns" :key="item.device_sn" :label="item.nickname"
                  :value="item.device_sn" />
              </el-select>
@@ -192,7 +195,7 @@
          <el-col :span="8">
            <el-form-item label="周期频次" prop="date_range">
              <el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
                end-placeholder="结束日期" />
                end-placeholder="结束日期" :disabled-date="disabledDate" />
            </el-form-item>
          </el-col>
          <el-col :span="4">
@@ -222,19 +225,20 @@
          <div class="add-box-btns">
            <el-button type="danger" @click="submitForm(1)">发起</el-button>
            <el-button type="primary" @click="submitForm(0)">存草稿</el-button>
            <el-button @click="dialogVisible = false">取消</el-button>
          </div>
        </el-row>
      </el-form>
    </el-dialog>

    <!-- 工单详情对话框 -->
    <el-dialog v-model="detailVisible" :title="detailTitle" width="70%" :close-on-click-modal="false"
    <el-dialog align-center v-model="detailVisible" :title="detailTitle" width="70%" :close-on-click-modal="false"
      @close="resetForm">
      <div class="event-title-center">{{ form.name }}</div>
      <el-form :model="form" ref="testform" label-width="100px">
      <el-form :model="form" :rules="rules" ref="testform" label-width="100px">
        <div class="custom-steps-container">
          <!-- 标题行 -->
          <div class="steps-titles">
          <div class="steps-titles"  v-if="filters.status !== '0'">
            <div v-for="(record, index) in form.record_list" :class="{ active: record.user_id >= 0 }" :key="index"
              class="step-title">
              {{ record.status_str }}
@@ -242,7 +246,7 @@
          </div>

          <!-- Element Steps 组件 -->
          <el-steps :active="form.active" align-center class="custom-steps">
          <el-steps :active="form.active" align-center class="custom-steps"  v-if="filters.status !== '0'">
            <el-step v-for="(record, index) in form.record_list" :key="index">
              <template #description>
                <span class="step-description" style="position: relative; display: inline-block">
@@ -262,12 +266,12 @@
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="工单名称" prop="name">
              <el-input v-model="form.name" placeholder="请输入工单名称"></el-input>
              <el-input v-model="form.name" placeholder="请输入工单名称" :disabled="detailTitle === '工单详情'"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="关联航线" prop="file_id">
              <el-select v-model="form.file_id" placeholder="请选择航线" @change="getFlyingNestBy">
              <el-select v-model="form.file_id" placeholder="请选择航线" @change="getFlyingNestBy" filterable :disabled="detailTitle === '工单详情'">
                <el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
                  :value="item.wayline_id" />
              </el-select>
@@ -277,7 +281,7 @@
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="关联机巢" prop="device_sns">
              <el-select v-model="form.device_sns" placeholder="请选择机巢" multiple>
              <el-select v-model="form.device_sns" placeholder="请选择机巢" multiple :disabled="detailTitle === '工单详情'">
                <el-option v-for="item in device_sns" :key="item.device_sn" :label="item.nickname"
                  :value="item.device_sn" />
              </el-select>
@@ -285,7 +289,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="关联算法" prop="ai_types">
              <el-select v-model="form.ai_types" placeholder="请选择关联算法" multiple>
              <el-select v-model="form.ai_types" placeholder="请选择关联算法" multiple  :disabled="detailTitle === '工单详情'">
                <el-option v-for="item in ai_types" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
              </el-select>
            </el-form-item>
@@ -302,12 +306,12 @@
          <el-col :span="6">
            <el-form-item label="周期频次" prop="date_range">
              <el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
                end-placeholder="结束日期" />
                end-placeholder="结束日期" :disabled-date="disabledDate"   :disabled="detailTitle === '工单详情'" />
            </el-form-item>
          </el-col>

          <el-col :span="3">
            <el-select v-model="form.rep_fre_type" placeholder="请选择频次">
            <el-select v-model="form.rep_fre_type" placeholder="请选择频次" :disabled="detailTitle === '工单详情'">
              <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
            </el-select>
          </el-col>
@@ -316,7 +320,7 @@
            <el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" value-format="HH:mm"
              :picker-options="{
                selectableRange: '00:00 - 23:59',
              }" />
              }"  :disabled="detailTitle === '工单详情'"/>
          </el-col>
        </el-row>

@@ -324,7 +328,7 @@
          <el-col :span="12">
            <el-form-item label="工单内容" prop="content">
              <el-input type="textarea" v-model="form.content" rows="4" placeholder="请输入工单内容" maxlength="255"
                show-word-limit></el-input>
                show-word-limit  :disabled="detailTitle === '工单详情'"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
@@ -340,6 +344,7 @@
            <el-button type="danger"
              v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
              @click="submitForm(1)">发布</el-button>
              <el-button type="primary" v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)" @click="submitForm(0)">保存</el-button>
            <!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
                            @click="submitForm(0)">保存</el-button> -->

@@ -353,12 +358,12 @@
    </el-dialog>

    <!-- 工单详情 -->
    <el-dialog v-model="detailVisibleCopy" title="工单详情" width="70%" :close-on-click-modal="false" @close="resetForm">
    <el-dialog align-center v-model="detailVisibleCopy" title="工单详情" width="70%" :close-on-click-modal="false" @close="resetForm">
      <div class="event-title-center">{{ form.name }}</div>
      <el-form :model="form" ref="testform" label-width="100px">
        <div class="custom-steps-container">
          <!-- 标题行 -->
          <div class="steps-titles">
          <div class="steps-titles" v-if="filters.status !== '0'">
            <div v-for="(record, index) in form.record_list" :class="{ active: record.user_id >= 0 }" :key="index"
              class="step-title">
              {{ record.status_str }}
@@ -366,7 +371,7 @@
          </div>

          <!-- Element Steps 组件 -->
          <el-steps :active="form.active" align-center class="custom-steps">
          <el-steps :active="form.active" align-center class="custom-steps" v-if="filters.status !== '0'">
            <el-step v-for="(record, index) in form.record_list" :key="index">
              <template #description>
                <span class="step-description" style="position: relative; display: inline-block">
@@ -503,8 +508,16 @@
import { downloadXls } from '@/utils/util'
import 'nprogress/nprogress.css'
import { analyzeKmzFile, removeTextKey, XMLToJSON } from '@/utils/cesium/kmz'
import dayjs from 'dayjs';
import 'dayjs/locale/zh-cn'; // 导入中文语言包
import weekday from 'dayjs/plugin/weekday';
import elTooltipCopy from '@/components/ElTooltipCopy.vue'

dayjs.extend(weekday);
dayjs.locale('zh-cn');

export default {
  components: { elTooltipCopy },
  name: 'TicketPage',
  data () {
    return {
@@ -542,7 +555,7 @@
        { label: '已通过', value: '3' },
      ],
      //周期
      cycles: ['周一', '周二', '周三', '周四', '周五', '周六', '周末', '周天', '工作日', '每天'],
      cycles: ['每天', '周一', '周二', '周三', '周四', '周五', '周六', '周末', '周天', '工作日'],

      tableData: [],
      option: {
@@ -573,19 +586,54 @@
        calcHeight: 196,

        column: [
          { label: '工单编号', prop: 'job_info_num', width: 100, ellipsis: true, overHidden: true },
          { label: '工单名称', prop: 'name', width: 100, ellipsis: true, overHidden: true },
          { label: '工单状态', prop: 'status', width: 88 },
          { label: '所属单位', prop: 'dept_name', width: 100, ellipsis: true },
          { label: '发起时间', prop: 'create_time', width: 144, ellipsis: true },
          { label: '已执行次数', prop: 'job_num', width: 96, ellipsis: true },
          { label: '工单内容', prop: 'content', ellipsis: true, overHidden: true },
          { label: '关联航线', prop: 'wayline_name', width: 100, ellipsis: true, overHidden: true },
          { label: '关联算法', prop: 'ai_type_str', width: 100, ellipsis: true, overHidden: true },
          { label: '关联机巢', prop: 'device_names', width: 100, ellipsis: true, overHidden: true },
          {
            label: '工单编号', prop: 'job_info_num', width: 150,
          },
          {
            label: '工单名称', prop: 'name', width: 100, ellipsis: true, overHidden: true,
            showOverflowTooltip: true,
          },
          {
            label: '工单状态', prop: 'status', width: 88,
            showOverflowTooltip: true,
          },
          {
            label: '所属单位', prop: 'dept_name', ellipsis: true,
            showOverflowTooltip: true,
          },
          {
            label: '创建时间', prop: 'create_time', width: 144, ellipsis: true,
            showOverflowTooltip: true,
          },
          {
            label: '已执行次数', prop: 'job_num', width: 70, ellipsis: true,
            showOverflowTooltip: true,
          },
          {
            label: '工单内容', prop: 'content', ellipsis: true, overHidden: true,
            showOverflowTooltip: true,
          },
          {
            label: '关联航线', prop: 'wayline_name', ellipsis: true, overHidden: true,
            showOverflowTooltip: true,
          },
          {
            label: '关联算法', prop: 'ai_type_str', width: 100, ellipsis: true, overHidden: true,
            showOverflowTooltip: true,
          },
          {
            label: '关联机巢', prop: 'device_names', width: 100, ellipsis: true, overHidden: true,
            showOverflowTooltip: true,
          },

          { label: '创建人', prop: 'creator_name', width: 96, ellipsis: true, overHidden: true },
          { label: '关联机巢', prop: 'device_names', width: 112, ellipsis: true, overHidden: true },
          {
            label: '创建人', prop: 'creator_name', width: 96, ellipsis: true, overHidden: true,
            showOverflowTooltip: true,
          },
          // {
          //   label: '关联机巢', prop: 'device_names', width: 112, ellipsis: true, overHidden: true,
          //   showOverflowTooltip: true,
          // },
          {
            label: '工单周期频次',
            prop: '',
@@ -593,6 +641,7 @@
            formatter: row => this.formatCycleTime(row),
            html: true,
            ellipsis: true,
            showOverflowTooltip: true,
            // overHidden: true
          },
        ],
@@ -614,7 +663,6 @@
        ],
        file_id: [{ required: true, message: '需要选择航线', trigger: 'change' }],
        device_sns: [{ required: true, message: '请选择机巢', trigger: 'change' }],
        ai_types: [{ required: true, message: '请选择算法', trigger: 'change' }],
        content: [
          { required: true, message: '请输入工单内容', trigger: 'blur' },
          { max: 255, message: '工单内容不能超过255个字', trigger: 'blur' },
@@ -648,17 +696,24 @@
  mounted () {
    this.fetchTableData()
    const id = this.$route.query.id
    console.log('idddddd',id);

    if (id) {
      // 确保 id 存在
      this.handleViewDetail({ id })
      const find = this.$store.state.tags.bsTagList.find(i => i.path === '/tickets/orderLog')
        find && (find.query = {})
    } else {
      console.error('工单ID不存在！')

    }
  },
  computed: {
    ...mapGetters(['userInfo', 'permission']),
    filteredTabs () {
      // rejection_and_draft 权限控制“已驳回”和“草稿”tab
      // console.log(this.permission, '权限信息')
      // console.log(this.userInfo, '权限信息22')
      const canShowRejectAndDraft = this.permission?.rejection_and_draft === true
      return this.tabs
        .map(tab => {
@@ -675,6 +730,32 @@
  },

  methods: {
    handleCellClick(row, column) {
      if (column.no === 1) {
        navigator.clipboard.writeText(row.job_info_num).then(() => {
          this.$message.success('复制工单编号成功')
        })
      } else if (column.no === 2) {
        navigator.clipboard.writeText(row.name).then(() => {
          this.$message.success('复制工单名称成功')
        })
      } else if (column.no === 4) {
        navigator.clipboard.writeText(row.dept_name).then(() => {
          this.$message.success('复制所属单位成功')
        })
      } else if (column.no === 8) {
        navigator.clipboard.writeText(row.wayline_name).then(() => {
          this.$message.success('复制关联航线成功')
        })
      } else if (column.no === 9) {
        navigator.clipboard.writeText(row.ai_type_str).then(() => {
          this.$message.success('复制关联算法成功')
        })
      }
    },
    disabledDate (time) {
      return time.getTime() < Date.now() - 8.64e7 // 86400000 = 24 * 60 * 60 * 1000
    },
    searchChange (params, done) {
      // console.log('searchChange')
      this.query = params
@@ -793,11 +874,43 @@
          this.form.begin_time = this.formatDate(dateRange[0])
          this.form.end_time = this.formatDate(dateRange[1])

          // 如果选中日期包含当前天，那么选中的时间点不能小于当前时间
          if (this.form.deal_time) {
            const selectedDate = dayjs(this.form.date_range[0]).format('YYYY-MM-DD')
            const selectedTime = dayjs(selectedDate + ' ' + this.form.deal_time).toDate()
            const now = new Date()

            if (selectedDate === dayjs().format('YYYY-MM-DD') && selectedTime < now) {
              return this.$message.warning('任务时间不能小于当前时间')
            }
          }

          const submitData = {
            ...this.form,

            status: status,
            ai_types: this.form.ai_types?.length ? this.form.ai_types : [],
          }
          // 判断该值this.form.date_range[0] 周几 和rep_fre_type 是不是相等
          // if (this.form.deal_time) {
          //    const weekday = dayjs(this.form.date_range[0]).format('dddd');
          //    console.log('444', weekday)
          //   //  form.rep_fre_type
          //   const now = new Date()
          //   const today = now.toDateString()
          //   const selectedDate = new Date(this.form.date_range[0]).toDateString()

          //   if (today === selectedDate) {
          //     const [hours, minutes] = this.form.deal_time.split(':')
          //     const selectedTime = new Date()
          //     selectedTime.setHours(parseInt(hours), parseInt(minutes))

          //     if (selectedTime < now) {
          //       return this.$message.warning('任务时间不能小于当前时间')

          //     }
          //   }
          // }

          await saveUpdateOrderLog(submitData)
          let id = this.form.id
          if (id) {
@@ -823,7 +936,8 @@
        this.form = {
          ...response.data.data,
        }
        this.detailVisible = true
        // this.detailVisible = true
        this.handleViewDetail(data)
      })
    },
    formatDate (date) {
@@ -858,6 +972,15 @@
    handleTabChange (tab) {
      this.activeTab = tab.props?.name || tab.name
      this.filters.status = ''
      if (tab.props?.name === 'WAIT_AUDIT') {
        this.filters.status = '1'
      } else if (tab.props?.name === 'REJECTED') {
        this.filters.status = '2'
      } else if (tab.props?.name === 'PASS') {
        this.filters.status = '3'
      } else if (tab.props?.name === 'DRAFT') {
        this.filters.status = '0'
      }
      this.page.currentPage = 1
      this.fetchTableData()
    },
@@ -941,12 +1064,11 @@
      this.device_sns = data.device_list
      this.permission &&
        (this.permission.order_log_review || this.permission.order_log_recall) &&
        (data.status == 1 || data.status == 3 || data.status == 2)
        (data.status == 1 || data.status == 3 || (data.status == 2 && this.userInfo.user_id !== this.form.create_user))
        ? (this.detailTitle = '工单详情')
        : (this.detailTitle = '编辑工单')

      this.detailVisible = true

      // 更新航线列表，追加 wayline_file_region_vo 数据
      if (data.wayline_file_region_vo) {
        const newWayline = data.wayline_file_region_vo
@@ -962,6 +1084,9 @@
      }

      this.initMapLine(data.device_map_infos)
            const find = this.$store.state.tags.bsTagList.find(i => i.path === '/tickets/orderLog')
        find && (find.query = {})

    },
    async handleCheckDetail (row) {
      const response = await orderLogDetails(row.id)
@@ -1082,6 +1207,8 @@
    async getFlyingNestBy (waylineId) {
      const that = this

       // 先清空
      that.form.device_sns = []
      that.device_sns = []

      this.initMapLine({}, async (polygon) => {
@@ -1089,11 +1216,12 @@

        //按照航线来
        const params = {
          type: currentLine.wayline_type,
          type: [2, 4, 5].includes(currentLine.wayline_type) ? 2 : 0,
          wayline_id: waylineId,
          polygon
        }
        var wayLineListResponse = await getFlyingNestBy(params)
        // 再赋值
        that.device_sns = wayLineListResponse.data.data
      })
    },
@@ -1120,6 +1248,12 @@
      let data = response.data.data
      this.$message.success('审核通过')
      this.detailVisibleCopy = false

      this.detailVisible = false

      this.page.currentPage = 1
      this.onLoad(this.page, this.query)
      // this.handleViewDetail()
    },
    /**
     * 驳回
@@ -1131,8 +1265,13 @@
      }).then(async ({ value }) => {
        let response = await orderLogReject(id, value)
        let data = response.data.data
        this.$message.success('驳回成果')
        this.$message.success('驳回成功')
        this.detailVisibleCopy = false

        // this.detailVisible = false

        this.page.currentPage = 1
        this.onLoad(this.page, this.query)
      })
    },
  },
@@ -1232,6 +1371,10 @@
  width: 100%; // 确保所有输入框和选择框宽度一致
}

:deep(.el-textarea__inner) {
  resize: none;
}

.action-bar {
  margin-bottom: 16px;
}
@@ -1244,7 +1387,7 @@

.el-dialog {
  .el-form-item {
    margin-bottom: 20px;
    margin-bottom: 10px;
  }
}

@@ -1330,12 +1473,9 @@

    &> ::v-deep(.el-button) {
      flex: 1;
      max-width: 44px;
      margin-left: 0;
      margin-right: 10px;

      &:nth-child(4n) {
        margin-left: 0;
      }
    }
  }
}