模型质量报告

src/views/model/report/deleted.vue

@@ -1,55 +1,51 @@
 <template>
   <!-- 待删除页面 -->
   <div class="box">
-    <ul class="infinite-list" style="overflow:auto">
-      <li class="infinite-list-item" v-for="(item,index) in pageData" :key="index">
-        <div class="content-box">
-          <div class="content-top">
-            <div class="details">
-              <h4>{{index | numTransformation(4)}}<el-badge value="待删除" class="item"></el-badge>
-              </h4>
-              <h4>{{`${item.BuildingName}建筑模型`}}-{{`${item.FloorName}层`}}-{{`${item.EquipLocalName?item.EquipLocalName:item.EquipName}`}}</h4>
-              <b>BIM ID:<span @dblclick="copyContent" id="copy">{{item.ScanTaskBase[0].BIMID | bimIdTransformation}}</span></b><span class="copy"
-                @click="clickCopy">点击复制</span>
-              <input id="copyContent" type="text" @dblclick="copyContent" style="border:none;opacity:0;position:absolute;top:0;left:0;">
-              <p style="margin-top:30px;">Revit族:{{item.BIMFamilyName}}</p>
-              <p>设计图纸中编码:{{item.CADID}}</p>
-              <p><span>设备类型:{{item.Category}}</span><span>设备ID:{{item.EquipLocalID}}</span></p>
-              <p><span v-if="item.Property && item.Property.FamilyName">资产族:{{item.Property.FamilyName.Name}}</span><span
-                  v-if="item.PropertyId">关联的资产ID:{{item.PropertyId}}</span></p>
-              <p>现场任务ID:{{item.ScanTaskBase[0].TaskId}}</p>
-              <p><span>执行人:{{item.ScanTaskBase[0].WorkerName}}</span><span>确认人:{{item.ScanTaskBase[0].ConfirmingPersonName}}</span></p>
-            </div>
-            <div class="plan">
-              <p>平面图上的位置：<span>{{item.local | localTransformation}}</span></p>
-              <div class="img-box">
-                <canvas :id="'canvas'+index" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0" :data-modelid="item.ModelId"
-                  :data-EquipID='item.EquipID' :data-x="item.local.X" :data-y="item.local.Y"></canvas>
-              </div>
-            </div>
+    <div class="content-box" v-for="(item,index) in pageData" :key="index">
+      <div class="content-top">
+        <div class="details">
+          <h4>{{index | numTransformation(4)}}<el-badge value="待删除" class="item"></el-badge>
+          </h4>
+          <h4>{{`${item.BuildingName}建筑模型`}}-{{`${item.FloorName}层`}}-{{`${item.EquipLocalName?item.EquipLocalName:item.EquipName}`}}</h4>
+          <b>BIM ID:<span @dblclick="copyContent" id="copy">{{item.ScanTaskBase[0].BIMID | bimIdTransformation}}</span></b><span class="copy"
+            @click="clickCopy">点击复制</span>
+          <input id="copyContent" type="text" @dblclick="copyContent" style="border:none;opacity:0;position:absolute;top:0;left:0;">
+          <p style="margin-top:30px;">Revit族:{{item.BIMFamilyName}}</p>
+          <p>设计图纸中编码:{{item.CADID}}</p>
+          <p><span>设备类型:{{item.Category}}</span><span>设备ID:{{item.EquipLocalID}}</span></p>
+          <p><span v-if="item.Property && item.Property.FamilyName">资产族:{{item.Property.FamilyName.Name}}</span><span
+              v-if="item.PropertyId">关联的资产ID:{{item.PropertyId}}</span></p>
+          <p>现场任务ID:{{item.ScanTaskBase[0].TaskId}}</p>
+          <p><span>执行人:{{item.ScanTaskBase[0].WorkerName}}</span><span>确认人:{{item.ScanTaskBase[0].ConfirmingPersonName}}</span></p>
+        </div>
+        <div class="plan">
+          <p>平面图上的位置：<span>{{item.local | localTransformation}}</span></p>
+          <div class="img-box">
+            <canvas :id="'canvas'+index" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0" :data-modelid="item.ModelId"
+              :data-EquipID='item.EquipID' :data-x="item.local.X" :data-y="item.local.Y"></canvas>
           </div>
-          <div class="content-bottom">
-            <div class="explain">
-              <p>现场问题说明：</p>
+        </div>
+      </div>
+      <div class="content-bottom">
+        <div class="explain" v-if="item.ScanTaskBase[0].Note">
+          <p>现场问题说明：</p>
+          <el-scrollbar>
+            <p class="explain-content">
               <el-scrollbar>
-                <p class="explain-content">
-                  <el-scrollbar>
-                    {{item.ScanTaskBase[0].Note?item.ScanTaskBase[0].Note:'暂无说明'}}
-                  </el-scrollbar>
-                </p>
+                {{item.ScanTaskBase[0].Note?item.ScanTaskBase[0].Note:'暂无说明'}}
               </el-scrollbar>
