From 3be2e099bbc05e902dfcfabc403ade0a2aba8ef4 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 21 Jul 2025 15:12:44 +0800
Subject: [PATCH] feat:数据中心优化
---
src/views/tickets/orderLog.vue | 286 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 185 insertions(+), 101 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index ba8e811..e73457a 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -12,7 +12,7 @@
<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">
- <div class="tab-content">
+ <basic-main-content>
<!-- 查询条件筛选栏 -->
<div class="filter-bar">
<div class="search-bar-box">
@@ -46,12 +46,12 @@
</el-select>
</div>
- <div class="search-bar-box-item">
+ <!-- <div class="search-bar-box-item">
<el-select v-model="filters.type" placeholder="请选择工单类型" clearable>
<el-option v-for="item in types" :key="item.dictValue" :label="item.dictValue"
:value="item.dictKey" />
</el-select>
- </div>
+ </div> -->
<div class="search-bar-box-item">
<el-select v-model="filters.status" placeholder="请选择工单状态" clearable>
@@ -67,7 +67,7 @@
</div>
<div class="search-bar-box-item">
- <el-select v-model="filters.rep_fre_type" placeholder="请选择频次">
+ <el-select v-model="filters.rep_fre_type" placeholder="请选择频次" clearable>
<el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
</el-select>
</div>
@@ -90,9 +90,9 @@
</div>
<!-- 表格部分 -->
- <avue-crud :data="tableData" :option="option" v-model:page="page" ref="crud" :table-loading="loading"
- @current-change="currentChange" @refresh-change="refreshChange" @on-load="onLoad"
- @search-change="searchChange" @size-change="sizeChange">
+ <avue-crud class="ztzf-public-general-avue-crud" :data="tableData" :option="option" v-model:page="page"
+ ref="crud" :table-loading="loading" @current-change="currentChange" @refresh-change="refreshChange"
+ @on-load="onLoad" @search-change="searchChange" @size-change="sizeChange" v-if="activeTab === tab.name">
<template #menu-left>
<el-button v-if="hasAddBtnPermission() && activeTab != 'WAIT_AUDIT'" type="primary" icon="el-icon-plus"
@click="handleAdd">新建工单</el-button>
@@ -102,8 +102,7 @@
<template #menu="{ row }">
<div class="menu-custom-box">
<template v-if="row.status == 1">
- <el-button v-if="hasPaddingBtnPermission()" type="text" icon="el-icon-view"
- @click="handleCheckDetail(row)">审核</el-button>
+ <el-button v-if="hasPaddingBtnPermission()" type="text" icon="el-icon-view" @click="handleCheckDetail(row)">审核</el-button>
</template>
<!-- v-if="
(userInfo.user_id == row.create_user || hasRecallPaddingBtnPermission()) &&
@@ -111,13 +110,15 @@
" -->
<template v-if="row.status == 1">
<!--待审核状态-->
- <el-button type="text" icon="el-icon-warning" v-if="hasRecallPaddingBtnPermission()" @click="orderLogRecall(row.id)">撤回</el-button>
- <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button>
+ <el-button type="text" icon="el-icon-warning" v-if="hasRecallPaddingBtnPermission()"
+ @click="orderLogRecall(row.id)">撤回</el-button>
+ <!-- <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button> -->
</template>
<!--已驳回-->
<template v-if="row.status == 2">
<el-button type="text" icon="el-icon-warning" @click="rejectDetail(row.id)">驳回原因</el-button>
- <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button>
+ <el-button v-if="userInfo.user_id == row.create_user" type="text" icon="el-icon-view" @click="handleViewDetail(row)">编辑</el-button>
+ <el-button v-else type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button>
</template>
<!-- 已通过 -->
<template v-if="row.status == 3">
@@ -140,7 +141,7 @@
</el-tooltip>
</template>
</avue-crud>
- </div>
+ </basic-main-content>
</el-tab-pane>
</el-tabs>
@@ -191,7 +192,7 @@
<el-col :span="8">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
- end-placeholder="结束日期" />
+ end-placeholder="结束日期" :disabled-date="disabledDate" />
</el-form-item>
</el-col>
<el-col :span="4">
@@ -221,6 +222,7 @@
<div class="add-box-btns">
<el-button type="danger" @click="submitForm(1)">发起</el-button>
<el-button type="primary" @click="submitForm(0)">存草稿</el-button>
+ <el-button @click="dialogVisible = false">取消</el-button>
</div>
</el-row>
</el-form>
@@ -230,7 +232,7 @@
<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">
+ <el-form :model="form" :rules="rules" ref="testform" label-width="100px">
<div class="custom-steps-container">
<!-- 标题行 -->
<div class="steps-titles">
@@ -261,12 +263,12 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="工单名称" prop="name">
- <el-input v-model="form.name" placeholder="请输入工单名称"></el-input>
+ <el-input v-model="form.name" placeholder="请输入工单名称" :disabled="detailTitle === '工单详情'"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="关联航线" prop="file_id">
- <el-select v-model="form.file_id" placeholder="请选择航线" @change="getFlyingNestBy">
+ <el-select v-model="form.file_id" placeholder="请选择航线" @change="getFlyingNestBy" :disabled="detailTitle === '工单详情'">
<el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
:value="item.wayline_id" />
</el-select>
@@ -276,7 +278,7 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="关联机巢" prop="device_sns">
- <el-select v-model="form.device_sns" placeholder="请选择机巢" multiple>
+ <el-select v-model="form.device_sns" placeholder="请选择机巢" multiple :disabled="detailTitle === '工单详情'">
<el-option v-for="item in device_sns" :key="item.device_sn" :label="item.nickname"
:value="item.device_sn" />
</el-select>
@@ -284,7 +286,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="关联算法" prop="ai_types">
- <el-select v-model="form.ai_types" placeholder="请选择关联算法" multiple>
+ <el-select v-model="form.ai_types" placeholder="请选择关联算法" multiple :disabled="detailTitle === '工单详情'">
<el-option v-for="item in ai_types" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
</el-select>
</el-form-item>
@@ -301,12 +303,12 @@
<el-col :span="6">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
- end-placeholder="结束日期" />
+ end-placeholder="结束日期" :disabled-date="disabledDate" :disabled="detailTitle === '工单详情'" />
</el-form-item>
</el-col>
<el-col :span="3">
- <el-select v-model="form.rep_fre_type" placeholder="请选择频次">
+ <el-select v-model="form.rep_fre_type" placeholder="请选择频次" :disabled="detailTitle === '工单详情'">
<el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
</el-select>
</el-col>
@@ -315,7 +317,7 @@
<el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" value-format="HH:mm"
:picker-options="{
selectableRange: '00:00 - 23:59',
- }" />
+ }" :disabled="detailTitle === '工单详情'"/>
</el-col>
</el-row>
@@ -323,7 +325,7 @@
<el-col :span="12">
<el-form-item label="工单内容" prop="content">
<el-input type="textarea" v-model="form.content" rows="4" placeholder="请输入工单内容" maxlength="255"
- show-word-limit></el-input>
+ show-word-limit :disabled="detailTitle === '工单详情'"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -502,6 +504,12 @@
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';
+
+dayjs.extend(weekday);
+dayjs.locale('zh-cn');
export default {
name: 'TicketPage',
@@ -541,7 +549,7 @@
{ label: '已通过', value: '3' },
],
//周期
- cycles: ['周一', '周二', '周三', '周四', '周五', '周六', '周末', '周天', '工作日', '每天'],
+ cycles: ['每天', '周一', '周二', '周三', '周四', '周五', '周六', '周末', '周天', '工作日'],
tableData: [],
option: {
@@ -567,20 +575,60 @@
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 },
+ height: 'auto',
+ calcHeight: 196,
+
+ column: [
+ {
+ label: '工单编号', prop: 'job_info_num', width: 100, ellipsis: true, overHidden: true,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '工单名称', prop: 'name', width: 100, ellipsis: true, overHidden: true,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '工单状态', prop: 'status', width: 88,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '所属单位', prop: 'dept_name', width: 100, ellipsis: true,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '创建时间', prop: 'create_time', width: 144, ellipsis: true,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '已执行次数', prop: 'job_num', width: 96, ellipsis: true,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '工单内容', prop: 'content', ellipsis: true, overHidden: true,
+ showOverflowTooltip: true,
+ },
+ {
+ label: '关联航线', prop: 'wayline_name', width: 100, 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: '',
@@ -588,6 +636,7 @@
formatter: row => this.formatCycleTime(row),
html: true,
ellipsis: true,
+ showOverflowTooltip: true,
// overHidden: true
},
],
@@ -654,6 +703,8 @@
...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 => {
@@ -670,6 +721,9 @@
},
methods: {
+ disabledDate (time) {
+ return time.getTime() < Date.now() - 8.64e7 // 86400000 = 24 * 60 * 60 * 1000
+ },
searchChange (params, done) {
// console.log('searchChange')
this.query = params
@@ -793,6 +847,27 @@
status: status,
}
+ // 判断该值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) {
@@ -818,7 +893,8 @@
this.form = {
...response.data.data,
}
- this.detailVisible = true
+ // this.detailVisible = true
+ this.handleViewDetail(data)
})
},
formatDate (date) {
@@ -936,7 +1012,7 @@
this.device_sns = data.device_list
this.permission &&
(this.permission.order_log_review || this.permission.order_log_recall) &&
- (data.status == 1 || data.status == 3 || data.status == 2)
+ (data.status == 1 || data.status == 3 || (data.status == 2 && this.userInfo.user_id !== this.form.create_user))
? (this.detailTitle = '工单详情')
: (this.detailTitle = '编辑工单')
@@ -1056,7 +1132,7 @@
this.initMapLine()
},
- initMapLine (cb = () => { }) {
+ initMapLine (infos = {}, cb = () => { }) {
let currentLine = this.wayLineList.find(item => item.wayline_id == this.form.file_id)
if (!currentLine) return
@@ -1066,7 +1142,8 @@
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
+ cb,
+ infos
})
}
})
@@ -1076,18 +1153,21 @@
async getFlyingNestBy (waylineId) {
const that = this
+ // 先清空
+ that.form.device_sns = []
that.device_sns = []
- this.initMapLine(async (polygon) => {
+ this.initMapLine({}, async (polygon) => {
const currentLine = that.wayLineList.find(item => item.wayline_id === waylineId)
//按照航线来
const params = {
- type: currentLine.wayline_type,
+ type: [2, 4, 5].includes(currentLine.wayline_type) ? 2 : 0,
wayline_id: waylineId,
polygon
}
var wayLineListResponse = await getFlyingNestBy(params)
+ // 再赋值
that.device_sns = wayLineListResponse.data.data
})
},
@@ -1114,6 +1194,10 @@
let data = response.data.data
this.$message.success('审核通过')
this.detailVisibleCopy = false
+
+ this.page.currentPage = 1
+ this.onLoad(this.page, this.query)
+ this.handleViewDetail()
},
/**
* 驳回
@@ -1125,8 +1209,11 @@
}).then(async ({ value }) => {
let response = await orderLogReject(id, value)
let data = response.data.data
- this.$message.success('驳回成果')
+ this.$message.success('驳回成功')
this.detailVisibleCopy = false
+
+ this.page.currentPage = 1
+ this.onLoad(this.page, this.query)
})
},
},
@@ -1143,42 +1230,32 @@
</script>
<style lang="scss" scoped>
-:deep() {
- .avue-crud__body {
- .el-form {
- height: 625px;
- overflow: auto;
+::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;
}
}
-}
-
-: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%; // 确保所有输入框和选择框宽度一致
-}
-
-.tab-content {
- padding: 10px;
}
.filter-bar {
@@ -1211,6 +1288,35 @@
}
}
+: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 {
margin-bottom: 16px;
}
@@ -1218,25 +1324,6 @@
.el-tabs {
:deep(.el-tabs__content) {
overflow: visible;
- }
-}
-
-.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;
}
}
@@ -1328,12 +1415,9 @@
&> ::v-deep(.el-button) {
flex: 1;
- max-width: 44px;
+ margin-left: 0;
margin-right: 10px;
- &:nth-child(4n) {
- margin-left: 0;
- }
}
}
}
--
Gitblit v1.9.3