From 277bd4b41924b1b18470c3ce6982f57be8160d03 Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Wed, 19 Nov 2025 10:26:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9C=BA=E5=9C=BA=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E5=8F=8A=E6=97=A0=E4=BA=BA=E6=9C=BA=E7=9B=B4=E6=92=AD=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E7=A4=BA=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Zhigan/Zhigan/ZhiGan_AirportLive/index.vue | 10 +++++----- .../Zhigan/Zhigan/ZhiGan_DroneLive/index.vue | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_AirportLive/index.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_AirportLive/index.vue index 9dc0af0..9b88f98 100644 --- a/src/packages/components/Zhigan/Zhigan/ZhiGan_AirportLive/index.vue +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_AirportLive/index.vue @@ -107,24 +107,24 @@ const rs = JSON.parse(mes); if (rs.method == 'live_start_push' && startTidList.includes(rs.tid)) { if (rs.data.result == 0) { - message.success('开始直播成功'); + // message.success('开始直播成功'); airportPlayer.src(live_info.url + liveData.value.sn + '.flv'); airportPlayer.play(); } else if (rs.data.result == 513003) { - message.success('直播已开启'); + // message.success('直播已开启'); airportPlayer.src(live_info.url + liveData.value.sn + '.flv'); airportPlayer.play(); } else { - message.error('开始直播失败,' + errorName(rs.data.result)); + // message.error('开始直播失败,' + errorName(rs.data.result)); } } else if (rs.method == 'live_stop_push' && rs.tid == stopTid) { if (rs.data.result == 0) { - message.success('停止直播成功'); + // message.success('停止直播成功'); if (airportPlayer) { airportPlayer.dispose(); } } else { - message.error('停止直播失败,' + errorName(rs.data.result)); + // message.error('停止直播失败,' + errorName(rs.data.result)); } } }); diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_DroneLive/index.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_DroneLive/index.vue index 856b2f7..1e8a7ce 100644 --- a/src/packages/components/Zhigan/Zhigan/ZhiGan_DroneLive/index.vue +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_DroneLive/index.vue @@ -140,21 +140,21 @@ } if (rs.method == 'live_start_push' && startTidList.includes(rs.tid)) { if (rs.data.result == 0) { - message.success('无人机开始直播成功'); + // message.success('无人机开始直播成功'); uavList.value.forEach(item => { if(rs.tid == item.startTid){ item.isUAVLive = true } }) } else if (rs.data.result == 513003) { - message.success('无人机直播已开启'); + // message.success('无人机直播已开启'); uavList.value.forEach(item => { if(rs.tid == item.startTid){ item.isUAVLive = true } }) } else { - message.error('开始直播失败，' + errorName(rs.data.result)); + // message.error('开始直播失败，' + errorName(rs.data.result)); uavList.value.forEach(item => { if(rs.tid == item.startTid){ item.isUAVLive = false From cefa07622eb2193cbd42aeb1f5b4c7128da19c0b Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Wed, 19 Nov 2025 10:59:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=89=93=E5=8D=A1=E7=82=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E5=BA=94=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XunChaGuiJi/XunChaClockInInfos/index.vue | 10 +++++----- .../XunChaGuiJi/XunChaClockInList/index.vue | 6 +++--- .../XunChaGuiJi/XunChaGuiJi/XunChaRecordList/index.vue | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInInfos/index.vue b/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInInfos/index.vue index 650e58a..35c9da0 100644 --- a/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInInfos/index.vue +++ b/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInInfos/index.vue @@ -7,7 +7,7 @@
打卡点名称
-
{{ dataset.PointName }}
+
{{ dataset.pointname }}
@@ -15,7 +15,7 @@ 创建时间
-
{{ dataset.CreateTime }}
+
{{ dataset.createtime }}
@@ -23,9 +23,9 @@ 打卡点位置
- {{ dataset.Lng }} - ， - {{ dataset.Lat }} + {{ dataset.lng }} + ， + {{ dataset.lat }}
diff --git a/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInList/index.vue b/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInList/index.vue index 509d507..e22b641 100644 --- a/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInList/index.vue +++ b/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInList/index.vue @@ -41,18 +41,18 @@
打卡点名称
-
{{ item.PointName }}
+
{{ item.pointname }}
创建时间
-
{{ item.CreateTime }}
+
{{ item.createtime }}
负责人员
-
{{ item.CreateUserName }}
+
{{ item.usernames }}
diff --git a/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaRecordList/index.vue b/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaRecordList/index.vue index f03197f..bfb565a 100644 --- a/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaRecordList/index.vue +++ b/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaRecordList/index.vue @@ -206,7 +206,7 @@ const getXunChaListData = ()=>{ onMounted(() => { // 获取eventBus传过来的值 EventBus.on('clockinlistsenddata', (data) => { - userId.value = data.Id + userId.value = data.userid getRecordListData() getXunChaListData() }); From 9273b1796395bd12bd57472ae55e366838cde6cb Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Wed, 19 Nov 2025 11:20:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=93=E5=8D=A1=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=8F=8A=E5=B7=A1=E6=9F=A5=E8=BD=A8=E8=BF=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XunChaGuiJi/XunChaGuiJi/XunChaRecordList/index.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaRecordList/index.vue b/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaRecordList/index.vue index bfb565a..3897e2b 100644 --- a/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaRecordList/index.vue +++ b/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaRecordList/index.vue @@ -58,7 +58,7 @@
打卡时间 - {{ item.CreateTime }} + {{ item.ClockonTime }}
@@ -83,6 +83,8 @@ import { EventBus } from '@/utils/eventBus' import axios from 'axios' import { message } from 'ant-design-vue'; import { getAppEnvConfig } from '@/utils/env' +import dayjs from 'dayjs' +import * as mars3d from 'mars3d'; var { VITE_GLOB_API_URL } = getAppEnvConfig(); const props = defineProps({ @@ -108,7 +110,7 @@ const navsIndex = ref('1') const navsArr = ref(['巡查轨迹','打卡记录']) const rangeValue = ref() const userId = ref() -const dateRange = ref([null,null]) +const dateRange = ref([dayjs().subtract(1, 'month').format('YYYY-MM-DD'),dayjs().format('YYYY-MM-DD')]) const polyLineArr = ref([]) const navsClick = (index) =>{ navsIndex.value = index From fc89bd0996ad704832911fdf5b644696fbe7dc0d Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Wed, 19 Nov 2025 11:32:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=89=93=E5=8D=A1=E7=82=B9=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E7=82=B9=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=B5=B7=E9=87=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XunChaGuiJi/XunChaGuiJi/XunChaClockInList/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInList/index.vue b/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInList/index.vue index e22b641..a692662 100644 --- a/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInList/index.vue +++ b/src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInList/index.vue @@ -166,7 +166,7 @@ const lisClick=(e)=>{ const handlerAddEntity = (data) => { let graphicOptions = { id: data.Id, - position: [parseFloat(data.Lng), parseFloat(data.Lat)], + position: [parseFloat(data.lng), parseFloat(data.lat)], style: { image: '/src/assets/images/chart/mapicons/putongbiaojidian.png', clampToGround: true,