From 93fd50d4705b441125a05439b20a8531a2e453f7 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 10 Dec 2025 09:05:15 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v9.0/9.0.1' into feature/v9.0/9.0.2
---
src/styles/common.scss | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 488a42d..18ff080 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -1,5 +1,12 @@
// 全局变量
@import './variables.scss';
+@import './base.scss';
+@import './tool.scss';
+@import './element-ui.scss';
+// video-js 直播回放 样式
+@import './video-js.scss';
+// 地图编辑样式
+@import './mapEdit.scss';
a {
text-decoration: none;
@@ -20,9 +27,9 @@
.avue-layout {
display: flex;
- height: 1080px;
- width: 1920px;
- background: url("@/assets/images/layoutBg.png") no-repeat center / 100% 100%;
+ width: 100%;
+ height: 100%;
+ background: url("@/assets/images/layoutBg.png") no-repeat center / 100% 100%;
overflow: hidden;
&--horizontal {
@@ -85,9 +92,12 @@
margin-bottom: 0;
}
-.avue-view {
- width: 100%;
- box-sizing: border-box;
+.main-avue-view-container {
+ height: 0;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
}
.avue-footer {
@@ -110,6 +120,32 @@
right: 0;
top: 0;
bottom: 0;
+}
+
+.ztzf-cesium {
+ .cesium-viewer {
+ height: 100%;
+ overflow: hidden;
+
+ .cesium-viewer-cesiumWidgetContainer {
+ width: 100%;
+ height: 100%;
+
+ .cesium-widget {
+ width: 100%;
+ height: 100%;
+
+ canvas {
+ width: 100%;
+ height: 100%;
+ }
+ }
+ }
+ }
+
+ .cesium-viewer-bottom {
+ display: none;
+ }
}
// ele样式覆盖
@@ -155,7 +191,7 @@
}
}
-.ztzf-cesium{
+.ztzf-cesium {
.cesium-viewer {
height: 100%;
overflow: hidden;
@@ -179,4 +215,4 @@
.cesium-viewer-bottom {
display: none;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3