src/views/model/report/deleted.vue

@@ -38,10 +38,11 @@
           </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="现场拍摄照片"> -->
+            <p>{{it.Name}}<span>拍摄时间：{{it.CreateTime | timeTransformation}}</span></p>
+            <div class="img-content">
+              <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${it.key}`" alt="现场拍摄照片">
+            </div>
           </div>
         </div>
       </div>
@@ -63,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,
@@ -105,17 +100,19 @@ export default {
       return str;
     },
     timeTransformation(time) {
-      time = time.replace(/(\d+)\-(\d+)\-(\d+)\ (\d+)\:(\d+)\:(\d+)/, function () {
-        let str = '';
-        let ary = ['年', '月', '日', '时', '分'];
-        let time = Array.prototype.concat.apply([], arguments);
-        time = time.splice(1, 5);
-        time.forEach((item, index) => {
-          str += item + ary[index];
-        })
-        return str;
-      })
+      time = time.substring(0, 16)
       return time;
+      // time = time.replace(/(\d+)\-(\d+)\-(\d+)\ (\d+)\:(\d+)\:(\d+)/, function () {
+      //   let str = '';
+      //   let ary = ['年', '月', '日', '时', '分'];
+      //   let time = Array.prototype.concat.apply([], arguments);
+      //   time = time.splice(1, 5);
+      //   time.forEach((item, index) => {
+      //     str += item + ary[index];
+      //   })
+      //   return str;
+      // })
+      // return time;
     }
   },
   methods: {
@@ -167,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;
@@ -251,6 +246,8 @@ export default {
 .box {
   background: #f2f2f2;
   margin: 0 auto;
+  height: 100%;
+  overflow-y: auto;
   ul {
     .infinite-list-item {
       margin-bottom: 20px;
@@ -340,11 +337,26 @@ export default {
 }
 .img-box {
   width: 100%;
-  // text-align: center;
-  img {
-    vertical-align: middle;
-    width: 400px;
+  .img-content {
+    overflow: hidden;
+    position: relative;
+    width: calc(100%-20px);
     height: 300px;
+    vertical-align: middle;
+    text-align: center;
+    background: #ebeef5;
+    margin-right: 20px;
+    img {
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
+      width: 400px;
+      vertical-align: middle;
+    }
   }
 }
+canvas {
+  position: static !important;
+}
 </style>

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'
@@ -47,7 +46,7 @@
                 </el-badge>
               </template>
             </el-table-column>
-            <el-table-column prop="questionItem" label="有问题的检查项" fixed width="150">
+            <el-table-column prop="questionItem" label="有问题的检查项" fixed width="150" style="border-right:1px solid red">
               <template slot-scope="scope">
                 <el-badge :value="scope.row.questionItem" class="item" :type='scope.row.questionItem?"warning":"success"'>
                 </el-badge>
@@ -410,11 +409,10 @@ export default {
         }
       })
     },
-    tableRowClassName({ row, rowIndex }) {// 设置缺失楼层所在行的背景色
+    tableRowClassName({ row, rowIndex, column }) {// 设置缺失楼层所在行的背景色
       if (row.flag && row.flag === 'lost') {
         return 'warning-row';
       }
-      console.log(rowIndex,9381)
     },
     handleSizeChange(val) {// 切换每页显示数量
       this.page.pageSize = val;
@@ -423,7 +421,7 @@ export default {
     handleCurrentChange(val) {// 切换页码
       this.page.pageNumber = val;
       this.getModelFloor();
-    },
+    }
   },
   watch: {
     projectId() {
@@ -468,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 {
@@ -491,4 +485,7 @@ export default {
     background: #f3f3f3 !important;
   }
 }
+.el-table_1_column_4 {
+  border-right: 1px solid rgb(226, 226, 226) !important;
+}
 </style>

src/views/model/report/supplement.vue

@@ -1,51 +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">
-                <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${it.key}`" alt="铭牌图片">
-              </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">
-              <p v-if="item.LedgerParam.PhotoDoc.Pic">{{photo.name}}<span>拍摄时间：{{photo.createTime | timeTransformation}}</span></p>
-              <div class="img-box" v-if="item.LedgerParam.PhotoDoc.Pic">
-                <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${photo.key}`" alt="设备图片" v-if="photo.type !=='video'">
-                <!-- <video v-if="photo.type === 'video'" width="400" height="300" controls>
-                  <source :src="`/image-service/common/image_get?systemId=dataPlatform&key=${photo.key}`" type="video/mp4">
-                </video> -->
-              </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>
 
@@ -61,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: '',
@@ -93,21 +85,22 @@ export default {
       return str;
     },
     timeTransformation(time) {// 时间转换
-      time = time.replace(/(\d+)\-(\d+)\-(\d+)\ (\d+)\:(\d+)\:(\d+)/, function () {
-        let str = '';
-        let ary = ['年', '月', '日', '时', '分'];
-        let time = Array.prototype.concat.apply([], arguments);
-        time = time.splice(1, 5);
-        time.forEach((item, index) => {
-          str += item + ary[index];
-        })
-        return str;
-      })
+      time = time.substring(0, 16)
       return time;
+      //   time = time.replace(/(\d+)\-(\d+)\-(\d+)\ (\d+)\:(\d+)\:(\d+)/, function () {
+      //     let str = '';
+      //     let ary = ['年', '月', '日', '时', '分'];
+      //     let time = Array.prototype.concat.apply([], arguments);
+      //     time = time.splice(1, 5);
+      //     time.forEach((item, index) => {
+      //       str += item + ary[index];
+      //     })
+      //     return str;
+      //   })
+      //   return time;
     }
   },
   mounted() {
-    // this.getGraphy();
     this.getToBeSuppement();
   },
   created() {
@@ -155,9 +148,7 @@ 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;
@@ -250,6 +241,8 @@ export default {
 .box {
   background: #f2f2f2;
   margin: 0 auto;
+  height: 100%;
+  overflow-y: auto;
   ul {
     .infinite-list-item {
       margin-bottom: 20px;
@@ -339,11 +332,26 @@ export default {
 }
 .img-box {
   width: 100%;
-  // text-align: center;
-  img {
-    vertical-align: middle;
-    width: 400px;
+  .img-content {
+    overflow: hidden;
+    position: relative;
+    width: calc(100%-20px);
     height: 300px;
+    vertical-align: middle;
+    text-align: center;
+    background: #ebeef5;
+    margin-right: 20px;
+    img {
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
+      width: 400px;
+      vertical-align: middle;
+    }
   }
 }
+canvas {
+  position: static !important;
+}
 </style>

src/views/screen/splitscreen/spaceledger/index.vue

@@ -40,8 +40,6 @@
                   <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.key}`" alt="空间图片">
                 </div>
               </div>
-              <div class="space-img" v-if="!spaceDetails.Pic">
-              </div>
               <div v-show="!spaceDetails.Pic" style="height:100%;transform: translateY(50%);textAlign:center;">
                 <i class="icon-wushuju iconfont"></i>
                 数据暂无
@@ -53,9 +51,7 @@
           <el-tabs v-model="activeTab" type='card'>
             <template v-for="(item,index) in tabsList">
               <el-tab-pane :name="item.Code" :key="index" :label="item.Name">
-                <div v-show="activeTab === 'staticData'" style="width:100%;height:100%;textAlign:left;" id="iframe-box">
-                  <!-- <iframe height="100%" width="100%" :src="iframeSrc" id="screenIframe"></iframe> -->
-                </div>
+                <div v-show="activeTab === 'staticData'" style="width:100%;height:100%;textAlign:left;" id="iframe-box"></div>
                 <div v-show="activeTab === 'dynamicData'" style="width:100%;height:100%;">
                   <div class="content-box" style="height:100%;">
                     <el-table ref="multipleTable" :data="tableData" stripe height="100%" :header-cell-style="headerStyle">