Bläddra i källkod

动参p2各模块接口查询待关联实例接口替换;新增动参查询已关联实例接口

haojianlong 5 år sedan
förälder
incheckning
546cd62cd8

+ 12 - 0
src/api/scan/request.js

@@ -1456,6 +1456,18 @@ export function dynamicAutoRelate(param, success) {
   http.postJson(url, param, success)
 }
 
+//动态数据关联-(2020改版新增接口)已关联实例查询
+export function dynamicRelatedObj(param, success) {
+  let url = `${baseUrl}/pointconfig/dynamic/query-related-objs`;
+  http.postJson(url, param, success)
+}
+
+//查询部件
+export function partsQuery(param, success) {
+  let url = `${baseUrl}/datacenter/object/component/query`;
+  http.postJson(url, param, success)
+}
+
 //查询项目信息
 export function projectQuery(param, success) {
   let url = `${baseUrl}/datacenter/project/query`;

+ 28 - 17
src/views/point/dynamicdata/addRelation/buildRela/index.vue

@@ -162,6 +162,7 @@ import {
   dynamicPointTypeList,
   dynamicQueryAI,
   buildingQuery, //数据中心建筑查询
+  dynamicRelatedObj
 } from "@/api/scan/request";
 export default {
   components: {
@@ -392,28 +393,38 @@ export default {
     getRightData() {
       let pa = {
         PageNumber: this.rPage.pageNumber,
-        PageSize: this.rPage.pageSize
+        PageSize: this.rPage.pageSize,
+        Filters: 'not BuildID isNull'
       };
       //处理查询条件
       if (this.form.ObjectLocalName && this.form.ObjectLocalName.length) {
-        pa.Filters = `BuildLocalName contain '${this.form.ObjectLocalName}'`;
+        pa.Filters += `;BuildLocalName contain '${this.form.ObjectLocalName}'`;
       }
       this.rTableLoading = true;
-      buildingQuery(pa, res => {
-        this.rPage.total = res.Total;
-        let tempArr = res.Content.map(t => {
-          t.ObjectID = t.BuildID.substr(12);
-          t.ObjectLocalName = t.BuildLocalName;
-          t.ObjectLocalCode = t.BuildLocalID;
-          return t;
-        });
-        if (this.rPage.pageNumber == 1) {
-          this.RtableData = tempArr;
-        } else {
-          this.RtableData = this.RtableData.concat(tempArr);
-        }
-        this.rTableLoading = false;
-      });
+      dynamicRelatedObj({ Filters: `TypeName='${this.typeName}'` },
+        response => {
+          const tempArr = response.Content.map(t => {
+            return t.TypeCode + t.ProjectId + t.ObjectID
+          })
+          if (tempArr.length) {
+            pa.Filters += `;not BuildID in ${JSON.stringify(tempArr)}`
+          }
+          buildingQuery(pa, res => {
+            this.rPage.total = res.Total;
+            let tempArr = res.Content.map(t => {
+              t.ObjectID = t.BuildID.substr(12);
+              t.ObjectLocalName = t.BuildLocalName;
+              t.ObjectLocalCode = t.BuildLocalID;
+              return t;
+            });
+            if (this.rPage.pageNumber == 1) {
+              this.RtableData = tempArr;
+            } else {
+              this.RtableData = this.RtableData.concat(tempArr);
+            }
+            this.rTableLoading = false;
+          });
+        })
     },
     //清除对应关系成功
     deleteSuc() {

+ 38 - 23
src/views/point/dynamicdata/addRelation/equipRela/index.vue

@@ -162,6 +162,7 @@ import {
   dynamicPointTypeList,
   dynamicQueryAI,
   queryEquip, //数据中心设备查询
+  dynamicRelatedObj
 } from "@/api/scan/request";
 export default {
   components: {
@@ -410,32 +411,46 @@ export default {
       if (this.form.locationVal.length > 1) {
         pa.Filters += `;FloorId='${this.form.locationVal[1]}'`;
       }
+      let pa2 = {
+        Filters: `TypeName='${this.typeName}'`
+      }
+      if (this.form.SubTypeName.length) {
+        pa2.Filters += `;SubTypeName in ${JSON.stringify(this.form.SubTypeName)}`
+      }
       this.rTableLoading = true;
-      queryEquip(pa, res => {
-        this.rPage.total = res.Total;
-        let tempArr = res.Content.map(t => {
-          t.ObjectID = t.EquipID.substr(14);
-          t.ObjectLocalName = t.EquipLocalName;
-          t.ObjectLocalCode = t.EquipLocalID;
-          t.SubTypeName = t.EquipCategory ? t.EquipCategory.EquipName : '';
-          t.BuildLocalName = t.Building ? t.Building.BuildLocalName : '';
-          t.FloorLocalName = t.Floor ? t.Floor.FloorLocalName : '';
-          t.RoomLocalName = '';
-          if (t.ZoneSpaceBaseIn) {
-            t.ZoneSpaceBaseIn.forEach(item => {
-              t.RoomLocalName += item.RoomLocalName + ',';
-            })
-            t.RoomLocalName = t.RoomLocalName.substring(0, t.RoomLocalName.length - 1);
+      dynamicRelatedObj(pa2, response => {
+        const tempArr = response.Content.map(t => {
+          return t.TypeCode + t.ProjectId + t.ObjectID
+        })
+        if (tempArr.length) {
+          pa.Filters += `;not EquipID in ${JSON.stringify(tempArr)}`
+        }
+        queryEquip(pa, res => {
+          this.rPage.total = res.Total;
+          let tempArr = res.Content.map(t => {
+            t.ObjectID = t.EquipID.substr(12);
+            t.ObjectLocalName = t.EquipLocalName;
+            t.ObjectLocalCode = t.EquipLocalID;
+            t.SubTypeName = t.EquipCategory ? t.EquipCategory.EquipName : '';
+            t.BuildLocalName = t.Building ? t.Building.BuildLocalName : '';
+            t.FloorLocalName = t.Floor ? t.Floor.FloorLocalName : '';
+            t.RoomLocalName = '';
+            if (t.ZoneSpaceBaseIn) {
+              t.ZoneSpaceBaseIn.forEach(item => {
+                t.RoomLocalName += item.RoomLocalName + ',';
+              })
+              t.RoomLocalName = t.RoomLocalName.substring(0, t.RoomLocalName.length - 1);
+            }
+            return t;
+          });
+          if (this.rPage.pageNumber == 1) {
+            this.RtableData = tempArr;
+          } else {
+            this.RtableData = this.RtableData.concat(tempArr);
           }
-          return t;
+          this.rTableLoading = false;
         });
-        if (this.rPage.pageNumber == 1) {
-          this.RtableData = tempArr;
-        } else {
-          this.RtableData = this.RtableData.concat(tempArr);
-        }
-        this.rTableLoading = false;
-      });
+      })
     },
     //清除对应关系成功
     deleteSuc() {

+ 27 - 17
src/views/point/dynamicdata/addRelation/floorRela/index.vue

@@ -167,6 +167,7 @@ import {
   dynamicPointTypeList,
   dynamicQueryAI,
   floorQuery, //数据中心查询楼层
+  dynamicRelatedObj
 } from "@/api/scan/request";
 export default {
   components: {
@@ -413,23 +414,32 @@ export default {
         }
       }
       this.rTableLoading = true;
-      floorQuery(pa, res => {
-        this.rPage.total = res.Total;
-        let tempArr = res.Content.map(t => {
-          t.ObjectID = t.FloorID.substr(12);
-          t.ObjectLocalName = t.FloorLocalName;
-          t.ObjectLocalCode = t.FloorLocalID;
-          t.ObjectSequenceID = t.FloorSequenceID;
-          t.BuildLocalName = t.Building ? t.Building.BuildLocalName : '';
-          return t;
-        });
-        if (this.rPage.pageNumber == 1) {
-          this.RtableData = tempArr;
-        } else {
-          this.RtableData = this.RtableData.concat(tempArr);
-        }
-        this.rTableLoading = false;
-      })
+      dynamicRelatedObj({ Filters: `TypeName='${this.typeName}'` },
+        response => {
+          const tempArr = response.Content.map(t => {
+            return t.TypeCode + t.ProjectId + t.ObjectID
+          })
+          if (tempArr.length) {
+            pa.Filters += `;not FloorID in ${JSON.stringify(tempArr)}`
+          }
+          floorQuery(pa, res => {
+            this.rPage.total = res.Total;
+            let tempArr = res.Content.map(t => {
+              t.ObjectID = t.FloorID.substr(12);
+              t.ObjectLocalName = t.FloorLocalName;
+              t.ObjectLocalCode = t.FloorLocalID;
+              t.ObjectSequenceID = t.FloorSequenceID;
+              t.BuildLocalName = t.Building ? t.Building.BuildLocalName : '';
+              return t;
+            });
+            if (this.rPage.pageNumber == 1) {
+              this.RtableData = tempArr;
+            } else {
+              this.RtableData = this.RtableData.concat(tempArr);
+            }
+            this.rTableLoading = false;
+          })
+        })
     },
     //清除对应关系成功
     deleteSuc() {

+ 49 - 28
src/views/point/dynamicdata/addRelation/partsRela/index.vue

@@ -156,12 +156,14 @@ import dataSource from "@/components/point/dynamicdata/dataSource";
 import locationFlag from "@/components/point/dynamicdata/locationFlag";
 import { mapGetters, mapActions } from "vuex";
 import {
-  dynamicPendingobjs,
+  // dynamicPendingobjs,
   dynamicPendingPoint,
   dynamicCreateRelation,
   dynamicDeleteRelation,
   dynamicPointTypeList,
-  dynamicQueryAI
+  dynamicQueryAI,
+  dynamicRelatedObj,
+  partsQuery, //数据中心部件查询
 } from "@/api/scan/request";
 export default {
   components: {
@@ -390,46 +392,65 @@ export default {
     },
     //获取待关联实例-右侧
     getRightData() {
-      let param = {
+      let pa = {
         PageNumber: this.rPage.pageNumber,
         PageSize: this.rPage.pageSize,
-        TypeNameList: [this.typeName]
+        Filters: 'not EquipID isNull'
       };
       //处理查询条件
       if (this.form.ObjectLocalName && this.form.ObjectLocalName.length) {
-        param.ObjectLocalName = this.form.ObjectLocalName;
-      }
-      if (this.form.SubTypeName.length) {
-        param.SubTypeNameList = this.form.SubTypeName;
+        pa.Filters += `;EquipLocalName contain "${this.form.ObjectLocalName}"`;
       }
+      //TODO
+      // if (this.form.SubTypeName.length) {
+      //   param.SubTypeNameList = this.form.SubTypeName;
+      // }
       if (this.form.locationVal.length > 0) {
-        param.BuildLocalName = this.form.locationVal[0];
+        pa.Filters += `;BuildingId='${this.form.locationVal[0]}'`;
       }
       if (this.form.locationVal.length > 1) {
-        param.FloorLocalName = this.form.locationVal[1];
-      }
-      if (this.form.locationVal.length > 2) {
-        param.SpaceType = this.form.locationVal[2];
+        pa.Filters += `;FloorId='${this.form.locationVal[1]}'`;
       }
-      if (this.form.locationVal.length > 3) {
-        param.RoomLocalName = this.form.locationVal[3];
+      let pa2 = {
+        Filters: `TypeName='${this.typeName}'`
       }
-      if (!this.form.locationVal.length) {
-        delete param.BuildLocalName
-        delete param.FloorLocalName
-        delete param.SpaceType
-        delete param.RoomLocalName
+      if (this.form.SubTypeName.length) {
+        pa2.Filters += `;SubTypeName in ${JSON.stringify(this.form.SubTypeName)}`
       }
       this.rTableLoading = true;
-      dynamicPendingobjs(param, res => {
-        this.rPage.total = res.PageSize < 50 ? res.PageSize : res.Total;
-        if (this.rPage.pageNumber == 1) {
-          this.RtableData = res.Content;
-        } else {
-          this.RtableData = this.RtableData.concat(res.Content);
+      dynamicRelatedObj(pa2, response => {
+        const tempArr = response.Content.map(t => {
+          return t.TypeCode + t.ProjectId + t.ObjectID
+        })
+        if (tempArr.length) {
+          pa.Filters += `;not EquipID in ${JSON.stringify(tempArr)}`
         }
-        this.rTableLoading = false;
-      });
+        partsQuery(pa, res => {
+          this.rPage.total = res.Total;
+          let tempArr = res.Content.map(t => {
+            t.ObjectID = t.EquipID.substr(12);
+            t.ObjectLocalName = t.EquipLocalName;
+            t.ObjectLocalCode = t.EquipLocalID;
+            // t.SubTypeName = t.EquipCategory ? t.EquipCategory.EquipName : '';
+            // t.BuildLocalName = t.Building ? t.Building.BuildLocalName : '';
+            // t.FloorLocalName = t.Floor ? t.Floor.FloorLocalName : '';
+            // t.RoomLocalName = '';
+            // if (t.ZoneSpaceBaseIn) {
+            //   t.ZoneSpaceBaseIn.forEach(item => {
+            //     t.RoomLocalName += item.RoomLocalName + ',';
+            //   })
+            //   t.RoomLocalName = t.RoomLocalName.substring(0, t.RoomLocalName.length - 1);
+            // }
+            return t;
+          });
+          if (this.rPage.pageNumber == 1) {
+            this.RtableData = tempArr;
+          } else {
+            this.RtableData = this.RtableData.concat(tempArr);
+          }
+          this.rTableLoading = false;
+        });
+      })
     },
     //清除对应关系成功
     deleteSuc() {

+ 26 - 16
src/views/point/dynamicdata/addRelation/projectRela/index.vue

@@ -163,6 +163,7 @@ import {
   dynamicPointTypeList,
   dynamicQueryAI,
   projectQuery, //数据中心查询项目信息
+  dynamicRelatedObj
 } from "@/api/scan/request";
 export default {
   components: {
@@ -393,28 +394,37 @@ export default {
     getRightData() {
       let pa = {
         PageNumber: this.rPage.pageNumber,
-        PageSize: this.rPage.pageSize
+        PageSize: this.rPage.pageSize,
+        Filters: 'not ProjID isNull'
       };
       //处理查询条件
       if (this.form.ObjectLocalName && this.form.ObjectLocalName.length) {
-        pa.Filters = `ProjLocalName contain '${this.form.ObjectLocalName}'`;
+        pa.Filters += `;ProjLocalName contain '${this.form.ObjectLocalName}'`;
       }
       this.rTableLoading = true;
-      projectQuery(pa, res => {
-        this.rPage.total = res.Total;
-        let tempArr = res.Content.map(t => {
-          t.ObjectID = t.ProjID.substr(2);
-          t.ObjectLocalName = t.ProjLocalName;
-          t.ObjectLocalCode = t.ProjLocalID;
-          return t;
-        });
-        if (this.rPage.pageNumber == 1) {
-          this.RtableData = tempArr;
-        } else {
-          this.RtableData = this.RtableData.concat(tempArr);
+      dynamicRelatedObj({ Filters: `TypeName='${this.typeName}'` }, response => {
+        const tempArr = response.Content.map(t => {
+          return t.TypeCode + t.ProjectId + t.ObjectID
+        })
+        if (tempArr.length) {
+          pa.Filters += `;not ProjID in ${JSON.stringify(tempArr)}`
         }
-        this.rTableLoading = false;
-      });
+        projectQuery(pa, res => {
+          this.rPage.total = res.Total;
+          let tempArr = res.Content.map(t => {
+            t.ObjectID = t.ProjID.substr(2);
+            t.ObjectLocalName = t.ProjLocalName;
+            t.ObjectLocalCode = t.ProjLocalID;
+            return t;
+          });
+          if (this.rPage.pageNumber == 1) {
+            this.RtableData = tempArr;
+          } else {
+            this.RtableData = this.RtableData.concat(tempArr);
+          }
+          this.rTableLoading = false;
+        });
+      })
     },
     //清除对应关系成功
     deleteSuc() {

+ 32 - 21
src/views/point/dynamicdata/addRelation/spaceRela/index.vue

@@ -163,6 +163,7 @@ import {
   dynamicPointTypeList,
   dynamicQueryAI,
   queryAllZone, //数据中心所有空间实例
+  dynamicRelatedObj, //动参-查询已关联实例
 } from "@/api/scan/request";
 export default {
   components: {
@@ -401,35 +402,45 @@ export default {
       if (this.form.ObjectLocalName && this.form.ObjectLocalName.length) {
         pa.Filters += `;RoomLocalName contain "${this.form.ObjectLocalName}"`;
       }
-      //TODO
-      // if (this.form.SubTypeName.length) {
-      //   param.SubTypeNameList = this.form.SubTypeName;
-      // }
       if (this.form.locationVal.length > 0) {
         pa.Filters += `;BuildingId="${this.form.locationVal[0]}"`;
       }
       if (this.form.locationVal.length > 1) {
         pa.Filters += `;FloorId="${this.form.locationVal[1]}"`;
       }
+      let pa2 = {
+        Filters: `TypeName='${this.typeName}'`
+      }
+      if (this.form.SubTypeName.length) {
+        pa2.Filters += `;SubTypeName in ${JSON.stringify(this.form.SubTypeName)}`
+      }
       this.rTableLoading = true;
-      queryAllZone(pa, res => {
-        this.rPage.total = res.Total;
-        let tempArr = res.Content.map(t => {
-          t.ObjectID = t.RoomID.substr(12);
-          t.ObjectLocalName = t.RoomLocalName;
-          t.ObjectLocalCode = t.RoomLocalID;
-          t.BuildLocalName = t.Building ? t.Building.BuildLocalName : '';
-          t.FloorLocalName = t.Floor ? t.Floor.FloorLocalName : '';
-          t.SubTypeName = t.DClassDef ? t.DClassDef.Name : '';
-          return t;
-        });
-        if (this.rPage.pageNumber == 1) {
-          this.RtableData = tempArr;
-        } else {
-          this.RtableData = this.RtableData.concat(tempArr);
+      dynamicRelatedObj(pa2, response => {
+        const tempArr = response.Content.map(t => {
+          return t.TypeCode + t.ProjectId + t.ObjectID
+        })
+        if (tempArr.length) {
+          pa.Filters += `;not RoomID in ${JSON.stringify(tempArr)}`
         }
-        this.rTableLoading = false;
-      });
+        queryAllZone(pa, res => {
+          this.rPage.total = res.Total;
+          let tempArr = res.Content.map(t => {
+            t.ObjectID = t.RoomID.substr(12);
+            t.ObjectLocalName = t.RoomLocalName;
+            t.ObjectLocalCode = t.RoomLocalID;
+            t.BuildLocalName = t.Building ? t.Building.BuildLocalName : '';
+            t.FloorLocalName = t.Floor ? t.Floor.FloorLocalName : '';
+            t.SubTypeName = t.DClassDef ? t.DClassDef.Name : '';
+            return t;
+          });
+          if (this.rPage.pageNumber == 1) {
+            this.RtableData = tempArr;
+          } else {
+            this.RtableData = this.RtableData.concat(tempArr);
+          }
+          this.rTableLoading = false;
+        });
+      })
     },
     //清除对应关系成功
     deleteSuc() {

+ 33 - 17
src/views/point/dynamicdata/addRelation/systemRela/index.vue

@@ -162,6 +162,7 @@ import {
   dynamicPointTypeList,
   dynamicQueryAI,
   queryLinkSys, //数据中心系统查询
+  dynamicRelatedObj
 } from "@/api/scan/request";
 export default {
   components: {
@@ -392,28 +393,43 @@ export default {
     getRightData() {
       let pa = {
         PageNumber: this.rPage.pageNumber,
-        PageSize: this.rPage.pageSize
+        PageSize: this.rPage.pageSize,
+        Filters: 'not SysID isNull'
       };
-      //处理查询条件
+      //处理查询条件(todo)
       if (this.form.SubTypeName.length) {
-        pa.Filters = `CategoryName in ${JSON.stringify(this.form.SubTypeName)}`
+        pa.Filters += `;CategoryName in ${JSON.stringify(this.form.SubTypeName)}`
+      }
+      let pa2 = {
+        Filters: `TypeName='${this.typeName}'`
+      }
+      if (this.form.SubTypeName.length) {
+        pa2.Filters += `;SubTypeName in ${JSON.stringify(this.form.SubTypeName)}`
       }
       this.rTableLoading = true;
-      queryLinkSys(pa, res => {
-        this.rPage.total = res.Total;
-        let tempArr = res.Content.map(t => {
-          t.ObjectID = t.SysID.substr(12);
-          t.ObjectLocalName = t.SysLocalName;
-          t.ObjectLocalCode = t.SysLocalID;
-          return t;
-        });
-        if (this.rPage.pageNumber == 1) {
-          this.RtableData = tempArr;
-        } else {
-          this.RtableData = this.RtableData.concat(tempArr);
+      dynamicRelatedObj(pa2, response => {
+        const tempArr = response.Content.map(t => {
+          return t.TypeCode + t.ProjectId + t.ObjectID
+        })
+        if (tempArr.length) {
+          pa.Filters += `;not SysID in ${JSON.stringify(tempArr)}`
         }
-        this.rTableLoading = false;
-      });
+        queryLinkSys(pa, res => {
+          this.rPage.total = res.Total;
+          let tempArr = res.Content.map(t => {
+            t.ObjectID = t.SysID.substr(12);
+            t.ObjectLocalName = t.SysLocalName;
+            t.ObjectLocalCode = t.SysLocalID;
+            return t;
+          });
+          if (this.rPage.pageNumber == 1) {
+            this.RtableData = tempArr;
+          } else {
+            this.RtableData = this.RtableData.concat(tempArr);
+          }
+          this.rTableLoading = false;
+        });
+      })
     },
     //清除对应关系成功
     deleteSuc() {

+ 34 - 23
src/views/point/dynamicdata/addRelation/tenantRela/index.vue

@@ -163,6 +163,7 @@ import {
   dynamicPointTypeList,
   dynamicQueryAI,
   queryTenant, //数据中心查询租户
+  dynamicRelatedObj
 } from "@/api/scan/request";
 export default {
   components: {
@@ -394,11 +395,12 @@ export default {
       let pa = {
         PageNumber: this.rPage.pageNumber,
         PageSize: this.rPage.pageSize,
-        Cascade: [{ Name: 'zoneTenantList' }]
+        Cascade: [{ Name: 'zoneTenantList' }],
+        Filters: 'not TenantID isNull'
       };
       //处理查询条件
       if (this.form.ObjectLocalName && this.form.ObjectLocalName.length) {
-        pa.Filters = `TenantLocalName contain "${this.form.ObjectLocalName}"`;
+        pa.Filters += `;TenantLocalName contain "${this.form.ObjectLocalName}"`;
       }
       // if (this.form.locationVal.length > 0) {
       //   param.BuildLocalName = this.form.locationVal[0];
@@ -413,28 +415,37 @@ export default {
       //   param.RoomLocalName = this.form.locationVal[3];
       // }
       this.rTableLoading = true;
-      queryTenant(pa, res => {
-        this.rPage.total = res.Total;
-        let tempArr = res.Content.map(t => {
-          t.ObjectID = t.TenantID.substr(14);
-          t.ObjectLocalName = t.TenantLocalName;
-          t.ObjectLocalCode = t.TenantLocalID;
-          t.RoomLocalName = '';
-          if (t.ZoneTenantList) {
-            t.ZoneTenantList.forEach(item => {
-              t.RoomLocalName += item.RoomLocalName + ',';
-            });
-            t.RoomLocalName = t.RoomLocalName.substring(0, t.RoomLocalName.length - 1);
+      dynamicRelatedObj({ Filters: `TypeName='${this.typeName}'` },
+        response => {
+          const tempArr = response.Content.map(t => {
+            return t.TypeCode + t.ProjectId + t.ObjectID
+          })
+          if (tempArr.length) {
+            pa.Filters += `;not TenantID in ${JSON.stringify(tempArr)}`
           }
-          return t;
-        });
-        if (this.rPage.pageNumber == 1) {
-          this.RtableData = tempArr;
-        } else {
-          this.RtableData = this.RtableData.concat(tempArr);
-        }
-        this.rTableLoading = false;
-      });
+          queryTenant(pa, res => {
+            this.rPage.total = res.Total;
+            let tempArr = res.Content.map(t => {
+              t.ObjectID = t.TenantID.substr(14);
+              t.ObjectLocalName = t.TenantLocalName;
+              t.ObjectLocalCode = t.TenantLocalID;
+              t.RoomLocalName = '';
+              if (t.ZoneTenantList) {
+                t.ZoneTenantList.forEach(item => {
+                  t.RoomLocalName += item.RoomLocalName + ',';
+                });
+                t.RoomLocalName = t.RoomLocalName.substring(0, t.RoomLocalName.length - 1);
+              }
+              return t;
+            });
+            if (this.rPage.pageNumber == 1) {
+              this.RtableData = tempArr;
+            } else {
+              this.RtableData = this.RtableData.concat(tempArr);
+            }
+            this.rTableLoading = false;
+          });
+        })
     },
     //清除对应关系成功
     deleteSuc() {