Merge branch 'report' into dev

src/views/model/report/deleted.vue

@@ -7,7 +7,8 @@
           <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"
+          <b>BIM ID:<span @dblclick="copyContent"
+              id="copy">{{item.ScanTaskBase && item.ScanTaskBase[0]?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>
@@ -16,8 +17,10 @@
           <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>
-          <p><span>执行人:{{item.ScanTaskBase[0].WorkerName}}</span><span>确认人:{{item.ScanTaskBase[0].ConfirmingPersonName}}</span></p>
+          <p>现场任务ID:{{item.ScanTaskBase && item.ScanTaskBase[0]?item.ScanTaskBase[0].TaskId:""}}</p>
+          <p>
+            <span>执行人:{{item.ScanTaskBase && item.ScanTaskBase[0]?item.ScanTaskBase[0].WorkerName:''}}</span><span>确认人:{{item.ScanTaskBase && item.ScanTaskBase[0]?item.ScanTaskBase[0].ConfirmingPersonName:''}}</span>
+          </p>
         </div>
         <div class="plan">
           <p>平面图上的位置：<span>{{item.local | localTransformation}}</span></p>
@@ -28,17 +31,17 @@
         </div>
       </div>
       <div class="content-bottom">
-        <div class="explain" v-if="item.ScanTaskBase[0].Note">
+        <div class="explain" v-if="item.ScanTaskBase && item.ScanTaskBase[0] && item.ScanTaskBase[0].Note">
           <p>现场问题说明：</p>
           <el-scrollbar>
             <p class="explain-content">
               <el-scrollbar>
-                {{item.ScanTaskBase[0].Note}}
+                {{item.ScanTaskBase?item.ScanTaskBase[0].Note:""}}
               </el-scrollbar>
             </p>
           </el-scrollbar>
         </div>
-        <div class="photo" v-for="(it,ind) in item.ScanTaskBase[0].TaskPicList" :key='ind'>
+        <div class="photo" v-for="(it,ind) in item.ScanTaskBase[0].TaskPicList" :key='ind' v-else-if="item.ScanTaskBase && item.ScanTaskBase[0]">
           <div class="img-box">
             <p>{{it.Name}}<span>拍摄时间：{{it.CreateTime | timeTransformation}}</span></p>
             <div class="img-content">