From 3d3609bc26c0e3ce1d3a8bdfbb7767dc7d15ccb1 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 05 Feb 2026 10:21:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue | 5 +++--
applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue | 2 +-
applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue | 5 +++--
applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue | 2 +-
uniapps/work-wx/src/static/fonts/font.css | 8 ++++++++
applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue | 4 +++-
applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue | 5 ++++-
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue | 2 +-
applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue | 6 +++---
applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue | 2 +-
applications/task-work-order/src/styles/common/cockpit.scss | 4 +++-
applications/drone-command/src/utils/cesium/shapeTools/edit/EditPolygonTool.js | 4 ++--
applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/FormDiaLog.vue | 3 ++-
applications/drone-command/src/api/dataCockpit/index.js | 6 +++---
applications/drone-command/src/views/recordManage/historyTracks/flyTrajectory.js | 2 +-
15 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/applications/drone-command/src/api/dataCockpit/index.js b/applications/drone-command/src/api/dataCockpit/index.js
index 6432650..91f4022 100644
--- a/applications/drone-command/src/api/dataCockpit/index.js
+++ b/applications/drone-command/src/api/dataCockpit/index.js
@@ -53,7 +53,7 @@
})
}
-// ????
+// 告警收藏
export const alarmFavoriteSaveApi = (data) => {
return request({
url: '/drone-fw/record/fwAlarmFavorite/save',
@@ -62,7 +62,7 @@
})
}
-// ??????
+// 取消收藏
export const alarmFavoriteRemoveApi = (ids) => {
const formattedIds = Array.isArray(ids) ? ids.join(',') : ids
return request({
@@ -117,4 +117,4 @@
method: 'get',
params,
})
-}
\ No newline at end of file
+}
diff --git a/applications/drone-command/src/utils/cesium/shapeTools/edit/EditPolygonTool.js b/applications/drone-command/src/utils/cesium/shapeTools/edit/EditPolygonTool.js
index e13c109..e0a09df 100644
--- a/applications/drone-command/src/utils/cesium/shapeTools/edit/EditPolygonTool.js
+++ b/applications/drone-command/src/utils/cesium/shapeTools/edit/EditPolygonTool.js
@@ -75,9 +75,9 @@
handleMouseMove(movement) {
if (!this.tooltip?.isVisible) {
- this.tooltip.show('????????????', movement.endPosition)
+ this.tooltip.show('拖动顶点编辑', movement.endPosition)
} else {
- this.tooltip.show('????????????')
+ this.tooltip.show('拖动顶点编辑')
this.tooltip.move(movement.endPosition)
}
if (!this.isDragging || this.draggedIndex < 0) return
diff --git a/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue
index 5ad124e..4800370 100644
--- a/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/areaStatistics/FormDiaLog.vue
@@ -68,7 +68,7 @@
const formData = ref(initForm()) // 弹框显隐
const visible = defineModel() // 弹框模式
-const dialogMode = ref('view') // ????
+const dialogMode = ref('view') // 弹窗模式
const titleEnum = ref({ view: '查看' })
const dictObj = inject('dictObj')
diff --git a/applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue
index 1afc927..bccbe34 100644
--- a/applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue
@@ -191,7 +191,7 @@
const titleEnum = ref({ edit: '编辑', view: '查看', add: '新增' })
const effectiveDateRange = ref([]) // 有效时间范围
const sceneConfigList = ref([]) // 场景配置列表
-const areaList = ref([]) // ????
+const areaList = ref([]) // 区域列表
const mapRef = ref(null)
const route = useRoute()
let viewer
@@ -263,7 +263,7 @@
}
// 获取场景配置列表
-// ?????
+// 区域展示数据源
function ensureAreaDisplaySource() {
if (!viewer) return null
if (!areaDisplaySource) {
@@ -522,7 +522,7 @@
})
}
-// ??????????
+// 加载区域列表
async function loadAreaList(sceneId) {
if (!sceneId) {
areaList.value = []
diff --git a/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue b/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue
index 36a6d36..c11cb95 100644
--- a/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue
+++ b/applications/drone-command/src/views/recordManage/historyTracks/TrajectoryDiaLog.vue
@@ -147,7 +147,7 @@
})
startDroneEntity && geometricSource.entities.remove(startDroneEntity)
startDroneEntity = geometricSource.entities.add({
- position: positions[0],
+ position: positions[positions.length - 1],
billboard: {
image: droneIcon,
width: 40,
diff --git a/applications/drone-command/src/views/recordManage/historyTracks/flyTrajectory.js b/applications/drone-command/src/views/recordManage/historyTracks/flyTrajectory.js
index 754cc49..ef1791f 100644
--- a/applications/drone-command/src/views/recordManage/historyTracks/flyTrajectory.js
+++ b/applications/drone-command/src/views/recordManage/historyTracks/flyTrajectory.js
@@ -24,7 +24,7 @@
return request({
url: `/drone-fw/record/fwDroneFlightRecordDetail/page`,
method: 'get',
- params: { descs: 'update_time', ...params, size: 9999 },
+ params: { asc: 'point_time', ...params, size: 9999 },
})
}
diff --git a/applications/task-work-order/src/styles/common/cockpit.scss b/applications/task-work-order/src/styles/common/cockpit.scss
index 4264ea0..dabcf47 100644
--- a/applications/task-work-order/src/styles/common/cockpit.scss
+++ b/applications/task-work-order/src/styles/common/cockpit.scss
@@ -1201,10 +1201,12 @@
.gd-date-picker {
height: 36px;
}
-
.gd-input {
height: 36px;
}
+ .gd-upload-btn {
+ height: 36px;
+ }
.el-input,
.el-input-number {
min-width: 200px;
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/FormDiaLog.vue
index 16fb8d5..4cf0a5b 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/FormDiaLog.vue
@@ -48,7 +48,7 @@
:model="formData"
:rules="rules"
:disabled="dialogReadonly"
- label-width="140px"
+ :label-width="pxToRem(112)"
>
<el-row>
<el-col :span="12">
@@ -133,6 +133,7 @@
gdApplicationInnovationDetailApi,
gdApplicationInnovationSubmitApi,
} from '@/views/orderView/orderDataManage/appInnovation/appInnovationApi'
+import { pxToRem } from '@/utils/rem'
// 初始化表单数据
const initForm = () => ({
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
index ea5a869..19ec03e 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
@@ -88,7 +88,7 @@
:model="formData"
:rules="rules"
:disabled="dialogReadonly"
- label-width="180px"
+ :label-width="pxToRem(144)"
>
<el-row>
<el-col :span="12">
@@ -163,7 +163,7 @@
class="upload-demo"
>
<template #trigger>
- <el-button type="primary">选择文件</el-button>
+ <el-button class="gd-upload-btn" type="primary">选择文件</el-button>
</template>
<template #tip>
<div class="el-upload__tip">支持上传 (.zip/.rar/.7z/.tar/.gz)格式</div>
@@ -270,6 +270,7 @@
import { putFileAttachApi } from '@/views/orderView/orderDataManage/supplyAdd/supplyAddApi'
import { pxToRem } from '@/utils/rem'
import { useStore } from 'vuex'
+
const store = useStore()
const permission = computed(() => store.state.user.permission);
// const requesterProvider = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue
index c44bc53..7649e44 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue
@@ -33,7 +33,8 @@
</el-row>
<el-form class="gd-dialog-form" v-else ref="formRef" :model="formData" :rules="rules" :disabled="dialogReadonly"
- label-width="140px">
+ :label-width="pxToRem(112)"
+ >
<el-row>
<el-col :span="12">
<el-form-item label="标题" prop="title">
@@ -99,6 +100,7 @@
gdDataEvaluationDetailApi,
gdDataEvaluationSubmitApi,
} from '@/views/orderView/orderDataManage/evaluate/evaluateApi'
+import { pxToRem } from '@/utils/rem'
// 初始化表单数据
const initForm = () => ({
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue
index d19b263..5b1a07f 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/FormDiaLog.vue
@@ -67,7 +67,7 @@
:model="formData"
:rules="rules"
:disabled="dialogReadonly"
- :label-width="pxToRem(190)"
+ :label-width="pxToRem(124)"
>
<el-row>
<el-col :span="12">
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue
index d5a1d40..9e3e05a 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue
@@ -111,7 +111,7 @@
</el-form-item>
<el-form-item label="上传文件" prop="link" v-if="titleTxt === '上传巡查报告'">
<el-upload class="avatar-uploader" action="" :show-file-list="false" :before-upload="onUploadFileBefore">
- <el-button size="small" type="primary">点击上传</el-button>
+ <el-button class="gd-upload-btn" type="primary">点击上传</el-button>
</el-upload>
<div class="upload-tip">
{{ uploadName }}
diff --git a/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue b/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
index 8f966d8..d64a6f7 100644
--- a/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
@@ -102,7 +102,8 @@
<el-form-item label="导出模板">
<el-button
color="#F2F3F5"
- type="primary"
+ type="primary"
+ class="gd-upload-btn"
@click="handleExportTemplate"
>
下载模板
@@ -111,7 +112,7 @@
<el-form-item label="上传文件" prop="file">
<el-upload class="avatar-uploader" action="" :show-file-list="false" :before-upload="onImportFileBefore">
- <el-button type="primary">点击上传</el-button>
+ <el-button class="gd-upload-btn" type="primary">点击上传</el-button>
</el-upload>
<div class="upload-tip">
{{ importFileName }}
diff --git a/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue
index 37ae250..bfd324d 100644
--- a/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue
@@ -155,7 +155,10 @@
name: fieldRules(true,50),
parentCode: fieldRules(true),
regionLevel: fieldRules(true),
- sort: fieldRules(true,50),
+ sort: [
+ { required: true, message: '请输入'},
+
+ ],
status: fieldRules(true),
}
diff --git a/uniapps/work-wx/src/static/fonts/font.css b/uniapps/work-wx/src/static/fonts/font.css
index 2989dd8..1a189cb 100644
--- a/uniapps/work-wx/src/static/fonts/font.css
+++ b/uniapps/work-wx/src/static/fonts/font.css
@@ -43,3 +43,11 @@
font-style: normal;
font-display: swap;
}
+
+@font-face {
+ font-family: "PangMen";
+ src: url("PANGMENZHENGDAOBIAOTITIMIANFEIBAN-2.TTF") format("truetype");
+ font-weight: normal;
+ font-style: normal;
+ font-display: swap;
+}
--
Gitblit v1.9.3