diff --git a/src/views/DialogTabs/component/ImouPlayer.vue b/src/views/DialogTabs/component/ImouPlayer.vue index eb03201..f2eb02a 100644 --- a/src/views/DialogTabs/component/ImouPlayer.vue +++ b/src/views/DialogTabs/component/ImouPlayer.vue @@ -99,10 +99,12 @@ newVal => { console.log('kitToken-----------------------', newVal); if (newVal) { + console.log('-----------------------kitToken', newVal); init(newVal); } }, { + immediate: true, deep: true, } ); diff --git a/src/views/DialogTabs/component/ImouPlayer.vue b/src/views/DialogTabs/component/ImouPlayer.vue index eb03201..f2eb02a 100644 --- a/src/views/DialogTabs/component/ImouPlayer.vue +++ b/src/views/DialogTabs/component/ImouPlayer.vue @@ -99,10 +99,12 @@ newVal => { console.log('kitToken-----------------------', newVal); if (newVal) { + console.log('-----------------------kitToken', newVal); init(newVal); } }, { + immediate: true, deep: true, } ); diff --git a/src/views/oneMap/BIM/Tunnel.vue b/src/views/oneMap/BIM/Tunnel.vue index 3471cb7..b4b6e4d 100644 --- a/src/views/oneMap/BIM/Tunnel.vue +++ b/src/views/oneMap/BIM/Tunnel.vue @@ -238,7 +238,7 @@ icon: '/Three/icon/sxj_icon.png', data: [], show: false, - pointCode: '7H0961CPAN3025A', + pointCode: '7H0961CPAN3D25A', dataTime: '', toP: { x: -1886.2723566649995, @@ -267,7 +267,7 @@ icon: '/Three/icon/sxj_icon.png', data: [], show: false, - pointCode: '6M07046RANBCF8D', + pointCode: '6M07046RAN8CF8D', dataTime: '', toP: { x: -1752.3189961540095, @@ -289,7 +289,7 @@ id: `YuanDian9`, type: 'Camera', position: { - x: 1400, + x: -1400, y: 80, z: -230, }, @@ -299,16 +299,16 @@ pointCode: '8L06A0DPANC7F5D', dataTime: '', toP: { - x: 2084.596738127489, - y: 329.14146563769543, - z: -724.7590410737567, + x: -2089.562623089388, + y: 206.72718264695376, + z: 75.23770757109253, duration: 2, ease: 'power4.out', }, toC: { - x: 611.2649344201147, - y: 70.11387500990296, - z: 85.72625224535601, + x: 359.7699129924445, + y: -183.71540614783018, + z: -576.8883411050198, duration: 2, ease: 'power4.out', }, @@ -318,7 +318,7 @@ id: `YuanDian10`, type: 'Camera', position: { - x: 1200, + x: -1200, y: 80, z: -230, }, @@ -328,16 +328,16 @@ pointCode: '8L06A0DPAN08D33', dataTime: '', toP: { - x: 1902.5691003457061, - y: 217.24904311339517, - z: -644.2039002397069, + x: -1750.097379470923, + y: 370.7008069192562, + z: 359.7792259497344, duration: 2, ease: 'power4.out', }, toC: { - x: 219.1670066526854, - y: 83.89641838442645, - z: 193.82493356121392, + x: -993.5058200238494, + y: 79.81783429320103, + z: -257.19833907335476, duration: 2, ease: 'power4.out', }, diff --git a/src/views/DialogTabs/component/ImouPlayer.vue b/src/views/DialogTabs/component/ImouPlayer.vue index eb03201..f2eb02a 100644 --- a/src/views/DialogTabs/component/ImouPlayer.vue +++ b/src/views/DialogTabs/component/ImouPlayer.vue @@ -99,10 +99,12 @@ newVal => { console.log('kitToken-----------------------', newVal); if (newVal) { + console.log('-----------------------kitToken', newVal); init(newVal); } }, { + immediate: true, deep: true, } ); diff --git a/src/views/oneMap/BIM/Tunnel.vue b/src/views/oneMap/BIM/Tunnel.vue index 3471cb7..b4b6e4d 100644 --- a/src/views/oneMap/BIM/Tunnel.vue +++ b/src/views/oneMap/BIM/Tunnel.vue @@ -238,7 +238,7 @@ icon: '/Three/icon/sxj_icon.png', data: [], show: false, - pointCode: '7H0961CPAN3025A', + pointCode: '7H0961CPAN3D25A', dataTime: '', toP: { x: -1886.2723566649995, @@ -267,7 +267,7 @@ icon: '/Three/icon/sxj_icon.png', data: [], show: false, - pointCode: '6M07046RANBCF8D', + pointCode: '6M07046RAN8CF8D', dataTime: '', toP: { x: -1752.3189961540095, @@ -289,7 +289,7 @@ id: `YuanDian9`, type: 'Camera', position: { - x: 1400, + x: -1400, y: 80, z: -230, }, @@ -299,16 +299,16 @@ pointCode: '8L06A0DPANC7F5D', dataTime: '', toP: { - x: 2084.596738127489, - y: 329.14146563769543, - z: -724.7590410737567, + x: -2089.562623089388, + y: 206.72718264695376, + z: 75.23770757109253, duration: 2, ease: 'power4.out', }, toC: { - x: 611.2649344201147, - y: 70.11387500990296, - z: 85.72625224535601, + x: 359.7699129924445, + y: -183.71540614783018, + z: -576.8883411050198, duration: 2, ease: 'power4.out', }, @@ -318,7 +318,7 @@ id: `YuanDian10`, type: 'Camera', position: { - x: 1200, + x: -1200, y: 80, z: -230, }, @@ -328,16 +328,16 @@ pointCode: '8L06A0DPAN08D33', dataTime: '', toP: { - x: 1902.5691003457061, - y: 217.24904311339517, - z: -644.2039002397069, + x: -1750.097379470923, + y: 370.7008069192562, + z: 359.7792259497344, duration: 2, ease: 'power4.out', }, toC: { - x: 219.1670066526854, - y: 83.89641838442645, - z: 193.82493356121392, + x: -993.5058200238494, + y: 79.81783429320103, + z: -257.19833907335476, duration: 2, ease: 'power4.out', }, diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue index 1ba450b..3ce0f80 100644 --- a/src/views/oneMap/BIM/WangJiaPIng.vue +++ b/src/views/oneMap/BIM/WangJiaPIng.vue @@ -283,9 +283,9 @@ id: `YuanDian9`, type: 'Camera', position: { - x: -50.5, - y: 4, - z: -5, + x: -31, + y: 2, + z: -0.5, }, icon: '/Three/icon/sxj_icon.png', data: [], @@ -293,16 +293,16 @@ pointCode: '7H0961CPAN77924', dataTime: '', toP: { - x: -70.27433095597907, - y: 8.753833164595864, - z: -5.218871727447189, + x: -45.924407539182454, + y: 7.189627675025373, + z: 12.6757759936444, duration: 2, ease: 'power4.out', }, toC: { - x: -1.1466023223195003, - y: -1.8988402785746414, - z: -3.2914248069834957, + x: -4.114398340434963, + y: 0.08082001424786653, + z: -11.592833184658446, duration: 2, ease: 'power4.out', }, @@ -312,9 +312,9 @@ id: `YuanDian10`, type: 'Camera', position: { - x: 50.5, - y: 4, - z: -5, + x: 31, + y: 2, + z: -0.5, }, icon: '/Three/icon/sxj_icon.png', data: [], @@ -322,16 +322,16 @@ pointCode: '8L06A0DPAN0754B', dataTime: '', toP: { - x: 69.1252383332412, - y: 8.632133195958298, - z: -4.822438477532835, + x: 24.68196219814941, + y: 6.266287653545593, + z: 18.39617180748944, duration: 2, ease: 'power4.out', }, toC: { - x: -0.38725392744080417, - y: 0.8244778362443704, - z: -6.522822745737244, + x: 48.59089410203559, + y: -2.342202792946317, + z: -29.41152159924059, duration: 2, ease: 'power4.out', }, @@ -607,8 +607,8 @@ LabelRenderer.value.render(Scene, Camera.value); const delta = clock.getDelta(); // 如需调试请打开这个获取Camera,Controls 的值 - // console.log('Camera.value', Camera.value); - // console.log('Controls.value', Controls.value); + console.log('Camera.value', Camera.value); + console.log('Controls.value', Controls.value); }; // 创建气泡窗 @@ -727,16 +727,16 @@ }); } else if (data.name.includes('摄像机')) { gsap.to(Camera.value.position, { - x: -74.57145168733881, - y: 14.5437957001853, - z: 18.62897991542918, + x: -46.343936013819174, + y: 8.692178725546759, + z: 13.161639628298248, duration: 3, ease: 'power4.out', }); gsap.to(Controls.value.target, { - x: 0.6482923084213158, - y: -1.5888868202391535, - z: -19.59950474716774, + x: 5.105856900482379, + y: -2.3930348676814326, + z: -8.702381184141286, duration: 3, ease: 'power4.out', }); diff --git a/src/views/DialogTabs/component/ImouPlayer.vue b/src/views/DialogTabs/component/ImouPlayer.vue index eb03201..f2eb02a 100644 --- a/src/views/DialogTabs/component/ImouPlayer.vue +++ b/src/views/DialogTabs/component/ImouPlayer.vue @@ -99,10 +99,12 @@ newVal => { console.log('kitToken-----------------------', newVal); if (newVal) { + console.log('-----------------------kitToken', newVal); init(newVal); } }, { + immediate: true, deep: true, } ); diff --git a/src/views/oneMap/BIM/Tunnel.vue b/src/views/oneMap/BIM/Tunnel.vue index 3471cb7..b4b6e4d 100644 --- a/src/views/oneMap/BIM/Tunnel.vue +++ b/src/views/oneMap/BIM/Tunnel.vue @@ -238,7 +238,7 @@ icon: '/Three/icon/sxj_icon.png', data: [], show: false, - pointCode: '7H0961CPAN3025A', + pointCode: '7H0961CPAN3D25A', dataTime: '', toP: { x: -1886.2723566649995, @@ -267,7 +267,7 @@ icon: '/Three/icon/sxj_icon.png', data: [], show: false, - pointCode: '6M07046RANBCF8D', + pointCode: '6M07046RAN8CF8D', dataTime: '', toP: { x: -1752.3189961540095, @@ -289,7 +289,7 @@ id: `YuanDian9`, type: 'Camera', position: { - x: 1400, + x: -1400, y: 80, z: -230, }, @@ -299,16 +299,16 @@ pointCode: '8L06A0DPANC7F5D', dataTime: '', toP: { - x: 2084.596738127489, - y: 329.14146563769543, - z: -724.7590410737567, + x: -2089.562623089388, + y: 206.72718264695376, + z: 75.23770757109253, duration: 2, ease: 'power4.out', }, toC: { - x: 611.2649344201147, - y: 70.11387500990296, - z: 85.72625224535601, + x: 359.7699129924445, + y: -183.71540614783018, + z: -576.8883411050198, duration: 2, ease: 'power4.out', }, @@ -318,7 +318,7 @@ id: `YuanDian10`, type: 'Camera', position: { - x: 1200, + x: -1200, y: 80, z: -230, }, @@ -328,16 +328,16 @@ pointCode: '8L06A0DPAN08D33', dataTime: '', toP: { - x: 1902.5691003457061, - y: 217.24904311339517, - z: -644.2039002397069, + x: -1750.097379470923, + y: 370.7008069192562, + z: 359.7792259497344, duration: 2, ease: 'power4.out', }, toC: { - x: 219.1670066526854, - y: 83.89641838442645, - z: 193.82493356121392, + x: -993.5058200238494, + y: 79.81783429320103, + z: -257.19833907335476, duration: 2, ease: 'power4.out', }, diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue index 1ba450b..3ce0f80 100644 --- a/src/views/oneMap/BIM/WangJiaPIng.vue +++ b/src/views/oneMap/BIM/WangJiaPIng.vue @@ -283,9 +283,9 @@ id: `YuanDian9`, type: 'Camera', position: { - x: -50.5, - y: 4, - z: -5, + x: -31, + y: 2, + z: -0.5, }, icon: '/Three/icon/sxj_icon.png', data: [], @@ -293,16 +293,16 @@ pointCode: '7H0961CPAN77924', dataTime: '', toP: { - x: -70.27433095597907, - y: 8.753833164595864, - z: -5.218871727447189, + x: -45.924407539182454, + y: 7.189627675025373, + z: 12.6757759936444, duration: 2, ease: 'power4.out', }, toC: { - x: -1.1466023223195003, - y: -1.8988402785746414, - z: -3.2914248069834957, + x: -4.114398340434963, + y: 0.08082001424786653, + z: -11.592833184658446, duration: 2, ease: 'power4.out', }, @@ -312,9 +312,9 @@ id: `YuanDian10`, type: 'Camera', position: { - x: 50.5, - y: 4, - z: -5, + x: 31, + y: 2, + z: -0.5, }, icon: '/Three/icon/sxj_icon.png', data: [], @@ -322,16 +322,16 @@ pointCode: '8L06A0DPAN0754B', dataTime: '', toP: { - x: 69.1252383332412, - y: 8.632133195958298, - z: -4.822438477532835, + x: 24.68196219814941, + y: 6.266287653545593, + z: 18.39617180748944, duration: 2, ease: 'power4.out', }, toC: { - x: -0.38725392744080417, - y: 0.8244778362443704, - z: -6.522822745737244, + x: 48.59089410203559, + y: -2.342202792946317, + z: -29.41152159924059, duration: 2, ease: 'power4.out', }, @@ -607,8 +607,8 @@ LabelRenderer.value.render(Scene, Camera.value); const delta = clock.getDelta(); // 如需调试请打开这个获取Camera,Controls 的值 - // console.log('Camera.value', Camera.value); - // console.log('Controls.value', Controls.value); + console.log('Camera.value', Camera.value); + console.log('Controls.value', Controls.value); }; // 创建气泡窗 @@ -727,16 +727,16 @@ }); } else if (data.name.includes('摄像机')) { gsap.to(Camera.value.position, { - x: -74.57145168733881, - y: 14.5437957001853, - z: 18.62897991542918, + x: -46.343936013819174, + y: 8.692178725546759, + z: 13.161639628298248, duration: 3, ease: 'power4.out', }); gsap.to(Controls.value.target, { - x: 0.6482923084213158, - y: -1.5888868202391535, - z: -19.59950474716774, + x: 5.105856900482379, + y: -2.3930348676814326, + z: -8.702381184141286, duration: 3, ease: 'power4.out', }); diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue index 33887d2..a757a00 100644 --- a/src/views/oneMap/index.vue +++ b/src/views/oneMap/index.vue @@ -764,6 +764,17 @@ }); newfiberMapbox.addLayer(layer); } + // 打开王家坪摄像头 + if (properties.type == 'video' && properties.name == '王家坪旧址门口') { + // type: "video" + let data = { + title: '王家坪旧址门口摄像机', + comIDs: ['Imou'], + getSiteId: '8L06A0DPAN427E1', + }; + bus.emit('publicDialog', data); + return; + } bus.emit('popupcontent', { popupShow: true, point: point,