Explorar o código

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

shaun-sheep %!s(int64=5) %!d(string=hai) anos
pai
achega
5503f17519

+ 3 - 2
src/components/point/dynamicdata/buildRules.vue

@@ -28,12 +28,13 @@
         </el-col>
         </el-col>
         <el-col :span="2">
         <el-col :span="2">
           <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
           <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
-            <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;" :disabled="isPending">
+            <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;margin-left:10px;"
+              :disabled="isPending">
             </el-button>
             </el-button>
           </el-tooltip>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="`根据${typeName}标识自动填充实例`" placement="left">
           <el-tooltip class="item" effect="dark" :content="`根据${typeName}标识自动填充实例`" placement="left">
             <el-button size="small" type="primary" @click="autoGroupRela" :icon="autoLoading?'iconfont icon-jiazai':'iconfont icon-zidong'"
             <el-button size="small" type="primary" @click="autoGroupRela" :icon="autoLoading?'iconfont icon-jiazai':'iconfont icon-zidong'"
-              style="float:right;padding:7px 14px;margin-right:10px;" :disabled="autoLoading"></el-button>
+              style="float:right;padding:7px 14px;width:44px;margin-left:0;" :disabled="autoLoading"></el-button>
           </el-tooltip>
           </el-tooltip>
         </el-col>
         </el-col>
       </el-row>
       </el-row>

+ 3 - 2
src/components/point/dynamicdata/equipRules.vue

@@ -28,12 +28,13 @@
         </el-col>
         </el-col>
         <el-col :span="2">
         <el-col :span="2">
           <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
           <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
-            <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;" :disabled="isPending">
+            <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;margin-left:10px;"
+              :disabled="isPending">
             </el-button>
             </el-button>
           </el-tooltip>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="`根据${typeName}标识自动填充实例`" placement="left">
           <el-tooltip class="item" effect="dark" :content="`根据${typeName}标识自动填充实例`" placement="left">
             <el-button size="small" type="primary" @click="autoGroupRela" :icon="autoLoading?'iconfont icon-jiazai':'iconfont icon-zidong'"
             <el-button size="small" type="primary" @click="autoGroupRela" :icon="autoLoading?'iconfont icon-jiazai':'iconfont icon-zidong'"
-              style="float:right;padding:7px 14px;margin-right:10px;" :disabled="autoLoading"></el-button>
+              style="float:right;padding:7px 14px;width:44px;margin-left:0;" :disabled="autoLoading"></el-button>
           </el-tooltip>
           </el-tooltip>
         </el-col>
         </el-col>
       </el-row>
       </el-row>

+ 3 - 2
src/components/point/dynamicdata/floorRules.vue

@@ -28,12 +28,13 @@
         </el-col>
         </el-col>
         <el-col :span="2">
         <el-col :span="2">
           <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
           <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
-            <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;" :disabled="isPending">
+            <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;margin-left:10px;"
+              :disabled="isPending">
             </el-button>
             </el-button>
           </el-tooltip>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="`根据${typeName}标识自动填充实例`" placement="left">
           <el-tooltip class="item" effect="dark" :content="`根据${typeName}标识自动填充实例`" placement="left">
             <el-button size="small" type="primary" @click="autoGroupRela" :icon="autoLoading?'iconfont icon-jiazai':'iconfont icon-zidong'"
             <el-button size="small" type="primary" @click="autoGroupRela" :icon="autoLoading?'iconfont icon-jiazai':'iconfont icon-zidong'"
-              style="float:right;padding:7px 14px;margin-right:10px;" :disabled="autoLoading"></el-button>
+              style="float:right;padding:7px 14px;width:44px;margin-left:0;" :disabled="autoLoading"></el-button>
           </el-tooltip>
           </el-tooltip>
         </el-col>
         </el-col>
       </el-row>
       </el-row>

+ 10 - 7
src/components/point/dynamicdata/partsRules.vue

