Merge branch 'report' into dev

src/views/model/report/deleted.vue

@@ -64,12 +64,6 @@ export default {
       pageData: [],
       count: 0,
       equipComDelList: null,
-      page: {
-        pageSize: 50,
-        pageSizes: [10, 20, 50, 100],
-        pageNumber: 1,
-        total: 0
-      },
       canvasWidth: 400,
       canvasHeight: 280,
       i: 0,
@@ -170,9 +164,7 @@ export default {
             Name: "equipCategory"// 级联-设备类型
           }
         ],
-        Filters: `ModelId in ${this.equipComDelList}`,
-        PageNumber: this.page.pageNumber,
-        PageSize: this.page.pageSize
+        Filters: `ModelId in ${this.equipComDelList}`
       }
       toBeDelEquipPage(params, res => {
         this.pageData = res.Content;
@@ -360,7 +352,6 @@ export default {
       top: 50%;
       transform: translate(-50%, -50%);
       width: 400px;
-      height: 100%;
       vertical-align: middle;
     }
   }

src/views/model/report/index.vue

@@ -26,10 +26,9 @@
       </div>
       <div class="content-box">
         <div class="button">
-          <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>
+          <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 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)'">
           <el-table ref="multipleTable" :data="tableData" stripe height="100%" :header-cell-style="headerStyle" v-loading='loading'
@@ -467,14 +466,10 @@ export default {
 }
 .button {
   padding-left: 10px;
-  .el-link {
-    font-size: 12px;
-    text-decoration: none;
-    color: #606266 !important;
-    padding: 4px 15px;
+  button {
     border: 1px solid #dcdfe6;
-    border-radius: 3px;
-    margin-right: 10px;
+    color: #606266;
+    background: white;
   }
 }
 .success-color {

src/views/model/report/supplement.vue

@@ -1,54 +1,50 @@
 <template>
   <!-- 待补充页面 -->
   <div class="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>
-              </h4>
-              <h4>{{`${item.BuildingName}建筑模型`}}-{{`${item.FloorName}层`}}-{{`${item.EquipLocalName?item.EquipLocalName:item.EquipName}`}}</h4>
-              <b>标记码:<span @dblclick="copyContent" id="copy">{{item.EquipID}}</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.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>
-            </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" type="success"></el-badge>
+          </h4>
+          <h4>{{`${item.BuildingName}建筑模型`}}-{{`${item.FloorName}层`}}-{{`${item.EquipLocalName?item.EquipLocalName:item.EquipName}`}}</h4>
+          <b>标记码:<span @dblclick="copyContent" id="copy">{{item.EquipID}}</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.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>
+        </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="photo" v-for="(it,ind) in item.LedgerParam.PhotoDoc.Nameplate" :key="ind">
-              <p>{{it.name}}<span>拍摄时间：{{it.createTime | timeTransformation}}</span></p>
-              <div class="img-box">
-                <div class="img-content">
-                  <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${it.key}`" alt="铭牌图片">
-                </div>
-              </div>
+        </div>
+      </div>
+      <div class="content-bottom">
+        <div class="photo" v-for="(it,ind) in item.LedgerParam.PhotoDoc.Nameplate" :key="ind">
+          <p>{{it.name}}<span>拍摄时间：{{it.createTime | timeTransformation}}</span></p>
+          <div class="img-box">
+            <div class="img-content">
+              <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${it.key}`" alt="铭牌图片">
             </div>
-            <div class="photo" v-for="(photo,num) in item.LedgerParam.PhotoDoc.Pic" :key="num+photo">
-              <div class="img-box" v-if="item.LedgerParam.PhotoDoc.Pic">
-                <p v-if="item.LedgerParam.PhotoDoc.Pic && photo.type !== 'video'">
-                  {{photo.name}}<span>拍摄时间：{{photo.createTime | timeTransformation}}</span>
-                </p>
-                <div class="img-content" v-if="photo.type !=='video'">
-                  <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${photo.key}`" alt="现场图片">
-                </div>
-              </div>
+          </div>
+        </div>
+        <div class="photo" v-for="(photo,num) in item.LedgerParam.PhotoDoc.Pic" :key="num+photo">
+          <div class="img-box" v-if="item.LedgerParam.PhotoDoc.Pic">
+            <p v-if="item.LedgerParam.PhotoDoc.Pic && photo.type !== 'video'">
+              {{photo.name}}<span>拍摄时间：{{photo.createTime | timeTransformation}}</span>
+            </p>
+            <div class="img-content" v-if="photo.type !=='video'">
+              <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${photo.key}`" alt="现场图片">
             </div>
           </div>
         </div>
-      </li>
-    </ul>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -64,14 +60,7 @@ export default {
   data() {
     return {
       pageData: [],
-      count: 0,
       equipComDelList: null,
-      page: {
-        pageSize: 50,
-        pageSizes: [10, 20, 50, 100],
-        pageNumber: 1,
-        total: 0
-      },
       canvasWidth: 400,
       canvasHeight: 280,
       scene: '',
@@ -159,13 +148,10 @@ export default {
             "Name": "familyName"
           }
         ],
-        Filters: `ModelId in ${this.equipComDelList}`,
-        PageNumber: this.page.pageNumber,
-        PageSize: this.page.pageSize
+        Filters: `ModelId in ${this.equipComDelList}`
       }
       toBeSupplementEquip(params, res => {
         this.pageData = res.Content;
-        console.log(this.pageData, 123)
         this.pageData.forEach(item => {
           if (item.BIMLocation) {
             let local = {};
@@ -361,7 +347,6 @@ export default {
       top: 50%;
       transform: translate(-50%, -50%);
       width: 400px;
-      height: 100%;
       vertical-align: middle;
     }
   }