-            </div>
-            <div class="photo" v-for="(it,ind) in item.ScanTaskBase[0].TaskPicList" :key='ind'>
-              <p>{{it.Name}}<span>拍摄时间：{{it.CreateTime | timeTransformation}}</span></p>
-              <div class="img-box">
-                {{it.Key}}
-                <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${it.Key}`" alt="现场拍摄照片">
-              </div>
-            </div>
+            </p>
+          </el-scrollbar>
+        </div>
+        <div class="photo" v-for="(it,ind) in item.ScanTaskBase[0].TaskPicList" :key='ind'>
+          <p>{{it.Name}}<span>拍摄时间：{{it.CreateTime | timeTransformation}}</span></p>
+          <div class="img-box">
+            <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${it.key}`" alt="现场拍摄照片">
+            <!-- <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${'1542788378693.png'}`" alt="现场拍摄照片"> -->
           </div>
         </div>
-      </li>
-    </ul>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -177,7 +173,6 @@ export default {
       }
       toBeDelEquipPage(params, res => {
         this.pageData = res.Content;
-        console.log(this.pageData, 121)
         this.pageData.forEach(item => {
           if (item.BIMLocation) {
             let local = {};
@@ -198,7 +193,6 @@ export default {
       })
     },
     getGraphy() {// 绘制空间位置图片
-      console.log(this.i, 39)
       let can = this.$refs.canvas;
       let that = this;
       that.clearGraphy(this.i)
@@ -215,7 +209,7 @@ export default {
         let EquipID = can[this.i].dataset.equipid;
         let X = Number(can[this.i].dataset.x);
         let Y = can[this.i].dataset.y * -1;
-        console.log(X, Y)
+        // console.log(X, Y)
         that.view.scene = that.scene;
         this.scene.addMarker({
           Id: EquipID,

src/views/model/report/index.vue

@@ -26,8 +26,8 @@
       </div>
       <div class="content-box">
         <div class="button">
-          <el-link :underline="false" @click="del">需从模型中删除的设备</el-link>
-          <el-link @click="supplement" :underline="false">模型待补充的设备</el-link>
+          <el-link :underline="false" @click="del" v-if="toBeDelCount">需从模型中删除的设备</el-link>
+          <el-link @click="supplement" :underline="false" v-if="toBeSuppCount">模型待补充的设备</el-link>
           <el-button type="info" :loading="load" @click='getExportReport' style="border:1px solid #dcdfe6;color:#606266;background:white;">导出模型问题报告
           </el-button>
         </div>
@@ -182,6 +182,8 @@ export default {
       loading: false,
       load: false,
       floorIconType: null,
+      toBeSuppCount: 0,
+      toBeDelCount: 0
     }
   },
   mounted() { },
@@ -275,7 +277,6 @@ export default {
         Filters: `FolderId='${this.activeTab}';Status=4`
       }
       queryLostReportList(params, res => {
-        console.log(res,392)
         this.LostFloorName = res.Content;
         this.getToBeCount();
       })
@@ -311,7 +312,12 @@ export default {
       Promise.all([promise1, promise2]).then(response => {
         let res = response[0];
         let res1 = response[1];
+        this.toBeDelCount = 0;
+        this.toBeSuppCount = 0;
         res.Content.forEach(item => {
+          if (item.Count > 0) {
+            this.toBeDelCount += 1;
+          }
           this.LostFloorName.forEach(it => {
             if (item.ModelId === it.CurrentModelId) {
               it.toBeDel = item.Count;
@@ -319,6 +325,9 @@ export default {
           })
         })
         res1.Content.forEach(item => {
+          if (item.Count > 0) {
+            this.toBeSuppCount += 1;
+          }
           this.LostFloorName.forEach(it => {
             if (item.ModelId === it.CurrentModelId) {
               it.toBeSupplement = item.Count;
@@ -478,7 +487,7 @@ export default {
 <style lang="less">
 .el-table__row.warning-row {
   td {
-    background: #e9e9e9 !important;
+    background: #f3f3f3 !important;
   }
 }
 </style>

src/views/model/report/supplement.vue

@@ -1,9 +1,9 @@
 <template>
   <!-- 待补充页面 -->
   <div class="box">
-    <ul class="infinite-list" v-infinite-scroll="load" style="overflow:auto">
-      <li class="infinite-list-item" v-for="(item,index) in pageData" :key="index">
-        <div class="content-box">
+    <ul class="infinite-list" style="overflow:auto">
+      <li class="infinite-list-item">
+        <div class="content-box" v-for="(item,index) in pageData" :key="index">
           <div class="content-top">
             <div class="details">
               <h4>{{index |numTransformation(4)}}<el-badge value="待补充" class="item" type="success"></el-badge>
@@ -161,6 +161,7 @@ export default {
       }
       toBeSupplementEquip(params, res => {
         this.pageData = res.Content;
+        console.log(this.pageData,123)
         this.pageData.forEach(item => {
           if (item.BIMLocation) {
             let local = {};
@@ -191,7 +192,6 @@ export default {
       })
     },
     getGraphy() {// 绘制空间位置图片
-      console.log(this.i, 39)
       let can = this.$refs.canvas;
       let that = this;
       that.clearGraphy(this.i)
@@ -208,7 +208,7 @@ export default {
         let EquipID = can[this.i].dataset.equipid;
         let X = Number(can[this.i].dataset.x);
         let Y = can[this.i].dataset.y * -1;
-        console.log(X, Y)
+        // console.log(X, Y)
         that.view.scene = that.scene;
         this.scene.addMarker({
           Id: EquipID,