From 5f694550ed7bf0f6147c66feaa4406034ae62e54 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Tue, 11 Aug 2026 19:06:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 91 +++++++++++++++++++++++++++++----------------
1 files changed, 59 insertions(+), 32 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 75afa99..80b0744 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
@@ -8,12 +8,17 @@
destroy-on-close
:close-on-click-modal="false"
>
- <el-tabs class="gd-tabs" v-model="activeName" @tab-click="tabsClick" v-if="dialogReadonly && formData.workOrderStatus >= '30'">
+ <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>
+ </el-tabs>
<div class="content" style="display: flex" v-if="activeName === 'basic'">
<div class="processBox" v-if="dialogMode !== 'add'">
<div class="detail-title">工单记录</div>
@@ -95,13 +100,14 @@
<el-col :span="12">
<el-form-item label="工单类型" prop="workOrderType">
<el-cascader
- class="gd-select"
- popper-class="gd-select-popper"
+ class="gd-cascader"
+ popper-class="gd-cascader-popper"
v-model="formData.workOrderType"
:options="workOrderTypeXT"
- :props="taskTypeCascaderProps"
+ :props="{...taskTypeCascaderProps,multiple:true }"
placeholder="请选择"
clearable
+ collapse-tags
/>
</el-form-item>
</el-col>
@@ -128,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>
@@ -174,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"
@@ -282,7 +281,10 @@
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'
+import {
+ getTaskTypeLabel,
+ taskTypeCascaderProps,
+} from '../taskTypeOptions'
const store = useStore()
const permission = computed(() => store.state.user.permission)
const activeName = ref('basic')
@@ -297,6 +299,7 @@
remark: '',
geom: '',
recommendDeviceIds: '',
+ typePinyinFirst: '',
})
const mapRef = ref(null)
@@ -410,7 +413,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,
@@ -453,11 +456,7 @@
if (!formData.value.id) {
formData.value.workOrderStatus = '10'
}
- const payload = {
- ...formData.value,
- workOrderType: toTaskTypeRequestValue(formData.value.workOrderType),
- }
- await gdWorkOrderSaveApi(payload)
+ await gdWorkOrderSaveApi(formData.value)
ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
visible.value = false
emit('success')
@@ -479,7 +478,6 @@
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]
}
@@ -689,6 +687,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()
@@ -698,15 +726,15 @@
</script>
<style lang="scss">
-.orderManageFormDlg{
- .el-dialog__body{
- display: flex;
- flex-direction: column;
- .content{
- height: 0;
- flex: 1;
- }
+.orderManageFormDlg {
+ .el-dialog__body {
+ display: flex;
+ flex-direction: column;
+ .content {
+ height: 0;
+ flex: 1;
}
+ }
}
</style>
@@ -724,7 +752,6 @@
}
}
-
.content {
display: flex;
gap: 0 20px;
@@ -739,7 +766,7 @@
.gd-cesium {
position: relative;
- //overflow: hidden;
+ overflow: hidden;
width: 100%;
height: 390px;
}
--
Gitblit v1.9.3