diff --git a/src/packages/components/CustomComponents/CustomComponents/GDMap/index.vue b/src/packages/components/CustomComponents/CustomComponents/GDMap/index.vue index 860a33b4..d71666af 100644 --- a/src/packages/components/CustomComponents/CustomComponents/GDMap/index.vue +++ b/src/packages/components/CustomComponents/CustomComponents/GDMap/index.vue @@ -91,14 +91,15 @@ - +
{ }) } }) - + console.log(point) } }) } +const pointJump = (item:any) => { + console.log(item) + postMessageToParent({type: 'changeRouterV1', url: '/' + item.dataBind.skipPath}) +} + let timer:unknown watch(() => [props.chartConfig.request.requestInterval, props.chartConfig.request.requestIntervalUnit].join('&&'), v => { if(!isPreview()) return diff --git a/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/index.vue b/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/index.vue index 4d9b7897..d53eb8a0 100644 --- a/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/index.vue +++ b/src/packages/components/CustomComponents/CustomComponents/RealTimeTraffic/index.vue @@ -226,16 +226,17 @@ const option = reactive({ series: [seriesItem] }) -const query = { + +const vChartRef = ref() +const getData = () => { + const methodArr = 'handle'.split('_') + const query = { types: ['rec'], start_time: moment().subtract(10, 'm').format('YYYY-MM-DD HH:mm:ss'), end_time: moment().format('YYYY-MM-DD HH:mm:ss'), duration: 15, query_type: '' -} -const vChartRef = ref() -const getData = () => { - const methodArr = 'handle'.split('_') + } query.types = [methodArr[0]] query.query_type = methodArr[1] || '' option.xAxis['data'] = [] diff --git a/src/packages/components/CustomComponents/CustomComponents/Theme1/index.vue b/src/packages/components/CustomComponents/CustomComponents/Theme1/index.vue index c1d42e74..54136aa2 100644 --- a/src/packages/components/CustomComponents/CustomComponents/Theme1/index.vue +++ b/src/packages/components/CustomComponents/CustomComponents/Theme1/index.vue @@ -1,6 +1,6 @@
-
+
{{ showMoreMenuBts ? '全屏' : '退出全屏' }}
@@ -129,6 +129,36 @@ const weeks = ['周一', '周二', '周三', '周四', '周五', '周六', '周 let time = ref(moment().format('HH:mm:ss ') + weeks[Number(moment().format('e'))]) let timer: unknown onMounted(() => { + // document.getElementById('fullscreenButton')!.addEventListener('click', function() { + // showMoreMenuBts.value = !showMoreMenuBts.value + // // 检查是否已经处于全屏模式 + // if (document.fullscreenElement || + // (document as any).webkitFullscreenElement || + // (document as any).mozFullScreenElement || + // (document as any).msFullscreenElement) { + // // 当前处于全屏,尝试退出全屏 + // if (document.exitFullscreen) { + // document.exitFullscreen(); + // } else if ((document as any).mozCancelFullScreen) { // Firefox + // (document as any).mozCancelFullScreen(); + // } else if ((document as any).webkitExitFullscreen) { // Chrome, Safari and Opera + // (document as any).webkitExitFullscreen(); + // } else if ((document as any).msExitFullscreen) { // IE/Edge + // (document as any).msExitFullscreen(); + // } + // } else { + // // 当前非全屏,尝试进入全屏 + // if (document.documentElement.requestFullscreen) { + // document.documentElement.requestFullscreen(); + // } else if ((document.documentElement as any).mozRequestFullScreen) { // Firefox + // (document.documentElement as any).mozRequestFullScreen(); + // } else if ((document.documentElement as any).webkitRequestFullscreen) { // Chrome, Safari and Opera + // (document.documentElement as any).webkitRequestFullscreen(); + // } else if ((document.documentElement as any).msRequestFullscreen) { // IE/Edge + // (document.documentElement as any).msRequestFullscreen(); + // } + // } + // }); if(!isPreview()) return timer = setInterval(() => { date.value = moment().format('yyyy-MM-DD') @@ -143,8 +173,9 @@ const showMoreMenuBts = ref(true) // 切换全屏函数 function toggleFullscreen() { postMessageToParent({type: 'fullScreen'}) + // console.log(document.documentElement) - // showMoreMenuBts.value = !showMoreMenuBts.value + showMoreMenuBts.value = !showMoreMenuBts.value // // if (document.fullscreenElement) { // // 如果当前已经是全屏状态,则退出全屏