@@ -28,11 +28,12 @@
         </el-col>
         </el-col>
         <el-col :span="2">
         <el-col :span="2">
           <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
           <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
-            <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;" :disabled="isPending"></el-button>
+            <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;margin-left:10px;"
+              :disabled="isPending"></el-button>
           </el-tooltip>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="`根据${typeName}标识自动填充实例`" placement="left">
           <el-tooltip class="item" effect="dark" :content="`根据${typeName}标识自动填充实例`" placement="left">
             <el-button size="small" type="primary" @click="autoGroupRela" :icon="autoLoading?'iconfont icon-jiazai':'iconfont icon-zidong'"
             <el-button size="small" type="primary" @click="autoGroupRela" :icon="autoLoading?'iconfont icon-jiazai':'iconfont icon-zidong'"
-              style="float:right;padding:7px 14px;margin-right:10px;" :disabled="autoLoading"></el-button>
+              style="float:right;padding:7px 14px;width:44px;margin-left:0;" :disabled="autoLoading"></el-button>
           </el-tooltip>
           </el-tooltip>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
@@ -57,9 +58,11 @@
         <el-table-column prop="ObjectLocalName" :label="`${typeName}实例`" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
         <el-table-column prop="ObjectLocalName" :label="`${typeName}实例`" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
         <el-table-column label="所在建筑楼层" min-width="100">
         <el-table-column label="所在建筑楼层" min-width="100">
           <template slot-scope="scope">
           <template slot-scope="scope">
-            <el-tooltip :content="scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''"
+            <el-tooltip
+              :content="scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''"
               placement="top">
               placement="top">
-              <div class="tool-tip">{{scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''}}
+              <div class="tool-tip">
+                {{scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''}}
               </div>
               </div>
             </el-tooltip>
             </el-tooltip>
           </template>
           </template>
@@ -69,8 +72,8 @@
         <el-table-column prop="action" label="操作" min-width="100">
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="清除对应规则" placement="left">
             <el-tooltip class="item" effect="dark" content="清除对应规则" placement="left">
-              <el-button size="mini" @click="handleDelete(scope.$index, scope.row)" type="danger" plain :disabled="isPending||scope.row.Related=='False'"
-                icon="el-icon-delete"></el-button>
+              <el-button size="mini" @click="handleDelete(scope.$index, scope.row)" type="danger" plain
+                :disabled="isPending||scope.row.Related=='False'" icon="el-icon-delete"></el-button>
             </el-tooltip>
             </el-tooltip>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
