Merge remote-tracking branch 'origin/dev_xd' into dev_xd

yanzhu-bigscreen/src/views/bimManage.vue

@@ -117,6 +117,7 @@
             </div>
             <div class="warn-info">
               <div class="warn-item">
+<<<<<<< HEAD
                 <div class="czz-number-img czz-number-img-blue">
                   <svg-icon icon-class="notesearch" />
                 </div>
@@ -151,6 +152,46 @@
                   <div class="warn-data-val led-number">{{safetyInfo.safetyTimeoutCount}}</div>
                   <div class="warn-data-text">超时数</div>
                 </div>
+=======
+               
+                  <div class="czz-number-img czz-number-img-blue">
+                    <svg-icon icon-class="notesearch" />
+                  </div>
+                  <div class="warn-data">
+                    <div class="warn-data-val led-number">888</div>
+                    <div class="warn-data-text">问题数</div>
+                  </div>
+              </div>
+              <div class="warn-item">
+               
+                  <div class="czz-number-img czz-number-img-blue">
+                    <svg-icon icon-class="tools"  />
+                  </div>
+                  <div class="warn-data">
+                    <div class="warn-data-val led-number">888</div>
+                    <div class="warn-data-text">整改数</div>
+                  </div>
+              </div>
+              <div class="warn-item">
+               
+                  <div class="czz-number-img czz-number-img-green">
+                    <svg-icon icon-class="percent"  class="green"/>
+                  </div>
+                  <div class="warn-data">
+                    <div class="warn-data-val led-number">888</div>
+                    <div class="warn-data-text">整改率</div>
+                  </div>
+              </div>
+              <div class="warn-item">
+               
+                  <div class="czz-number-img czz-number-img-blue">
+                    <svg-icon icon-class="warn" class="red"/>
+                  </div>
+                  <div class="warn-data">
+                    <div class="warn-data-val led-number">888</div>
+                    <div class="warn-data-text">超时数</div>
+                  </div>
+>>>>>>> origin/dev_xd
               </div>
             </div>
           </div>
@@ -383,6 +424,7 @@ export default {
       planFinishRate: 0,
       finishRate: 0,
       photographyList: [],
+<<<<<<< HEAD
       safetyListCount:[],
       safetyInfo:{
         safetyRectifyCount:0,
@@ -390,6 +432,8 @@ export default {
         safetyTimeoutCount:0,
         safetyTimeoutRate:0
       }
+=======
+>>>>>>> origin/dev_xd
     };
   },
   beforeDestroy() {
@@ -431,8 +475,13 @@ export default {
       let opt = {
         tooltip: {
           show: true,
+<<<<<<< HEAD
           formatter: function (params) {
             return params.seriesName + "<br/>" + params.marker + (params.value * 100).toFixed(2) + "%";
+=======
+          formatter: function(params){
+            return params.seriesName + "<br/>"+params.marker + (params.value * 100).toFixed(2) + "%";
+>>>>>>> origin/dev_xd
           },
         },
         series: [
@@ -440,7 +489,11 @@ export default {
             type: "liquidFill",
             data: [n == 0 ? this.planFinishRate : this.finishRate],
             name: n == 0 ? "计划完成" : "实际完成",
+<<<<<<< HEAD
             color: [n == 0 ? "orange" : "#47D89F"], //颜色
+=======
+            color: [n==0?"orange":"#47D89F"], //颜色
+>>>>>>> origin/dev_xd
             //波浪动画效果
             waveAnimation: true,
             animationEasingUpdate: "quinticInOut",
@@ -452,12 +505,21 @@ export default {
             outline: {
               show: false,
             },
+<<<<<<< HEAD
             label: {
               fontSize: 30,
               formatter: function (param) {
                 return (param.value * 100).toFixed(2) + "%";
               },
             },
+=======
+            label:{
+              fontSize: 20,
+              formatter: function (param) {
+                return (param.value*100).toFixed(2) + "%";
+              },
+            }
+>>>>>>> origin/dev_xd
           },
         ],
       };
@@ -473,6 +535,7 @@ export default {
       this.getRootScheduleNode();
       this.getFinishRate();
       this.selectLastPhotography();
+<<<<<<< HEAD
       this.getSafetyListCount();
     },
     getSafetyListCount() {
@@ -495,6 +558,8 @@ export default {
         }
         this.safetyInfo.safetyTimeoutCount=func("整改超时");
       });
+=======
+>>>>>>> origin/dev_xd
     },
     selectLastPhotography() {
       this.$api.detail.photographyList(this.selProject.id).then((d) => {
@@ -1244,6 +1309,7 @@ export default {
       }
     }
   }
+<<<<<<< HEAD
   .warn-info {
     height: calc(100% - 30px);
     .warn-item {
@@ -1257,19 +1323,43 @@ export default {
         height: 80px;
         line-height: 80px;
         .svg-icon {
+=======
+  .warn-info{
+    height: calc(100% - 30px);
+    .warn-item{
+      display: inline-flex;
+      width:50%;
+      height:50%;
+      justify-content: center;
+      align-items: center;
+      .czz-number-img{
+        width:80px;
+        height: 80px;
+        line-height: 80px;
+        .svg-icon{
+>>>>>>> origin/dev_xd
           width: 40px;
           height: 40px;
           fill: #5cc0eb;
           position: relative;
+<<<<<<< HEAD
           top: 12px;
           &.red {
             fill: red;
           }
           &.green {
+=======
+          top:12px;
+          &.red{
+            fill: red;
+          }
+          &.green{
+>>>>>>> origin/dev_xd
             fill: #00e900;
           }
         }
       }
+<<<<<<< HEAD
       .warn-data {
         margin-left: 10px;
         .warn-data-val {
@@ -1281,6 +1371,15 @@ export default {
           margin-top:10px;
           text-align: center;
         }
+=======
+      .warn-data{
+        margin-left:10px;
+        .warn-data-val{
+          font-size:30px;
+          font-weight: 700;
+          color: #22d0d2;
+        }
+>>>>>>> origin/dev_xd
       }
     }
   }