From 1d552a3bad95caae4af15322df28e6240b797693 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 13 Aug 2026 15:32:06 +0800
Subject: [PATCH] feat: app视频封面图
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 268 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 200 insertions(+), 68 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
index 06ed06b..f56ecfc 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
@@ -1,6 +1,6 @@
<template>
<el-dialog
- class="gd-dialog"
+ class="gd-dialog orderManageFormDlg"
v-model="visible"
:title="titleEnum[dialogMode]"
@closed="visible = false"
@@ -8,7 +8,18 @@
destroy-on-close
:close-on-click-modal="false"
>
- <div class="content" style="display: flex">
+ <el-tabs
+ class="gd-tabs"
+ v-model="activeName"
+ @tab-click="tabsClick"
+ v-if="dialogReadonly && formData.workOrderStatus >= '30'"
+ >
+ <el-tab-pane label="基础信息" name="basic"></el-tab-pane>
+ <el-tab-pane label="成果数据" name="result">
+ <OutcomeData :workOrderId="formData.id" />
+ </el-tab-pane>
+ </el-tabs>
+ <div class="content" style="display: flex" v-if="activeName === 'basic'">
<div class="processBox" v-if="dialogMode !== 'add'">
<div class="detail-title">工单记录</div>
<div class="process">
@@ -25,7 +36,7 @@
</el-col>
<el-col :span="12">
<div class="label">工单类型</div>
- <div class="val">{{ getDictLabel(formData.workOrderType, dictObj.workOrderType) }}</div>
+ <div class="val">{{ getTaskTypeLabel(formData.workOrderType, workOrderTypeXT) }}</div>
</el-col>
<el-col :span="12">
<div class="label">执行时间范围</div>
@@ -56,7 +67,7 @@
<el-table-column prop="patrolTaskName" show-overflow-tooltip label="巡查任务名称" />
<el-table-column prop="patrolTaskType" show-overflow-tooltip label="巡查任务类型">
<template v-slot="{ row }">
- {{ getDictLabel(row.patrolTaskType, dictObj.workOrderType) }}
+ {{ getTaskTypeLabel(row.patrolTaskType, workOrderTypeXT) }}
</template>
</el-table-column>
<el-table-column prop="taskStatus" show-overflow-tooltip label="任务状态">
@@ -88,20 +99,16 @@
</el-col>
<el-col :span="12">
<el-form-item label="工单类型" prop="workOrderType">
- <el-select
- class="gd-select"
- popper-class="gd-select-popper"
+ <el-cascader
+ class="gd-cascader"
+ popper-class="gd-cascader-popper"
v-model="formData.workOrderType"
+ :options="workOrderTypeXT"
+ :props="{...taskTypeCascaderProps,multiple:true }"
placeholder="请选择"
clearable
- >
- <el-option
- v-for="item in dictObj.workOrderType"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
- </el-select>
+ collapse-tags
+ />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -127,12 +134,7 @@
clearable
@change="loadDemandChange"
>
- <el-option
- v-for="item in payloadList"
- :key="item.name"
- :label="item.name"
- :value="item.name"
- />
+ <el-option v-for="item in payloadList" :key="item.name" :label="item.name" :value="item.name" />
</el-select>
</el-form-item>
</el-col>
@@ -150,7 +152,7 @@
</el-col>
</el-row>
</el-form>
- <div class="detail-title" :style="{ marginTop: pxToRem(20) }">
+ <div class="detail-title" :style="{ marginTop: pxToRem(10) }">
<span class="required-star" v-if="!dialogReadonly">*</span>
工单执行范围
</div>
@@ -173,9 +175,7 @@
</div>
<el-table
class="separateTable"
- :empty-text="
- pointList.length ? '暂无数据' : '请先在地图上绘制工单范围'
- "
+ :empty-text="pointList.length ? '暂无数据' : '请先在地图上绘制工单范围'"
ref="deviceTableRef"
:data="pointList.length ? deviceList : []"
row-key="id"
@@ -189,23 +189,31 @@
</div>
</div>
- <template #footer>
- <el-button v-if="['11', '21', '23', '31', '60'].includes(gdStatus)" @click="viewDescription" color="#F2F3F5">
+ <template #footer v-if="activeName === 'basic' && detailLoaded">
+ <el-button
+ v-if="['11', '21', '23', '31', '60'].includes(gdStatus)"
+ :disabled="footerLoading"
+ @click="viewDescription"
+ color="#F2F3F5"
+ >
{{ gdStatusObj[gdStatus]?.reason }}
</el-button>
<template v-if="!suddenlyEdit">
<el-button
- @click="addDescription"
v-if="['20'].includes(gdStatus) && permission.order_applyCancel"
+ :disabled="footerLoading"
+ @click="addDescription"
color="#F2F3F5"
>
申请取消
</el-button>
<el-button
- color="#4C34FF"
- @click="requestModification"
v-if="['20'].includes(gdStatus) && permission.order_applyEdit"
+ :loading="modifying"
+ :disabled="footerLoading"
+ @click="requestModification"
+ color="#4C34FF"
>
申请修改
</el-button>
@@ -213,32 +221,86 @@
<el-button
v-if="(['11'].includes(gdStatus) || suddenlyEdit || !formData.id) && permission.order_release"
:loading="submitting"
- :disabled="submitting"
+ :disabled="footerLoading"
color="#4C34FF"
@click="handleSubmit"
>
{{ gdStatus === '11' || !gdStatus ? '发布' : '提交修改' }}
</el-button>
- <el-button v-if="gdStatus === '50' && permission.order_settlement" @click="addDescription" color="#F2F3F5">
+ <el-button
+ v-if="gdStatus === '50' && permission.order_settlement"
+ :disabled="footerLoading"
+ @click="addDescription"
+ color="#F2F3F5"
+ >
结算
</el-button>
<template v-if="permission.order_controlOrder">
- <el-button v-if="gdStatus === '10'" @click="addDescription" color="#F2F3F5">拒绝接单</el-button>
- <el-button v-if="gdStatus === '10'" @click="statusChange(1)" color="#4C34FF">接单</el-button>
+ <el-button v-if="gdStatus === '10'" :disabled="footerLoading" @click="addDescription" color="#F2F3F5">
+ 拒绝接单
+ </el-button>
+ <el-button
+ v-if="gdStatus === '10'"
+ :loading="statusLoading === 1"
+ :disabled="footerLoading"
+ @click="statusChange(1)"
+ color="#4C34FF"
+ >
+ 接单
+ </el-button>
</template>
<template v-if="permission.order_controlEdit">
- <el-button v-if="gdStatus === '22'" @click="statusChange(8)" color="#F2F3F5">驳回</el-button>
- <el-button v-if="gdStatus === '22'" @click="statusChange(7)" color="#4C34FF">同意</el-button>
+ <el-button
+ v-if="gdStatus === '22'"
+ :loading="statusLoading === 8"
+ :disabled="footerLoading"
+ @click="statusChange(8)"
+ color="#F2F3F5"
+ >
+ 驳回
+ </el-button>
+ <el-button
+ v-if="gdStatus === '22'"
+ :loading="statusLoading === 7"
+ :disabled="footerLoading"
+ @click="statusChange(7)"
+ color="#4C34FF"
+ >
+ 同意
+ </el-button>
</template>
<template v-if="permission.order_controlCancel">
- <el-button v-if="gdStatus === '21'" @click="statusChange(6)" color="#F2F3F5">驳回</el-button>
- <el-button v-if="gdStatus === '21'" @click="statusChange(5)" color="#4C34FF">通过</el-button>
+ <el-button
+ v-if="gdStatus === '21'"
+ :loading="statusLoading === 6"
+ :disabled="footerLoading"
+ @click="statusChange(6)"
+ color="#F2F3F5"
+ >
+ 驳回
+ </el-button>
+ <el-button
+ v-if="gdStatus === '21'"
+ :loading="statusLoading === 5"
+ :disabled="footerLoading"
+ @click="statusChange(5)"
+ color="#4C34FF"
+ >
+ 通过
+ </el-button>
</template>
- <el-button v-if="gdStatus === '30' && permission.order_applyNegotiation" @click="addDescription" color="#4C34FF">
+ <el-button
+ v-if="gdStatus === '30' && permission.order_applyNegotiation"
+ :disabled="footerLoading"
+ @click="addDescription"
+ color="#4C34FF"
+ >
协商修改
</el-button>
<el-button
v-if="gdStatus === '31' && permission.order_controlNegotiation"
+ :loading="statusLoading === 10"
+ :disabled="footerLoading"
@click="statusChange(10)"
color="#4C34FF"
>
@@ -256,7 +318,7 @@
</template>
<script setup>
-import { computed, ref, nextTick } from 'vue'
+import { computed, ref, nextTick, inject } from 'vue'
import { ElMessage } from 'element-plus'
import { dateRangeFormat, fieldRules, flyVisual, geomAnalysis, getDictLabel } from '@ztzf/utils'
import {
@@ -274,29 +336,38 @@
import RefuseOrderDialog from '@/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue'
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import { gdPatrolTaskPageApi } from '@/views/orderView/orderManage/inspectionRequest/inspectionRequestApi'
-import { Check } from '@element-plus/icons-vue'
+import { Check, Search, RefreshRight } from '@element-plus/icons-vue'
import droneIcon from '@/assets/images/orderView/orderManage/drone.png'
import droneActiveIcon from '@/assets/images/orderView/orderManage/droneActive.png'
import { useStore } from 'vuex'
import OrderStepBar from '@/views/orderView/orderManage/orderManage/OrderStepBar.vue'
+import OutcomeData from './outcomeData.vue'
+import { getDictListApi } from '@/api/zkxt'
+import {
+ getTaskTypeLabel,
+ taskTypeCascaderProps,
+} from '../taskTypeOptions'
const store = useStore()
const permission = computed(() => store.state.user.permission)
+const activeName = ref('basic')
// 初始化表单数据
const initForm = () => ({
workOrderName: '',
- workOrderType: '',
+ workOrderType: [],
executeStartTime: '',
executeEndTime: '',
deviceLoadDemand: '',
remark: '',
geom: '',
recommendDeviceIds: '',
+ typePinyinFirst: '',
})
const mapRef = ref(null)
const rejectVisible = ref(false)
const dictObj = inject('dictObj')
+const workOrderTypeXT = inject('workOrderTypeXT', ref([]))
const dateRange = ref([])
const patrolTaskList = ref([])
const emit = defineEmits(['success'])
@@ -305,6 +376,10 @@
const visible = defineModel() // 弹框显隐
const dialogMode = ref('add') // 弹框模式
const submitting = ref(false) // 提交中
+const modifying = ref(false) // 申请修改中
+const statusLoading = ref(null) // 状态操作中
+const footerLoading = computed(() => submitting.value || modifying.value || statusLoading.value !== null)
+const detailLoaded = ref(false) // 详情加载完成
const dialogReadonly = computed(() => dialogMode.value === 'view')
const titleEnum = ref({ edit: '编辑', view: '查看', add: '新增' })
const deviceList = ref([]) // 设备列表
@@ -345,26 +420,37 @@
// 操作类型：1接单，2拒接接单，3申请取消，4申请修改， 5同意取消
// 6不同意取消 7.同意修改 8.不同意修改 9.协商修改,10:同意协商修改，11.结算
-function statusChange(operationType) {
- gdWorkOrderHandleStatusApi({
- operationType: operationType,
- workOrderId: formData.value.id,
- }).then(res => {
+async function statusChange(operationType) {
+ if (footerLoading.value) return
+ statusLoading.value = operationType
+ try {
+ await gdWorkOrderHandleStatusApi({
+ operationType: operationType,
+ workOrderId: formData.value.id,
+ })
visible.value = false
emit('success')
- })
+ } finally {
+ statusLoading.value = null
+ }
}
// 申请修改按钮
async function requestModification() {
- suddenlyEdit.value = true
- dialogMode.value = 'edit'
- await getDeviceList()
- nextTick(() => {
- syncSelection()
- viewPlane && viewer.entities.remove(viewPlane)
- editPolygon()
- })
+ if (footerLoading.value) return
+ modifying.value = true
+ try {
+ suddenlyEdit.value = true
+ dialogMode.value = 'edit'
+ await getDeviceList()
+ nextTick(() => {
+ syncSelection()
+ viewPlane && viewer.entities.remove(viewPlane)
+ editPolygon()
+ })
+ } finally {
+ modifying.value = false
+ }
}
// 填写说明弹框回调
@@ -431,16 +517,17 @@
// 提交新增/编辑
async function handleSubmit() {
- const isValid = await formRef.value?.validate().catch(() => false)
- if (!isValid) return
- if (!pointList.value.length) {
- return ElMessage.warning('请绘制范围')
- }
- if (!formData.value.recommendDeviceIds) {
- return ElMessage.warning('请选择设备')
- }
+ if (footerLoading.value) return
submitting.value = true
try {
+ const isValid = await formRef.value?.validate().catch(() => false)
+ if (!isValid) return
+ if (!pointList.value.length) {
+ return ElMessage.warning('请绘制范围')
+ }
+ if (!formData.value.recommendDeviceIds) {
+ return ElMessage.warning('请选择设备')
+ }
const str = [...pointList.value, pointList.value[0]].map(item => `${item.longitude} ${item.latitude}`).join(',')
formData.value.geom = `POLYGON((${str}))`
if (!formData.value.id) {
@@ -623,6 +710,7 @@
// 打开弹框
async function open({ mode = 'add', row } = {}) {
+ detailLoaded.value = false
dialogMode.value = mode
getPayloadList()
initMap()
@@ -637,6 +725,7 @@
hasPatrolTaskList.value && gdPatrolTaskPage()
dialogMode.value === 'edit' ? editPolygon() : viewPolygon()
}
+ detailLoaded.value = true
await nextTick()
await getDeviceList()
@@ -675,6 +764,36 @@
}
)
+// 取汉字（或英文）首字的拼音首字母，大写。如「占」→ Z
+function getFirstPinyinLetter(text) {
+ const char = String(text ?? '').trim().charAt(0)
+ if (!char) return ''
+ // 英文/数字直接取大写
+ if (/[a-zA-Z]/.test(char)) return char.toUpperCase()
+ // 按拼音排序的各首字母边界字，用 zh-CN 本地化比较定位所属字母
+ const boundaries = [
+ ['A', '啊'], ['B', '芭'], ['C', '擦'], ['D', '搭'], ['E', '蛾'],
+ ['F', '发'], ['G', '噶'], ['H', '哈'], ['J', '击'], ['K', '喀'],
+ ['L', '垃'], ['M', '妈'], ['N', '拿'], ['O', '哦'], ['P', '啪'],
+ ['Q', '期'], ['R', '然'], ['S', '撒'], ['T', '塌'], ['W', '挖'],
+ ['X', '昔'], ['Y', '压'], ['Z', '匝'],
+ ]
+ for (let i = boundaries.length - 1; i >= 0; i--) {
+ if (char.localeCompare(boundaries[i][1], 'zh-CN') >= 0) return boundaries[i][0]
+ }
+ return ''
+}
+
+// 工单类型变化时，用类型名称第一个字的拼音首字母（大写）赋值给 typePinyinFirst
+watch(
+ () => formData.value.workOrderType,
+ value => {
+ const label = getTaskTypeLabel(value, workOrderTypeXT.value)
+ formData.value.typePinyinFirst = getFirstPinyinLetter(label)
+ },
+ { deep: true }
+)
+
// 地图加载完毕
function mapReady() {
dialogMode.value === 'add' && mapRef.value.flyBoundary()
@@ -683,7 +802,20 @@
defineExpose({ open })
</script>
-<style lang="scss" scoped>
+<style lang="scss">
+.orderManageFormDlg {
+ .el-dialog__body {
+ display: flex;
+ flex-direction: column;
+ .content {
+ height: 0;
+ flex: 1;
+ }
+ }
+}
+</style>
+
+<style scoped lang="scss">
.separateTable {
height: 0;
flex: 1;
@@ -696,10 +828,11 @@
}
}
}
+
.content {
display: flex;
gap: 0 20px;
- height: 680px;
+ //height: 630px;
.leftBox {
width: 0;
@@ -712,8 +845,7 @@
position: relative;
overflow: hidden;
width: 100%;
- min-height: 360px;
- flex: 1;
+ height: 390px;
}
}
--
Gitblit v1.9.3