소스 검색

Merge branch 'dev'

zhangyu 4 년 전
부모
커밋
27aeeee397
2개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 0
      src/components/business_space/newAddDialogs/addEquipDialog.vue
  2. 0 1
      src/components/business_space/newTables/eqToSpaceTable.vue

+ 5 - 0
src/components/business_space/newAddDialogs/addEquipDialog.vue

@@ -133,6 +133,7 @@ export default {
     },
     },
     // 获取列表数据
     // 获取列表数据
     getTableData() {
     getTableData() {
+      this.loading = true
       let pa = {
       let pa = {
         data: {
         data: {
           Cascade: [{ Name: "equipCategory" }],
           Cascade: [{ Name: "equipCategory" }],
@@ -168,12 +169,14 @@ export default {
           // pa.data.Cascade.push({ Name: "zoneSpaceInBase" })
           // pa.data.Cascade.push({ Name: "zoneSpaceInBase" })
           pa.data.Cascade = [{ Name: "equipCategory" }];
           pa.data.Cascade = [{ Name: "equipCategory" }];
           getEqNotInSpace(pa, res => {
           getEqNotInSpace(pa, res => {
+            this.loading = false
             this.getDataSuc(res, 'ZoneSpaceBaseIn')
             this.getDataSuc(res, 'ZoneSpaceBaseIn')
           })
           })
         } else {
         } else {
           // pa.data.Cascade.push({ Name: "zoneSpaceForBase" })
           // pa.data.Cascade.push({ Name: "zoneSpaceForBase" })
           pa.data.Cascade = [{ Name: "equipCategory" }];
           pa.data.Cascade = [{ Name: "equipCategory" }];
           getEqNotForSpace(pa, res => {
           getEqNotForSpace(pa, res => {
+            this.loading = false
             this.getDataSuc(res, 'ZoneSpaceBaseFor')
             this.getDataSuc(res, 'ZoneSpaceBaseFor')
           })
           })
         }
         }
@@ -181,11 +184,13 @@ export default {
         if (this.type == "Equipment") {
         if (this.type == "Equipment") {
           pa.data.Cascade.push({ Name: "zoneSpaceInBase" })
           pa.data.Cascade.push({ Name: "zoneSpaceInBase" })
           notEqInSpaceQuery(pa, res => {
           notEqInSpaceQuery(pa, res => {
+            this.loading = false
             this.getDataSuc(res, 'ZoneSpaceBaseIn')
             this.getDataSuc(res, 'ZoneSpaceBaseIn')
           })
           })
         } else {
         } else {
           pa.data.Cascade.push({ Name: "zoneSpaceForBase" })
           pa.data.Cascade.push({ Name: "zoneSpaceForBase" })
           notEqForSpaceQuery(pa, res => {
           notEqForSpaceQuery(pa, res => {
+            this.loading = false
             this.getDataSuc(res, 'ZoneSpaceBaseFor')
             this.getDataSuc(res, 'ZoneSpaceBaseFor')
           })
           })
         }
         }

+ 0 - 1
src/components/business_space/newTables/eqToSpaceTable.vue

@@ -73,7 +73,6 @@ export default {
         EquipmentFor: '服务于空间的设备',
         EquipmentFor: '服务于空间的设备',
       },
       },
       hidden: true,
       hidden: true,
-      loading: false
     };
     };
   },
   },
   props: {
   props: {