From 7014258149392cb1f960896d9bd458bca0549375 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 22 Jan 2026 12:57:11 +0800
Subject: [PATCH] feat: 过滤设备
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 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 9f1a5fa..916d839 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
@@ -72,7 +72,6 @@
</el-table-column>
</el-table>
</template>
-
</div>
<el-form
class="gd-dialog-form"
@@ -163,7 +162,12 @@
<div class="rightBox" v-if="!dialogReadonly">
<div class="detail-title">推荐设备</div>
<template v-if="formData.deviceLoadDemand && pointList.length">
- <el-table ref="deviceTableRef" :data="deviceList" row-key="id" @selection-change="handleDeviceSelectionChange">
+ <el-table
+ ref="deviceTableRef"
+ :data="deviceList"
+ row-key="id"
+ @selection-change="handleDeviceSelectionChange"
+ >
<el-table-column type="selection" width="55" :reserve-selection="true" />
<el-table-column prop="nickname" label="设备名称" />
<el-table-column prop="deviceName" label="设备型号" />
@@ -171,7 +175,6 @@
</el-table>
</template>
<div v-else>请先选择设备需求并绘制范围</div>
-
</div>
</div>
@@ -199,7 +202,7 @@
>
发布
</el-button>
- <el-button color="#F2F3F5" v-if="gdStatus === '11'" @click="addDescription(2,'view')">拒单原因</el-button>
+ <el-button color="#F2F3F5" v-if="gdStatus === '11'" @click="addDescription(2, 'view')">拒单原因</el-button>
<el-button color="#F2F3F5" @click="statusChange(3)" v-if="gdStatus === '20'">申请取消</el-button>
<el-button color="#4C34FF" @click="requestModification" v-if="gdStatus === '20'" class="save-btn">
申请修改
@@ -284,6 +287,10 @@
let pointList = ref([])
const requester = inject('requester')
const editStatus = inject('editStatus')
+const suddenlyEdit = ref(false)
+const processList = ref([])
+let viewPlane
+const hasPatrolTaskList = computed(() => ['30', '40', '50', '60'].includes(String(formData.value.workOrderStatus)))
// 工单状态：0草稿、10发布中_接单中、11发布中_拒绝接单、20响应中_待拆分、21响应中_申请取消、22响应中_申请修改、23响应中_已取消、
// 24响应中_拒绝取消、25响应中_拒绝修改 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、50验收通过_待结算、60结算完成_已结算
@@ -303,7 +310,6 @@
})
}
-const suddenlyEdit = ref(false)
function requestModification() {
suddenlyEdit.value = true
dialogMode.value = 'edit'
@@ -320,15 +326,15 @@
}
// 填写说明
-function addDescription(type,mode = 'add') {
+function addDescription(type, mode = 'add') {
let formLabel = ''
- switch ( type) {
+ switch (type) {
case 2:
- formLabel = '拒绝原因';
- break
+ formLabel = '拒绝原因'
+ break
case 9:
- formLabel = '修改原因';
- break
+ formLabel = '修改原因'
+ break
}
rejectVisible.value = true
nextTick(() => {
@@ -344,11 +350,14 @@
// 获取推荐设备列表
async function getDeviceList() {
try {
+ const str = [...pointList.value, pointList.value[0]].map(item => `${item.longitude} ${item.latitude}`).join(',')
+ let geom = `POLYGON((${str}))`
const res = await gdManageDeviceListApi({
current: 1,
size: 1000,
ids: formData.value.recommendDeviceIds,
devicePayload: dialogMode.value === 'add' ? formData.value.deviceLoadDemand : '',
+ geom: dialogMode.value === 'add' ? geom : '',
})
deviceList.value = res?.data?.data ?? []
} catch (error) {
@@ -357,7 +366,6 @@
}
function loadDemandChange() {
- console.log('loadDemandChange')
formData.value.recommendDeviceIds = ''
getDeviceList()
syncSelection()
@@ -402,7 +410,6 @@
}
)
-const processList = ref([])
function loadList() {
gdWorkOrderFlowListApi({ workOrderId: formData.value.id }).then(res => {
processList.value = res.data.data
@@ -431,6 +438,8 @@
const val = cartesian3Convert(item, viewer)
return { ...val, lng: val.longitude, lat: val.latitude }
})
+ await getDeviceList()
+ syncSelection()
}
// 编辑面
@@ -448,7 +457,6 @@
drawPolygonExample.subscribe('getPolygonPositions', drawFinished)
}
-let viewPlane
// 查看面
function viewPolygon() {
if (!formData.value?.geom) return
@@ -474,7 +482,6 @@
function syncSelection() {
if (!deviceTableRef.value) return
deviceTableRef.value.clearSelection()
- console.log(formData.value)
const deviceIds = formData.value.recommendDeviceIds.split(',')
deviceList.value.forEach(device => {
if (deviceIds.includes(String(device.id))) {
@@ -483,7 +490,6 @@
})
}
-const hasPatrolTaskList = computed(() => ['30','40','50','60'].includes(String(formData.value.workOrderStatus)))
function gdPatrolTaskPage() {
gdPatrolTaskPageApi({ current: 1, size: 1000, workOrderId: formData.value.id }).then(res => {
--
Gitblit v1.9.3