From 2676f45f33b9dedb80d0417e5af603df41216f0b Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 19 Nov 2024 18:31:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/views/rs/components/rightContainer.vue | 76 +++----------------------------------
1 files changed, 7 insertions(+), 69 deletions(-)
diff --git a/src/views/rs/components/rightContainer.vue b/src/views/rs/components/rightContainer.vue
index 368a022..c523e6f 100644
--- a/src/views/rs/components/rightContainer.vue
+++ b/src/views/rs/components/rightContainer.vue
@@ -2,91 +2,29 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-03-10 15:27:59
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-10-26 14:49:05
- * @FilePath: \bigScreen\src\views\survey\components\rightContainer.vue
+ * @LastEditTime: 2024-11-19 16:01:24
+ * @FilePath: \bigScreen\src\views\rs\components\rightContainer.vue
* @Description:
*
* Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
-->
<script setup>
-import fireSource from './box/fireSource.vue'
-import fireTrend from './box/fireTrend.vue'
-import occurStatistics from './box/occurStatistics.vue'
-import publicContent from './box/publicContent.vue'
+import dataContent from './box/dataContent.vue'
</script>
<template>
<div class="right-container">
- <div class="fire-source box">
+ <div class="data box h0 flex-1">
<title-box>
<template #titleName>
- 火警事件来源
+ 风险源信息
</template>
</title-box>
<div class="content-box">
- <fire-source></fire-source>
- </div>
- </div>
-
- <div class="occur-statistics box">
- <title-box>
- <template #titleName>
- 易发区统计
- </template>
- </title-box>
- <div class="content-box">
- <fire-trend></fire-trend>
- </div>
- </div>
-
- <div class="fire-trend box">
- <title-box>
- <template #titleName>
- 火警上报趋势
- </template>
- </title-box>
- <div class="content-box">
- <occur-statistics></occur-statistics>
+ <data-content></data-content>
</div>
</div>
</div>
</template>
-<style lang="scss" scoped>
-.right-container {
- display: flex;
- flex-direction: column;
- padding: 20px;
- position: absolute;
- top: 0;
- right: 0;
- width: 440px;
- height: 100%;
- pointer-events: auto;
-
- .box {
- margin-top: 20px;
-
- .header {
- height: 32px;
- background: url(/img/bg/sub-title.png) no-repeat;
- }
- }
-
- .fire-source {
- flex: 3;
- }
-
- .occur-statistics {
- flex: 3;
- }
-
- .fire-trend {
- flex: 4;
- }
-
- .box:first-child {
- margin-top: 0;
- }
-}
-</style>
\ No newline at end of file
+<style lang="scss" scoped></style>
\ No newline at end of file
--
Gitblit v1.9.3