@@ -230,7 +233,7 @@ export default {
     },
     },
     //自动对应实例
     //自动对应实例
     autoGroupRela() {
     autoGroupRela() {
-      this.$emit('autoGroupRela','parts');
+      this.$emit('autoGroupRela', 'parts');
     }
     }
   },
   },
   watch: {
   watch: {

+ 10 - 7
src/components/point/dynamicdata/spaceRules.vue

@@ -28,11 +28,12 @@
         </el-col>
         </el-col>
         <el-col :span="2">
         <el-col :span="2">
           <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
           <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
-            <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;" :disabled="isPending"></el-button>
+            <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;margin-left:10px;"
+              :disabled="isPending"></el-button>
           </el-tooltip>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="`根据${typeName}标识自动填充实例`" placement="left">
           <el-tooltip class="item" effect="dark" :content="`根据${typeName}标识自动填充实例`" placement="left">
             <el-button size="small" type="primary" @click="autoGroupRela" :icon="autoLoading?'iconfont icon-jiazai':'iconfont icon-zidong'"
             <el-button size="small" type="primary" @click="autoGroupRela" :icon="autoLoading?'iconfont icon-jiazai':'iconfont icon-zidong'"
-              style="float:right;padding:7px 14px;margin-right:10px;" :disabled="autoLoading"></el-button>
+              style="float:right;padding:7px 14px;width:44px;margin-left:0;" :disabled="autoLoading"></el-button>
           </el-tooltip>
           </el-tooltip>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
@@ -57,9 +58,11 @@
         <el-table-column prop="ObjectLocalName" :label="`${typeName}实例`" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
         <el-table-column prop="ObjectLocalName" :label="`${typeName}实例`" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
         <el-table-column label="所在建筑楼层" min-width="300">
         <el-table-column label="所在建筑楼层" min-width="300">
           <template slot-scope="scope">
           <template slot-scope="scope">
-            <el-tooltip :content="scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''"
+            <el-tooltip
+              :content="scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''"
               placement="top">
               placement="top">
-              <div class="tool-tip">{{scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''}}
+              <div class="tool-tip">
+                {{scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''}}
               </div>
               </div>
             </el-tooltip>
             </el-tooltip>
           </template>
           </template>
@@ -69,8 +72,8 @@
         <el-table-column prop="action" label="操作" min-width="100">
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="清除对应规则" placement="left">
             <el-tooltip class="item" effect="dark" content="清除对应规则" placement="left">
-              <el-button size="mini" @click="handleDelete(scope.$index, scope.row)" type="danger" plain :disabled="isPending||scope.row.Related=='False'"
-                icon="el-icon-delete"></el-button>
+              <el-button size="mini" @click="handleDelete(scope.$index, scope.row)" type="danger" plain
+                :disabled="isPending||scope.row.Related=='False'" icon="el-icon-delete"></el-button>
             </el-tooltip>
             </el-tooltip>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
@@ -230,7 +233,7 @@ export default {
     },
     },
     //自动对应实例
     //自动对应实例
     autoGroupRela() {
     autoGroupRela() {
-      this.$emit('autoGroupRela','space');
+      this.$emit('autoGroupRela', 'space');
     }
     }
   },
   },
   watch: {
   watch: {

+ 6 - 5
src/components/point/dynamicdata/systemRules.vue

@@ -28,11 +28,12 @@
         </el-col>
         </el-col>
         <el-col :span="2">
         <el-col :span="2">
           <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
           <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
-            <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;" :disabled="isPending"></el-button>
+            <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;margin-left:10px;"
+              :disabled="isPending"></el-button>
           </el-tooltip>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="`根据${typeName}标识自动填充实例`" placement="left">
           <el-tooltip class="item" effect="dark" :content="`根据${typeName}标识自动填充实例`" placement="left">
             <el-button size="small" type="primary" @click="autoGroupRela" :icon="autoLoading?'iconfont icon-jiazai':'iconfont icon-zidong'"
             <el-button size="small" type="primary" @click="autoGroupRela" :icon="autoLoading?'iconfont icon-jiazai':'iconfont icon-zidong'"
-              style="float:right;padding:7px 14px;margin-right:10px;" :disabled="autoLoading"></el-button>
+              style="float:right;padding:7px 14px;width:44px;margin-left:0;" :disabled="autoLoading"></el-button>
           </el-tooltip>
           </el-tooltip>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
@@ -69,8 +70,8 @@
         <el-table-column prop="action" label="操作" min-width="100">
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="清除对应规则" placement="left">
             <el-tooltip class="item" effect="dark" content="清除对应规则" placement="left">
-              <el-button size="mini" @click="handleDelete(scope.$index, scope.row)" type="danger" plain :disabled="isPending||scope.row.Related=='False'"
-                icon="el-icon-delete"></el-button>
+              <el-button size="mini" @click="handleDelete(scope.$index, scope.row)" type="danger" plain
+                :disabled="isPending||scope.row.Related=='False'" icon="el-icon-delete"></el-button>
             </el-tooltip>
             </el-tooltip>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
@@ -230,7 +231,7 @@ export default {
     },
     },
     //自动对应实例
     //自动对应实例
     autoGroupRela() {
     autoGroupRela() {
-      this.$emit('autoGroupRela','system');
+      this.$emit('autoGroupRela', 'system');
     }
     }
   },
   },
   watch: {
   watch: {

+ 10 - 7
src/components/point/dynamicdata/tenantRules.vue

@@ -28,11 +28,12 @@
         </el-col>
         </el-col>
         <el-col :span="2">
         <el-col :span="2">
           <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
           <el-tooltip class="item" effect="dark" :content="`填充${typeName}标识与实例对应规则`" placement="left">
-            <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;" :disabled="isPending"></el-button>
+            <el-button size="small" type="primary" @click="toAddRelation" icon="el-icon-edit-outline" style="float:right;margin-left:10px;"
+              :disabled="isPending"></el-button>
           </el-tooltip>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="`根据${typeName}标识自动填充实例`" placement="left">
           <el-tooltip class="item" effect="dark" :content="`根据${typeName}标识自动填充实例`" placement="left">
             <el-button size="small" type="primary" @click="autoGroupRela" :icon="autoLoading?'iconfont icon-jiazai':'iconfont icon-zidong'"
             <el-button size="small" type="primary" @click="autoGroupRela" :icon="autoLoading?'iconfont icon-jiazai':'iconfont icon-zidong'"
-              style="float:right;padding:7px 14px;margin-right:10px;" :disabled="autoLoading"></el-button>
+              style="float:right;padding:7px 14px;margin-left:0;width:44px;" :disabled="autoLoading"></el-button>
           </el-tooltip>
           </el-tooltip>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
@@ -57,9 +58,11 @@
         <el-table-column prop="ObjectLocalName" :label="`${typeName}实例`" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
         <el-table-column prop="ObjectLocalName" :label="`${typeName}实例`" show-overflow-tooltip min-width="100" class-name="td-bl"></el-table-column>
         <el-table-column label="所在业务空间" min-width="300">
         <el-table-column label="所在业务空间" min-width="300">
           <template slot-scope="scope">
           <template slot-scope="scope">
-            <el-tooltip :content="scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''"
+            <el-tooltip
+              :content="scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''"
               placement="top">
               placement="top">
-              <div class="tool-tip">{{scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''}}
+              <div class="tool-tip">
+                {{scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''}}
               </div>
               </div>
             </el-tooltip>
             </el-tooltip>
           </template>
           </template>
@@ -69,8 +72,8 @@
         <el-table-column prop="action" label="操作" min-width="100">
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="清除对应规则" placement="left">
             <el-tooltip class="item" effect="dark" content="清除对应规则" placement="left">
-              <el-button size="mini" @click="handleDelete(scope.$index, scope.row)" type="danger" plain :disabled="isPending||scope.row.Related=='False'"
-                icon="el-icon-delete"></el-button>
+              <el-button size="mini" @click="handleDelete(scope.$index, scope.row)" type="danger" plain
+                :disabled="isPending||scope.row.Related=='False'" icon="el-icon-delete"></el-button>
             </el-tooltip>
             </el-tooltip>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
@@ -230,7 +233,7 @@ export default {
     },
     },
     //自动对应实例
     //自动对应实例
     autoGroupRela() {
     autoGroupRela() {
-      this.$emit('autoGroupRela','tenant');
+      this.$emit('autoGroupRela', 'tenant');
     }
     }
   },
   },
   watch: {
   watch: {

+ 1 - 1
src/views/ledger/system/addsystem.vue

@@ -198,7 +198,7 @@ export default {
         session.remove("systemAddData")
         session.remove("systemAddData")
         this.$router.push({
         this.$router.push({
           name: "systemlist",
           name: "systemlist",
-          params: { deviceId: this.category.Category }
+          params: { SysType: this.category.Category }
         });
         });
       })
       })
     },
     },

