From 4a4bd1d5546197b6f1bcd5fa317458dd5e969d3d Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 28 Apr 2025 20:38:07 +0800
Subject: [PATCH] Merge branch 'test' of http://139.196.74.78:10010/r/drone/drone-web-manage into test
---
src/views/tickets/orderLog.vue | 363 +++++++++++++++++++++++++++++++--------------------
1 files changed, 220 insertions(+), 143 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index ef0c0bf..fe185ac 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2025-04-15 20:02:29
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2025-04-15 21:56:14
+ * @LastEditTime: 2025-04-28 11:38:16
* @FilePath: \drone-web-manage\src\views\tickets\orderLog.vue
* @Description:
*
@@ -11,12 +11,13 @@
<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">
- <el-input v-model="filters.key_word" placeholder="输入工单编号/名称/内容/姓名" class="filter-item" clearable
- @keyup.enter="handleSearch" />
+ <el-input style="width: 250px" v-model="filters.key_word" placeholder="输入工单编号/名称/内容/姓名"
+ class="filter-item" clearable @keyup.enter="handleSearch" />
<el-select placeholder="请选择所属单位" v-model="filters.create_dept" @change="handleDepartmentChange"
class="filter-item" clearable>
@@ -24,9 +25,11 @@
:value="dept.value" />
</el-select>
- <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-date-picker v-model="filters.dateRange" type="daterange" range-separator="至"
+ start-placeholder="开始日期" end-placeholder="结束日期" class="filter-item" style="width: 100px"
+ :default-value="datePickerDefaultVal" />
+ <el-select v-model="filters.file_id" placeholder="请选择关联航线" class="filter-item frequency"
+ clearable>
<el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
:value="item.wayline_id" />
</el-select>
@@ -46,16 +49,17 @@
:value="item.value" />
</el-select>
- <el-date-picker v-model="filters.cycleDateRange" type="datetimerange" range-separator="至"
+ <!-- <el-date-picker v-model="filters.cycleDateRange" type="datetimerange" range-separator="至"
start-placeholder="工单周期开始日期" end-placeholder="工单周期结束时间日期" class="filter-item"
- style="width: 240px !important" />
- <el-select v-model="filters.rep_fre_type" placeholder="请选择频次" class="filter-item">
- <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
- </el-select>
- <el-time-picker style="width: 100px" v-model="filters.deal_time" placeholder="请选择执行时间"
+ style="width: 220px !important" /> -->
+ <el-time-picker style="width: 250px" v-model="filters.deal_time" placeholder="请选择执行时间"
prop="deal_time" value-format="HH:mm" :picker-options="{
selectableRange: '00:00 - 23:59',
}" />
+ <el-select v-model="filters.rep_fre_type" placeholder="请选择频次" class="filter-item frequency">
+ <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
+ </el-select>
+
<el-col :span="8">
</el-col>
<el-button type="primary" icon="el-icon-search" @click="handleSearch">查询</el-button>
@@ -67,42 +71,43 @@
: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 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">
- <el-button v-if="hasPaddingBtnPermission()" type="text" icon="el-icon-view" @click="handleCheckDetail(row)">审核</el-button>
-
- </div>
-
- <div v-if="userInfo.user_id == row.create_user || hasRecallPaddingBtnPermission()">
- <!--待审核状态-->
+ <div class="menu-custom-box">
<div v-if="row.status == 1">
- <el-button type="text" icon="el-icon-warning-outline"
+ <el-button class="audit-btn" v-if="hasPaddingBtnPermission()" type="text"
+ icon="el-icon-view" @click="handleViewDetail(row)">审核</el-button>
+ </div>
+
+ <div
+ v-if="(userInfo.user_id == row.create_user || hasRecallPaddingBtnPermission()) && row.status == 1">
+ <!--待审核状态-->
+ <el-button class="withdraw-btn" type="text" icon="el-icon-warning"
@click="orderLogRecall(row.id)">撤回</el-button>
</div>
+ <!--已驳回-->
+ <div v-if="row.status == 2">
+ <el-button class="reject-reason-btn" type="text" icon="el-icon-warning"
+ @click="rejectDetail(row.id)">驳回原因</el-button>
+ </div>
+ <!--草稿-->
+ <div v-if="row.status == 0 && userInfo.user_id == row.create_user">
+ <el-button class="edit-btn" type="text" icon="el-icon-edit-outline"
+ @click="handleViewDetail(row)">编辑</el-button>
+ <el-button class="publish-btn" type="text" icon="el-icon-position"
+ @click="userPublishPush(row.id)">发布</el-button>
+ <el-button class="delete-btn" type="text" icon="el-icon-delete"
+ @click="deleteOrderLog(row.id)">删除</el-button>
+ </div>
+ <div v-if="row.status == 3 || row.status == 1 || row.status == 2">
+ <el-button class="detail-btn" type="text" icon="el-icon-view"
+ @click="handleViewDetail(row)">详情</el-button>
+ </div>
</div>
- <!--已驳回-->
- <div v-if="row.status == 2">
- <el-button type="text" icon="el-icon-warning-outline"
- @click="rejectDetail(row.id)">驳回原因</el-button>
- </div>
- <!--草稿-->
- <div v-if="row.status == 0 && userInfo.user_id == row.create_user">
- <el-button type="text" icon="el-icon-edit-outline"
- @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>
- </div>
- <div v-if="row.status == 3 || row.status == 1 || row.status == 2">
-
- <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button>
- </div>
-
</template>
<template #status="{ row }">
<el-tag :type="getStatusTagType(row.status)">{{ mapStatus(row.status) }}</el-tag>
@@ -117,15 +122,16 @@
</el-tab-pane>
</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">
@@ -140,14 +146,10 @@
<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-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>
@@ -164,14 +166,8 @@
<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>
@@ -181,8 +177,6 @@
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="请选择频次">
@@ -205,12 +199,20 @@
</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-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">
<!-- 标题行 -->
@@ -268,12 +270,8 @@
<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>
@@ -290,14 +288,8 @@
<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>
@@ -524,6 +516,26 @@
export default {
name: 'TicketPage',
data() {
+ const calculateDefaultRange = () => {
+ const now = new Date()
+ const currentYear = now.getFullYear()
+ const currentMonth = now.getMonth() // 0-11
+
+ // 计算上个月
+ let lastMonthYear = currentYear
+ let lastMonth = currentMonth - 1
+ if (lastMonth < 0) {
+ lastMonth = 11
+ lastMonthYear = currentYear - 1
+ }
+
+ // 设置默认范围 [上个月, 当前月]
+ return [
+ new Date(lastMonthYear, lastMonth, 1),
+ new Date(currentYear, currentMonth, 1)
+ ]
+ }
+
return {
activeTab: 'all',
@@ -549,8 +561,7 @@
device_sns: [],
ai_types: [],
wayLineList: [],
- detailTitle:"编辑工单",
- detailVisibleCopy: false,
+ detailTitle: "编辑工单",
statuses: [
{ label: '草稿', value: '0' },
@@ -563,9 +574,11 @@
tableData: [],
option: {
+ indexFixed: true,
+
+ align: 'center',
border: true,
stripe: true,
- menuWidth: 150,
searchShow: true,
searchBtnText: '搜索',
searchMenuSpan: 6,
@@ -574,34 +587,35 @@
viewBtn: false,
editBtn: false,
delBtn: false,
- menu: true,
cancelBtn: true,
cancelBtnText: '取消',
+
+ menu: true,
+ menuWidth: 210,
+ menuClassName: 'cur-menu',
column: [
- { label: '序号', prop: 'id', width: 50, ellipsis: true },
+ { label: '序号', prop: 'id', width: 72, ellipsis: true },
{ label: '工单编号', prop: 'job_info_num', width: 100, ellipsis: true, overHidden: true },
{ label: '工单名称', prop: 'name', width: 100, ellipsis: true, overHidden: true },
{ label: '所属单位', prop: 'dept_name', width: 100, ellipsis: true },
- { label: '发起时间', prop: 'create_time', width: 100, ellipsis: true },
+ { label: '发起时间', prop: 'create_time', width: 144, ellipsis: true },
{ label: '工单内容', prop: 'content', width: 160, 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: 50, ellipsis: true, overHidden: true },
- { label: '关联机巢', prop: 'device_names', width: 80, 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: '工单周期频次',
prop: '',
- width: 108,
+ width: 110,
formatter: row => this.formatCycleTime(row),
html: true,
- ellipsis: true, overHidden: true
-
-
-
+ ellipsis: true,
+ // overHidden: true
},
- { label: '工单状态', prop: 'status', width: 60 },
+ { label: '工单状态', prop: 'status', width: 96 },
],
},
@@ -616,7 +630,7 @@
form: {},
rules: {
name: [{ required: true, message: '请输入工单名称', trigger: 'blur' },
- { max: 100, message: '工单名称不能超过100个字', trigger: 'blur' },
+ { max: 100, message: '工单名称不能超过100个字', trigger: 'blur' },
],
file_id: [{ required: true, message: '需要选择航线', trigger: 'change' }],
device_sns: [{ required: true, message: '请选择机巢', trigger: 'change' }],
@@ -632,13 +646,16 @@
loading: false,
globalCounts: {},
mapLoaded: false,
+
+ // 配置时间选择器默认配置
+ datePickerDefaultVal: calculateDefaultRange()
}
},
async created() {
var response = await getDictionaryByCode('SF')
- var word_order_typeResponse = await getDictionaryByCode('WORK_ORDER_TYPE' )
+ 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.types = word_order_typeResponse.data.data['WORK_ORDER_TYPE']
//获取航线
this.asyncgetWaylineFileListByArea()
const response2 = await getTicketInfo()
@@ -654,16 +671,17 @@
computed: {
...mapGetters(['userInfo', 'permission']),
filteredTabs() {
- const canShowRejectAndDraft = this.permission?.rejection_and_draft === true;
+ // 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 };
+ return { ...tab, isShow: canShowRejectAndDraft }
}
if (tab.name === 'REJECTED') {
- return { ...tab, isShow: canShowRejectAndDraft };
+ return { ...tab, isShow: canShowRejectAndDraft }
}
- return { ...tab, isShow: true };
- }).filter(tab => tab.isShow);
+ return { ...tab, isShow: true }
+ }).filter(tab => tab.isShow)
},
},
@@ -707,7 +725,7 @@
}
},
formatCycleTime(row) {
- return row.cycle_time_value;
+ return `${row.cycle_time_value}`
},
async fetchTableData() {
@@ -726,7 +744,7 @@
})
- console.log('权限检查:', this.permission);
+ console.log('权限检查:', this.permission)
this.page.total = total || 0
this.updateGlobalCounts()
} catch (error) {
@@ -782,7 +800,7 @@
this.page.pageSize = pageSize
},
async submitForm(status) {
-
+
this.$refs.testform.validate(async valid => {
if (valid) {
@@ -891,14 +909,14 @@
PASS: 0,
}
- var reponse = await jobStatusNum();
- console.log("统计" + reponse.data.data);
+ 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
}
- });
+ })
},
@@ -934,20 +952,21 @@
return `${location[0].toFixed(6)}, ${location[1].toFixed(6)}`
},
async handleViewDetail(row) {
- const response = await orderLogDetails(row.id);
- const data = response.data.data;
+ console.log("工单名称1111:")
+ const response = await orderLogDetails(row.id)
+ const data = response.data.data
this.form = {
...data,
- };
+ }
- this.detailVisible = true;
+ this.detailVisible = true
// 更新机巢列表
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="编辑工单";
- console.log("工单名称:"+this.detailTitle);
+ (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 = "编辑工单"
+ console.log("工单名称:" + this.detailTitle)
},
async handleCheckDetail(row) {
const response = await orderLogDetails(row.id);
@@ -981,24 +1000,24 @@
},
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;
+ 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;
+ console.log('权限检查:', this.permission)
+ 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;
+ console.log('权限检查:', this.permission)
+ 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;
+ console.log('权限检查:', this.permission)
+ return this.permission && this.permission.rejection_btn === true
},
//自己点发布
userPublishPush(id) {
@@ -1007,9 +1026,9 @@
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
- let response = userPublish(id);
- this.$message.success('发布成功');
- this.fetchTableData();
+ let response = userPublish(id)
+ this.$message.success('发布成功')
+ this.fetchTableData()
})
},
@@ -1021,9 +1040,9 @@
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
- let response = deleteOrderLog(id);
- this.$message.success('删除');
- this.fetchTableData();
+ let response = deleteOrderLog(id)
+ this.$message.success('删除')
+ this.fetchTableData()
})
},
@@ -1141,22 +1160,36 @@
},
}
</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;
+ // align-items: center;
margin-bottom: 15px;
flex-wrap: wrap;
.filter-item {
- margin-right: 10px;
+ margin-right: 20px;
margin-bottom: 10px;
width: 200px;
+ }
+
+ .frequency {
+ margin-left: 20px;
}
.date-picker {
@@ -1264,13 +1297,57 @@
color: #666;
line-height: 1.5;
}
-.event-title-center {
- text-align: center;
- font-size: 20px;
- font-weight: bold;
- margin-bottom: 12px;
- color: #333;
-}
-</style>
-```
+.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;
+
+ &>div {
+ flex: 1;
+ }
+
+ .audit-btn {
+ color: #1BA0FF;
+ }
+
+ .withdraw-btn {
+ color: #FF5D9E;
+ }
+
+ .reject-reason-btn {
+ color: #FF6A00;
+ }
+
+ .edit-btn {
+ color: #00B187;
+ }
+
+ .publish-btn {
+ color: #5E00FF;
+ }
+
+ .delete-btn {
+ color: #FE0202;
+ }
+
+ .detail-btn {
+ color: #1F4AFF;
+ }
+ }
+}
+
+.add-box-btns {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+}
+</style>
\ No newline at end of file
--
Gitblit v1.9.3