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

yanzhu-bigscreen/src/views/bimManage.vue

@@ -121,7 +121,7 @@
                   <svg-icon icon-class="notesearch" />
                 </div>
                 <div class="warn-data">
-                  <div class="warn-data-val led-number">{{safetyInfo.safetyCount}}</div>
+                  <div class="warn-data-val led-number">{{ safetyInfo.safetyCount }}</div>
                   <div class="warn-data-text">问题数</div>
                 </div>
               </div>
@@ -130,7 +130,7 @@
                   <svg-icon icon-class="tools" />
                 </div>
                 <div class="warn-data">
-                  <div class="warn-data-val led-number">{{safetyInfo.safetyRectifyCount}}</div>
+                  <div class="warn-data-val led-number">{{ safetyInfo.safetyRectifyCount }}</div>
                   <div class="warn-data-text">整改数</div>
                 </div>
               </div>
@@ -139,7 +139,7 @@
                   <svg-icon icon-class="percent" class="green" />
                 </div>
                 <div class="warn-data">
-                  <div class="warn-data-val led-number">{{safetyInfo.safetyRectifyRate}}%</div>
+                  <div class="warn-data-val led-number">{{ safetyInfo.safetyRectifyRate }}%</div>
                   <div class="warn-data-text">整改率</div>
                 </div>
               </div>
@@ -148,7 +148,7 @@
                   <svg-icon icon-class="warn" class="red" />
                 </div>
                 <div class="warn-data">
-                  <div class="warn-data-val led-number">{{safetyInfo.safetyTimeoutCount}}</div>
+                  <div class="warn-data-val led-number">{{ safetyInfo.safetyTimeoutCount }}</div>
                   <div class="warn-data-text">超时数</div>
                 </div>
               </div>
