diff --git a/src/components/MapContainer/index.vue b/src/components/MapContainer/index.vue new file mode 100644 index 0000000..2a1dd3a --- /dev/null +++ b/src/components/MapContainer/index.vue @@ -0,0 +1,851 @@ + + + + + diff --git a/src/router/index.ts b/src/router/index.ts index cb7c119..47ef7b5 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -4,12 +4,16 @@ import { qiankunWindow } from 'vite-plugin-qiankun/dist/helper'; const router = createRouter({ history: createWebHashHistory(qiankunWindow.__POWERED_BY_QIANKUN__ ? '/highScoreVisualization' : '/'), routes: [ + { + path: '/', + redirect: '/highScoreVisualization' // 自动跳转到 /highScoreVisualization + }, { path: '/highScoreVisualization', name: 'highScoreVisualization', component: () => import('../views/highScore/dailyMonitoring/index.vue') } ] -}) +}); export default router; diff --git a/src/views/highScore/chargeMonitoring/container/containerLeft.vue b/src/views/highScore/chargeMonitoring/container/containerLeft.vue index 10b3532..19ce7eb 100644 --- a/src/views/highScore/chargeMonitoring/container/containerLeft.vue +++ b/src/views/highScore/chargeMonitoring/container/containerLeft.vue @@ -272,7 +272,7 @@ padding: 2% 0 0 2%; display: flex; margin-left: 7%; - width: 71%; + width: 100%; height: 280px; background: url('/src/assets/highScore/charge/chargeListBg.png') no-repeat 0 0/100% 100%; .pic { diff --git a/src/views/highScore/dailyMonitoring/index.vue b/src/views/highScore/dailyMonitoring/index.vue index cc55ffa..1dba429 100644 --- a/src/views/highScore/dailyMonitoring/index.vue +++ b/src/views/highScore/dailyMonitoring/index.vue @@ -22,7 +22,19 @@
-
+ +
+ +
+
@@ -59,6 +71,7 @@
+
@@ -69,7 +82,7 @@ -
+
图例名称 @@ -106,6 +119,7 @@ import surveillancerightList from '../video/container/containerright.vue'; import surveillanceLeftList from '../video/container/containerLeft.vue'; import surveillance from '../video/container/index.vue'; + import MapContainer from '../../../components/MapContainer/index.vue'; import tunnel from '../tunnelMonitoring/container/index.vue'; import bottom from './container/bottom.vue'; import { @@ -729,7 +743,7 @@ opacity: 0.8; position: absolute; top: 3%; - left: -20%; + left: 2%; img { margin-top: 45%; } @@ -737,16 +751,6 @@ .map-data { height: 80%; position: relative; - #watch-map { - position: absolute; - top: -6%; - left: -15%; - width: 130%; - height: 120%; - // background-color: #d7f359; - border-radius: 28% / 50%; /* 使边框变成椭圆形,横轴和纵轴不同的比例 */ - overflow: hidden; /* 防止内容溢出 */ - } .watch-video { position: absolute; top: -6%; @@ -754,12 +758,6 @@ width: 130%; height: 120%; } - .watch-bottom { - z-index: 9999 !important; - position: absolute; - bottom: -18%; - left: 20%; - } .info-map { display: flex; z-index: 9998 !important; diff --git a/src/views/highScore/tunnelMonitoring/container/index.vue b/src/views/highScore/tunnelMonitoring/container/index.vue index f77f7dc..a65761e 100644 --- a/src/views/highScore/tunnelMonitoring/container/index.vue +++ b/src/views/highScore/tunnelMonitoring/container/index.vue @@ -33,11 +33,19 @@
事件报警
1340
-
+
预案执行
1340
-
+
故障设备
1427
@@ -229,7 +237,12 @@
- +