+ 32 - 16
src/views/model/report/deleted.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <!-- 待删除页面 -->
   <!-- 待删除页面 -->
-  <div class="box">
+  <div class="box" ref="boxBody">
     <div class="content-box" v-for="(item,index) in pageData" :key="index">
     <div class="content-box" v-for="(item,index) in pageData" :key="index">
       <div class="content-top">
       <div class="content-top">
         <div class="details">
         <div class="details">
@@ -74,24 +74,28 @@ export default {
       scene: '',
       scene: '',
       view: '',
       view: '',
       page: {
       page: {
-        pageSize: 50,
+        pageSize: 20,
         pageNumber: 1,
         pageNumber: 1,
+        total: 0
       }
       }
     }
     }
   },
   },
   mounted() {
   mounted() {
     this.queryToBelDelEquip();
     this.queryToBelDelEquip();
-    window.addEventListener('scroll', () => {
-      let clientHeight = document.documentElement.clientHeight;
-      let scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
-      let scrollHeight = document.body.scrollHeight || document.documentElement.scrollHeight;
-      if (clientHeight + scrollTop + 100 >= scrollHeight) {
-        if (this.pageData.length < 50) {
-          this.page.pageNumber = 1
-        } else {
+    this.boxBody = this.$refs.boxBody;
+    this.boxBody.addEventListener('scroll', () => {
+      let clientHeight = this.boxBody.clientHeight;
+      let scrollTop = this.boxBody.scrollTop;
+      let scrollHeight = this.boxBody.scrollHeight;
+      if (clientHeight + scrollTop === scrollHeight) {
+        console.log(this.page.pageNumber * this.page.pageSize)
+        if (this.page.pageNumber * this.page.pageSize < this.page.total) {
           this.page.pageNumber++;
           this.page.pageNumber++;
+          if (this.pageData.length < 20) {
+            this.page.pageNumber = 1
+          }
+          this.queryToBelDelEquip();
         }
         }
-        this.queryToBelDelEquip();
       }
       }
     })
     })
   },
   },
