解决冲突

src/views/projectAdmin/jlw/CIM/index.vue

@@ -96,6 +96,7 @@ export default {
 .container {
   width: 100%;
   height: 100%;
+<<<<<<< HEAD
   display: flex;
   justify-content: space-between;
   .charts {
@@ -107,6 +108,26 @@ 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;

src/views/projectAdmin/jlw/digitalSite/index.vue

@@ -222,7 +222,6 @@ export default {
   width: 25%;
   height: 100%;
   margin-right: 15px;
-  margin-left: 15px;
   .leftTop {
     height: 35%;
     margin-bottom: 15px;

src/views/projectAdmin/jlw/envirManage/index.vue

@@ -86,7 +86,6 @@ export default {
   width: 25%;
   height: 100%;
   margin-right: 15px;
-  margin-left: 15px;
   .leftTop {
     height: 35%;
     margin-bottom: 15px;

src/views/projectAdmin/jlw/index.vue

@@ -2,26 +2,30 @@
   <div class="dataBoardPage">
     <div class="headerBox">
       <div class="topTit">
-        <div class="time">
+        <div class="leftmodel">
-          <span>{{currentDate}}</span>
+          <img class="wetherImg" src="../../../assets/images/projectImg/sun.png" alt />
-          <span>{{currentWeek}}</span>
+        <div class="wether">多云 32℃</div>
-          <span>{{currentTime}}</span>
+        <img class="logo" src="../../../assets/images/projectImg/logo.png" alt />
         </div>
-        <div class="title">
+        <div class="centermodel">
           <h1 class="title">{{'金林湾项目监管平台'}}</h1>
         </div>
-        <div>
+        
-          <img class="wetherImg" src="../../../assets/images/projectImg/sun.png" alt />
+        <div class="rightmodel">
-          <span>多云 32℃</span>
+          <div class="time">
-          <img
+            <span>{{currentDate}}</span>
-            class="backImg"
+            <span>{{currentWeek}}</span>
-            @click="toBack()"
+            <span>{{currentTime}}</span>
-            src="../../../assets/images/projectImg/back.png"
+            <img
-            alt
+              class="backImg"
-          />
+              @click="toBack()"
+              src="../../../assets/images/projectImg/back.png"
+              alt
+            />
+          </div>
         </div>
       </div>
-      <div style="height: 40px" class="menuBox">
+      <div class="menuBox">
         <ul class="left">
           <li
             v-for="(item, index) in menuList"
@@ -143,5 +147,4 @@ export default {
 
 <style lang="less" scoped>
 @import url("./style.less");
-
 </style>

src/views/projectAdmin/jlw/laborManage/index.vue

@@ -129,7 +129,6 @@ export default {
   width: 25%;
   height: 100%;
   margin-right: 15px;
-  margin-left: 15px;
   .leftTop {
     height: 35%;
     margin-bottom: 15px;

src/views/projectAdmin/jlw/planProgress/index.vue

@@ -50,7 +50,6 @@ export default {
   width: 25%;
   height: 100%;
   margin-right: 15px;
-  margin-left: 15px;
   .leftTop {
     height: 35%;
     margin-bottom: 15px;

src/views/projectAdmin/jlw/projectHuli/generalView.vue

@@ -202,7 +202,7 @@ export default {
         }
       }
       .manager-persons {
-        height: 60%;
+        height: 65%;
         display: flex;
         // margin-left: 20px;
         .person {

src/views/projectAdmin/jlw/projectHuli/index.vue

@@ -109,7 +109,6 @@ export default {
   width: 25%;
   height: 100%;
   margin-right: 15px;
-  margin-left: 15px;
   .leftTop {
     height: 35%;
     margin-bottom: 15px;

src/views/projectAdmin/jlw/qualityManage/index.vue

@@ -54,7 +54,6 @@ export default {
   width: 25%;
   height: 100%;
   margin-right: 15px;
-  margin-left: 15px;
   .leftTop {
     height: 35%;
     margin-bottom: 15px;

src/views/projectAdmin/jlw/safeManage/index.vue

@@ -54,7 +54,6 @@ export default {
   width: 25%;
   height: 100%;
   margin-right: 15px;
-  margin-left: 15px;
   .leftTop {
     height: 35%;
     margin-bottom: 15px;

src/views/projectAdmin/jlw/style.less

@@ -7,53 +7,72 @@
 }
 
 .headerBox{
-    background-image: url('../../../assets/images/projectImg/title.png');
+    background-image: url('../../../assets/images/projectImg/title2.png');
     background-position: bottom center;
     background-repeat: no-repeat;
-    height: 100px;
     position: relative;
     background-size: 100% auto;
     margin: 0 6px;
     .topTit{
         display: flex;
-
+        justify-content: center;
-        .time{
+        align-items: center;
-           span{
+        .leftmodel{
-            padding: 20px;
-            line-height: 40px;
-            margin-top: 5px;
-           }
-        }
-        .title{
             flex: 1;
-            margin-top: 8px;
+            .wetherImg{
-            margin-right: 50px;
+                margin-left:10px;
+            }
+            .wether{
+                display: inline-block;
+                margin: 10px;
+                font-size: 14px;
+            }
+            .logo{
+                margin-top: 10px;
+                margin-left: 10px;
+            }
         }
-        .wetherImg,.backImg{
+        .centermodel{
-            margin:10px 20px 0px 20px ;
+            flex: 1;
-            width: 20px;
+            .title{
-            height: 20px;
+                margin-top: 25px;
+                color: #fcfcfc;
+                margin-left: 40px;
+            }
+           
         }
+        .rightmodel{
 
+            .time{
+                span{
+                 padding: 20px;
+                 line-height: 30px;
+                 margin-top: 5px;
+                }
+             }
+             
+             .backImg{
+                 display: inline-block;
+                 margin:10px 20px 0px 20px ;
+                 width: 20px;
+                 height: 20px;
+             }
+        }
+        
     }
-    .title{
+    
-        color: #fcfcfc;
-        font-size: 31px;
-        text-align: center;
-        // padding-top: 15px;
-    }
 }
 
 .menuBox{
     li{
         display: inline-block;
         color: #ffffff;
-        font-size: 18px;
+        font-size: 20px;
         width: 130px;
         height: 40px;
         text-align: center;
         line-height: 15px;
-        font-weight: bold;
+        // font-weight: bold;
         cursor: pointer;
         position: relative;
         z-index: 2;