From 89380e6260a75d1d3b94de687ebcc2f50d50659d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 03 Feb 2026 15:44:33 +0800
Subject: [PATCH] feat:环境变量配置调整
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 331 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 208 insertions(+), 123 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 2b5ba57..2acc032 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
@@ -9,23 +9,11 @@
:close-on-click-modal="false"
>
<div class="content" style="display: flex">
- <div class="processBox" v-if="dialogMode !== 'add' && processList.length">
- <el-timeline>
- <el-timeline-item
- v-for="(activity, index) in processList"
- :key="index"
- :icon="Check"
- :type="index === processList.length - 1 ? 'success' : 'info'"
- :color="activity.color"
- :hollow="activity.hollow"
- :timestamp="activity.flowDesc.split(' ')[1]"
- >
- <div class="item-content">
- <div>{{ activity.flowDesc.split(' ')[0] }}</div>
- <div class="flowName">{{ activity.flowName }}</div>
- </div>
- </el-timeline-item>
- </el-timeline>
+ <div class="processBox" v-if="dialogMode !== 'add'">
+ <div class="detail-title">工单记录</div>
+ <div class="process">
+ <OrderStepBar :processList="processList" />
+ </div>
</div>
<div class="leftBox">
<div v-if="dialogReadonly">
@@ -56,18 +44,19 @@
</el-col>
</el-row>
<div class="detail-title" :style="{ marginTop: pxToRem(20) }">已选设备</div>
- <el-table class="setHeight" ref="deviceTableRef" :data="deviceList" row-key="id">
+ <el-table class="setHeight gd-dialog-table" ref="deviceTableRef" :data="deviceList" row-key="id">
+ <el-table-column type="index" label="序号" />
<el-table-column prop="nickname" label="设备名称" />
<el-table-column prop="deviceName" label="设备型号" />
<el-table-column prop="devicePayload" label="设备负载" />
</el-table>
<template v-if="hasPatrolTaskList">
<div class="detail-title" :style="{ marginTop: pxToRem(20) }">巡查任务名称</div>
- <el-table class="setHeight" :data="patrolTaskList" row-key="id">
+ <el-table class="setHeight gd-dialog-table" :data="patrolTaskList" row-key="id">
<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.patrolTaskType) }}
+ {{ getDictLabel(row.patrolTaskType, dictObj.workOrderType) }}
</template>
</el-table-column>
<el-table-column prop="taskStatus" show-overflow-tooltip label="任务状态">
@@ -90,6 +79,7 @@
:disabled="dialogReadonly"
label-width="90px"
>
+ <div class="detail-title">工单详情</div>
<el-row>
<el-col :span="12">
<el-form-item label="工单名称" prop="workOrderName">
@@ -118,7 +108,6 @@
<el-form-item label="执行时间" prop="executeStartTime">
<el-date-picker
class="gd-date-picker"
- popper-class="gd-date-picker-popper"
v-model="dateRange"
type="daterange"
range-separator="至"
@@ -149,15 +138,25 @@
</el-col>
<el-col :span="24">
<el-form-item label="工单备注" prop="remark">
- <el-input class="gd-input" type="textarea" :rows="4" v-model="formData.remark" placeholder="请输入" clearable />
+ <el-input
+ class="gd-input"
+ type="textarea"
+ :rows="3"
+ v-model="formData.remark"
+ placeholder="请输入"
+ clearable
+ />
</el-form-item>
</el-col>
</el-row>
</el-form>
- <div class="detail-title" :style="{ marginTop: pxToRem(20) }">工单执行范围</div>
+ <div class="detail-title" :style="{ marginTop: pxToRem(20) }">
+ <span class="required-star" v-if="!dialogReadonly">*</span>
+ 工单执行范围
+ </div>
<CommonCesiumMap
ref="mapRef"
- class="leftMap gd-cesium"
+ class="gd-cesium"
:active="visible"
:flat-mode="false"
:terrain="true"
@@ -168,55 +167,83 @@
/>
</div>
<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-column type="selection" width="55" :reserve-selection="true" />
- <el-table-column prop="nickname" label="设备名称" />
- <el-table-column prop="deviceName" label="设备型号" />
- <el-table-column prop="devicePayload" label="设备负载" />
- </el-table>
- </template>
- <div v-else class="tipSelect">请先选择设备需求并在地图上绘制工单范围</div>
+ <div class="detail-title">
+ <span class="required-star" v-if="!dialogReadonly">*</span>
+ 推荐设备
+ </div>
+ <el-table
+ class="separateTable"
+ :empty-text="
+ formData.deviceLoadDemand && pointList.length ? '暂无数据' : '请先选择设备需求并在地图上绘制工单范围'
+ "
+ ref="deviceTableRef"
+ :data="formData.deviceLoadDemand && pointList.length ? 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="设备型号" />
+ <el-table-column prop="devicePayload" label="设备负载" />
+ </el-table>
</div>
</div>
<template #footer>
- <template v-if="requester">
+ <el-button v-if="['11', '21', '23', '31', '60'].includes(gdStatus)" @click="viewDescription" color="#F2F3F5">
+ {{ gdStatusObj[gdStatus]?.reason }}
+ </el-button>
+
+ <template v-if="!suddenlyEdit">
<el-button
- v-if="['11'].includes(gdStatus) || suddenlyEdit || (!dialogReadonly && !formData.id)"
- :loading="submitting"
- :disabled="submitting"
- @click="handleSubmit"
+ @click="addDescription"
+ v-if="['20'].includes(gdStatus) && permission.order_applyCancel"
+ color="#F2F3F5"
>
- {{ gdStatus === '11' || !gdStatus ? '发布' : '提交修改' }}
+ 申请取消
</el-button>
- <el-button v-if="['11', '21', '23', '24', '25', '31', '60'].includes(gdStatus)" @click="viewDescription">
- {{ gdStatusObj[gdStatus].reason }}
+ <el-button
+ color="#4C34FF"
+ @click="requestModification"
+ v-if="['20'].includes(gdStatus) && permission.order_applyEdit"
+ >
+ 申请修改
</el-button>
- <el-button @click="addDescription" v-if="['20', '24', '25', '50'].includes(gdStatus)">
- {{ gdStatus === '50' ? '结算' : '申请取消' }}
- </el-button>
- <el-button @click="requestModification" v-if="['20', '25'].includes(gdStatus)">申请修改</el-button>
</template>
- <template v-else>
- <el-button v-if="['21', '23'].includes(gdStatus)" @click="viewDescription">
- {{ gdStatusObj[gdStatus].reason }}
- </el-button>
- <el-button v-if="gdStatus === '10'" @click="addDescription">拒绝接单</el-button>
- <el-button v-if="gdStatus === '10'" @click="statusChange(1)">接单</el-button>
- <el-button v-if="gdStatus === '22'" @click="statusChange(8)">不同意修改</el-button>
- <el-button v-if="gdStatus === '22'" @click="statusChange(7)">同意修改</el-button>
- <el-button v-if="gdStatus === '21'" @click="addDescription">不同意取消</el-button>
- <el-button v-if="gdStatus === '21'" @click="statusChange(5)">同意取消</el-button>
- <el-button v-if="gdStatus === '30'" @click="addDescription">协商修改</el-button>
- <el-button v-if="gdStatus === '31'" @click="statusChange(10)">同意</el-button>
+ <el-button
+ v-if="(['11'].includes(gdStatus) || suddenlyEdit || !formData.id) && permission.order_release"
+ :loading="submitting"
+ :disabled="submitting"
+ color="#4C34FF"
+ @click="handleSubmit"
+ >
+ {{ gdStatus === '11' || !gdStatus ? '发布' : '提交修改' }}
+ </el-button>
+ <el-button v-if="gdStatus === '50' && permission.order_settlement" @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>
</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>
+ </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>
+ </template>
+ <el-button v-if="gdStatus === '30' && permission.order_applyNegotiation" @click="addDescription" color="#4C34FF">
+ 协商修改
+ </el-button>
+ <el-button
+ v-if="gdStatus === '31' && permission.order_controlNegotiation"
+ @click="statusChange(10)"
+ color="#4C34FF"
+ >
+ 同意
+ </el-button>
</template>
<RefuseOrderDialog
@@ -229,7 +256,7 @@
</template>
<script setup>
-import { computed, ref, onMounted, nextTick } from 'vue'
+import { computed, ref, nextTick } from 'vue'
import { ElMessage } from 'element-plus'
import { dateRangeFormat, fieldRules, flyVisual, geomAnalysis, getDictLabel } from '@ztzf/utils'
import {
@@ -241,13 +268,20 @@
import { gdManageDeviceListApi } from './gdManageDeviceApi'
import { cartesian3Convert } from '@/utils/cesium/mapUtil'
import * as Cesium from 'cesium'
-import { DrawPolygon } from '@/utils/cesium/DrawPolygon'
+import { DrawPolygon } from '@ztzf/utils'
import { pxToRem } from '@/utils/rem'
import dayjs from 'dayjs'
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 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'
+const store = useStore()
+const permission = computed(() => store.state.user.permission)
+
// 初始化表单数据
const initForm = () => ({
workOrderName: '',
@@ -280,30 +314,26 @@
let viewer
let drawPolygonExample
let pointList = ref([])
-const requester = inject('requester')
const suddenlyEdit = ref(false)
const processList = ref([])
let viewPlane
const hasPatrolTaskList = computed(() => ['30', '40', '50', '60'].includes(String(formData.value.workOrderStatus)))
const gdStatusObj = {
- '10': { reason: '拒绝原因', operationType: '2' },
- '11': { reason: '拒绝原因' },
- '20': { reason: '取消原因', operationType: '3' },
- '21': { reason: '原因', operationType: '6' },
- '22': { reason: '驳回原因' },
+ '10': { reason: '拒单原因', operationType: '2', title: '拒绝接单' },
+ '11': { reason: '拒单原因' },
+ '20': { reason: '原因', operationType: '3', title: '申请取消' },
+ '21': { reason: '取消原因' },
'23': { reason: '取消原因' },
- '24': { reason: '驳回原因', operationType: '3' },
- '25': { reason: '驳回原因', operationType: '3' },
- '30': { reason: '修改原因', operationType: '9' },
+ '30': { reason: '修改原因', operationType: '9', title: '协商修改' },
'31': { reason: '修改原因' },
'40': { reason: '' },
- '50': { reason: '情况说明', operationType: '11' },
+ '50': { reason: '情况说明', operationType: '11', title: '结算' },
'60': { reason: '情况说明' },
}
// 工单状态：0草稿、10发布中_接单中、11发布中_拒绝接单、20响应中_待拆分、21响应中_申请取消、22响应中_申请修改、23响应中_已取消、
-// 24响应中_拒绝取消、25响应中_拒绝修改 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、50验收通过_待结算、60结算完成_已结算
+// 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、50验收通过_待结算、60结算完成_已结算
const gdStatus = computed(() => formData.value?.workOrderStatus)
const rules = {
@@ -325,9 +355,11 @@
})
}
-function requestModification() {
+// 申请修改按钮
+async function requestModification() {
suddenlyEdit.value = true
dialogMode.value = 'edit'
+ await getDeviceList()
nextTick(() => {
syncSelection()
viewPlane && viewer.entities.remove(viewPlane)
@@ -335,6 +367,7 @@
})
}
+// 填写说明弹框回调
function rejectSuccess() {
visible.value = false
emit('success')
@@ -349,6 +382,7 @@
row: formData.value,
type: gdStatusObj[gdStatus.value].operationType,
formLabel: gdStatusObj[gdStatus.value].reason,
+ title: gdStatusObj[gdStatus.value]?.title || '新增',
})
})
}
@@ -371,9 +405,9 @@
const str = [...pointList.value, pointList.value[0]].map(item => `${item.longitude} ${item.latitude}`).join(',')
let geom = `POLYGON((${str}))`
const res = await gdManageDeviceListApi({
- deviceIds: formData.value.recommendDeviceIds,
- devicePayload: dialogMode.value === 'add' ? formData.value.deviceLoadDemand : '',
- geom: dialogMode.value === 'add' ? geom : '',
+ deviceIds: dialogMode.value === 'add' ? '' : formData.value.recommendDeviceIds,
+ devicePayload: formData.value?.deviceLoadDemand,
+ geom: geom,
})
deviceList.value = res?.data?.data ?? []
} catch (error) {
@@ -382,10 +416,10 @@
}
// 设备需求变化
-function loadDemandChange() {
+async function loadDemandChange() {
formData.value.recommendDeviceIds = ''
selectedDevices.value = []
- getDeviceList()
+ await getDeviceList()
syncSelection()
}
@@ -421,18 +455,9 @@
}
}
-watch(
- () => dateRange.value,
- newVal => {
- const range = dateRangeFormat(dateRange.value)
- formData.value.executeStartTime = range[0]
- formData.value.executeEndTime = range[1]
- }
-)
-
// 加载时间线list
function loadList() {
- gdWorkOrderFlowListApi({ workOrderId: formData.value.id }).then(res => {
+ gdWorkOrderFlowListApi({ workOrderId: formData.value.id, type: '0' }).then(res => {
processList.value = res.data.data
})
}
@@ -488,11 +513,17 @@
viewPlane = viewer.entities?.add({
customType: 'control_group',
position: Cesium.Cartesian3.fromDegrees(result[0], result[1]),
+ polygon: {
+ hierarchy: Cesium.Cartesian3.fromDegreesArray(result),
+ material: Cesium.Color.fromBytes(45, 140, 240, 99),
+ outline: false,
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+ },
polyline: {
positions: Cesium.Cartesian3.fromDegreesArray(result),
clampToGround: true,
- width: 3,
- material: Cesium.Color.RED,
+ width: 2,
+ material: Cesium.Color.fromBytes(45, 140, 240, 255),
},
})
flyVisual({
@@ -501,7 +532,7 @@
})
}
-// 同步关联场景
+// 回显选中设备
function syncSelection() {
if (!deviceTableRef.value) return
deviceTableRef.value.clearSelection()
@@ -520,25 +551,28 @@
})
}
-function setMapDevice() {
- gdManageDeviceListApi().then(res => {
- renderingDevice(res?.data?.data || [])
- })
-}
-
-import droneIcon from '@/assets/images/orderView/orderManage/drone.png'
-
-function renderingDevice(list) {
- // 渲染红点
+// 渲染
+function renderingAllDevice(list) {
list.forEach(item => {
- const position = Cesium.Cartesian3.fromDegrees(item.longitude || 115.0, item.latitude || 27.11)
+ if (!item.longitude || !item.latitude) return
+ const position = Cesium.Cartesian3.fromDegrees(item.longitude, item.latitude)
viewer.entities.add({
position: position,
billboard: {
image: droneIcon,
- width: 40,
- height: 40,
+ width: 30,
+ height: 30,
verticalOrigin: Cesium.VerticalOrigin.CENTER,
+ },
+ label: {
+ text: item.nickname,
+ font: '12px/1.5 Microsoft YaHei',
+ style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+ outlineWidth: 2,
+ outlineColor: Cesium.Color.WHITE,
+ horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+ verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+ pixelOffset: new Cesium.Cartesian2(0, -20),
},
})
})
@@ -547,8 +581,10 @@
// 打开弹框
async function open({ mode = 'add', row } = {}) {
dialogMode.value = mode
- formData.value = dialogMode.value === 'add' ? initForm() : row
initMap()
+ const allDeviceRes = await gdManageDeviceListApi()
+ formData.value = dialogMode.value === 'add' ? initForm() : row
+ renderingAllDevice(allDeviceRes?.data?.data || [])
if (dialogMode.value === 'add') {
addPolygon()
} else {
@@ -556,9 +592,11 @@
hasPatrolTaskList.value && gdPatrolTaskPage()
dialogMode.value === 'edit' ? editPolygon() : viewPolygon()
}
- // setMapDevice()
+
await nextTick()
+ await getDeviceList()
syncSelection()
+ highlightSelectedDevices()
}
// 初始化地图实例
@@ -568,6 +606,31 @@
viewer = map?.viewer || null
}
+// 高亮选中的设备
+function highlightSelectedDevices() {
+ const selectedIds = (formData.value.recommendDeviceIds || '').split(',').filter(Boolean)
+ if (!viewer?.entities) return
+ viewer.entities.values.forEach(entity => {
+ const image = entity.billboard?.image?._value
+ if ((image === droneIcon || image === droneActiveIcon) && entity.label) {
+ const device = deviceList.value.find(d => d.nickname === entity.label.text._value)
+ entity.billboard.image = device && selectedIds.includes(String(device.id)) ? droneActiveIcon : droneIcon
+ }
+ })
+}
+
+watch(() => formData.value.recommendDeviceIds, highlightSelectedDevices)
+
+watch(
+ () => dateRange.value,
+ newVal => {
+ const range = dateRangeFormat(dateRange.value)
+ formData.value.executeStartTime = range[0]
+ formData.value.executeEndTime = range[1]
+ }
+)
+
+// 地图加载完毕
function mapReady() {
dialogMode.value === 'add' && mapRef.value.flyBoundary()
}
@@ -576,24 +639,41 @@
</script>
<style lang="scss" scoped>
+.separateTable {
+ height: 0;
+ flex: 1;
+ :deep() {
+ .el-scrollbar__view {
+ height: 100%;
+ }
+ .el-table__empty-text {
+ line-height: normal;
+ }
+ }
+}
.content {
display: flex;
gap: 0 20px;
+ height: 680px;
.leftBox {
width: 0;
flex: 1;
display: flex;
+ overflow: auto;
flex-direction: column;
.gd-cesium {
width: 100%;
- height: 423px;
+ min-height: 360px;
+ flex: 1;
}
}
.rightBox {
width: 350px;
+ display: flex;
+ flex-direction: column;
.title {
font-weight: 500;
font-size: 14px;
@@ -602,24 +682,29 @@
}
.processBox {
- width: 312px;
- .el-timeline {
- padding-left: 100px;
- }
- .item-content {
- position: relative;
- .flowName {
- position: absolute;
- left: -100px;
- top: 0;
- }
+ display: flex;
+ flex-direction: column;
+
+ .process {
+ height: 100%;
+ padding: 12px 16px 24px 16px;
+ width: 312px;
+ border: 1px solid #e4e4e4;
+ border-radius: 8px;
+ background: #fff;
+ overflow: auto;
}
}
}
-.tipSelect{
+.tipSelect {
text-align: center;
height: 200px;
line-height: 200px;
}
+
+.required-star {
+ color: #f56c6c;
+ margin-right: 4px;
+}
</style>
--
Gitblit v1.9.3