From 8a958adc8f2f8bd72df84d02c62c36a2599f8984 Mon Sep 17 00:00:00 2001
From: Jack <1638169491@qq.com>
Date: Tue, 23 Aug 2022 16:47:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(CIM)?=
 =?UTF-8?q?=EF=BC=9A=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectAdmin/jlw/CIM/index.vue | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/src/views/projectAdmin/jlw/CIM/index.vue b/src/views/projectAdmin/jlw/CIM/index.vue
index 9542b1e6..0d99eb6b 100644
--- a/src/views/projectAdmin/jlw/CIM/index.vue
+++ b/src/views/projectAdmin/jlw/CIM/index.vue
@@ -96,7 +96,6 @@ export default {
 .container {
   width: 100%;
   height: 100%;
-<<<<<<< HEAD
   display: flex;
   justify-content: space-between;
   .charts {
@@ -108,26 +107,6 @@ export default {
     .chart {
       height: 32%;
     }
-=======
-  background-color: #07162b;
-  background-image: url('~@/assets/images/projectImg/Bimbgc.png');
-}
-.topBox {
-  height: 20%;
-}
-.leftBox {
-  position: relative;
-  width: 25%;
-  height: 100%;
-  margin-right: 15px;
-  .leftTop {
-    height: 33%;
-    margin-bottom: 15px;
-  }
-  .leftCenter {
-    height: 33%;
-    margin-bottom: 15px;
->>>>>>> dev-xiaole
   }
   .bim {
     padding: 8px;