haojianlong преди 4 години
родител
ревизия
3322f309ca

+ 5 - 5
config/index.js

@@ -295,17 +295,17 @@ module.exports = {
       '/image-service': {
         // 目标 API 地址
         // target: 'http://172.16.42.210:8080/' ,
-        target: 'http://60.205.177.43:8080',
+        target: 'http://api.sagacloud.cn',
         // 如果要代理 websockets
         ws: true,
         // 将主机标头的原点更改为目标URL
         changeOrigin: false,
-        // pathRewrite: {
-        //   "^/image-service": "/dp-auxiliary/image-service/"
-        // }
         pathRewrite: {
-          "^/image-service": "/image-service/"
+          "^/image-service": "/dp-auxiliary/image-service/"
         }
+        // pathRewrite: {
+        //   "^/image-service": "/image-service/"
+        // }
       },
       '/modelapi': {
         // target: 'http://172.16.42.210:8082',

+ 4 - 4
src/api/scan/httpUtil.js

@@ -49,8 +49,8 @@ function downFile(blob, fileName) {
 
 export default {
   getJson: function (url, data, success, failed, err) {
-    let ProjectId = localStorage.getItem("projectId")
-    // let ProjectId = "Pj1101050029"
+    // let ProjectId = localStorage.getItem("projectId")
+    let ProjectId = "Pj1101050029"
     let userName = storage.get("user_name")
     let vm = this;
     fetch({
@@ -65,8 +65,8 @@ export default {
     });
   },
   postJson: function (url, data, success, failed, err) {
-    let ProjectId = localStorage.getItem("projectId")
-    // let ProjectId = "Pj1101050029"
+    // let ProjectId = localStorage.getItem("projectId")
+    let ProjectId = "Pj1101050029"
     let userName = storage.get("user_name")
     let vm = this;
     fetch({

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

@@ -2051,13 +2051,13 @@ export function getSpaceBdFlData(param, success) {
 
 //关系-----业务空间内的元空间,业务空间一对多,累计添加会覆盖以前记录
 export function createRelateInZoneAndISp(param, success) {
-  let url = `${baseUrl}${dataCenter}/si-in-sp-base/link-sp?type=${param.type}`;
+  let url = `${baseUrl}${rel}/si-in-sp-base/link-sp?type=${param.type}`;
   http.postJson(url, param.data, success)
 }
 
 //关系-----业务空间内的元空间,创建业务空间内的元空间关系, 累计添加不会覆盖-批量关联
 export function groupCreRelaZoneAndISp(param, success) {
-  let url = `${baseUrl}${dataCenter}/si-in-sp-base/link-list?type=${param.type}`;
+  let url = `${baseUrl}${rel}/si-in-sp-base/link-list?type=${param.type}`;
   http.postJson(url, param.data, success)
 }
 

+ 21 - 21
src/components/business_space/newGraphy/graphy.vue

@@ -403,7 +403,7 @@
       let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
       let pa = {
         cascader: [{name: 'spaceOutline'}],
-        classCode: ObjectType,
+        zoneType: ObjectType,
         filters: `not id isNull`,
         orders: "createTime desc, id asc",
         pageSize: 10000
@@ -744,11 +744,12 @@
     editeSpaceDetail() {
       let item = this.curZoneItem.data;
       let query = {
-        RoomID: item.id,
+        RoomID: item.RoomID,
         zone: this.tab.code,
         isMyTab: 1,
         buildFloorSelectd: this.buildFloor
       }
+
       this.$router.push({
         path: "/ledger/spaceDetail",
         query: query
@@ -777,8 +778,8 @@
         ObjectType: ObjectType
       }
       let pa = {
-        Content: [space],
-        Projection: ['State']
+        content: [space],
+        projection: ['State']
       }
       zoneUpdate(pa, res => {
         this.curZoneItem.isInfected = false;
@@ -799,9 +800,9 @@
       let zoneObj = { outline: [], height: 0, state: this.confirmAndSaveFlag ? 0 : this.curZoneItem.isInfected ? 1 : 0 }, IspaceIdList = [];
       // 空间
       selectSpace.map(t => {
-        zoneObj.outline.push(t.data.outLine);
-        if (this.BIMIDToSID[t.data.sourceId]) {
-          IspaceIdList.push(this.BIMIDToSID[t.data.sourceId]);
+        zoneObj.outline.push(t.data.OutLine);
+        if (this.BIMIDToSID[t.data.SourceId]) {
+          IspaceIdList.push(this.BIMIDToSID[t.data.SourceId]);
         }
 
         // if (t.Height && (zoneObj.Height == 0 || t.Height < zoneObj.Height)) {
@@ -842,7 +843,7 @@
       if (!zoneObj.outline.length) {
         zoneObj.outline = null;
       }
-      zoneObj.id = this.curZoneItem.data.id;
+      zoneObj.id = this.curZoneItem.data.RoomID;
       this.updateBSPOutline(zoneObj, IspaceIdList)
     },
     // 根据图批量创建所选业务空间
@@ -1010,7 +1011,7 @@
       if (Spaces.length) {
         let param = {
           data: {
-            Content: Spaces
+            content: Spaces
           },
           type: ObjectType
         }
@@ -1029,13 +1030,12 @@
     groupCreateBSP(spaces) {
       let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
       spaces = spaces.map(t => {
-        t.ObjectType = ObjectType;
-        t.BIMLocation = this.getAverageVal(t.Outline);
-
+        t.classCode = ObjectType;
+        t.bimLocation = this.getAverageVal(t.outline);
         return t;
       })
       let pa = {
-        Content: spaces,
+        content: spaces,
       }
       zoneCreate(pa, res => {
         res.entityList.map(t => {
@@ -1052,10 +1052,10 @@
     // 单个创建
     createSingleBSP(space, IspaceIdList) {
       let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
-      space.BIMLocation = space.outline ? this.getAverageVal(space.outline) : null;
-      space.ObjectType = ObjectType;
+      space.bimLocation = space.outline ? this.getAverageVal(space.outline) : null;
+      space.classCode = ObjectType;
       let pa = {
-        Content: [space]
+        content: [space]
       }
       zoneCreate(pa, res => {
         this.relationInBSPandISP(res.entityList[0].id, IspaceIdList)
@@ -1064,13 +1064,13 @@
     // 更新业务空间区域
     updateBSPOutline(zoneObj, IspaceIdList) {
       let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
-      zoneObj.BIMLocation = zoneObj.outline ? this.getAverageVal(zoneObj.outline) : null;
-      zoneObj.ObjectType = ObjectType;
+      zoneObj.bimLocation = zoneObj.outline ? this.getAverageVal(zoneObj.outline) : null;
+      zoneObj.classCode = ObjectType;
       zoneObj.buildingId = this.buildFloor[0];
       zoneObj.floorId = this.buildFloor[1];
       let pa = {
-        Content: [zoneObj],
-        Projection: ['BIMLocation', 'ObjectType', 'Outline', 'Height', 'BuildingId', 'FloorId']
+        content: [zoneObj],
+        projection: ['bimLocation', 'classCode', 'outline', 'height', 'buildingId', 'floorId']
       }
       zoneUpdate(pa, res => {
         zoneUpdateOutline(pa, res => { console.log(res) })
@@ -1085,7 +1085,7 @@
         id: zoneObj.floorId,
       }]
       handleZoneUpdateBd(pa, res => {
-        this.relationInBSPandISP(zoneObj.id, ispaceIdList)
+        this.relationInBSPandISP(zoneObj.id, IspaceIdList)
       })
     },
     // 查询未关联平面图的业务空间(项目下+当前分区)

+ 20 - 20
src/components/business_space/newGraphy/unRelateBSP.vue

@@ -16,7 +16,7 @@
         <el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
-              {{scope.row.RoomLocalName||scope.row.RoomName||''}}
+              {{scope.row.localName||scope.row.name||''}}
             </div>
           </template>
         </el-table-column>
@@ -66,9 +66,9 @@ export default {
       },
       floor: ['all'], // 级联建筑楼层
       props: { //自定义字段
-        value: "BuildID",
-        label: "BuildLocalName",
-        children: "Floor"
+        value: "id",
+        label: "localName",
+        children: "floor"
       },
       bfData: {}, //建筑楼层id =>名称
       options: [], //级联
@@ -118,47 +118,47 @@ export default {
           if (t.floor) {
             t.floor = t.floor.map(item => {
               this.bfData[item.id] = item.localName;
-              item.BuildID = item.id;
-              item.BuildLocalName = item.localName;
               return item;
             })
           } else {
             t.Floor = []
           }
-          t.floor.unshift({ BuildID: 'all', BuildLocalName: '全部' }, { BuildID: 'isNull', BuildLocalName: '未明确楼层' })
+          t.floor.unshift({ id: 'all', localName: '全部' }, { id: 'isNull', localName: '未明确楼层' })
           return t;
         })
-        this.options.unshift({ BuildID: 'all', BuildLocalName: '全部' }, { BuildID: 'isNull', BuildLocalName: '未明确建筑' })
+        console.log(this.options);
+        console.log(8888888888);
+        this.options.unshift({ id: 'all', localName: '全部' }, { id: 'isNull', localName: '未明确建筑' })
       })
     },
     // 查询未关联平面图的业务空间(项目下+当前分区)
     getTableData() {
       let pa = {
-        ZoneType: this.code,
-        Filters: `Outline isNull`,
-        Orders: "createTime desc, id asc",
-        PageSize: this.page.pageSize,
+        zoneType: this.code,
+        filters: `outline isNull`,
+        orders: "createTime desc, id asc",
+        pageSize: this.page.pageSize,
         pageNumber: this.page.pageNumber
       }
 
       if (this.floor[0] == 'isNull') {
-        pa.BuildingId = `isnull`
+        pa.buildingId = `isnull`
       } else if (this.floor[0] && this.floor[0] != 'all') {
-        pa.BuildingId = this.floor[0]
+        pa.buildingId = this.floor[0]
       }
       if (this.floor[1] == 'isNull') {
-        pa.FloorId = `isnull`
+        pa.floorId = `isnull`
       } else if (this.floor[1] && this.floor[1] != 'all') {
-        pa.FloorId = this.floor[1]
+        pa.floorId = this.floor[1]
       }
       if (this.keycode != '') {
-        pa.Filters += `;RoomLocalName contain "${this.keycode}" or RoomName contain "${this.keycode}"`
+        pa.filters += `;localName contain "${this.keycode}" or name contain "${this.keycode}"`
       }
       zoneQuery(pa, res => {
         this.page.total = res.Total;
-        this.tableData = res.Content.map(t => {
-          t.BNAME = this.bfData[t.BuildingId];
-          t.FNAME = this.bfData[t.FloorId];
+        this.tableData = res.content.map(t => {
+          t.BNAME = this.bfData[t.buildingId];
+          t.FNAME = this.bfData[t.floorId];
           return t;
         })
       })