From 5aec569c9d67c86819010171bc527afede505fe5 Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期四, 23 二月 2023 18:51:48 +0800
Subject: [PATCH] 管网一张图对接接口数据

---
 src/components/Screen/right.vue |   46 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/components/Screen/right.vue b/src/components/Screen/right.vue
index f99994d..090c5f5 100644
--- a/src/components/Screen/right.vue
+++ b/src/components/Screen/right.vue
@@ -2,17 +2,22 @@
   <div class="current">
     <div class="rightContainer" v-show="ChartDisplay">
       <div class="current1">
-        <div class="aside-title">鐩綍鍒嗗竷</div>
-        <echart11></echart11>
+        <div class="aside-title">宸ョ▼绉嶇被</div>
+        <project-category></project-category>
       </div>
-      <div class="current1">
+      <!-- <div class="current1">
         <div class="aside-title">鏁版嵁鍙婃湇鍔℃彁浜�</div>
         <echart12></echart12>
-      </div>
-      <div class="current1">
-        <div class="aside-title">鍚勭被鏁版嵁瀛樺偍鍒嗗竷</div>
-        <!-- <echart13></echart13> -->
-        <chart></chart>
+      </div> -->
+      <div class="" >
+        <div class="aside-title">鏂囦欢鏍煎紡</div>
+        <div class="content" style="height: 542px">
+          <div class="header">
+            <div>鏍煎紡</div>
+            <div>鏁伴噺</div>
+          </div>
+          <file-format></file-format>
+        </div>
       </div>
     </div>
     <div class="rightarrow">
@@ -24,14 +29,16 @@
 import echart11 from "@/components/echart11.vue"
 import echart12 from "@/components/echart12.vue"
 import echart13 from "@/components/echart13.vue"
-import chart from "@/components/chart/index.vue"
+import FileFormat from "@/components/chart/FileFormat.vue"
+import ProjectCategory from "../chart/ProjectCategory.vue"
 
 export default {
   components: {
     echart11,
     echart12,
     echart13,
-    chart
+    FileFormat,
+    ProjectCategory
   },
   data() {
     return {
@@ -52,7 +59,7 @@
   },
 }
 </script>
-<style lang="scss">
+<style lang="less">
 .current {
   height: 100%;
   width: 100%;
@@ -74,7 +81,7 @@
   }
   .rightContainer {
     height: 100%;
-    width: calc(100% - 36px);
+    width: calc(100% - 7px);
 
     display: flex;
     flex-direction: column;
@@ -89,4 +96,19 @@
     }
   }
 }
+.content {
+  width: 377px;
+  background: url(../../assets/img/Screen/contentBg.png);
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  .header {
+    margin: 0px auto;
+    padding: 10px 0;
+    width: 80%;
+    display: flex;
+    justify-content: space-between;
+    color: #fff;
+    font-size: 13px;
+  }
+}
 </style>

--
Gitblit v1.9.3