Merge branch 'report' into dev

src/views/model/report/deleted.vue

@@ -12,7 +12,8 @@
           <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>设备类型:{{item.Category}}</span></p>
+          <p>设备ID:{{item.EquipID}}</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>
@@ -167,6 +168,7 @@ export default {
         Filters: `ModelId in ${this.equipComDelList}`
       }
       toBeDelEquipPage(params, res => {
+        console.log(res.Content, 123)
         this.pageData = res.Content;
         this.pageData.forEach(item => {
           if (item.BIMLocation) {

src/views/model/report/index.vue

@@ -27,7 +27,7 @@
       <div class="content-box">
         <div class="button">
           <el-button @click="del" :plain="toBeDelCount?false:true" :disabled="toBeDelCount?false:true">需从模型中删除的设备</el-button>
-          <el-button @click="supplement" :plain="toBeSuppCount?false:true" :disabled="toBeSuppCount?false:true">需从模型中删除的设备</el-button>
+          <el-button @click="supplement" :plain="toBeSuppCount?false:true" :disabled="toBeSuppCount?false:true">模型待补充的设备</el-button>
           <el-button type="info" :loading="load" @click='getExportReport'>导出模型问题报告</el-button>
         </div>
         <div class="table" :style="tableList&&tableList.length?'width: 100%;height: calc(100% - 47px)':'width: 100%;height: calc(100% - 10px)'">

src/views/model/report/supplement.vue

@@ -11,7 +11,6 @@
           <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.Res}}</p>
           <p>设计图纸中编码:{{item.CADID}}</p>
-          <!-- <p><span>设备类型:{{'XXXXXXX'}}</span><span>设备ID:{{'XXXXXXX'}}</span></p> -->
           <p><span>资产族:{{item.FamilyName.Name}}</span></p>
           <p><span style="width:500px;">资产ID:{{item.EquipID}}</span></p>
           <p>现场发现人:{{item.FindPeople}}</p>