@@ -383,6 +383,15 @@ export default {
       planFinishRate: 0,
       finishRate: 0,
       photographyList: [],
+<<<<<<< HEAD
+      safetyListCount: [],
+      safetyInfo: {
+        safetyRectifyCount: 0,
+        safetyRectifyRate: 0,
+        safetyTimeoutCount: 0,
+        safetyTimeoutRate: 0,
+      },
+=======
       safetyListCount:[],
       safetyInfo:{
         safetyRectifyCount:0,
@@ -390,6 +399,7 @@ export default {
         safetyTimeoutCount:0,
         safetyTimeoutRate:0
       }
+>>>>>>> origin/dev_xd
     };
   },
   beforeDestroy() {
@@ -428,6 +438,8 @@ export default {
       return this.renderChart(1);
     },
     renderChart(n) {
+      let is1K = this.$dpi() == "1K";
+      let is2K = this.$dpi() == "2K";
       let opt = {
         tooltip: {
           show: true,
@@ -453,7 +465,7 @@ export default {
               show: false,
             },
             label: {
-              fontSize: 30,
+              fontSize: is1K ? 20 : is2K ? 30 : 40,
               formatter: function (param) {
                 return (param.value * 100).toFixed(2) + "%";
               },
@@ -482,23 +494,23 @@ export default {
       };
       this.$api.safety.listCountForBG({ ...postData, infoType: 0 }).then((d) => {
         this.safetyListCount = d.data;
-        let func=lbl=>{
+        let func = (lbl) => {
-          let obj=this.safetyListCount.find(it=>it.remark==lbl);
+          let obj = this.safetyListCount.find((it) => it.remark == lbl);
-          return obj?obj.id||0:0;
+          return obj ? obj.id || 0 : 0;
         };
-        this.safetyInfo.safetyCount=func("全部");
+        this.safetyInfo.safetyCount = func("全部");
-        this.safetyInfo.safetyRectifyCount=func("完成");
+        this.safetyInfo.safetyRectifyCount = func("完成");
-        if(this.safetyInfo.safetyCount==0){
+        if (this.safetyInfo.safetyCount == 0) {
-          this.safetyInfo.safetyRectifyRate=100;
+          this.safetyInfo.safetyRectifyRate = 100;
-        }else{
+        } else {
-          this.safetyInfo.safetyRectifyRate=(this.safetyInfo.safetyRectifyCount/this.safetyInfo.safetyCount*100.0).toFixed(2);
+          this.safetyInfo.safetyRectifyRate = ((this.safetyInfo.safetyRectifyCount / this.safetyInfo.safetyCount) * 100.0).toFixed(2);
         }
-        this.safetyInfo.safetyTimeoutCount=func("整改超时");
+        this.safetyInfo.safetyTimeoutCount = func("整改超时");
       });
     },
     selectLastPhotography() {
       this.$api.detail.photographyList(this.selProject.id).then((d) => {
-        this.photographyList = d.data;
+        this.photographyList =[];// d.data;
       });
     },
     getFinishRate() {
@@ -996,11 +1008,12 @@ export default {
   }
 
   .data-content {
-    border: solid 1px #75fbfdaa;
+   
-    background-color: #06445b81;
     height: 100%;
     .div-row {
       height: 33%;
+       border: solid 1px #75fbfdaa;
+        background-color: #06445b81;
       .row-title {
         background: linear-gradient(0deg, #105696, #c0dafb00, #1765ae);
         padding-left: 10px;
@@ -1222,7 +1235,7 @@ export default {
       width: 80%;
       height: 80%;
       margin-left: 10%;
-      margin-top: 6%;
+      margin-top: 3%;
       display: flex;
       align-items: center;
       justify-content: center;
@@ -1277,8 +1290,8 @@ export default {
           font-weight: 700;
           color: #22d0d2;
         }
-        .warn-data-text{
+        .warn-data-text {
-          margin-top:10px;
+          margin-top: 10px;
           text-align: center;
         }
       }
@@ -1327,5 +1340,371 @@ export default {
       padding: 4px 8px;
     }
   }
+  @media (max-width: 1920px) {
+    .data-content {
+      .div-row {
+        min-height: 220px;
+        .row-title {
+          height: 30px;
+          line-height: 30px;
+          font-size: 14px;
+        }
+      }
+    }
+    .div-tools {
+      bottom: 25vh;
+      margin-left: -220px;
+      border-radius: 10px;
+      .tool-item {
+        padding: 10px 20px;
+        .icon {
+          width:30px;
+          height: 30px;
+          border-radius: 15px;
+          .svg-icon {
+            width: 20px;
+            height: 20px;
+          }
+        }
+        .sp-text {
+          margin-top: 10px;
+          font-size: 12px;
+        }
+      }
+    }
+
+    .prj-info {
+      padding: 10px;
+
+      .base-info {
+        .floor-area {
+          font-size: 24px;
+        }
+        .floor-area-text {
+          line-height: 20px;
+          font-size: 12px;
+        }
+        margin-bottom: 10px;
+      }
+      .tb-prj {
+        td,
+        th {
+          border: solid 1px #6ea9ab68;
+          padding: 4px;
+          font-size: 12px;
+        }
+      }
+    }
+
+    .prj-worker {
+      height: calc(100% - 50px);
+      .worker-chart {
+        .chart-item {
+          .chart-gif,
+          .chart-text {
+            left: 24px;
+            top: 20px;
+            width: 80px;
+            height: 80px;
+          }
+          .chart-text {
+            font-size: 20px;
+          }
+        }
+      }
+      .worker-title {
+        .title-item {
+          padding: 20px 0px 10px 0px;
+          .svg-icon {
+            fill: #3ffcff;
+            width: 60px;
+            height: 60px;
+          }
+          font-size: 12px;
+          color: #3ffcff;
+        }
+      }
+    }
+
+    .investment-stats-cost {
+      padding: 20px 10px;
+      top: -12px;
+
+      .stat-card {
+        padding: 16px 0;
+        box-shadow: 0 2px 8px #0004;
+        border-radius: 10px;
+      }
+      .stat-title {
+        font-size: 12px;
+        margin-bottom: 8px;
+      }
+      .stat-value {
+        font-size: 20px;
+      }
+      .center-icon {
+        width: 60px;
+        height: 60px;
+        font-size: 24px;
+        .chart-gif {
+          width: 50px;
+          height: 50px;
+          top: 5px;
+          left: 5px;
+        }
+      }
+    }
+    .plan-chart {
+      height: calc(100% - 30px);
+      .chart-item {
+        .chart-title {
+          font-size: 12px;
+          top: -30px;
+        }
+      }
+    }
+
+    .photography-list {
+      height: calc(100% - 30px);
+      padding: 10px 0px;
+      .el-carousel {
+        height: calc(100% - 10px);
+      }
+
+      .photography-video {
+        height: calc(100% - 30px);
+      }
+
+      .photography-list-title {
+        line-height: 24px;
+        font-size: 12px;
+      }
+      .photography-list-nodata {
+       
+        .video-play {
+          width: 60px;
+          height: 60px;
+          line-height: 60px;
+          border-radius: 30px;
+          margin-bottom: 12px;
+        }
+
+        .photography-list-no-title {
+          font-size: 12px;
+        }
+      }
+    }
+
+    .warn-info {
+      height: calc(100% - 30px);
+      .warn-item {
+        width: calc(50% - 30px);
+        height: 50%;
+        padding-left: 30px;
+        .czz-number-img {
+          width: 70px;
+          height: 70px;
+          line-height: 70px;
+          .svg-icon {
+            width: 30px;
+            height: 30px;
+            top: 6px;
+          }
+        }
+        .warn-data {
+          margin-left: 10px;
+          .warn-data-val {
+            font-size: 30px;
+          }
+          .warn-data-text {
+            font-size: 12px;
+          }
+        }
+      }
+    }
+  }
+  @media (min-width: 2561px) {
+    .data-content {
+      .div-row {
+        min-height: 420px;
+        .row-title {
+          height: 48px;
+          line-height: 48px;
+          font-size: 32px;
+        }
+      }
+    }
+    .div-tools {
+      bottom: 25vh;
+      margin-left: -340px;
+      border-radius: 10px;
+      .tool-item {
+        padding: 10px 20px;
+        .icon {
+          width: 60px;
+          height: 60px;
+          border-radius: 30px;
+          .svg-icon {
+            width: 40px;
+            height: 40px;
+          }
+        }
+        .sp-text {
+          margin-top: 10px;
+          font-size: 24px;
+        }
+      }
+    }
+
+    .prj-info {
+      padding: 20px;
+
+      .base-info {
+        .floor-area {
+          font-size: 60px;
+        }
+        .floor-area-text {
+          line-height: 40px;
+          font-size: 24px;
+        }
+        margin-bottom: 10px;
+      }
+      .tb-prj {
+        td,
+        th {
+          border: solid 1px #6ea9ab68;
+          padding: 8px;
+          font-size: 24px;
+        }
+      }
+    }
+
+    .prj-worker {
+      height: calc(100% - 60px);
+      .worker-chart {
+        .chart-item {
+          .chart-gif,
+          .chart-text {
+            left: 40px;
+            top: 20px;
+            width: 180px;
+            height: 180px;
+          }
+          .chart-text {
+            font-size: 60px;
+          }
+        }
+      }
+      .worker-title {
+        .title-item {
+          padding: 20px 0px 10px 0px;
+          .svg-icon {
+            fill: #3ffcff;
+            width: 120px;
+            height: 120px;
+          }
+          font-size: 24px;
+          color: #3ffcff;
+        }
+      }
+    }
+
+    .investment-stats-cost {
+      padding: 30px 20px;
+      top: -18px;
+
+      .stat-card {
+        height: 130px;
+        padding: 16px 0;
+        box-shadow: 0 2px 8px #0004;
+        border-radius: 10px;
+      }
+      .stat-title {
+        font-size: 24px;
+        margin-bottom: 8px;
+      }
+      .stat-value {
+        font-size: 60px;
+      }
+      .center-icon {
+        width: 120px;
+        height: 120px;
+        font-size: 48px;
+        .chart-gif {
+          width: 110px;
+          height: 110px;
+          top: 5px;
+          left: 5px;
+        }
+      }
+    }
+    .plan-chart {
+      height: calc(100% - 60px);
+      .chart-item {
+        .chart-title {
+          font-size: 24px;
+          top: -40px;
+        }
+      }
+    }
+
+    .photography-list {
+      height: calc(100% - 60px);
+      padding: 10px 0px;
+      .el-carousel {
+        height: calc(100% - 10px);
+      }
+
+      .photography-video {
+        height: calc(100% - 30px);
+      }
+
+      .photography-list-title {
+        line-height: 36px;
+        font-size: 24px;
+      }
+      .photography-list-nodata {
+        .video-play {
+          width: 120px;
+          height: 120px;
+          line-height: 120px;
+          border-radius: 60px;
+          margin-bottom: 12px;
+        }
+
+        .photography-list-no-title {
+          font-size: 24px;
+        }
+      }
+    }
+
+    .warn-info {
+      height: calc(100% - 60px);
+      .warn-item {
+        width: calc(50% - 30px);
+        height: 50%;
+        padding-left: 30px;
+        .czz-number-img {
+          width: 140px;
+          height: 140px;
+          line-height: 140px;
+          .svg-icon {
+            width: 60px;
+            height: 60px;
+            top: 24px;
+          }
+        }
+        .warn-data {
+          margin-left: 10px;
+          .warn-data-val {
+            font-size: 60px;
+          }
+          .warn-data-text {
+            font-size: 24px;
+          }
+        }
+      }
+    }
+  }
 }
 </style>