gitY
/
LinYeFangHuo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://123.132.248.154:10000/gitY/LinYeFangHuo

main
徐景良 2025-11-19 16:10:45 +08:00
parent 13b17ba157 fc89bd0996
commit 1de223770d
5 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInInfos/index.vue
View File

@ -7,7 +7,7 @@
<div class="contentbox">
<div class="header">
<div class="label">打卡点名称</div>
<div>{{ dataset.PointName }}</div>
<div>{{ dataset.pointname }}</div>
</div>
<div class="clockdetail">
<div class="detailbox">
@ -15,7 +15,7 @@
<span class="span"></span>
<span class="label">创建时间</span>
</div>
<div>{{ dataset.CreateTime }}</div>
<div>{{ dataset.createtime }}</div>
</div>
<div class="detailbox">
<div>
@ -23,9 +23,9 @@
<span class="label">打卡点位置</span>
</div>
<div>
<span>{{ dataset.Lng }}</span>
<span v-if="dataset.Lat&&dataset.Lng">，</span>
<span>{{ dataset.Lat }}</span>
<span>{{ dataset.lng }}</span>
<span v-if="dataset.lat&&dataset.lng">，</span>
<span>{{ dataset.lat }}</span>
</div>
</div>
</div>

8
src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaClockInList/index.vue
View File

@ -41,18 +41,18 @@
<div class="flex column jc-c seclisbox">
<div class="header flex ai-c">
<div class="label">打卡点名称</div>
<div>{{ item.PointName }}</div>
<div>{{ item.pointname }}</div>
</div>
<div class="clockdetail">
<div class="flex ai-c">
<span class="span"></span>
<div class="label">创建时间</div>
<div>{{ item.CreateTime }}</div>
<div>{{ item.createtime }}</div>
</div>
<div class="flex ai-c">
<span class="span"></span>
<div class="label">负责人员</div>
<div>{{ item.CreateUserName }}</div>
<div>{{ item.usernames }}</div>
</div>
</div>
</div>
@ -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,

8
src/packages/components/XunChaGuiJi/XunChaGuiJi/XunChaRecordList/index.vue
View File

@ -58,7 +58,7 @@
<div class="flex clockinfobox">
<img class="iconsimg" src="@/assets/images/chart/xunchaguiji/clockfill.png" />
<span class="lab">打卡时间</span>
<span class="val">{{ item.CreateTime }}</span>
<span class="val">{{ item.ClockonTime }}</span>
</div>
<div class="flex clockinfobox">
<img class="iconsimg" src="@/assets/images/chart/xunchaguiji/positionicon.png" />
@ -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
@ -206,7 +208,7 @@ const getXunChaListData = ()=>{
onMounted(() => {
// 获取eventBus传过来的值
EventBus.on('clockinlistsenddata', (data) => {
userId.value = data.Id
userId.value = data.userid
getRecordListData()
getXunChaListData()
});

10
src/packages/components/Zhigan/Zhigan/ZhiGan_AirportLive/index.vue
View File

@ -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));
}
}
});

6
src/packages/components/Zhigan/Zhigan/ZhiGan_DroneLive/index.vue
View File

@ -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