Merge branch 'yanyan_dev' into 'shenzhen-dev'

Yanyan dev

See merge request !87

src/views/projectAdmin/fourEngin/carbon/rightTop.vue

@@ -29,9 +29,9 @@ export default {
   height: 100%;
   color: #fff;
   img{
-    width: 98%;
+    width: 95%;
     height: 95%;
-    margin-top: 11px;
+    margin: 2.5% auto;
   }
   .leftWeather,.rightWeather{
     box-sizing: border-box;

src/views/projectAdmin/fourEngin/govComp/Col2.vue

@@ -77,7 +77,7 @@ export default {
           safe: "陈鑫华、唐鹏程",
           type: "安全",
           position: "基坑承台垫层",
-          change: "是"
+          change: "否"
         },
         {
           time: "2022-09-24",
@@ -95,7 +95,7 @@ export default {
           safe: "唐鹏程、谢文乐",
           type: "安全",
           position: "14号桩",
-          change: "是"
+          change: "否"
         },
         {
           time: "2022-08-27",
@@ -104,7 +104,7 @@ export default {
           safe: "谢文乐、周凌杰",
           type: "安全",
           position: "抗拔实验基础",
-          change: "是"
+          change: "否"
         },
         {
           time: "2022-08-13",
@@ -113,7 +113,7 @@ export default {
           safe: "陈鑫华、周凌杰",
           type: "安全",
           position: "25号桩",
-          change: "是"
+          change: "否"
         },
         {
           time: "2022-07-22",
@@ -122,7 +122,7 @@ export default {
           safe: "周凌杰、谢文乐",
           type: "安全",
           position: "20号桩",
-          change: "是"
+          change: "否"
         },
         {
           time: "2022-07-18",
@@ -131,7 +131,7 @@ export default {
           safe: "周凌杰、唐鹏程",
           type: "安全",
           position: "5号桩",
-          change: "是"
+          change: "否"
         },
         {
           time: "2022-06-25",
@@ -140,7 +140,7 @@ export default {
           safe: "唐鹏程、陈鑫华",
           type: "安全",
           position: "21号桩",
-          change: "是"
+          change: "否"
         },
         {
           time: "2022-06-11",
@@ -149,7 +149,7 @@ export default {
           safe: "唐鹏程、陈鑫华",
           type: "安全",
           position: "三级沉淀池垫层",
-          change: "是"
+          change: "否"
         },
         {
           
@@ -159,7 +159,7 @@ export default {
           safe: "谢文乐、周凌杰",
           type: "安全",
           position: "4号桩",
-          change: "是"
+          change: "否"
         },
         {
           
@@ -169,7 +169,7 @@ export default {
           safe: "谢文乐、陈鑫华",
           type: "安全",
           position: "25号桩",
-          change: "是"
+          change: "否"
         },
       ]
     };

src/views/projectAdmin/fourEngin/govComp/leftTop.vue

@@ -18,7 +18,7 @@
             <div style="margin:2px 0 0 80px">中国建筑第四工程局有限公司（施工图设计）</div>
             <div>总包单位：中国建筑第四工程局有限公司</div>
             <!-- <div>业主单位：中国建筑第四工程局有限公司</div> -->
-            <div>合同工期：2022-04-18/2024-10-08</div>
+            <!-- <div>合同工期：2022-04-18/2024-10-08</div> -->
           </div>
         </div>
       </vue-scroll>