From 0082fa417fb2af9add3406bf05ab3e3e45890c34 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 12 Jun 2025 14:30:02 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage
---
src/views/tickets/orderLog.vue | 995 ++++++++++++++++++++++------------------------------------
1 files changed, 382 insertions(+), 613 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 38f11de..782f5e5 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -11,102 +11,59 @@
<template>
<basic-container>
<el-tabs v-model="activeTab" @tab-click="handleTabChange">
- <el-tab-pane
- v-for="tab in filteredTabs"
- :key="tab.name"
- :label="`${tab.label} (${tab.count})`"
- :name="tab.name"
- >
+ <el-tab-pane v-for="tab in filteredTabs" :key="tab.name" :label="`${tab.label} (${tab.count})`" :name="tab.name">
<div class="tab-content">
<!-- 查询条件筛选栏 -->
<div class="filter-bar">
<div class="search-bar-box">
<div class="search-bar-box-item">
- <el-input
- v-model="filters.key_word"
- placeholder="输入工单编号/名称/内容/姓名"
- clearable
- @keyup.enter="handleSearch"
- />
+ <el-input v-model="filters.key_word" placeholder="输入工单编号/名称/内容/姓名" clearable
+ @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-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="至"
- start-placeholder="开始日期"
- end-placeholder="结束日期"
- :default-value="datePickerDefaultVal"
- />
+ <el-date-picker 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-option
- v-for="item in wayLineList"
- :key="item.wayline_id"
- :label="item.name"
- :value="item.wayline_id"
- />
+ <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-option
- v-for="item in ai_types"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
+ <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">
<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-option v-for="item in types" :key="item.dictValue" :label="item.dictValue"
+ :value="item.dictKey" />
</el-select>
</div>
<div class="search-bar-box-item">
<el-select v-model="filters.status" placeholder="请选择工单状态" clearable>
- <el-option
- v-for="item in statuses"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
+ <el-option v-for="item in statuses" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
</div>
<div class="search-bar-box">
<div class="search-bar-box-item flex-2">
- <el-date-picker
- v-model="filters.cycleDateRange"
- type="daterange"
- range-separator="至"
- start-placeholder="工单周期开始日期"
- end-placeholder="工单周期结束日期"
- :default-value="datePickerDefaultVal"
- />
+ <el-date-picker v-model="filters.cycleDateRange" type="daterange" range-separator="至"
+ start-placeholder="工单周期开始日期" end-placeholder="工单周期结束日期" :default-value="datePickerDefaultVal" />
</div>
<div class="search-bar-box-item">
@@ -116,103 +73,60 @@
</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 v-model="filters.deal_time" placeholder="请选择执行时间" prop="deal_time" value-format="HH:mm"
:picker-options="{
selectableRange: '00:00 - 23:59',
- }"
- />
+ }" />
</div>
<div class="search-bar-box-item"></div>
<div class="search-bar-box-item"></div>
<div class="search-bar-box-item search-btn">
- <el-button type="primary" icon="el-icon-search" @click="handleSearch"
- >搜索</el-button
- >
+ <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
<el-button icon="el-icon-refresh" @click="handleReset">清空</el-button>
</div>
</div>
</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"
- >
+ <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">
<template #menu-left>
- <el-button
- v-if="hasAddBtnPermission() && activeTab != 'WAIT_AUDIT'"
- type="primary"
- icon="el-icon-plus"
- @click="handleAdd"
- >新建工单</el-button
- >
- <el-button type="success" plain icon="el-icon-download" @click="exportData"
- >导出</el-button
- >
+ <el-button v-if="hasAddBtnPermission() && activeTab != 'WAIT_AUDIT'" type="primary" icon="el-icon-plus"
+ @click="handleAdd">新建工单</el-button>
+ <el-button type="success" plain icon="el-icon-download" @click="exportData">导出</el-button>
</template>
<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>
- <template
- v-if="
+ <!-- v-if="
(userInfo.user_id == row.create_user || hasRecallPaddingBtnPermission()) &&
row.status == 1
- "
- >
+ " -->
+ <template v-if="row.status == 1">
<!--待审核状态-->
- <el-button type="text" icon="el-icon-warning" @click="orderLogRecall(row.id)"
- >撤回</el-button
- >
+ <el-button type="text" icon="el-icon-warning" @click="orderLogRecall(row.id)">撤回</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 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>
</template>
<!-- 已通过 -->
<template v-if="row.status == 3">
- <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 == 0">
- <el-button type="text" icon="el-icon-edit" @click="handleViewDetail(row)"
- >编辑</el-button
- >
- <el-button type="text" icon="el-icon-position" @click="userPublishPush(row.id)"
- >发布</el-button
- >
- <el-button type="text" icon="el-icon-delete" @click="deleteOrderLog(row.id)"
- >删除</el-button
- >
+ <el-button type="text" icon="el-icon-edit" @click="handleViewDetail(row)">编辑</el-button>
+ <el-button type="text" icon="el-icon-position" @click="userPublishPush(row.id)">发布</el-button>
+ <el-button type="text" icon="el-icon-delete" @click="deleteOrderLog(row.id)">删除</el-button>
</template>
</div>
</template>
@@ -230,34 +144,19 @@
</el-tabs>
<!-- 新建工单对话框 -->
- <el-dialog
- v-model="dialogVisible"
- title="新建工单"
- width="70%"
- :close-on-click-modal="false"
- @close="resetForm"
- >
+ <el-dialog v-model="dialogVisible" title="新建工单" width="70%" :close-on-click-modal="false" @close="resetForm">
<el-form :model="form" :rules="rules" ref="testform" label-width="100px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="工单名称" prop="name">
- <el-input
- v-model="form.name"
- placeholder="请输入工单名称"
- maxlength="100"
- show-word-limit
- ></el-input>
+ <el-input v-model="form.name" placeholder="请输入工单名称" maxlength="100" show-word-limit></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-option
- v-for="item in wayLineList"
- :key="item.wayline_id"
- :label="item.name"
- :value="item.wayline_id"
- />
+ <el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
+ :value="item.wayline_id" />
</el-select>
</el-form-item>
</el-col>
@@ -266,24 +165,15 @@
<el-col :span="12">
<el-form-item label="关联机巢" prop="device_sns">
<el-select v-model="form.device_sns" placeholder="请选择机巢" multiple>
- <el-option
- v-for="item in device_sns"
- :key="item.device_sn"
- :label="item.nickname"
- :value="item.device_sn"
- />
+ <el-option v-for="item in device_sns" :key="item.device_sn" :label="item.nickname"
+ :value="item.device_sn" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="关联算法" prop="ai_types">
<el-select v-model="form.ai_types" placeholder="请选择关联算法" multiple>
- <el-option
- v-for="item in ai_types"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
+ <el-option v-for="item in ai_types" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
</el-select>
</el-form-item>
</el-col>
@@ -292,26 +182,15 @@
<el-row :gutter="20">
<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>
+ <el-input type="textarea" v-model="form.content" rows="4" placeholder="请输入工单内容" maxlength="255"
+ show-word-limit></el-input>
</el-form-item>
</el-col>
<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="结束日期"
- />
+ <el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
+ end-placeholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="4">
@@ -322,15 +201,10 @@
</el-select>
</div>
<div class="flex-1">
- <el-time-picker
- style="width: 100px"
- v-model="form.deal_time"
- prop="deal_time"
- value-format="HH:mm"
+ <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',
- }"
- />
+ }" />
</div>
</div>
</el-col>
@@ -352,24 +226,15 @@
</el-dialog>
<!-- 工单详情对话框 -->
- <el-dialog
- v-model="detailVisible"
- :title="detailTitle"
- width="70%"
- :close-on-click-modal="false"
- @close="resetForm"
- >
+ <el-dialog 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">
<div class="custom-steps-container">
<!-- 标题行 -->
<div class="steps-titles">
- <div
- v-for="(record, index) in form.record_list"
- :class="{ active: record.user_id >= 0 }"
- :key="index"
- class="step-title"
- >
+ <div v-for="(record, index) in form.record_list" :class="{ active: record.user_id >= 0 }" :key="index"
+ class="step-title">
{{ record.status_str }}
</div>
</div>
@@ -381,18 +246,7 @@
<span class="step-description" style="position: relative; display: inline-block">
{{ record.user_name }}
</span>
- <span
- style="
- position: absolute;
- left: 80%;
- top: 50%;
- transform: translateY(-50%);
- width: 100px;
- margin-left: 4px;
- color: #666;
- font-size: 12px;
- "
- >
+ <span class="step-timer ">
{{ record.interval_time_str }}
</span>
<div class="step-description">
@@ -412,12 +266,8 @@
<el-col :span="12">
<el-form-item label="关联航线" prop="file_id">
<el-select v-model="form.file_id" placeholder="请选择航线" @change="getFlyingNestBy">
- <el-option
- v-for="item in wayLineList"
- :key="item.wayline_id"
- :label="item.name"
- :value="item.wayline_id"
- />
+ <el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
+ :value="item.wayline_id" />
</el-select>
</el-form-item>
</el-col>
@@ -426,24 +276,15 @@
<el-col :span="12">
<el-form-item label="关联机巢" prop="device_sns">
<el-select v-model="form.device_sns" placeholder="请选择机巢" multiple>
- <el-option
- v-for="item in device_sns"
- :key="item.device_sn"
- :label="item.nickname"
- :value="item.device_sn"
- />
+ <el-option v-for="item in device_sns" :key="item.device_sn" :label="item.nickname"
+ :value="item.device_sn" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="关联算法" prop="ai_types">
<el-select v-model="form.ai_types" placeholder="请选择关联算法" multiple>
- <el-option
- v-for="item in ai_types"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
+ <el-option v-for="item in ai_types" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
</el-select>
</el-form-item>
</el-col>
@@ -458,13 +299,8 @@
<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="结束日期"
- />
+ <el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
+ end-placeholder="结束日期" />
</el-form-item>
</el-col>
@@ -475,29 +311,18 @@
</el-col>
<el-col :span="3">
- <el-time-picker
- style="width: 100px"
- v-model="form.deal_time"
- prop="deal_time"
- value-format="HH:mm"
+ <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',
- }"
- />
+ }" />
</el-col>
</el-row>
<el-row :gutter="20">
<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>
+ <el-input type="textarea" v-model="form.content" rows="4" placeholder="请输入工单内容" maxlength="255"
+ show-word-limit></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -510,51 +335,30 @@
<el-row>
<div class="add-box-btns">
- <el-button
- type="danger"
+ <el-button type="danger"
v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
- @click="submitForm(1)"
- >发布</el-button
- >
+ @click="submitForm(1)">发布</el-button>
<!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
@click="submitForm(0)">保存</el-button> -->
- <el-button
- type="primary"
- v-if="form.status == 1 && this.permission.orderLogpass"
- @click="orderLogPass(form.id)"
- >通过</el-button
- >
- <el-button
- type="danger"
- v-if="form.status == 1 && hasRejectionBtnPermission()"
- @click="orderLogReject(form.id)"
- >驳回</el-button
- >
+ <el-button type="primary" v-if="form.status == 1 && this.permission.orderLogpass"
+ @click="orderLogPass(form.id)">通过</el-button>
+ <el-button type="danger" v-if="form.status == 1 && hasRejectionBtnPermission()"
+ @click="orderLogReject(form.id)">驳回</el-button>
</div>
</el-row>
</el-form>
</el-dialog>
<!-- 工单详情 -->
- <el-dialog
- v-model="detailVisibleCopy"
- title="工单详情"
- width="70%"
- :close-on-click-modal="false"
- @close="resetForm"
- >
+ <el-dialog 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
- v-for="(record, index) in form.record_list"
- :class="{ active: record.user_id >= 0 }"
- :key="index"
- class="step-title"
- >
+ <div v-for="(record, index) in form.record_list" :class="{ active: record.user_id >= 0 }" :key="index"
+ class="step-title">
{{ record.status_str }}
</div>
</div>
@@ -566,18 +370,7 @@
<span class="step-description" style="position: relative; display: inline-block">
{{ record.user_name }}
</span>
- <span
- style="
- position: absolute;
- left: 80%;
- top: 50%;
- transform: translateY(-50%);
- width: 100px;
- margin-left: 4px;
- color: #666;
- font-size: 12px;
- "
- >
+ <span class="step-timer ">
{{ record.interval_time_str }}
</span>
<div class="step-description">
@@ -591,22 +384,14 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="工单名称" prop="name">
- <el-input
- v-model="form.name"
- placeholder="请输入工单名称"
- :disabled="true"
- ></el-input>
+ <el-input v-model="form.name" placeholder="请输入工单名称" :disabled="true"></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="请选择航线" :disabled="true">
- <el-option
- v-for="item in wayLineList"
- :key="item.wayline_id"
- :label="item.name"
- :value="item.wayline_id"
- />
+ <el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
+ :value="item.wayline_id" />
</el-select>
</el-form-item>
</el-col>
@@ -615,35 +400,16 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="关联机巢" prop="device_sns">
- <el-select
- v-model="form.device_sns"
- placeholder="请选择机巢"
- multiple
- :disabled="true"
- >
- <el-option
- v-for="item in device_sns"
- :key="item.device_sn"
- :label="item.nickname"
- :value="item.device_sn"
- />
+ <el-select v-model="form.device_sns" placeholder="请选择机巢" multiple :disabled="true">
+ <el-option v-for="item in device_sns" :key="item.device_sn" :label="item.nickname"
+ :value="item.device_sn" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="关联算法" prop="ai_types">
- <el-select
- v-model="form.ai_types"
- placeholder="请选择关联算法"
- multiple
- :disabled="true"
- >
- <el-option
- v-for="item in ai_types"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
+ <el-select v-model="form.ai_types" placeholder="请选择关联算法" multiple :disabled="true">
+ <el-option v-for="item in ai_types" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
</el-select>
</el-form-item>
</el-col>
@@ -658,14 +424,8 @@
<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="结束日期"
- :disabled="true"
- />
+ <el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
+ end-placeholder="结束日期" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="3">
@@ -675,32 +435,18 @@
</el-col>
<el-col :span="3">
- <el-time-picker
- style="width: 100px"
- v-model="form.deal_time"
- prop="deal_time"
- :disabled="true"
- value-format="HH:mm"
- :picker-options="{
+ <el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" :disabled="true"
+ value-format="HH:mm" :picker-options="{
selectableRange: '00:00 - 23:59',
- }"
- />
+ }" />
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="工单内容" prop="content">
- <el-input
- type="textarea"
- v-model="form.content"
- rows="2"
- placeholder="请输入工单内容"
- maxlength="255"
- show-word-limit
- :readonly="true"
- :disabled="true"
- ></el-input>
+ <el-input type="textarea" v-model="form.content" rows="2" placeholder="请输入工单内容" maxlength="255"
+ show-word-limit :readonly="true" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -713,27 +459,16 @@
<el-row>
<div class="add-box-btns">
- <el-button
- type="danger"
+ <el-button type="danger"
v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
- @click="submitForm(1)"
- >发布</el-button
- >
+ @click="submitForm(1)">发布</el-button>
<!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
@click="submitForm(0)">保存</el-button> -->
- <el-button
- type="primary"
- v-if="form.status == 1 && this.permission.orderLogpass"
- @click="orderLogPass(form.id)"
- >通过</el-button
- >
- <el-button
- type="danger"
- v-if="form.status == 1 && hasRejectionBtnPermission()"
- @click="orderLogReject(form.id)"
- >驳回</el-button
- >
+ <el-button type="primary" v-if="form.status == 1 && this.permission.orderLogpass"
+ @click="orderLogPass(form.id)">通过</el-button>
+ <el-button type="danger" v-if="form.status == 1 && hasRejectionBtnPermission()"
+ @click="orderLogReject(form.id)">驳回</el-button>
<el-button @click="detailVisibleCopy = false">取消</el-button>
</div>
</el-row>
@@ -743,7 +478,7 @@
</template>
<script>
-import { calculateDefaultRange } from '@/utils/util';
+import { calculateDefaultRange } from '@/utils/util'
import {
getList,
saveUpdateOrderLog,
@@ -755,21 +490,21 @@
jobStatusNum,
userPublish,
deleteOrderLog,
-} from '@/api/tickets/orderLog';
-import { getTicketInfo } from '@/api/tickets/ticket';
-import { getDictionaryByCode } from '@/api/system/dictbiz';
-import { getWaylineFileListByArea } from '@/api/resource/wayline';
-import { export_json_to_excel } from '@/utils/exportExcel';
-import { getFlyingNestBy } from '@/api/device/device';
-import { mapGetters } from 'vuex';
-import NProgress from 'nprogress';
-import { downloadXls } from '@/utils/util';
-import 'nprogress/nprogress.css';
-import { analyzeKmzFile, removeTextKey, XMLToJSON } from '@/utils/cesium/kmz';
+} from '@/api/tickets/orderLog'
+import { getTicketInfo } from '@/api/tickets/ticket'
+import { getDictionaryByCode } from '@/api/system/dictbiz'
+import { getWaylineFileListByArea } from '@/api/resource/wayline'
+import { export_json_to_excel } from '@/utils/exportExcel'
+import { getFlyingNestBy } from '@/api/device/device'
+import { mapGetters } from 'vuex'
+import NProgress from 'nprogress'
+import { downloadXls } from '@/utils/util'
+import 'nprogress/nprogress.css'
+import { analyzeKmzFile, removeTextKey, XMLToJSON } from '@/utils/cesium/kmz'
export default {
name: 'TicketPage',
- data() {
+ data () {
return {
activeTab: 'all',
@@ -888,121 +623,121 @@
// 配置时间选择器默认配置
datePickerDefaultVal: calculateDefaultRange(),
- };
+ }
},
- async created() {
- var response = await getDictionaryByCode('SF');
- var word_order_typeResponse = await getDictionaryByCode('WORK_ORDER_TYPE');
- this.ai_types = response.data.data['SF'];
- this.types = word_order_typeResponse.data.data['WORK_ORDER_TYPE'];
+ async created () {
+ var response = await getDictionaryByCode('SF')
+ var word_order_typeResponse = await getDictionaryByCode('WORK_ORDER_TYPE')
+ this.ai_types = response.data.data['SF']
+ this.types = word_order_typeResponse.data.data['WORK_ORDER_TYPE']
//获取航线
- this.asyncgetWaylineFileListByArea();
- const response2 = await getTicketInfo();
- const { dept_data, event_type, ai_type } = response2.data.data;
+ this.asyncgetWaylineFileListByArea()
+ const response2 = await getTicketInfo()
+ const { dept_data, event_type, ai_type } = response2.data.data
this.departments = dept_data.map(item => ({
label: item.dept_name,
value: item.id,
- }));
+ }))
},
- mounted() {
- this.fetchTableData();
- const id = this.$route.query.id;
+ mounted () {
+ this.fetchTableData()
+ const id = this.$route.query.id
if (id) {
// 确保 id 存在
- this.handleViewDetail({ id });
+ this.handleViewDetail({ id })
} else {
- console.error('工单ID不存在！');
+ console.error('工单ID不存在！')
}
},
computed: {
...mapGetters(['userInfo', 'permission']),
- filteredTabs() {
+ filteredTabs () {
// rejection_and_draft 权限控制“已驳回”和“草稿”tab
- const canShowRejectAndDraft = this.permission?.rejection_and_draft === true;
+ const canShowRejectAndDraft = this.permission?.rejection_and_draft === true
return this.tabs
.map(tab => {
if (tab.name === 'DRAFT') {
- return { ...tab, isShow: canShowRejectAndDraft };
+ return { ...tab, isShow: canShowRejectAndDraft }
}
if (tab.name === 'REJECTED') {
- return { ...tab, isShow: canShowRejectAndDraft };
+ return { ...tab, isShow: canShowRejectAndDraft }
}
- return { ...tab, isShow: true };
+ return { ...tab, isShow: true }
})
- .filter(tab => tab.isShow);
+ .filter(tab => tab.isShow)
},
},
methods: {
- searchChange(params, done) {
+ searchChange (params, done) {
// console.log('searchChange')
- this.query = params;
- this.parentId = '';
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
+ this.query = params
+ this.parentId = ''
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
},
- async onLoad(page, params = {}) {
- this.loading = true;
+ async onLoad (page, params = {}) {
+ this.loading = true
getList(
null,
this.page.currentPage,
this.page.pageSize,
Object.assign(params, this.query)
).then(res => {
- this.tableData = res.data.data;
- this.loading = false;
- this.selectionClear();
- });
+ this.tableData = res.data.data
+ this.loading = false
+ this.selectionClear()
+ })
},
- selectionClear() {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
+ selectionClear () {
+ this.selectionList = []
+ this.$refs.crud.toggleSelection()
},
- async loadAMapScripts() {
+ async loadAMapScripts () {
try {
// await loadAMap();
// await loadAMapUI();
- this.mapLoaded = true;
+ this.mapLoaded = true
} catch (error) {
- console.error('Failed to load AMap scripts:', error);
- this.$message.error('地图加载失败，请检查网络或API Key配置');
+ console.error('Failed to load AMap scripts:', error)
+ this.$message.error('地图加载失败，请检查网络或API Key配置')
}
},
- formatCycleTime(row) {
- return `${row.cycle_time_value}`;
+ formatCycleTime (row) {
+ return `${row.cycle_time_value}`
},
- async fetchTableData() {
- this.loading = true;
+ async fetchTableData () {
+ this.loading = true
try {
- let params = this.getQueryParam();
+ let params = this.getQueryParam()
// console.log('发送的参数:', params)
- const response = await getList(params, this.page.currentPage, this.page.pageSize);
+ const response = await getList(params, this.page.currentPage, this.page.pageSize)
if (!response?.data?.data?.records) {
- throw new Error('接口返回数据格式不正确');
+ throw new Error('接口返回数据格式不正确')
}
- const { total, records } = response.data.data;
+ const { total, records } = response.data.data
this.tableData = records.map(item => {
- return item;
- });
+ return item
+ })
// console.log('权限检查:', this.permission)
- this.page.total = total || 0;
- this.updateGlobalCounts();
+ this.page.total = total || 0
+ this.updateGlobalCounts()
} catch (error) {
// console.error('获取数据失败:', error)
- this.$message.error(error.message || '获取数据失败');
- this.tableData = [];
- this.page.total = 0;
+ this.$message.error(error.message || '获取数据失败')
+ this.tableData = []
+ this.page.total = 0
} finally {
- this.loading = false;
+ this.loading = false
}
},
- getQueryParam() {
- const currentTab = this.tabs.find(tab => tab.name === this.activeTab);
+ getQueryParam () {
+ const currentTab = this.tabs.find(tab => tab.name === this.activeTab)
if (this.filters.dateRange) {
// console.log(
// 'this.formatDate(this.filters.dateRange[0])',
@@ -1037,43 +772,43 @@
deal_time: this.filters.deal_time || undefined,
current: this.page.currentPage,
size: this.page.pageSize,
- };
- return params;
+ }
+ return params
},
- sizeChange(pageSize) {
- this.page.pageSize = pageSize;
+ sizeChange (pageSize) {
+ this.page.pageSize = pageSize
},
- async submitForm(status) {
+ async submitForm (status) {
this.$refs.testform.validate(async valid => {
if (valid) {
- let dateRange = this.form.date_range;
+ let dateRange = this.form.date_range
// console.log('dateRange' + dateRange)
- this.form.begin_time = this.formatDate(dateRange[0]);
- this.form.end_time = this.formatDate(dateRange[1]);
+ this.form.begin_time = this.formatDate(dateRange[0])
+ this.form.end_time = this.formatDate(dateRange[1])
const submitData = {
...this.form,
status: status,
- };
- await saveUpdateOrderLog(submitData);
- let id = this.form.id;
- if (id) {
- this.$message.success('工单发布成功');
- } else {
- this.$message.success('工单创建成功');
}
- this.dialogVisible = false;
+ await saveUpdateOrderLog(submitData)
+ let id = this.form.id
+ if (id) {
+ this.$message.success('工单发布成功')
+ } else {
+ this.$message.success('工单创建成功')
+ }
+ this.dialogVisible = false
this.detailVisible = false;
- (this.device_sns = []), (this.wayLineList = []), this.fetchTableData();
+ (this.device_sns = []), (this.wayLineList = []), this.fetchTableData()
}
- });
+ })
},
//驳回原因显示
- async rejectDetail(id) {
- const response = await orderLogDetails(id);
- let data = response.data.data;
+ async rejectDetail (id) {
+ const response = await orderLogDetails(id)
+ let data = response.data.data
this.$confirm(data.remark, '驳回原因', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -1081,93 +816,93 @@
}).then(() => {
this.form = {
...response.data.data,
- };
- this.detailVisible = true;
- });
+ }
+ this.detailVisible = true
+ })
},
- formatDate(date) {
- if (!date) return undefined;
- const d = new Date(date);
+ formatDate (date) {
+ if (!date) return undefined
+ const d = new Date(date)
return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(
d.getDate()
- ).padStart(2, '0')} 00:00:00`;
+ ).padStart(2, '0')} 00:00:00`
},
- mapStatus(status) {
+ mapStatus (status) {
const statusTextMap = {
0: '草稿',
1: '待审核',
2: '已驳回',
3: '已通过',
- };
- return statusTextMap[status] || '未知状态';
+ }
+ return statusTextMap[status] || '未知状态'
},
- getStatusTagType(status) {
+ getStatusTagType (status) {
const statusMap = {
1: 'warning',
2: 'info',
3: 'primary',
4: 'success',
5: 'danger',
- };
- return statusMap[status] || 'info';
+ }
+ return statusMap[status] || 'info'
},
- handleTabChange(tab) {
- this.activeTab = tab.props?.name || tab.name;
- this.filters.status = '';
- this.page.currentPage = 1;
- this.fetchTableData();
+ handleTabChange (tab) {
+ this.activeTab = tab.props?.name || tab.name
+ this.filters.status = ''
+ this.page.currentPage = 1
+ this.fetchTableData()
},
- handleSearch() {
- this.page.currentPage = 1;
- this.fetchTableData();
+ handleSearch () {
+ this.page.currentPage = 1
+ this.fetchTableData()
},
- handleReset() {
+ handleReset () {
this.filters = {
keyword: '',
department: '',
type: '',
dateRange: [],
status: '',
- };
- this.page.currentPage = 1;
- this.fetchTableData();
+ }
+ this.page.currentPage = 1
+ this.fetchTableData()
},
- currentChange(currentPage) {
- this.page.currentPage = currentPage;
+ currentChange (currentPage) {
+ this.page.currentPage = currentPage
},
- async updateGlobalCounts() {
+ async updateGlobalCounts () {
const counts = {
all: 0,
DRAFT: 0,
WAIT_AUDIT: 0,
REJECTED: 0,
PASS: 0,
- };
- var reponse = await jobStatusNum();
+ }
+ var reponse = await jobStatusNum()
// console.log('统计' + reponse.data.data)
reponse.data.data.forEach(item => {
- const tab = this.tabs.find(t => t.name === item.dict_key);
+ const tab = this.tabs.find(t => t.name === item.dict_key)
if (tab) {
- tab.count = item.num;
+ tab.count = item.num
}
- });
+ })
},
- handleAdd() {
- this.form = {};
- this.dialogVisible = true;
+ handleAdd () {
+ this.form = {}
+ this.dialogVisible = true
//航线列表
- this.asyncgetWaylineFileListByArea();
+ this.asyncgetWaylineFileListByArea()
},
- resetForm() {
+ resetForm () {
this.form = {
name: '',
type: '',
@@ -1177,227 +912,260 @@
address: '',
content: '',
photos: [],
- };
+ }
if (this.$refs.testform) {
- this.$refs.testform.resetFields();
+ this.$refs.testform.resetFields()
}
},
- formatLocation(location) {
+ formatLocation (location) {
if (!Array.isArray(location)) {
- return '未知位置';
+ return '未知位置'
}
- return `${location[0].toFixed(6)}, ${location[1].toFixed(6)}`;
+ return `${location[0].toFixed(6)}, ${location[1].toFixed(6)}`
},
- async handleViewDetail(row) {
- const response = await orderLogDetails(row.id);
- const data = response.data.data;
+ async handleViewDetail (row) {
+ const response = await orderLogDetails(row.id)
+ const data = response.data.data
this.form = {
...data,
- };
+ }
// 更新机巢列表
- this.device_sns = data.device_list;
+ 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)
+ (this.permission.order_log_review || this.permission.order_log_recall) &&
+ (data.status == 1 || data.status == 3 || data.status == 2)
? (this.detailTitle = '工单详情')
- : (this.detailTitle = '编辑工单');
+ : (this.detailTitle = '编辑工单')
- this.detailVisible = true;
+ this.detailVisible = true
- this.initMapLine(data.device_map_infos);
+ // 更新航线列表，追加 wayline_file_region_vo 数据
+ if (data.wayline_file_region_vo) {
+ const newWayline = data.wayline_file_region_vo
+
+ // 检查是否已经存在于 this.wayLineList 中
+ const isDuplicate = this.wayLineList.some(
+ (item) => item.wayline_id === newWayline.wayline_id
+ )
+
+ if (!isDuplicate) {
+ this.wayLineList.push(newWayline)
+ }
+ }
+
+ this.initMapLine(data.device_map_infos)
},
- async handleCheckDetail(row) {
- const response = await orderLogDetails(row.id);
- const data = response.data.data;
+ async handleCheckDetail (row) {
+ const response = await orderLogDetails(row.id)
+ const data = response.data.data
this.form = {
...data,
- };
+ }
+ // 更新航线列表，追加 wayline_file_region_vo 数据
+ // 更新航线列表，追加 wayline_file_region_vo 数据
+ if (data.wayline_file_region_vo) {
+ const newWayline = data.wayline_file_region_vo
+ // 检查是否已经存在于 this.wayLineList 中
+ const isDuplicate = this.wayLineList.some(
+ (item) => item.wayline_id === newWayline.wayline_id
+ )
+
+ if (!isDuplicate) {
+ this.wayLineList.push(newWayline)
+ }
+ }
// 更新机巢列表
- this.device_sns = data.device_list;
- this.detailVisibleCopy = true;
- this.initMapLine(data.device_map_infos);
+ this.device_sns = data.device_list
+ this.detailVisibleCopy = true
+ this.initMapLine(data.device_map_infos)
},
//导出
- async exportData() {
+ async exportData () {
this.$confirm('是否智飞工单数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
- NProgress.start();
- let params = this.getQueryParam();
+ NProgress.start()
+ let params = this.getQueryParam()
orderLogExport(params).then(res => {
- downloadXls(res.data, `智飞工单${this.$dayjs().format('YYYY-MM-DD')}.xlsx`);
- NProgress.done();
- });
- });
+ downloadXls(res.data, `智飞工单${this.$dayjs().format('YYYY-MM-DD')}.xlsx`)
+ NProgress.done()
+ })
+ })
},
- hasAddBtnPermission() {
+ hasAddBtnPermission () {
// undefined 或 false 都返回 false，只有 true 返回 true
// console.log('this.permission.order_log_add :', this.permission.order_log_add)
- return this.permission && this.permission.order_log_add === true;
+ return this.permission && this.permission.order_log_add === true
},
- hasPaddingBtnPermission() {
+ hasPaddingBtnPermission () {
// undefined 或 false 都返回 false，只有 true 返回 true
// console.log('权限检查:', this.permission)
- return this.permission && this.permission.order_log_review === true;
+ return this.permission && this.permission.order_log_review === true
},
- hasRecallPaddingBtnPermission() {
+ hasRecallPaddingBtnPermission () {
// undefined 或 false 都返回 false，只有 true 返回 true
// console.log('权限检查:', this.permission)
// 智飞工单撤回
- return this.permission && this.permission.order_log_recall === true;
+ return this.permission && this.permission.order_log_recall === true
},
//驳回按钮权限
- hasRejectionBtnPermission() {
+ hasRejectionBtnPermission () {
// undefined 或 false 都返回 false，只有 true 返回 true
// console.log('权限检查:', this.permission)
- return this.permission && this.permission.rejection_btn === true;
+ return this.permission && this.permission.rejection_btn === true
},
//自己点发布
- userPublishPush(id) {
+ userPublishPush (id) {
this.$confirm('确定发布吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
- let response = userPublish(id);
- this.$message.success('发布成功');
- this.fetchTableData();
- });
+ let response = userPublish(id)
+ this.$message.success('发布成功')
+ this.fetchTableData()
+ })
},
//删除
- deleteOrderLog(id) {
+ deleteOrderLog (id) {
this.$confirm('确定删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
- let response = deleteOrderLog(id);
- this.$message.success('删除');
- this.fetchTableData();
- });
+ let response = deleteOrderLog(id)
+ this.$message.success('删除')
+ this.fetchTableData()
+ })
},
- refreshChange() {
- this.fetchTableData();
+ refreshChange () {
+ this.fetchTableData()
},
//获取航线列表
- async asyncgetWaylineFileListByArea(name) {
- var wayLineListResponse = await getWaylineFileListByArea(this.userInfo.detail.areaCode);
- this.wayLineList = wayLineListResponse.data.data;
+ async asyncgetWaylineFileListByArea (name) {
+ var wayLineListResponse = await getWaylineFileListByArea(this.userInfo.detail.areaCode)
+ this.wayLineList = wayLineListResponse.data.data
- this.initMapLine();
+ this.initMapLine()
},
- initMapLine(infos = {}) {
- let currentLine = this.wayLineList.find(item => item.wayline_id == this.form.file_id);
+ initMapLine (cb = () => { }) {
+ let currentLine = this.wayLineList.find(item => item.wayline_id == this.form.file_id)
- if (!currentLine) return;
+ if (!currentLine) return
- // 异步解析kmz文件
- const analysis = async url => {
- return new Promise(async resolve => {
- const res = await analyzeKmzFile(`${url}?_t=${new Date().getTime()}`);
- const templateXML = await res.fileInfoObj['wpmz/template.kml'];
- const templateXMLJSON = XMLToJSON(templateXML)?.['Document'];
- const templateXMLObj = removeTextKey(templateXMLJSON.Folder);
- resolve(templateXMLObj);
- });
- };
-
- const drawLine = async () => {
- let prexUrl = ref(import.meta.env.VITE_APP_AIRLINE_URL + currentLine.object_key);
- const res = await analysis(prexUrl.value);
- if (!res.Placemark.length) return;
- renderingLine(res);
- };
-
- const renderingLine = lineObj => {
- const positions = lineObj.Placemark.map(item => {
- return item.Point.coordinates.split(',');
- });
-
- if (JSON.stringify(infos) != '{}')
- positions.unshift([infos[0].longitude, infos[0].latitude]);
-
- this.$nextTick(() => {
- if (this.$refs.MapContainer && this.$refs.MapContainer.initAddEntity) {
- this.$refs.MapContainer.initAddEntity('polyline', positions);
- }
- });
- };
-
- drawLine();
+ this.$nextTick(() => {
+ if (this.$refs.MapContainer && this.$refs.MapContainer.initAddEntity) {
+ this.$refs.MapContainer.initAddEntity('polyline', {
+ url: `${import.meta.env.VITE_APP_AIRLINE_URL + currentLine.object_key}?_t=${new Date().getTime()}`,
+ type: currentLine.wayline_type,
+ cb
+ })
+ }
+ })
},
//可飞行机巢列表
- async getFlyingNestBy(waylineId) {
- this.initMapLine();
+ async getFlyingNestBy (waylineId) {
+ const that = this
- //按照航线来
- const params = {
- type: 0,
- wayline_id: waylineId,
- };
- var wayLineListResponse = await getFlyingNestBy(params);
- this.device_sns = wayLineListResponse.data.data;
+ that.device_sns = []
+
+ this.initMapLine(async (polygon) => {
+ const currentLine = that.wayLineList.find(item => item.wayline_id === waylineId)
+
+ //按照航线来
+ const params = {
+ type: currentLine.wayline_type,
+ wayline_id: waylineId,
+ polygon
+ }
+ var wayLineListResponse = await getFlyingNestBy(params)
+ that.device_sns = wayLineListResponse.data.data
+ })
},
//撤回
- async orderLogRecall(id) {
+ async orderLogRecall (id) {
this.$confirm('确定撤回则到草稿箱。', '是否撤回？', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(async () => {
- let reposne = await orderLogRecall(id);
- this.handleSearch();
- });
+ let reposne = await orderLogRecall(id)
+ this.handleSearch()
+ })
},
- onLoad() {
- this.fetchTableData();
+ onLoad () {
+ this.fetchTableData()
},
/**
* 通过
*/
- async orderLogPass(id) {
- let response = await orderLogPass(id);
- let data = response.data.data;
- this.$message.success('审核通过');
- this.detailVisibleCopy = false;
+ async orderLogPass (id) {
+ let response = await orderLogPass(id)
+ let data = response.data.data
+ this.$message.success('审核通过')
+ this.detailVisibleCopy = false
},
/**
* 驳回
*/
- async orderLogReject(id) {
+ async orderLogReject (id) {
this.$prompt('', '驳回原因', {
confirmButtonText: '确定',
cancelButtonText: '取消',
}).then(async ({ value }) => {
- let response = await orderLogReject(id, value);
- let data = response.data.data;
- this.$message.success('驳回成果');
- this.detailVisibleCopy = false;
- });
+ let response = await orderLogReject(id, value)
+ let data = response.data.data
+ this.$message.success('驳回成果')
+ this.detailVisibleCopy = false
+ })
},
},
watch: {
tableData: {
- handler() {
+ handler () {
// this.updateTabCounts()
},
deep: true,
},
},
-};
+}
</script>
-<style></style>
+
<style lang="scss" scoped>
+:deep() {
+ .avue-crud__body {
+ .el-form {
+ height: 625px;
+ overflow: auto;
+ }
+ }
+}
+
+:deep(.el-pagination .el-select) {
+ width: 128px !important;
+}
+
+.step-timer {
+ position: absolute;
+ left: 80%;
+ top: 50%;
+ transform: translateY(-50%);
+ width: 100px;
+ margin-left: 4px;
+ color: #666;
+ font-size: 12px;
+}
+
:deep(.el-textarea__inner) {
padding: 8px 12px;
}
@@ -1424,7 +1192,7 @@
&-item {
flex: 1;
- & > ::v-deep(.el-date-editor) {
+ &> ::v-deep(.el-date-editor) {
width: 100%;
box-sizing: border-box;
}
@@ -1557,9 +1325,10 @@
justify-content: center;
flex-wrap: wrap;
- & > ::v-deep(.el-button) {
+ &> ::v-deep(.el-button) {
flex: 1;
max-width: 44px;
+ margin-right: 10px;
&:nth-child(4n) {
margin-left: 0;
@@ -1581,7 +1350,7 @@
.flex-1 {
flex: 1;
- & > ::v-deep(div) {
+ &> ::v-deep(div) {
width: 100% !important;
}
}
--
Gitblit v1.9.3