From d04ecbb2aa47d93e05d28bb551e7bad83d97d60f Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 03 Jun 2026 18:38:55 +0800
Subject: [PATCH] feat: 类型多选改造
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 158 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 120 insertions(+), 38 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 e5aaf96..75afa99 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,13 @@
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 +31,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>
@@ -36,7 +42,7 @@
</el-col>
<el-col :span="12">
<div class="label">设备需求</div>
- <div class="val">{{ getDictLabel(formData.deviceLoadDemand, dictObj.deviceLoadDemand) }}</div>
+ <div class="val">{{ formData.deviceLoadDemand }}</div>
</el-col>
<el-col :span="24">
<div class="label">工单备注</div>
@@ -56,7 +62,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 +94,15 @@
</el-col>
<el-col :span="12">
<el-form-item label="工单类型" prop="workOrderType">
- <el-select
+ <el-cascader
class="gd-select"
popper-class="gd-select-popper"
v-model="formData.workOrderType"
+ :options="workOrderTypeXT"
+ :props="taskTypeCascaderProps"
placeholder="请选择"
clearable
- >
- <el-option
- v-for="item in dictObj.workOrderType"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
- </el-select>
+ />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -128,10 +129,10 @@
@change="loadDemandChange"
>
<el-option
- v-for="item in dictObj.deviceLoadDemand"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
+ v-for="item in payloadList"
+ :key="item.name"
+ :label="item.name"
+ :value="item.name"
/>
</el-select>
</el-form-item>
@@ -139,9 +140,9 @@
<el-col :span="24">
<el-form-item label="工单备注" prop="remark">
<el-input
- class="gd-input"
+ class="gd-input-text"
type="textarea"
- :rows="4"
+ :rows="3"
v-model="formData.remark"
placeholder="请输入"
clearable
@@ -150,7 +151,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>
@@ -174,10 +175,10 @@
<el-table
class="separateTable"
:empty-text="
- formData.deviceLoadDemand && pointList.length ? '暂无数据' : '请先选择设备需求并在地图上绘制工单范围'
+ pointList.length ? '暂无数据' : '请先在地图上绘制工单范围'
"
ref="deviceTableRef"
- :data="formData.deviceLoadDemand && pointList.length ? deviceList : []"
+ :data="pointList.length ? deviceList : []"
row-key="id"
@selection-change="handleDeviceSelectionChange"
>
@@ -189,7 +190,7 @@
</div>
</div>
- <template #footer>
+ <template #footer v-if="activeName === 'basic' && detailLoaded">
<el-button v-if="['11', '21', '23', '31', '60'].includes(gdStatus)" @click="viewDescription" color="#F2F3F5">
{{ gdStatusObj[gdStatus]?.reason }}
</el-button>
@@ -256,7 +257,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 {
@@ -265,7 +266,7 @@
gdWorkOrderHandleStatusApi,
gdWorkOrderSaveApi,
} from './orderManageApi'
-import { gdManageDeviceListApi } from './gdManageDeviceApi'
+import { gdDevicePayloadListApi, gdManageDeviceListApi } from './gdManageDeviceApi'
import { cartesian3Convert } from '@/utils/cesium/mapUtil'
import * as Cesium from 'cesium'
import { DrawPolygon } from '@ztzf/utils'
@@ -274,18 +275,22 @@
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, toTaskTypeCascaderValue, toTaskTypeRequestValue } from '../taskTypeOptions'
const store = useStore()
const permission = computed(() => store.state.user.permission)
+const activeName = ref('basic')
// 初始化表单数据
const initForm = () => ({
workOrderName: '',
- workOrderType: '',
+ workOrderType: [],
executeStartTime: '',
executeEndTime: '',
deviceLoadDemand: '',
@@ -297,6 +302,7 @@
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 +311,7 @@
const visible = defineModel() // 弹框显隐
const dialogMode = ref('add') // 弹框模式
const submitting = ref(false) // 提交中
+const detailLoaded = ref(false) // 详情加载完成
const dialogReadonly = computed(() => dialogMode.value === 'view')
const titleEnum = ref({ edit: '编辑', view: '查看', add: '新增' })
const deviceList = ref([]) // 设备列表
@@ -317,6 +324,7 @@
const suddenlyEdit = ref(false)
const processList = ref([])
let viewPlane
+let allDeviceList = []
const hasPatrolTaskList = computed(() => ['30', '40', '50', '60'].includes(String(formData.value.workOrderStatus)))
const gdStatusObj = {
@@ -340,7 +348,6 @@
workOrderName: fieldRules(true, 50),
workOrderType: fieldRules(true),
executeStartTime: fieldRules(true),
- deviceLoadDemand: fieldRules(true),
}
// 操作类型：1接单，2拒接接单，3申请取消，4申请修改， 5同意取消
@@ -403,7 +410,7 @@
async function getDeviceList() {
try {
const str = [...pointList.value, pointList.value[0]].map(item => `${item.longitude} ${item.latitude}`).join(',')
- let geom = `POLYGON((${str}))`
+ let geom = `POLYGON((${str}))`
const res = await gdManageDeviceListApi({
deviceIds: dialogMode.value === 'add' ? '' : formData.value.recommendDeviceIds,
devicePayload: formData.value?.deviceLoadDemand,
@@ -446,7 +453,11 @@
if (!formData.value.id) {
formData.value.workOrderStatus = '10'
}
- await gdWorkOrderSaveApi(formData.value)
+ const payload = {
+ ...formData.value,
+ workOrderType: toTaskTypeRequestValue(formData.value.workOrderType),
+ }
+ await gdWorkOrderSaveApi(payload)
ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
visible.value = false
emit('success')
@@ -468,12 +479,13 @@
loadList()
const res = await gdWorkOrderDetailApi({ id: formData.value.id })
formData.value = res?.data?.data ?? {}
+ formData.value.workOrderType = toTaskTypeCascaderValue(formData.value.workOrderType)
dateRange.value = [formData.value.executeStartTime, formData.value.executeEndTime]
}
// 新增模式绘制
function addPolygon() {
- drawPolygonExample = new DrawPolygon(viewer)
+ drawPolygonExample = new DrawPolygon({ deviceList: allDeviceList })
drawPolygonExample.initHandler(viewer)
drawPolygonExample.subscribe('getPolygonPositions', drawFinished)
}
@@ -495,7 +507,7 @@
if (!formData.value?.geom) return
pointList.value = geomAnalysis(formData.value.geom)
drawPolygonExample?.destroy()
- drawPolygonExample = new DrawPolygon(viewer)
+ drawPolygonExample = new DrawPolygon({ deviceList: allDeviceList })
let noClosedList = _.cloneDeep(pointList.value)
noClosedList.pop()
drawPolygonExample.initPolygon(
@@ -551,6 +563,19 @@
})
}
+// 生成圆形坐标点
+function buildCirclePositions(center, radius, segments = 120) {
+ const cartographic = Cesium.Cartographic.fromCartesian(center)
+ const positions = []
+ for (let i = 0; i < segments; i++) {
+ const angle = (i / segments) * 2 * Math.PI
+ const lat = cartographic.latitude + (radius / 6378137) * Math.cos(angle)
+ const lon = cartographic.longitude + (radius / (6378137 * Math.cos(cartographic.latitude))) * Math.sin(angle)
+ positions.push(Cesium.Cartesian3.fromRadians(lon, lat))
+ }
+ return positions
+}
+
// 渲染
function renderingAllDevice(list) {
list.forEach(item => {
@@ -563,6 +588,7 @@
width: 30,
height: 30,
verticalOrigin: Cesium.VerticalOrigin.CENTER,
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
},
label: {
text: item.nickname,
@@ -571,20 +597,52 @@
outlineWidth: 2,
outlineColor: Cesium.Color.WHITE,
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
pixelOffset: new Cesium.Cartesian2(0, -20),
+ },
+ })
+ // 覆盖范围 - 5km圆形区域
+ viewer.entities.add({
+ position: position,
+ ellipse: {
+ semiMajorAxis: 5000,
+ semiMinorAxis: 5000,
+ material: Cesium.Color.fromBytes(45, 140, 240, 80),
+ outline: false,
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+ },
+ })
+ // 覆盖范围描边线 - 贴地
+ const circlePositions = buildCirclePositions(position, 5000)
+ viewer.entities.add({
+ polyline: {
+ positions: [...circlePositions, circlePositions[0]],
+ clampToGround: true,
+ width: 2,
+ material: Cesium.Color.fromBytes(45, 140, 240, 255),
},
})
})
}
+const payloadList = ref([])
+function getPayloadList() {
+ gdDevicePayloadListApi().then(res => {
+ payloadList.value = res.data.data
+ })
+}
+
// 打开弹框
async function open({ mode = 'add', row } = {}) {
+ detailLoaded.value = false
dialogMode.value = mode
+ getPayloadList()
initMap()
const allDeviceRes = await gdManageDeviceListApi()
formData.value = dialogMode.value === 'add' ? initForm() : row
- renderingAllDevice(allDeviceRes?.data?.data || [])
+ allDeviceList = allDeviceRes?.data?.data || []
+ renderingAllDevice(allDeviceList)
if (dialogMode.value === 'add') {
addPolygon()
} else {
@@ -592,6 +650,7 @@
hasPatrolTaskList.value && gdPatrolTaskPage()
dialogMode.value === 'edit' ? editPolygon() : viewPolygon()
}
+ detailLoaded.value = true
await nextTick()
await getDeviceList()
@@ -638,7 +697,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;
@@ -651,10 +723,12 @@
}
}
}
+
+
.content {
display: flex;
gap: 0 20px;
- height: 680px;
+ //height: 630px;
.leftBox {
width: 0;
@@ -664,9 +738,10 @@
flex-direction: column;
.gd-cesium {
+ position: relative;
+ //overflow: hidden;
width: 100%;
- min-height: 360px;
- flex: 1;
+ height: 390px;
}
}
@@ -674,11 +749,18 @@
width: 350px;
display: flex;
flex-direction: column;
+
.title {
font-weight: 500;
font-size: 14px;
color: #272e37;
}
+
+ ::v-deep(.el-table) {
+ tr th {
+ font-weight: normal;
+ }
+ }
}
.processBox {
--
Gitblit v1.9.3