From cbef4aca6065b1d8b3bbbbf64851755f9902f03a Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 03 Feb 2026 17:32:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/components/map-container/device-map-container.vue | 7 +--
applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue | 18 ++++++++
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue | 17 ++++++++
applications/drone-command/env/.env.development | 4 +-
applications/drone-command/src/api/dataCockpit/index.js | 20 +++++++++
5 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/applications/drone-command/env/.env.development b/applications/drone-command/env/.env.development
index 67d4a44..b537c02 100644
--- a/applications/drone-command/env/.env.development
+++ b/applications/drone-command/env/.env.development
@@ -2,7 +2,7 @@
# @Author : yuan
# @Date : 2026-01-31 14:34:31
# @LastEditors : yuan
- # @LastEditTime : 2026-02-03 15:52:27
+ # @LastEditTime : 2026-02-03 17:22:33
# @FilePath : \applications\drone-command\env\.env.development
# @Description :
# Copyright 2026 OBKoro1, All Rights Reserved.
@@ -16,7 +16,7 @@
#开发环境代理地址（推荐本地新建文件 .env.development.local 来进行覆盖）
# VITE_APP_URL=https://wrj.shuixiongit.com/api
-VITE_APP_URL=http://192.168.1.168
+VITE_APP_URL=http://192.168.1.33
#新大屏地址
VITE_APP_DASHBOARD_URL='https://wrj.shuixiongit.com/command-center-dashboard/'
diff --git a/applications/drone-command/src/api/dataCockpit/index.js b/applications/drone-command/src/api/dataCockpit/index.js
index 21805e2..6432650 100644
--- a/applications/drone-command/src/api/dataCockpit/index.js
+++ b/applications/drone-command/src/api/dataCockpit/index.js
@@ -2,7 +2,7 @@
* @Author : yuan
* @Date : 2026-01-09 11:14:04
* @LastEditors : yuan
- * @LastEditTime : 2026-02-02 09:45:21
+ * @LastEditTime : 2026-02-03 17:21:56
* @FilePath : \applications\drone-command\src\api\dataCockpit\index.js
* @Description :
* Copyright 2026 OBKoro1, All Rights Reserved.
@@ -100,3 +100,21 @@
params
})
}
+
+// 查list --- 区域
+export const newAreaDivideList = params => {
+ return request({
+ url: `/drone-fw/cockpit/dataCockpit/areaDivideList`,
+ method: 'get',
+ params,
+ })
+}
+
+// 查list
+export const newDefenseSceneManageList = params => {
+ return request({
+ url: `/drone-fw/cockpit/dataCockpit/defenseSceneManageList`,
+ method: 'get',
+ params,
+ })
+}
\ No newline at end of file
diff --git a/applications/drone-command/src/components/map-container/device-map-container.vue b/applications/drone-command/src/components/map-container/device-map-container.vue
index 7819129..7d6383c 100644
--- a/applications/drone-command/src/components/map-container/device-map-container.vue
+++ b/applications/drone-command/src/components/map-container/device-map-container.vue
@@ -49,9 +49,8 @@
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import { buildEllipsePositions } from '@/utils/cesium/shapeTools'
import { AREA_TYPE_STYLE_MAP, BUFFER_LEVEL_STYLES, DEFAULT_AREA_STYLE } from '@ztzf/constants'
-import { fwAreaDivideListApi } from '@/views/areaManage/partition/partitionApi'
-import { fwDefenseSceneManageListApi } from '@/views/areaManage/sceneManage/sceneManageApi'
+import { newAreaDivideList, newDefenseSceneManageList } from '@/api/dataCockpit/index'
import { newCockpitAggregationApi } from '@/api/dataCockpit'
import layerControlIcon from '@/assets/images/dataCockpit/layerControl.png'
@@ -1142,7 +1141,7 @@
const loadPartitions = async () => {
if (!viewer) return
try {
- const res = await fwAreaDivideListApi({
+ const res = await newAreaDivideList({
isSetSceneManage: 1,
flyTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
})
@@ -1306,7 +1305,7 @@
const loadCommandPosts = async () => {
try {
- const res = await fwDefenseSceneManageListApi({
+ const res = await newDefenseSceneManageList({
time: dayjs().format('YYYY-MM-DD HH:mm:ss')
})
renderCommandPosts(res?.data?.data ?? [])
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
index e50d0aa..3c6a5c3 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
@@ -91,7 +91,9 @@
</el-table-column>
<el-table-column prop="taskStatus" show-overflow-tooltip label="巡查任务状态">
<template v-slot="{ row }">
- {{ getDictLabel(row.taskStatus, dictObj.taskStatus) }}
+ <span :style="{color: colors?.[row?.taskStatus]}">
+ {{ getDictLabel(row.taskStatus, dictObj.taskStatus) }}
+ </span>
</template>
</el-table-column>
<el-table-column prop="executeTime" show-overflow-tooltip label="任务执行时间" />
@@ -174,6 +176,19 @@
const activeName = ref('all')
provide('dictObj', dictObj)
+const colors = {
+ 0: '#F6A000',//0待签收
+ 1: '#FF0202',//1拒绝签收
+ 2: '#FF0202',//2已撤回
+ 3: '#212BF4',//3待审核
+ 4: '#FF0000',//4审核驳回
+ 5: '#0068F0',//5审核通过
+ 6: '#FD6716',//6待验收
+ 7: '#FF0000',//7拒绝验收
+ 8: '#019612',//8验收通过
+}
+
+
// 获取列表
async function getList() {
const range = dateRangeFormat(dateRange.value)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
index 2645760..2955350 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
@@ -90,7 +90,9 @@
</el-table-column>
<el-table-column prop="status" show-overflow-tooltip label="阶段状态">
<template v-slot="{ row }">
- {{ getDictLabel(row.workOrderStatus, dictObj.workOrderStatus).split('_')[0] }}
+ <span :style="{color: colors?.[row?.workOrderStatus]}">
+ {{ getDictLabel(row.workOrderStatus, dictObj.workOrderStatus).split('_')[0] }}
+ </span>
</template>
</el-table-column>
<el-table-column prop="workOrderStatus" show-overflow-tooltip label="工单状态">
@@ -236,6 +238,20 @@
})
}
+const colors = {
+ 10: '#AE00FF',
+ 11: '#AE00FF',
+ 20: '#002BFF',
+ 21: '#002BFF',
+ 22: '#002BFF',
+ 23: '#002BFF',
+ 30: '#FF5106',
+ 31: '#FF5106',
+ 40: '#FF0000',
+ 50: '#008CFF',
+ 60: '#019612',
+}
+
// 删除
async function handleDelete(row) {
const tips = row ? '该条' : '选中的项'
--
Gitblit v1.9.3