yangjunjing 5 роки тому
батько
коміт
c340c21a3b

+ 2 - 1
src/views/ledger/report/index.vue

@@ -32,7 +32,7 @@
         </li>
       </ul>
     </div>
-    <div class="progress">
+    <div class="progress" v-loading="loading">
       <p class="basic-statistics">基本统计</p>
       <div class="data equipment">
         <!-- 设备:本期只做前三个 -->
@@ -100,6 +100,7 @@ export default {
         { title: '按功能类型占比', tips: '' },
         { title: '关联业务空间完成度', tips: '' }
       ],
+      loading: false
     }
   },
   components: {

Різницю між файлами не показано, бо вона завелика
+ 82 - 67
src/views/model/report/deleted.vue


+ 5 - 5
src/views/model/report/index.vue

@@ -34,7 +34,7 @@
         </div>
         <div class="table" style="width: 100%;height: calc(100% - 47px)">
           <!-- <el-table ref="multipleTable" :data="tableData" stripe height="100%" :header-cell-style="headerStyle"> -->
-          <el-table ref="multipleTable" stripe height="100%" :header-cell-style="headerStyle">
+          <el-table ref="multipleTable" stripe height="100%" :header-cell-style="headerStyle" v-loading='loading'>
             <el-table-column prop="InfoPointName" label="模型楼层" fixed width="150"></el-table-column>
             <el-table-column prop="functionNo" label="待删除设备数量" fixed width="150"></el-table-column>
             <el-table-column prop="functionNoDynamicData" label="待补充设备数量" fixed width="150"></el-table-column>
@@ -47,12 +47,11 @@
               </div>
             </template>
           </el-table>
+          <el-pagination class="right" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page.pageNumber"
+            :page-sizes="page.pageSizes" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="page.total">
+          </el-pagination>
         </div>
       </div>
-      <!-- <el-pagination class="right" v-show="tableData && tableData.length" @size-change="handleSizeChange" @current-change="handleCurrentChange" -->
-      <el-pagination class="right" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page.pageNumber"
-        :page-sizes="page.pageSizes" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="page.total">
-      </el-pagination>
     </div>
   </div>
 </template>
@@ -87,6 +86,7 @@ export default {
         pageNumber: 1,
         total: 0
       },
+      loading:false
     }
   },
   mounted() { },

+ 73 - 58
src/views/model/report/supplement.vue

@@ -1,66 +1,71 @@
 <template>
   <!-- 待补充页面 -->
   <div class="box">
-    <div class="content-box">
-      <div class="content-top">
-        <div class="details">
-          <h4>{{'四位序列号'}}<el-badge value="待补充" class="item"></el-badge>
-          </h4>
-          <h4>{{"XXXX建筑模型夹"}}-{{"XXX层"}}-{{"待删除设备名称XXXXXXXXXXXXX"}}</h4>
-          <b>标记码:<span @dblclick="copyContent" id="copy">{{'12d13fs13f1sd313'}}</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族:{{'XXXXXXX'}}</p>
-          <p>设计图纸中编码:{{'XXXXXXX'}}</p>
-          <p><span>设备类型:{{'XXXXXXX'}}</span><span>设备ID:{{'XXXXXXX'}}</span></p>
-          <p><span>资产族:{{'XXXXXXX'}}</span><span>资产ID:{{'XXXXXXX'}}</span></p>
-          <p>现场发现人:{{'XXXXXXX'}}</p>
-        </div>
-        <div class="plan">
-          <p>平面图上的位置:<span>{{`${'('+'X:'+'329'+','+'Y:'+'398'+')'}`}}</span></p>
-          <div class="img-box">
-            <img src="https://hbimg.huabanimg.com/f761a5fd8164882f9bad2dc46da4f5682cfd7c6eabc2-ArjdOX_fw658" alt="">
-          </div>
-        </div>
-      </div>
-      <div class="content-bottom">
-        <div class="photo">
-          <p>铭牌图片:<span>拍摄时间:{{`${'2019'+'年'+'12'+'月'+'56'+'时'+'5'+'分'}`}}</span></p>
-          <div class="img-box">
-            <img src="https://hbimg.huabanimg.com/f761a5fd8164882f9bad2dc46da4f5682cfd7c6eabc2-ArjdOX_fw658" alt="">
-          </div>
-        </div>
-        <div class="photo">
-          <p>设备图片:<span>拍摄时间:{{`${'2019'+'年'+'12'+'月'+'56'+'时'+'5'+'分'}`}}</span></p>
-          <div class="img-box">
-            <img src="https://hbimg.huabanimg.com/f761a5fd8164882f9bad2dc46da4f5682cfd7c6eabc2-ArjdOX_fw658" alt="">
-          </div>
-        </div>
-        <div class="photo">
-          <p>设备图片:<span>拍摄时间:{{`${'2019'+'年'+'12'+'月'+'56'+'时'+'5'+'分'}`}}</span></p>
-          <div class="img-box">
-            <img src="https://hbimg.huabanimg.com/f761a5fd8164882f9bad2dc46da4f5682cfd7c6eabc2-ArjdOX_fw658" alt="">
-          </div>
-        </div>
-        <div class="photo">
-          <p>设备图片:<span>拍摄时间:{{`${'2019'+'年'+'12'+'月'+'56'+'时'+'5'+'分'}`}}</span></p>
-          <div class="img-box">
-            <img src="https://hbimg.huabanimg.com/f761a5fd8164882f9bad2dc46da4f5682cfd7c6eabc2-ArjdOX_fw658" alt="">
-          </div>
-        </div>
-        <div class="photo">
-          <p>设备图片:<span>拍摄时间:{{`${'2019'+'年'+'12'+'月'+'56'+'时'+'5'+'分'}`}}</span></p>
-          <div class="img-box">
-            <img src="https://hbimg.huabanimg.com/f761a5fd8164882f9bad2dc46da4f5682cfd7c6eabc2-ArjdOX_fw658" alt="">
+    <ul class="infinite-list" v-infinite-scroll="load" style="overflow:auto">
+      <!-- <li v-for="i in count" class="infinite-list-item"> -->
+      <li class="infinite-list-item">
+        <div class="content-box">
+          <div class="content-top">
+            <div class="details">
+              <h4>{{'四位序列号'}}<el-badge value="待补充" class="item"></el-badge>
+              </h4>
+              <h4>{{"XXXX建筑模型夹"}}-{{"XXX层"}}-{{"待删除设备名称XXXXXXXXXXXXX"}}</h4>
+              <b>标记码:<span @dblclick="copyContent" id="copy">{{'12d13fs13f1sd313'}}</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族:{{'XXXXXXX'}}</p>
+              <p>设计图纸中编码:{{'XXXXXXX'}}</p>
+              <p><span>设备类型:{{'XXXXXXX'}}</span><span>设备ID:{{'XXXXXXX'}}</span></p>
+              <p><span>资产族:{{'XXXXXXX'}}</span><span>资产ID:{{'XXXXXXX'}}</span></p>
+              <p>现场发现人:{{'XXXXXXX'}}</p>
+            </div>
+            <div class="plan">
+              <p>平面图上的位置:<span>{{`${'('+'X:'+'329'+','+'Y:'+'398'+')'}`}}</span></p>
+              <div class="img-box">
+                <img src="https://hbimg.huabanimg.com/f761a5fd8164882f9bad2dc46da4f5682cfd7c6eabc2-ArjdOX_fw658" alt="">
+              </div>
+            </div>
           </div>
