From 02409bfbe15f22fc3b5dccadabfd860a660a49d9 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 11 Oct 2025 10:37:14 +0800
Subject: [PATCH] feat: 名称修改
---
src/views/tickets/orderLog.vue | 1593 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 1,268 insertions(+), 325 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 5657ad3..6e19478 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -2,107 +2,152 @@
<basic-container>
<el-tabs v-model="activeTab" @tab-click="handleTabChange">
<el-tab-pane
- v-for="tab in tabs"
+ v-for="tab in filteredTabs"
:key="tab.name"
:label="`${tab.label} (${tab.count})`"
:name="tab.name"
>
- <div class="tab-content">
+ <basic-main-content>
<!-- 查询条件筛选栏 -->
<div class="filter-bar">
- <el-input
- v-model="filters.key_word"
- placeholder="输入工单编号/名称/内容/姓名"
- class="filter-item"
- clearable
- @keyup.enter="handleSearch"
- />
+ <div class="search-bar-box">
+ <div class="search-bar-box-item">
+ <el-input
+ v-model="filters.key_word"
+ placeholder="输入工单编号/名称/内容/姓名"
+ clearable
+ @keyup.enter="handleSearch"
+ />
+ </div>
- <el-select
- placeholder="请选择所属单位"
- v-model="filters.create_dept"
- @change="handleDepartmentChange"
- class="filter-item"
- clearable
- >
- <el-option
- v-for="dept in departments"
- :key="dept.value"
- :label="dept.label"
- :value="dept.value"
- />
- </el-select>
+ <!-- <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>-->
- <el-date-picker
- v-model="filters.dateRange"
- type="datetimerange"
- range-separator="至"
- start-placeholder="开始日期"
- end-placeholder="结束日期"
- class="filter-item"
- style="width: 100px"
- />
- <el-select
- v-model="filters.file_id"
- placeholder="请选择关联航线"
- class="filter-item"
- clearable
- >
- <el-option
- v-for="item in wayLineList"
- :key="item.wayline_id"
- :label="item.name"
- :value="item.wayline_id"
- />
- </el-select>
+ <div class="search-bar-box-item">
+ <el-date-picker
+ @change="handleSearch"
+ v-model="filters.dateRange"
+ type="daterange"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ :default-value="datePickerDefaultVal"
+ />
+ </div>
- <el-select
- v-model="filters.ai_types"
- placeholder="关联算法"
- class="filter-item"
- clearable
- >
- <el-option
- v-for="item in ai_types"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
- </el-select>
+ <div class="search-bar-box-item">
+ <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>
- <el-select
- v-model="filters.type"
- placeholder="请选择工单类型"
- class="filter-item"
- clearable
- >
- <el-option
- v-for="item in types"
- :key="item.dictValue"
- :label="item.dictValue"
- :value="item.dictKey"
- />
- </el-select>
+ <div class="search-bar-box-item">
+ <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>
- <el-select
- v-model="filters.status"
- placeholder="请选择工单状态"
- class="filter-item"
- clearable
- >
- <el-option
- v-for="item in statuses"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- <el-button type="primary" icon="el-icon-search" @click="handleSearch">查询</el-button>
- <el-button icon="el-icon-refresh" @click="handleReset">重置</el-button>
+ <!-- <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 class="search-bar-box-item">
+ <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>
+ </div>
+
+ <div class="search-bar-box">
+ <div class="search-bar-box-item flex-2">
+ <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
+ @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
+ @change="handleSearch"
+ 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 icon="el-icon-refresh" @click="handleReset">清空</el-button>
+ </div>
+ </div>
</div>
<!-- 表格部分 -->
<avue-crud
+ class="ztzf-public-general-avue-crud"
:data="tableData"
:option="option"
v-model:page="page"
@@ -113,37 +158,96 @@
@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 type="primary" icon="el-icon-plus" @click="handleAdd">新建工单</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
+ >
+ <el-button type="primary" plain icon="el-icon-plus" @click="moreAdd"
+ >批量添加</el-button
>
</template>
<template #menu="{ row }">
- <div v-if="row.status == 1 && userInfo.user_id != row.create_user">
- <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)"
- >审核</el-button
- >
- </div>
-
- <div v-if="userInfo.user_id == row.create_user">
- <!--待审核状态-->
- <div v-if="row.status == 1">
- <el-button type="text" icon="el-icon-view" @click="orderLogRecall(row.id)"
+ <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
+ >
+ </template>
+ <!-- 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"
+ v-if="hasRecallPaddingBtnPermission()"
+ @click="orderLogRecall(row.id)"
>撤回</el-button
>
- </div>
+ <!-- <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button> -->
+ </template>
<!--已驳回-->
- <div v-if="row.status == 2">
- <el-button type="text" icon="el-icon-view" @click="rejectDetail(row.id)"
+ <template v-if="row.status == 2">
+ <el-button type="text" icon="el-icon-warning" @click="rejectDetail(row.id)"
>驳回原因</el-button
>
- </div>
- <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">
+ <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
+ >
+ </template>
</div>
</template>
<template #status="{ row }">
@@ -155,7 +259,7 @@
</el-tooltip>
</template>
</avue-crud>
- </div>
+ </basic-main-content>
</el-tab-pane>
</el-tabs>
@@ -167,16 +271,26 @@
:close-on-click-modal="false"
@close="resetForm"
>
- <el-form :model="form" :rules="rules" ref="form" label-width="100px">
+ <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="请输入工单名称"></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-select
+ v-model="form.file_id"
+ placeholder="请选择航线"
+ filterable
+ @change="getFlyingNestBy"
+ >
<el-option
v-for="item in wayLineList"
:key="item.wayline_id"
@@ -190,7 +304,12 @@
<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"
@@ -222,11 +341,13 @@
v-model="form.content"
rows="4"
placeholder="请输入工单内容"
+ maxlength="255"
+ show-word-limit
></el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker
v-model="form.date_range"
@@ -234,46 +355,62 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
- class="date-picker"
+ :disabled-date="disabledDate"
/>
</el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <div class="flex">
+ <div class="flex-1">
+ <el-select v-model="form.rep_fre_type" placeholder="请选择频次">
+ <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
+ </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"
+ :picker-options="{
+ selectableRange: '00:00 - 23:59',
+ }"
+ />
+ </div>
+ </div>
+ </el-col>
+ </el-row>
- <el-button type="danger" @click="submitForm(1)">发布</el-button>
+ <el-row :gutter="20" style="height: 400px">
+ <el-col :span="24">
+ <map-container v-if="dialogVisible" ref="MapContainer"></map-container>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <div class="add-box-btns">
+ <el-button type="danger" @click="submitForm(1)">发起</el-button>
<el-button type="primary" @click="submitForm(0)">存草稿</el-button>
- </el-col>
- <el-col :span="3">
- <el-select v-model="form.rep_fre_type" placeholder="请选择频次">
- <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
- </el-select>
- </el-col>
-
- <el-col :span="3">
- <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-button @click="dialogVisible = false">取消</el-button>
+ </div>
</el-row>
</el-form>
</el-dialog>
<!-- 工单详情对话框 -->
<el-dialog
+ align-center
v-model="detailVisible"
- title="工单详情"
+ :title="detailTitle"
width="70%"
:close-on-click-modal="false"
@close="resetForm"
>
- <el-form :model="form" ref="form" label-width="100px">
+ <div class="event-title-center">{{ form.name }}</div>
+ <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 }"
@@ -285,26 +422,21 @@
</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;">
- {{ 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-description" style="position: relative; display: inline-block">
{{ record.user_name }}
</span>
- <div class="step-description" >
+ <span class="step-timer">
+ {{ record.interval_time_str }}
+ </span>
+ <div class="step-description">
{{ record.create_time_str }}
</div>
</template>
@@ -315,12 +447,22 @@
<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"
@@ -334,7 +476,12 @@
<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"
@@ -346,7 +493,12 @@
</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"
@@ -359,14 +511,9 @@
</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="请输入工单内容"
- ></el-input>
+ <el-col :span="12" prop="statusStr">
+ <el-form-item label="当前状态">
+ {{ mapStatus(form.status) }}
</el-form-item>
</el-col>
@@ -378,31 +525,18 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
- class="date-picker"
+ :disabled-date="disabledDate"
+ :disabled="detailTitle === '工单详情'"
/>
</el-form-item>
-
- <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 == 1 && userInfo.user_id != form.create_user"
- @click="orderLogPass(form.id)"
- >通过</el-button
- >
- <el-button
- type="danger"
- v-if="form.status == 1 && userInfo.user_id != form.create_user"
- @click="orderLogReject(form.id)"
- >驳回</el-button
- >
</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>
@@ -416,15 +550,333 @@
:picker-options="{
selectableRange: '00:00 - 23:59',
}"
+ :disabled="detailTitle === '工单详情'"
/>
</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
+ :disabled="detailTitle === '工单详情'"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row :gutter="20" style="height: 400px">
+ <el-col :span="24">
+ <map-container v-if="detailVisible" ref="MapContainer"></map-container>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <div class="add-box-btns">
+ <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> -->
+
+ <el-button
+ type="primary"
+ v-if="form.status == 1 && hasPaddingBtnPermission()"
+ @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
+ 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" 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 }}
+ </div>
+ </div>
+
+ <!-- Element 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">
+ {{ record.user_name }}
+ </span>
+ <span class="step-timer">
+ {{ record.interval_time_str }}
+ </span>
+ <div class="step-description">
+ {{ record.create_time_str }}
+ </div>
+ </template>
+ </el-step>
+ </el-steps>
+ </div>
+
+ <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-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-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <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>
+ </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>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row :gutter="20">
+ <el-col :span="12" prop="statusStr">
+ <el-form-item label="当前状态">
+ {{ mapStatus(form.status) }}
+ </el-form-item>
+ </el-col>
+
+ <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-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-select v-model="form.rep_fre_type" placeholder="请选择频次" :disabled="true">
+ <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
+ </el-select>
+ </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="{
+ 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-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row :gutter="20" style="height: 400px">
+ <el-col :span="24">
+ <map-container v-if="detailVisibleCopy" ref="MapContainer"></map-container>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <div class="add-box-btns">
+ <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 || userInfo.user_id == form.create_user"
+ @click="submitForm(0)">保存</el-button> -->
+
+ <el-button
+ type="primary"
+ v-if="form.status == 1 && hasPaddingBtnPermission()"
+ @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>
+ </el-form>
+ </el-dialog>
+ <el-dialog class="ztzf-dialog" append-to-body v-model="moreAddVisible" title="批量添加" :width="pxToRem(1200)" :close-on-click-modal="false" :destroy-on-close="true">
+ <el-button type="primary" plain icon="el-icon-plus" @click="addMoreData" style="margin-bottom: 10px;"></el-button>
+ <el-table border :data="moreDataList" height="400">
+ <el-table-column label="序号" type="index" width="60"></el-table-column>
+ <el-table-column prop="name" label="工单名称" align="center">
+ <template #default="scope">
+ <el-input v-model="scope.row.name"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="end_time" label="选择航线" align="center">
+ <template #default="scope">
+ <el-select
+ v-model="scope.row.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>
+ </template>
+ </el-table-column>
+ <el-table-column prop="end_time" label="选择机巢" align="center">
+ <template #default="scope">
+ <el-select
+ v-model="scope.row.device_sns"
+ placeholder="请选择机巢"
+ >
+ <el-option label="赣县-夏谭机场" value="赣县-夏谭机场" />
+ <el-option label="江西融媒" value="江西融媒" />
+ <el-option label="广盈机场" value="广盈机场" />
+ <el-option label="桃花街道" value="桃花街道" />
+ <el-option label="南昌机场一代1" value="南昌机场一代1" />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="time" label="创建日期" align="center">
+ <template #default="scope">
+ <el-date-picker v-model="scope.row.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 200px;" />
+ </template>
+ </el-table-column>
+ <el-table-column label="描述" prop="remark">
+ <template #default="scope">
+ <el-input v-model="scope.row.remark"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="操作" align="center" width="100">
+ <template #default="scope">
+ <el-button icon="el-icon-delete" type="text" @click="handleDelete(scope.$index)">删除</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="moreAddVisible = false">取 消</el-button>
+ <el-button type="primary" @click="saveSubmit">保存</el-button>
+ </span>
+ </template>
</el-dialog>
</basic-container>
</template>
<script>
+import { calculateDefaultRange } from '@/utils/util';
import {
getList,
saveUpdateOrderLog,
@@ -433,9 +885,12 @@
orderLogReject,
orderLogPass,
orderLogExport,
+ jobStatusNum,
+ userPublish,
+ deleteOrderLog,
} from '@/api/tickets/orderLog';
import { getTicketInfo } from '@/api/tickets/ticket';
-import { getDictionary } from '@/api/system/dictbiz';
+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';
@@ -443,8 +898,17 @@
import NProgress from 'nprogress';
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 {
@@ -452,10 +916,10 @@
tabs: [
{ label: '全部工单', name: 'all', value: null, count: 0 },
- { label: '待审核', name: 'pending', value: 1, count: 0 },
- { label: '已驳回', name: 'processing', value: 2, count: 0 },
- { label: '已通过', name: 'inProgress', value: 3, count: 0 },
- { label: '草稿', name: 'completed', value: 0, count: 0 },
+ { label: '待审核', name: 'WAIT_AUDIT', value: 1, count: 0 },
+ { label: '已驳回', name: 'REJECTED', value: 2, count: 0 },
+ { label: '已通过', name: 'PASS', value: 3, count: 0 },
+ { label: '草稿', name: 'DRAFT', value: 0, count: 0 },
],
filters: {
key_word: '',
@@ -472,6 +936,8 @@
device_sns: [],
ai_types: [],
wayLineList: [],
+ detailTitle: '编辑工单',
+ detailVisibleCopy: false,
statuses: [
{ label: '草稿', value: '0' },
@@ -480,13 +946,18 @@
{ label: '已通过', value: '3' },
],
//周期
- cycles: ['周一', '周二', '周三', '周四', '周五', '周六', '周末', '周天', '工作日', '每天'],
+ cycles: ['每天', '周一', '周二', '周三', '周四', '周五', '周六', '周末', '周天', '工作日'],
tableData: [],
option: {
+ index: true,
+ indexWidth: 66,
+ indexLabel: '序号',
+ indexFixed: true,
+
+ align: 'center',
border: true,
- stripe: true,
- menuWidth: 150,
+ stripe: false,
searchShow: true,
searchBtnText: '搜索',
searchMenuSpan: 6,
@@ -495,29 +966,109 @@
viewBtn: false,
editBtn: false,
delBtn: false,
- menu: true,
cancelBtn: true,
cancelBtnText: '取消',
- column: [
- { label: '序号', prop: 'id', width: 70 },
- { label: '工单编号', prop: 'job_info_num', width: 150 },
- { label: '工单名称', prop: 'name', width: 150 },
- { label: '所属单位', prop: 'dept_name', width: 100 },
- { label: '发起时间', prop: 'create_time', width: 160 },
- { label: '工单内容', prop: 'content', width: 160 },
- { label: '关联航线', prop: 'wayline_name', width: 160 },
- { label: '关联算法', prop: 'ai_type_str', width: 180 },
- { label: '关联机巢', prop: 'device_names', width: 180 },
- { label: '创建人', prop: 'creator_name', width: 180 },
- { label: '关联机巢', prop: 'device_names', width: 108 },
+ menu: true,
+ menuWidth: 210,
+ menuClassName: 'cur-menu',
+
+ height: 'auto',
+ calcHeight: 196,
+
+ column: [
{
- label: '工单周期凭次',
- prop: '',
- width: 108,
- formatter: row => this.formatCycleTime(row),
+ label: '工单编号',
+ prop: 'job_info_num',
+ width: 150,
},
- { label: '工单状态', prop: 'status', width: 60 },
+ {
+ 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,
+ showOverflowTooltip: true,
+ },
+ // {
+ // label: '关联机巢', prop: 'device_names', width: 112, ellipsis: true, overHidden: true,
+ // showOverflowTooltip: true,
+ // },
+ {
+ label: '工单周期频次',
+ prop: '',
+ width: 110,
+ formatter: row => this.formatCycleTime(row),
+ html: true,
+ ellipsis: true,
+ showOverflowTooltip: true,
+ // overHidden: true
+ },
],
},
@@ -526,16 +1077,23 @@
currentPage: 1,
total: 0,
},
+ moreDataList: [],
+ moreAddVisible: false,
dialogVisible: false,
detailVisible: false,
currentDetail: {},
form: {},
rules: {
- name: [{ required: true, message: '请输入工单名称', trigger: 'blur' }],
+ name: [
+ { required: true, message: '请输入工单名称', trigger: 'blur' },
+ { max: 100, message: '工单名称不能超过100个字', trigger: 'blur' },
+ ],
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' }],
+ content: [
+ { required: true, message: '请输入工单内容', trigger: 'blur' },
+ { max: 255, message: '工单内容不能超过255个字', trigger: 'blur' },
+ ],
date_range: [{ required: true, message: '请选择时间不能为空', trigger: 'blur' }],
rep_fre_type: [{ required: true, message: '请选择周期', trigger: 'blur' }],
deal_time: [{ required: true, message: '请选择执行时间', trigger: 'blur' }],
@@ -543,32 +1101,89 @@
loading: false,
globalCounts: {},
mapLoaded: false,
+
+ // 配置时间选择器默认配置
+ datePickerDefaultVal: calculateDefaultRange(),
};
},
async created() {
- var response = await getDictionary({ code: 'SF' });
- var word_order_typeResponse = await getDictionary({ code: 'WORK_ORDER_TYPE' });
- this.ai_types = response.data.data;
- this.types = word_order_typeResponse.data.data;
+ 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.departments = dept_data.map(item => ({
- label: item.dept_name,
- value: item.id,
- }));
+ 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;
+ 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']),
+ ...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 => {
+ if (tab.name === 'DRAFT') {
+ return { ...tab, isShow: canShowRejectAndDraft };
+ }
+ if (tab.name === 'REJECTED') {
+ return { ...tab, isShow: canShowRejectAndDraft };
+ }
+ return { ...tab, isShow: true };
+ })
+ .filter(tab => tab.isShow);
+ },
},
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');
+ // console.log('searchChange')
this.query = params;
this.parentId = '';
this.page.currentPage = 1;
@@ -587,8 +1202,6 @@
this.loading = false;
this.selectionClear();
});
-
-
},
selectionClear() {
this.selectionList = [];
@@ -605,14 +1218,14 @@
}
},
formatCycleTime(row) {
- return row.begin_time + '-' + row.end_time + ' ' + row.rep_rule_val;
+ return `${row.cycle_time_value}`;
},
async fetchTableData() {
this.loading = true;
try {
let params = this.getQueryParam();
- console.log('发送的参数:', params);
+ // console.log('发送的参数:', params)
const response = await getList(params, this.page.currentPage, this.page.pageSize);
if (!response?.data?.data?.records) {
throw new Error('接口返回数据格式不正确');
@@ -623,14 +1236,11 @@
return item;
});
- if (this.activeTab === 'all') {
- this.updateGlobalCounts(records, total);
- }
-
+ // console.log('权限检查:', this.permission)
this.page.total = total || 0;
- this.updateTabCounts();
+ this.updateGlobalCounts();
} catch (error) {
- console.error('获取数据失败:', error);
+ // console.error('获取数据失败:', error)
this.$message.error(error.message || '获取数据失败');
this.tableData = [];
this.page.total = 0;
@@ -642,10 +1252,10 @@
getQueryParam() {
const currentTab = this.tabs.find(tab => tab.name === this.activeTab);
if (this.filters.dateRange) {
- console.log(
- 'this.formatDate(this.filters.dateRange[0])',
- this.formatDate(this.filters.dateRange[0])
- );
+ // console.log(
+ // 'this.formatDate(this.filters.dateRange[0])',
+ // this.formatDate(this.filters.dateRange[0])
+ // )
}
const params = {
@@ -658,12 +1268,21 @@
file_id: this.filters.file_id || undefined,
status: this.filters.status !== '' ? Number(this.filters.status) : currentTab?.value,
dept_id: this.filters.department || undefined,
- start_date: this.filters.dateRange?.[0]
+ create_start_date: this.filters.dateRange?.[0]
? this.formatDate(this.filters.dateRange[0])
: undefined,
- end_date: this.filters.dateRange?.[1]
+ create_end_date: this.filters.dateRange?.[1]
? this.formatDate(this.filters.dateRange[1]).replace('00:00:00', '23:59:59')
: undefined,
+
+ start_date: this.filters.cycleDateRange?.[0]
+ ? this.formatDate(this.filters.cycleDateRange[0])
+ : undefined,
+ end_date: this.filters.cycleDateRange?.[1]
+ ? this.formatDate(this.filters.cycleDateRange[1]).replace('00:00:00', '23:59:59')
+ : undefined,
+ rep_fre_type: this.filters.rep_fre_type || undefined,
+ deal_time: this.filters.deal_time || undefined,
current: this.page.currentPage,
size: this.page.pageSize,
};
@@ -673,19 +1292,51 @@
this.page.pageSize = pageSize;
},
async submitForm(status) {
- this.$refs.form.validate(async valid => {
+ this.$refs.testform.validate(async valid => {
if (valid) {
let dateRange = this.form.date_range;
- console.log('dateRange' + dateRange);
+ // console.log('dateRange' + dateRange)
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) {
@@ -711,7 +1362,8 @@
this.form = {
...response.data.data,
};
- this.detailVisible = true;
+ // this.detailVisible = true
+ this.handleViewDetail(data);
});
},
formatDate(date) {
@@ -746,6 +1398,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();
},
@@ -771,50 +1432,103 @@
this.page.currentPage = currentPage;
},
- updateGlobalCounts(records, total) {
+ async updateGlobalCounts() {
const counts = {
- all: total,
- pending: 0,
- processing: 0,
- inProgress: 0,
- completed: 0,
- closed: 0,
- myTickets: 0,
+ all: 0,
+ DRAFT: 0,
+ WAIT_AUDIT: 0,
+ REJECTED: 0,
+ PASS: 0,
};
-
- records.forEach(item => {
- const tab = this.tabs.find(t => t.value === Number(item.status));
+ 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);
if (tab) {
- counts[tab.name] = (counts[tab.name] || 0) + 1;
+ tab.count = item.num;
}
});
-
- this.globalCounts = counts;
- },
-
- updateTabCounts() {
- if (this.activeTab === 'all') {
- this.tabs.forEach(tab => {
- tab.count = this.globalCounts[tab.name] || 0;
- });
- } else {
- this.tabs.forEach(tab => {
- if (tab.name === this.activeTab) {
- tab.count = this.tableData.length;
- } else {
- tab.count = this.globalCounts[tab.name] || 0;
- }
- });
- }
},
handleAdd() {
this.form = {};
this.dialogVisible = true;
+
+ this.$nextTick(() => {
+ if (this.$refs.MapContainer && this.$refs.MapContainer.initAddEntity) {
+ this.$refs.MapContainer.initAddEntity('initPosition');
+ }
+ });
+
//航线列表
this.asyncgetWaylineFileListByArea();
},
+ // 批量添加
+ moreAdd() {
+ this.moreDataList = []
+ this.moreAddVisible = true;
+ },
+ addMoreData() {
+ this.moreDataList.push({
+ name: '',
+ file_id: '',
+ device_sns: '',
+ time: '',
+ remark: ''
+ })
+ },
+ // 删除
+ handleDelete(index) {
+ if (this.moreDataList.length > 0) {
+ this.moreDataList.splice(index, 1)
+ }
+ },
+ // 批量保存
+ saveSubmit() {
+ // tableData复制5条数据
+ if (this.moreDataList.length === 0) {
+ this.$message.warning('请添加数据');
+ return
+ }
+ let bfList = []
+ this.moreDataList.map((item, index) => {
+ bfList.push({
+ $cellEdit:false,
+ $index:5,
+ ai_type_str:'道路裂缝',
+ area_code: `360113000000${index}`,
+ begin_time:"2025/09/27 18:08",
+ content:item.remark,
+ create_time:item.time,
+ create_user:"1971102860644016129",
+ creator_name:"权限测试账号",
+ cycle_time_value:"2025/09/27 2025/09/28 每天 18:08",
+ dept_name: item.device_sns,
+ device_names: item.device_sns,
+ device_sns:['8UUXN5M00A08ZD'],
+ end_time:"2025/09/28",
+ execute_time_arr: ['1758967680', '1759054080'],
+ file_id:"47825a57-e376-427e-8ed1-8bc94c27b9cf",
+ id: index,
+ industry_type_str:"综合类",
+ job_info_num:"36011320250927031",
+ latitude:28.692045732105385,
+ longitude:115.85282499919674,
+ name: item.name,
+ reason:"",
+ remark:item.remark,
+ rep_fre_type:"每天",
+ status:1,
+ status_str:"待审核",
+ wayline_job_info_id: index,
+ })
+ })
+ // 把备份的数据加入tableData 中
+ this.tableData = [...this.tableData, ...bfList]
+ this.page.total = this.tableData.length + bfList.length
+ this.moreAddVisible = false;
+ },
resetForm() {
this.form = {
name: '',
@@ -826,8 +1540,8 @@
content: '',
photos: [],
};
- if (this.$refs.form) {
- this.$refs.form.resetFields();
+ if (this.$refs.testform) {
+ this.$refs.testform.resetFields();
}
},
@@ -837,16 +1551,66 @@
}
return `${location[0].toFixed(6)}, ${location[1].toFixed(6)}`;
},
-
async handleViewDetail(row) {
const response = await orderLogDetails(row.id);
+ const data = response.data.data;
this.form = {
- ...response.data.data,
+ ...data,
};
+
+ // 更新机巢列表
+ 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.userInfo.user_id !== this.form.create_user))
+ ? (this.detailTitle = '工单详情')
+ : (this.detailTitle = '编辑工单');
+
this.detailVisible = true;
- //航线列表
- this.asyncgetWaylineFileListByArea();
- this.device_sns = response.data.data.deviceList;
+ // 更新航线列表，追加 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);
+ 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);
+ 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);
},
//导出
async exportData() {
@@ -863,7 +1627,53 @@
});
});
},
+ 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;
+ },
+ hasPaddingBtnPermission() {
+ // undefined 或 false 都返回 false，只有 true 返回 true
+ // console.log('权限检查:', this.permission)
+ return this.permission && this.permission.order_log_review === true;
+ },
+ hasRecallPaddingBtnPermission() {
+ // undefined 或 false 都返回 false，只有 true 返回 true
+ // console.log('权限检查:', this.permission)
+ // 智飞工单撤回
+ return this.permission && this.permission.order_log_recall === true;
+ },
+ //驳回按钮权限
+ hasRejectionBtnPermission() {
+ // undefined 或 false 都返回 false，只有 true 返回 true
+ // console.log('权限检查:', this.permission)
+ return this.permission && this.permission.rejection_btn === true;
+ },
+ //自己点发布
+ userPublishPush(id) {
+ this.$confirm('确定发布吗?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ }).then(() => {
+ let response = userPublish(id);
+ this.$message.success('发布成功');
+ this.fetchTableData();
+ });
+ },
+ //删除
+ deleteOrderLog(id) {
+ this.$confirm('确定删除吗?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ }).then(() => {
+ let response = deleteOrderLog(id);
+ this.$message.success('删除');
+ this.fetchTableData();
+ });
+ },
refreshChange() {
this.fetchTableData();
},
@@ -871,16 +1681,50 @@
async asyncgetWaylineFileListByArea(name) {
var wayLineListResponse = await getWaylineFileListByArea(this.userInfo.detail.areaCode);
this.wayLineList = wayLineListResponse.data.data;
+
+ this.initMapLine();
},
+
+ initMapLine(infos = {}, cb = () => {}) {
+ let currentLine = this.wayLineList.find(item => item.wayline_id == this.form.file_id);
+
+ if (!currentLine) return;
+
+ 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,
+ infos,
+ });
+ }
+ });
+ },
+
//可飞行机巢列表
async getFlyingNestBy(waylineId) {
- //按照航线来
- const params = {
- type: 0,
- waylineId: waylineId,
- };
- var wayLineListResponse = await getFlyingNestBy(params);
- this.device_sns = wayLineListResponse.data.data;
+ const that = this;
+
+ // 先清空
+ that.form.device_sns = [];
+ that.device_sns = [];
+
+ this.initMapLine({}, async polygon => {
+ const currentLine = that.wayLineList.find(item => item.wayline_id === waylineId);
+
+ //按照航线来
+ const params = {
+ 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;
+ });
},
//撤回
@@ -904,7 +1748,13 @@
let response = await orderLogPass(id);
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()
},
/**
* 驳回
@@ -916,8 +1766,13 @@
}).then(async ({ value }) => {
let response = await orderLogReject(id, value);
let data = response.data.data;
- this.$message.success('驳回成果');
- this.detailVisible = false;
+ this.$message.success('驳回成功');
+ this.detailVisibleCopy = false;
+
+ // this.detailVisible = false
+
+ this.page.currentPage = 1;
+ this.onLoad(this.page, this.query);
});
},
},
@@ -925,7 +1780,7 @@
watch: {
tableData: {
handler() {
- this.updateTabCounts();
+ // this.updateTabCounts()
},
deep: true,
},
@@ -934,25 +1789,91 @@
</script>
<style lang="scss" scoped>
-.tab-content {
- padding: 10px;
+::v-deep(.el-tabs) {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+
+ .el-tabs__header {
+ order: 1;
+ }
+
+ .el-tabs__content {
+ order: 2;
+ }
+
+ .el-tabs__content {
+ height: 0;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+
+ .el-tab-pane {
+ height: 0;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ }
+ }
}
.filter-bar {
- display: flex;
- align-items: center;
- margin-bottom: 15px;
- flex-wrap: wrap;
+ // align-items: center;
- .filter-item {
- margin-right: 10px;
- margin-bottom: 10px;
- width: 200px;
- }
+ .search-bar-box {
+ margin-bottom: 15px;
+ display: flex;
+ justify-content: space-between;
+ gap: 8px;
- .date-picker {
- width: 240px;
+ &-item {
+ flex: 1;
+
+ & > ::v-deep(.el-date-editor) {
+ width: 100%;
+ box-sizing: border-box;
+ }
+ }
+
+ .search-btn {
+ flex: 1;
+ display: flex;
+ justify-content: flex-end;
+ }
+
+ .flex-2 {
+ min-width: 454px;
+ }
}
+}
+
+: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;
+}
+
+:deep(.el-input__inner),
+:deep(.el-select),
+:deep(.el-select .el-input) {
+ width: 100%; // 确保所有输入框和选择框宽度一致
+}
+
+:deep(.el-textarea__inner) {
+ resize: none;
}
.action-bar {
@@ -965,28 +1886,9 @@
}
}
-.tab-content {
- min-height: 200px;
-}
-
-.detail-form {
- :deep(.el-form-item) {
- margin-bottom: 10px;
- }
-
- :deep(.el-form-item__label) {
- color: #606266;
- font-weight: normal;
- }
-
- :deep(.el-form-item__content) {
- color: #303133;
- }
-}
-
.el-dialog {
.el-form-item {
- margin-bottom: 20px;
+ margin-bottom: 10px;
}
}
@@ -1037,7 +1939,8 @@
}
.custom-steps {
- margin-top: -20px; /* 向上移动与标题重叠 */
+ margin-top: -20px;
+ /* 向上移动与标题重叠 */
}
.el-step__head {
@@ -1054,4 +1957,44 @@
color: #666;
line-height: 1.5;
}
-</style>
\ No newline at end of file
+
+.event-title-center {
+ text-align: center;
+ font-size: 20px;
+ font-weight: bold;
+ margin-bottom: 12px;
+ color: #333;
+}
+
+.cur-menu {
+ .menu-custom-box {
+ display: flex;
+ justify-content: center;
+ flex-wrap: wrap;
+
+ & > ::v-deep(.el-button) {
+ flex: 1;
+ margin-left: 0;
+ margin-right: 10px;
+ }
+ }
+}
+
+.add-box-btns {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+}
+
+.flex {
+ display: flex;
+}
+
+.flex-1 {
+ flex: 1;
+
+ & > ::v-deep(div) {
+ width: 100% !important;
+ }
+}
+</style>
--
Gitblit v1.9.3