Browse Source

Merge remote-tracking branch 'origin/dev' into dev

shaun-sheep 4 years ago
parent
commit
bd9cdc616d

+ 3 - 3
src/components/business_space/newAddDialogs/addEquipDialog.vue

@@ -163,7 +163,7 @@ export default {
         delete pa.data.filters
       }
       if (this.showType) {
-        if (this.type == "Equipment") {
+        if (this.type == "equipment") {
           // pa.data.Cascade.push({ Name: "zoneSpaceInBase" })
           pa.data.cascade = [{ Name: "equipCategory" }];
           getEqNotInSpace(pa, res => {
@@ -179,7 +179,7 @@ export default {
           })
         }
       } else {
-        if (this.type == "Equipment") {
+        if (this.type == "equipment") {
           pa.data.cascade.push({ Name: "zoneSpaceInBase" })
           notEqInSpaceQuery(pa, res => {
             this.loading = false
@@ -225,7 +225,7 @@ export default {
       this.selections.map(t => {
         pa.data.equipIdList.push(t.id)
       })
-      if (this.type == "Equipment") {
+      if (this.type == "equipment") {
         eqInSpaceCreate(pa, res => {
           this.successCallback()
         })

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

@@ -146,9 +146,6 @@ export default {
       }
       zoneQuery(pa, res => {
         this.loading = false;
-        console.log(88888888888);
-        console.log(res);
-        console.log(this.type);
         this.tableData = res.content[0][this.type] || []
         this.tableData.map(t => {
           t.spaceId = res.content[0].id

+ 2 - 2
src/views/ready/buildfloor/repetitionGraphy.vue

@@ -207,9 +207,9 @@ export default {
         orders: 'floorSequenceID desc'
       }
       floorQueryAndSign(floorParam, (res) => {
-        this.floorList = res.content;
+        this.floorList = res.content.filter(t => t.infos && t.infos.floorMap || t.id == this.FloorID);
         // todo
-        this.floorRadio = res.content[0];
+        this.floorRadio = this.floorList[0];
         this.alreadyRelatedModel = res.content.map((t) => {
           if (t.floorID != this.FloorID) return t.modelId
           this.sign = t.Sign > 0