From 2dfc8dc4bcd3d3cd4aed1b6054e073e140eba9c8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 19 May 2025 16:05:50 +0800
Subject: [PATCH] Merge branch 'master' into jiangwu
---
src/views/tickets/orderLog.vue | 1139 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 853 insertions(+), 286 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 734aff9..38f11de 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -1,8 +1,18 @@
+<!--
+ * @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">
<el-tab-pane
- v-for="tab in tabs"
+ v-for="tab in filteredTabs"
:key="tab.name"
:label="`${tab.label} (${tab.count})`"
:name="tab.name"
@@ -10,128 +20,200 @@
<div class="tab-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
- v-model="filters.create_dept"
- placeholder="请选择所属单位"
- class="filter-item"
- clearable
- >
- <el-option
- v-for="item in departments"
- :key="item.value"
- :label="item.label"
- :value="item.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="daterange"
- range-separator="至"
- start-placeholder="开始日期"
- end-placeholder="结束日期"
- class="filter-item"
- style="width: 80px"
- value-format="yyyy-MM-dd"
- />
+ <div class="search-bar-box-item">
+ <el-date-picker
+ 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 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-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 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 v-model="filters.status" placeholder="请选择工单状态" clearable>
+ <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"
+ />
+ </div>
+
+ <div class="search-bar-box-item">
+ <el-select v-model="filters.rep_fre_type" placeholder="请选择频次">
+ <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"
+ :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
:data="tableData"
:option="option"
- :page.sync="pagination"
v-model:page="page"
ref="crud"
:table-loading="loading"
- @current-change="handlePaginationChange"
- @size-change="handlePaginationChange"
+ @current-change="currentChange"
@refresh-change="refreshChange"
@on-load="onLoad"
@search-change="searchChange"
+ @size-change="sizeChange"
>
<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
>
</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 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>
+ <template
+ v-if="
+ (userInfo.user_id == row.create_user || hasRecallPaddingBtnPermission()) &&
+ row.status == 1
+ "
>
- </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)"
+ <!--待审核状态-->
+ <el-button type="text" icon="el-icon-warning" @click="orderLogRecall(row.id)"
>撤回</el-button
>
- </div>
+ </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 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,11 +237,16 @@
: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">
@@ -210,7 +297,162 @@
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-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-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>
+ </div>
+ </el-row>
+ </el-form>
+ </el-dialog>
+
+ <!-- 工单详情对话框 -->
+ <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"
+ >
+ {{ record.status_str }}
+ </div>
+ </div>
+
+ <!-- Element Steps 组件 -->
+ <el-steps :active="form.active" align-center class="custom-steps">
+ <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;
+ "
+ >
+ {{ 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="请输入工单名称"></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-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>
+ <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-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>
@@ -222,13 +464,10 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
- class="date-picker"
/>
</el-form-item>
-
- <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" />
@@ -247,59 +486,121 @@
/>
</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-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 || 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
+ >
+ </div>
+ </el-row>
</el-form>
</el-dialog>
- <!-- 工单详情对话框 -->
+ <!-- 工单详情 -->
<el-dialog
- v-model="detailVisible"
+ v-model="detailVisibleCopy"
title="工单详情"
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" 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"
+ >
+ {{ record.status_str }}
+ </div>
+ </div>
- <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" >{{record.status_str}}</div>
-
+ <!-- Element Steps 组件 -->
+ <el-steps :active="form.active" align-center class="custom-steps">
+ <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;
+ "
+ >
+ {{ record.interval_time_str }}
+ </span>
+ <div class="step-description">
+ {{ record.create_time_str }}
+ </div>
+ </template>
+ </el-step>
+ </el-steps>
+ </div>
-
-
- </div>
-
- <!-- Element Steps 组件 -->
- <el-steps :active="form.active" align-center class="custom-steps" >
-
- <el-step v-for="(record, index) in form.record_list" :key="index">
- <template #description>
- <div class="step-description">{{record.user_name}}</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="请输入工单名称"></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="请选择航线" @change="getFlyingNestBy">
+ <el-select v-model="form.file_id" placeholder="请选择航线" :disabled="true">
<el-option
v-for="item in wayLineList"
:key="item.wayline_id"
@@ -310,10 +611,16 @@
</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>
+ <el-select
+ v-model="form.device_sns"
+ placeholder="请选择机巢"
+ multiple
+ :disabled="true"
+ >
<el-option
v-for="item in device_sns"
:key="item.device_sn"
@@ -325,7 +632,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="true"
+ >
<el-option
v-for="item in ai_types"
:key="item.dictKey"
@@ -338,14 +650,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>
@@ -357,40 +664,22 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
- class="date-picker"
+ :disabled="true"
/>
</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="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"
+ style="width: 100px"
v-model="form.deal_time"
prop="deal_time"
+ :disabled="true"
value-format="HH:mm"
:picker-options="{
selectableRange: '00:00 - 23:59',
@@ -398,12 +687,63 @@
/>
</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 && 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>
</el-form>
</el-dialog>
</basic-container>
</template>
<script>
+import { calculateDefaultRange } from '@/utils/util';
import {
getList,
saveUpdateOrderLog,
@@ -412,8 +752,12 @@
orderLogReject,
orderLogPass,
orderLogExport,
+ jobStatusNum,
+ userPublish,
+ deleteOrderLog,
} from '@/api/tickets/orderLog';
-import { getDictionary } from '@/api/system/dictbiz';
+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';
@@ -421,6 +765,7 @@
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',
@@ -430,10 +775,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: '',
@@ -443,13 +788,15 @@
file_id: '',
ai_types: [],
status: '',
- dateRange: null,
+ dateRange: [],
},
departments: [],
types: [],
device_sns: [],
ai_types: [],
wayLineList: [],
+ detailTitle: '编辑工单',
+ detailVisibleCopy: false,
statuses: [
{ label: '草稿', value: '0' },
@@ -462,9 +809,14 @@
tableData: [],
option: {
+ index: true,
+ indexWidth: 66,
+ indexLabel: '序号',
+ indexFixed: true,
+
+ align: 'center',
border: true,
stripe: true,
- menuWidth: 150,
searchShow: true,
searchBtnText: '搜索',
searchMenuSpan: 6,
@@ -473,36 +825,38 @@
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',
+ 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: 'creator_name', width: 96, ellipsis: true, overHidden: true },
+ { label: '关联机巢', prop: 'device_names', width: 112, ellipsis: true, overHidden: true },
{
- label: '工单周期凭次',
+ label: '工单周期频次',
prop: '',
- width: 108,
+ width: 110,
formatter: row => this.formatCycleTime(row),
+ html: true,
+ ellipsis: true,
+ // overHidden: true
},
- { label: '工单状态', prop: 'status', width: 60 },
],
},
- pagination: {
- currentPage: 1,
- pageSize: 10,
- total: 0,
- },
+
page: {
pageSize: 10,
currentPage: 1,
@@ -513,11 +867,17 @@
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' }],
@@ -525,33 +885,71 @@
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,
+ }));
},
mounted() {
this.fetchTableData();
+ const id = this.$route.query.id;
+ if (id) {
+ // 确保 id 存在
+ this.handleViewDetail({ id });
+ } else {
+ console.error('工单ID不存在！');
+ }
},
computed: {
- ...mapGetters(['userInfo']),
+ ...mapGetters(['userInfo', 'permission']),
+ filteredTabs() {
+ // rejection_and_draft 权限控制“已驳回”和“草稿”tab
+ 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: {
searchChange(params, done) {
- console.log('searchChange');
+ // console.log('searchChange')
this.query = params;
this.parentId = '';
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
- onLoad(page, params = {}) {
+ async onLoad(page, params = {}) {
this.loading = true;
- getList(null, Object.assign(params, this.query)).then(res => {
+ 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();
@@ -572,15 +970,15 @@
}
},
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);
- const response = await getList(params);
+ // console.log('发送的参数:', params)
+ const response = await getList(params, this.page.currentPage, this.page.pageSize);
if (!response?.data?.data?.records) {
throw new Error('接口返回数据格式不正确');
}
@@ -590,17 +988,14 @@
return item;
});
- if (this.activeTab === 'all') {
- this.updateGlobalCounts(records, total);
- }
-
- this.pagination.total = total || 0;
- this.updateTabCounts();
+ // console.log('权限检查:', this.permission)
+ this.page.total = total || 0;
+ this.updateGlobalCounts();
} catch (error) {
- console.error('获取数据失败:', error);
+ // console.error('获取数据失败:', error)
this.$message.error(error.message || '获取数据失败');
this.tableData = [];
- this.pagination.total = 0;
+ this.page.total = 0;
} finally {
this.loading = false;
}
@@ -608,6 +1003,12 @@
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])
+ // )
+ }
const params = {
key_word: this.filters.key_word || undefined,
@@ -619,23 +1020,34 @@
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,
- current: this.pagination.currentPage,
- size: this.pagination.pageSize,
+
+ 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,
};
return params;
},
-
+ sizeChange(pageSize) {
+ 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]);
@@ -705,12 +1117,12 @@
handleTabChange(tab) {
this.activeTab = tab.props?.name || tab.name;
this.filters.status = '';
- this.pagination.currentPage = 1;
+ this.page.currentPage = 1;
this.fetchTableData();
},
handleSearch() {
- this.pagination.currentPage = 1;
+ this.page.currentPage = 1;
this.fetchTableData();
},
@@ -722,51 +1134,30 @@
dateRange: [],
status: '',
};
- this.pagination.currentPage = 1;
+ this.page.currentPage = 1;
this.fetchTableData();
},
- handlePaginationChange(val) {
- this.pagination.currentPage = val.currentPage;
- this.pagination.pageSize = val.pageSize;
- this.fetchTableData();
+ currentChange(currentPage) {
+ 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() {
@@ -787,8 +1178,8 @@
content: '',
photos: [],
};
- if (this.$refs.form) {
- this.$refs.form.resetFields();
+ if (this.$refs.testform) {
+ this.$refs.testform.resetFields();
}
},
@@ -798,16 +1189,36 @@
}
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.detailTitle = '工单详情')
+ : (this.detailTitle = '编辑工单');
+
this.detailVisible = true;
- //航线列表
- this.asyncgetWaylineFileListByArea();
- this.device_sns = response.data.data.deviceList;
+
+ this.initMapLine(data.device_map_infos);
+ },
+ async handleCheckDetail(row) {
+ const response = await orderLogDetails(row.id);
+ const data = response.data.data;
+ this.form = {
+ ...data,
+ };
+
+ // 更新机巢列表
+ this.device_sns = data.device_list;
+ this.detailVisibleCopy = true;
+ this.initMapLine(data.device_map_infos);
},
//导出
async exportData() {
@@ -824,7 +1235,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();
},
@@ -832,13 +1289,59 @@
async asyncgetWaylineFileListByArea(name) {
var wayLineListResponse = await getWaylineFileListByArea(this.userInfo.detail.areaCode);
this.wayLineList = wayLineListResponse.data.data;
+
+ this.initMapLine();
},
+
+ initMapLine(infos = {}) {
+ let currentLine = this.wayLineList.find(item => item.wayline_id == this.form.file_id);
+
+ 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();
+ },
+
//可飞行机巢列表
async getFlyingNestBy(waylineId) {
+ this.initMapLine();
+
//按照航线来
const params = {
type: 0,
- waylineId: waylineId,
+ wayline_id: waylineId,
};
var wayLineListResponse = await getFlyingNestBy(params);
this.device_sns = wayLineListResponse.data.data;
@@ -865,7 +1368,7 @@
let response = await orderLogPass(id);
let data = response.data.data;
this.$message.success('审核通过');
- this.detailVisible = false;
+ this.detailVisibleCopy = false;
},
/**
* 驳回
@@ -878,7 +1381,7 @@
let response = await orderLogReject(id, value);
let data = response.data.data;
this.$message.success('驳回成果');
- this.detailVisible = false;
+ this.detailVisibleCopy = false;
});
},
},
@@ -886,33 +1389,56 @@
watch: {
tableData: {
handler() {
- this.updateTabCounts();
+ // this.updateTabCounts()
},
deep: true,
},
},
};
</script>
-
+<style></style>
<style lang="scss" scoped>
+:deep(.el-textarea__inner) {
+ padding: 8px 12px;
+}
+
+:deep(.el-input__inner),
+:deep(.el-select),
+:deep(.el-select .el-input) {
+ width: 100%; // 确保所有输入框和选择框宽度一致
+}
+
.tab-content {
padding: 10px;
}
.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;
+ }
}
}
@@ -971,8 +1497,6 @@
margin-top: 7px;
}
-
-
.custom-steps-container {
width: 100%;
margin: 20px 0;
@@ -995,12 +1519,13 @@
}
.step-title.active {
- color: #409EFF;
+ color: #409eff;
font-weight: bold;
}
.custom-steps {
- margin-top: -20px; /* 向上移动与标题重叠 */
+ margin-top: -20px;
+ /* 向上移动与标题重叠 */
}
.el-step__head {
@@ -1018,4 +1543,46 @@
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;
+ max-width: 44px;
+
+ &:nth-child(4n) {
+ margin-left: 0;
+ }
+ }
+ }
+}
+
+.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