Browse Source

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

shaun-sheep 4 years ago
parent
commit
8c6a45c2f0
2 changed files with 3 additions and 3 deletions
  1. 2 2
      src/api/scan/config.js
  2. 1 1
      src/views/ledger/cenotelist/relatedSpace.vue

+ 2 - 2
src/api/scan/config.js

@@ -16,7 +16,7 @@ export const system = object + '/general-system'
 export const message = baseUrl + '/message-center'
 
 
-export const shaft = dataCenter + '/shaft'
+export const shaft = object + '/shaft'
 export const tenant = dataCenter + '/tenant'
 export const floor = dataCenter + '/floor'
 export const dict = dataCenter + '/dict'
@@ -24,7 +24,7 @@ export const classDef = dataCenter + '/class-def'
 export const locationPoint = dataCenter + '/location-point'
 export const modelScanTask = dataCenter + '/model-scan-task'
 export const equipScanTask = dataCenter + '/equip-scan-task'
-export const shContainSp = dataCenter + '/sh-contain-sp-base'
+export const shContainSp = rel + '/sh-contain-sp-base'
 export const statistics = dataCenter + '/statistics'
 export const graphicUrl = dataCenter + '/graphic'
 export const compSpace = component + '/space'

+ 1 - 1
src/views/ledger/cenotelist/relatedSpace.vue

@@ -147,7 +147,7 @@ export default {
           shaftId: this.$route.query.ShaftId
         }
         shaftSpaceTypeQuery(pa, res => {
-          this.spaceList = res.Content.map(item => {
+          this.spaceList = res.content.map(item => {
             return { Code: item.ObjectType, Name: item.ObjectTypeName };
           });
           this.showDefaultSpace();