-        </div>
-        <div class="photo">
-          <p>设备图片:<span>拍摄时间:{{`${'2019'+'年'+'12'+'月'+'56'+'时'+'5'+'分'}`}}</span></p>
-          <div class="img-box">
-            <img src="https://hbimg.huabanimg.com/f761a5fd8164882f9bad2dc46da4f5682cfd7c6eabc2-ArjdOX_fw658" alt="">
+          <div class="content-bottom">
+            <div class="photo">
+              <p>铭牌图片:<span>拍摄时间:{{`${'2019'+'年'+'12'+'月'+'56'+'时'+'5'+'分'}`}}</span></p>
+              <div class="img-box">
+                <img src="https://hbimg.huabanimg.com/f761a5fd8164882f9bad2dc46da4f5682cfd7c6eabc2-ArjdOX_fw658" alt="">
+              </div>
+            </div>
+            <div class="photo">
+              <p>设备图片:<span>拍摄时间:{{`${'2019'+'年'+'12'+'月'+'56'+'时'+'5'+'分'}`}}</span></p>
+              <div class="img-box">
+                <img src="https://hbimg.huabanimg.com/f761a5fd8164882f9bad2dc46da4f5682cfd7c6eabc2-ArjdOX_fw658" alt="">
+              </div>
+            </div>
+            <div class="photo">
+              <p>设备图片:<span>拍摄时间:{{`${'2019'+'年'+'12'+'月'+'56'+'时'+'5'+'分'}`}}</span></p>
+              <div class="img-box">
+                <img src="https://hbimg.huabanimg.com/f761a5fd8164882f9bad2dc46da4f5682cfd7c6eabc2-ArjdOX_fw658" alt="">
+              </div>
+            </div>
+            <div class="photo">
+              <p>设备图片:<span>拍摄时间:{{`${'2019'+'年'+'12'+'月'+'56'+'时'+'5'+'分'}`}}</span></p>
+              <div class="img-box">
+                <img src="https://hbimg.huabanimg.com/f761a5fd8164882f9bad2dc46da4f5682cfd7c6eabc2-ArjdOX_fw658" alt="">
+              </div>
+            </div>
+            <div class="photo">
+              <p>设备图片:<span>拍摄时间:{{`${'2019'+'年'+'12'+'月'+'56'+'时'+'5'+'分'}`}}</span></p>
+              <div class="img-box">
+                <img src="https://hbimg.huabanimg.com/f761a5fd8164882f9bad2dc46da4f5682cfd7c6eabc2-ArjdOX_fw658" alt="">
+              </div>
+            </div>
+            <div class="photo">
+              <p>设备图片:<span>拍摄时间:{{`${'2019'+'年'+'12'+'月'+'56'+'时'+'5'+'分'}`}}</span></p>
+              <div class="img-box">
+                <img src="https://hbimg.huabanimg.com/f761a5fd8164882f9bad2dc46da4f5682cfd7c6eabc2-ArjdOX_fw658" alt="">
+              </div>
+            </div>
           </div>
         </div>
-      </div>
-    </div>
+      </li>
+    </ul>
   </div>
 </template>
 
@@ -70,13 +75,18 @@ export default {
 
   },
   data() {
-    return {}
+    return {
+      count: 0
+    }
   },
   mounted() { },
   created() {
 
   },
   methods: {
+    load() {
+      this.count += 2
+    },
     copyContent(element) {
       // 双击复制
       let content = element.target.innerText;
@@ -120,6 +130,11 @@ export default {
 .box {
   background: #f2f2f2;
   margin: 0 auto;
+  ul {
+    .infinite-list-item {
+      margin-bottom: 20px;
+    }
+  }
   .content-box {
     width: 1000px;
     margin: 0 auto;