@@ -181,6 +185,21 @@ export default {
         PageSize: this.page.pageSize
         PageSize: this.page.pageSize
       }
       }
       toBeDelEquipPage(params, res => {
       toBeDelEquipPage(params, res => {
+        this.page.total = res.PageSize < 20 ? res.PageSize : res.Total;
+        res.Content.forEach(item => {
+          if (item.BIMLocation) {
+            let local = {};
+            let ary = item.BIMLocation.split(',');
+            let localAry = ['X', 'Y', 'Z'];
+            ary.forEach((item, index) => {
+              local[localAry[index]] = ary[index];
+            })
+            item.local = local;
+          }
+          if (item.ScanTaskBase && item.ScanTaskBase.length > 1) {
+            item.ScanTaskBase = item.ScanTaskBase.shift();
+          }
+        });
         if (this.page.pageNumber == 1) {
         if (this.page.pageNumber == 1) {
           this.pageData = res.Content;
           this.pageData = res.Content;
           this.$nextTick(() => {
           this.$nextTick(() => {
@@ -188,6 +207,7 @@ export default {
           })
           })
         } else {
         } else {
           this.pageData = this.pageData.concat(res.Content);
           this.pageData = this.pageData.concat(res.Content);
+          console.log(this.pageData.length, 19)
           this.$nextTick(() => {
           this.$nextTick(() => {
             this.getGraphy();
             this.getGraphy();
           })
           })
@@ -209,6 +229,7 @@ export default {
       })
       })
     },
     },
     getGraphy() {// 绘制空间位置图片
     getGraphy() {// 绘制空间位置图片
+      console.log(this.i);
       let can = this.$refs.canvas;
       let can = this.$refs.canvas;
       let that = this;
       let that = this;
       that.clearGraphy(this.i)
       that.clearGraphy(this.i)
@@ -378,9 +399,4 @@ export default {
 canvas {
 canvas {
   position: static !important;
   position: static !important;
 }
 }
-</style>
-<style>
-html {
-  height: auto;
-}
 </style>
 </style>

+ 16 - 11
src/views/model/report/supplement.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <!-- 待补充页面 -->
   <!-- 待补充页面 -->
-  <div class="box">
+  <div class="box" ref="boxBody">
     <div class="content-box" v-for="(item,index) in pageData" :key="index">
     <div class="content-box" v-for="(item,index) in pageData" :key="index">
       <div class="content-top">
       <div class="content-top">
         <div class="details">
         <div class="details">
@@ -66,8 +66,9 @@ export default {
       view: '',
       view: '',
       i: 0,
       i: 0,
       page: {
       page: {
-        pageSize: 50,
+        pageSize: 20,
         pageNumber: 1,
         pageNumber: 1,
+        total: 0
       }
       }
     }
     }
   },
   },
@@ -94,17 +95,20 @@ export default {
   },
   },
   mounted() {
   mounted() {
     this.getToBeSuppement();
     this.getToBeSuppement();
-    window.addEventListener('scroll', () => {
-      let clientHeight = document.documentElement.clientHeight;
-      let scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
-      let scrollHeight = document.body.scrollHeight || document.documentElement.scrollHeight;
-      if (clientHeight + scrollTop + 100 >= scrollHeight) {
-        if (this.pageData.length < 50) {
-          this.page.pageNumber = 1
-        } else {
+    this.boxBody = this.$refs.boxBody;
+    this.boxBody.addEventListener('scroll', () => {
+      let clientHeight = this.boxBody.clientHeight;
+      let scrollTop = this.boxBody.scrollTop;
+      let scrollHeight = this.boxBody.scrollHeight;
+      if (clientHeight + scrollTop === scrollHeight) {
+        console.log(this.page.pageNumber * this.page.pageSize)
+        if (this.page.pageNumber * this.page.pageSize < this.page.total) {
           this.page.pageNumber++;
           this.page.pageNumber++;
+          if (this.pageData.length < 20) {
+            this.page.pageNumber = 1
+          }
+          this.queryToBelDelEquip();
         }
         }
-        this.queryToBelDelEquip();
       }
       }
     })
     })
   },
   },
@@ -158,6 +162,7 @@ export default {
         PageSize: this.page.pageSize
         PageSize: this.page.pageSize
       }
       }
       toBeSupplementEquip(params, res => {
       toBeSupplementEquip(params, res => {
+        this.page.total = res.PageSize < 20 ? res.PageSize : res.Total;
         if (this.page.pageNumber == 1) {
         if (this.page.pageNumber == 1) {
           this.pageData = res.Content;
           this.pageData = res.Content;
           this.$nextTick(() => {
           this.$nextTick(() => {

+ 1 - 1
src/views/point/dynamicdata/index.vue

@@ -3,7 +3,7 @@
     <!-- tab分页 -->
     <!-- tab分页 -->
     <el-row class="top-tab" v-show="typeList.length">
     <el-row class="top-tab" v-show="typeList.length">
       <el-tabs v-model="curType" type='card'>
       <el-tabs v-model="curType" type='card'>
-        <el-tab-pane v-for="(item) in typeList" :key="item.Name" :label="item.Name+'('+item.Sum+'→'+item.Rcount+')'" :name="item.Name">
+        <el-tab-pane v-for="(item) in typeList" :key="item.Name" :label="item.Name+'('+item.Sum+'→'+item.RCount+')'" :name="item.Name">
         </el-tab-pane>
         </el-tab-pane>
       </el-tabs>
       </el-tabs>
       <div class="pos-right">
       <div class="pos-right">

+ 1 - 1
src/views/screen/splitscreen/spaceledger/index.vue

@@ -32,7 +32,7 @@
             <i class="icon-wushuju iconfont"></i>
             <i class="icon-wushuju iconfont"></i>
             数据暂无
             数据暂无
           </div>
           </div>
-          <div class="space-img" style="height:400px">
+          <div class="space-img" style="height:400px;margin-top:40px;">
             <el-scrollbar>
             <el-scrollbar>
               <p><b>空间照片:</b></p>
               <p><b>空间照片:</b></p>
               <div v-if="spaceDetails.Pic">
               <div v-if="spaceDetails.Pic">