diff --git a/src/assets/styles/map.scss b/src/assets/styles/map.scss index 935bc4f..57f0fd8 100644 --- a/src/assets/styles/map.scss +++ b/src/assets/styles/map.scss @@ -53,9 +53,8 @@ .video-dialog { background-color: transparent; - // width: 750px; - width: 25%; - height: 50%; + width: 750px; + height: 500px; .el-dialog__header { padding: 0; } @@ -69,7 +68,14 @@ display: none; } } +@media (min-width: 2500px) { + .video-dialog { + background-color: transparent; + width: 25% !important; + height: 50% !important; + } +} // 自定义车辆弹窗 .carPopup { .mars3d-popup-tip-container { @@ -138,6 +144,7 @@ height: 79%; width: 100%; overflow-y: auto; + padding: 10px; } .sub-title { width: 120px; diff --git a/src/components/grids.vue b/src/components/grids.vue index b97164c..aae58a0 100644 --- a/src/components/grids.vue +++ b/src/components/grids.vue @@ -359,8 +359,8 @@ export default { position: relative; // flex: 0 0 calc(100% / 6); /* 每行显示5个格子 */ flex: 1; - width: 140px; - height: 140px; + width: 130px; + height: 130px; margin-right: 10px; .video-src { width: 100%; @@ -471,7 +471,7 @@ export default { @media (min-width: 2500px) { .video-title { - margin-bottom: 8px; + margin-bottom: 12px; } .main-title, .title-btn { diff --git a/src/views/car.vue b/src/views/car.vue index 8b961ef..a012e80 100644 --- a/src/views/car.vue +++ b/src/views/car.vue @@ -198,6 +198,12 @@ export default { heading: 357.9, pitch: -31.5, }, + cameraController: { + enableZoom: true, + enableTranslate: true, + enableRotate: true, + enableTilt: true, + }, }); map.fixedLight = true; // 固定光照,避免gltf模型随时间存在亮度不一致。 // 创建矢量图层 diff --git a/src/views/carInfo.vue b/src/views/carInfo.vue index 3d2652e..e1d7838 100644 --- a/src/views/carInfo.vue +++ b/src/views/carInfo.vue @@ -94,6 +94,12 @@ export default { heading: 357.9, pitch: -31.5, }, + cameraController: { + enableZoom: true, + enableTranslate: true, + enableRotate: true, + enableTilt: true, + }, }); this.map = map; @@ -187,11 +193,11 @@ export default { // parseFloat(lastPoint.lat), // ]), // positions: [[parseFloat(lastPoint.lng), parseFloat(lastPoint.lat)]], - camera: { - type: "gs", - heading: 0, - radius: 3000, - }, + // camera: { + // type: "gs", + // heading: 0, + // radius: 3000, + // }, model: { show: true, url: this.carUrl, @@ -460,7 +466,7 @@ export default { top: 238px; & > div { - width: 340px !important; + width: 350px !important; img { height: 80px !important; } @@ -469,5 +475,8 @@ export default { } } } + .video-list { + padding: 20px !important; + } } diff --git a/src/views/mapOption.js b/src/views/mapOption.js index 327c67f..3cf1fd7 100644 --- a/src/views/mapOption.js +++ b/src/views/mapOption.js @@ -1,13 +1,12 @@ const mapOption = { scene: { - resolutionScale: 0.5, + resolutionScale: 0.7, scene3DOnly: true, requestRenderMode: true, fog: false, fxaa: false, removeDblClick: true, - requestRenderMode: false, - scene3DOnly: false, + sceneMode: 3, shadows: false, showMoon: false, @@ -16,7 +15,7 @@ const mapOption = { showSun: false, }, control: { - // contextmenu: { preventDefault: false, hasDefault: false }, + contextmenu: { preventDefault: false, hasDefault: false }, }, terrain: { show: false,