Browse Source

修改接口

haojianlong 4 years ago
parent
commit
a6e6babad5

+ 20 - 20
src/api/data_admin/buildTaskApi.js

@@ -1,7 +1,7 @@
 import http from '../scan/httpUtil';
 
 const baseUrl = '/api';
-import { scan } from './../scan/config';
+import { scan, modelScanTask, equipScanTask, dataCenter } from './../scan/config';
 
 
 /**
@@ -11,7 +11,7 @@ import { scan } from './../scan/config';
  *
  */
 export function queryTaskCount(param, success) {
-  // let url = `${baseUrl}/datacenter4/scan-task-base/count`;
+  // let url = `${baseUrl}${dataCenter}/scan-task-base/count`;
   let url = `${scan}/task/aggregate/count`;
   http.postJson(url, param, success);
 }
@@ -19,104 +19,104 @@ export function queryTaskCount(param, success) {
 /*************************模型任务接口****************************/
 //创建模型任务
 export function createModelTask(param, success) {
-  let url = `${baseUrl}/datacenter4/model-scan-task/create`;
+  let url = `${baseUrl}${modelScanTask}/create`;
   http.postJson(url, param, success);
 }
 
 //根据id删除模型任务
 export function deleteModelTask(param, success) {
-  let url = `${baseUrl}/datacenter4/model-scan-task/delete`;
+  let url = `${baseUrl}${modelScanTask}/delete`;
   http.postJson(url, param, success);
 }
 
 //查询:根据模型空间ID查询设备信息
 export function queryModelDiglog(param, success) {
-  let url = `${baseUrl}/datacenter4/model-scan-task/equip-query`;
+  let url = `${baseUrl}${modelScanTask}/equip-query`;
   http.postJson(url, param, success);
 }
 
 //查询模型任务
 export function queryModelTask(param, success) {
-  let url = `${baseUrl}/datacenter4/model-scan-task/page-query`;
+  let url = `${baseUrl}${modelScanTask}/page-query`;
   http.postJson(url, param, success);
 }
 
 //更新模型任务
 export function updateModelTask(param, success) {
-  let url = `${baseUrl}/datacenter4/model-scan-task/update`;
+  let url = `${baseUrl}${modelScanTask}/update`;
   http.postJson(url, param, success);
 }
 
 //查询设备分类
 export function queryModelCategory(param, success) {
-  let url = `${baseUrl}/datacenter4/model-scan-task/model-category-query`;
+  let url = `${baseUrl}${modelScanTask}/model-category-query`;
   http.postJson(url, param, success);
 }
 
 //查询模型文件夹和文件
 export function queryModelFile(param, success) {
   //todo
-  let url = `${baseUrl}/datacenter4/model-scan-task/model-file-query`;
+  let url = `${baseUrl}${modelScanTask}/model-file-query`;
   // let url = `${scan}/task/model/model-file-query`;
   http.postJson(url, param, success);
 }
 
 //查询模型任务下的部件类型及数量
 export function modelCategoryCount(param, success) {
-  let url = `${baseUrl}/datacenter4/model-scan-task/category-count`;
+  let url = `${baseUrl}${modelScanTask}/category-count`;
   http.postJson(url, param, success);
 }
 
 /*************************设备台账任务接口****************************/
 //创建设备台账任务
 export function createDeviceTask(param, success) {
-  let url = `${baseUrl}/datacenter4/equip-scan-task/create`;
+  let url = `${baseUrl}${equipScanTask}/create`;
   http.postJson(url, param, success);
 }
 
 //根据id删除设备台账任务
 export function deleteDeviceTask(param, success) {
-  let url = `${baseUrl}/datacenter4/equip-scan-task/delete`;
+  let url = `${baseUrl}${equipScanTask}/delete`;
   http.postJson(url, param, success);
 }
 
 //查询设备台账任务
 export function queryDeviceTask(param, success) {
-  // let url = `${baseUrl}/datacenter4/equip-scan-task/page-query`;
+  // let url = `${baseUrl}${equipScanTask}/page-query`;
   let url = `${scan}/task/equip/page-query`;
   http.postJson(url, param, success)
 }
 
 //更新设备台账任务
 export function updateDeviceTask(param, success) {
-  let url = `${baseUrl}/datacenter4/equip-scan-task/update`;
+  let url = `${baseUrl}${equipScanTask}/update`;
   http.postJson(url, param, success)
 }
 
 //查询设备分类
 export function queryDeviceCategory(param, success) {
-  // let url = `${baseUrl}/datacenter4/equip-scan-task/equip-category-query`;
+  // let url = `${baseUrl}${equipScanTask}/equip-category-query`;
   let url = `${scan}/task/equip/equip-category-query`;
   http.postJson(url, param, success)
 }
 
 //查询设备任务下的部件类型及数量
 export function categoryCount(param, success) {
-  let url = `${baseUrl}/datacenter4/equip-scan-task/category-count`
+  let url = `${baseUrl}${equipScanTask}/category-count`
   http.postJson(url, param, success)
 }
 
 /*************************资产台账任务接口****************************/
 //统计数量
 export function countAssetsTask(param, success) {
-  // let url = `${baseUrl}/datacenter4/property-scan-task/count`;
+  // let url = `${baseUrl}${dataCenter}/property-scan-task/count`;
   let url = `${scan}/task/property/count`;
   http.postJson(url, param, success)
 }
 
 //创建设备台账任务
 export function createAssetsTask(param, success) {
-  // let url = `${baseUrl}/datacenter4/property-scan-task/create`;
+  // let url = `${baseUrl}${dataCenter}/property-scan-task/create`;
   let url = `${scan}/task/property/create`;
   http.postJson(url, param, success)
 }
@@ -129,7 +129,7 @@ export function deleteAssetsTask(param, success) {
 
 //查询资产台账任务 y
 export function queryAssetsTask(param, success) {
-  // let url = `${baseUrl}/datacenter4/property-scan-task/page-query`;
+  // let url = `${baseUrl}${dataCenter}/property-scan-task/page-query`;
   let url = `${scan}/task/property/page-query`;
   http.postJson(url, param, success)
 }
@@ -142,7 +142,7 @@ export function updateAssetsTask(param, success) {
 
 //查询设备族
 export function queryAssetsFamily(param, success) {
-  // let url = `${baseUrl}/datacenter4/property-scan-task/property-category-query`;
+  // let url = `${baseUrl}${dataCenter}/property-scan-task/property-category-query`;
   let url = `${scan}/task/property/property-category-query`;
   http.postJson(url, param, success)
 }

+ 5 - 7
src/api/dict/index.js

@@ -1,28 +1,26 @@
-import fetch from "@/api/scan/fetch";
-import {baseUrl} from "@/api/scan/config";
+import {baseUrl, dict} from "@/api/scan/config";
 import http from "@/api/scan/httpUtil";
-import storage from "@/framework/utils/storage";
 
 //头部信息查询(查询所有设备类型-所有部件类型-所有系统类型-所有专业类型)
 export function queryPhysicsAllType(param, success) {
-  let url = `${baseUrl}/datacenter4/dict/category`;
+  let url = `${baseUrl}${dict}/category`;
   http.postJson(url, param, success);
 }
 
 //查询项目下类型的信息点
 export function getDataDictionary(param, success) {
-  let url = `${baseUrl}/datacenter4/dict/query`;
+  let url = `${baseUrl}${dict}/query`;
   http.postJson(url, param, success);
 }
 
 //批量处理字典信息操作
 export function setInfoPoint(param, success) {
-  let url = `${baseUrl}/datacenter4/dict/dict-batch`;
+  let url = `${baseUrl}${dict}/dict-batch`;
   http.postJson(url, param, success)
 }
 
 //设置-项目定制化字典
 export function setDataDictionary(param, success) {
-  let url = `${baseUrl}/datacenter4/dict/setting-dic-project`;
+  let url = `${baseUrl}${dict}/setting-dic-project`;
   http.postJson(url, param, success)
 }

+ 2 - 4
src/api/object/build.js

@@ -1,11 +1,9 @@
-import fetch from "@/api/scan/fetch";
-import {baseUrl} from "@/api/scan/config";
+import {baseUrl, object} from "@/api/scan/config";
 import http from "@/api/scan/httpUtil";
-import storage from "@/framework/utils/storage";
 
 //查询建筑信息
 export function buildingQuery(param, success) {
-  let url = `${baseUrl}/datacenter4/object/building/query`;
+  let url = `${baseUrl}${object}/building/query`;
   http.postJson(url, param, success);
 }
 

+ 4 - 6
src/api/object/equip.js

@@ -1,22 +1,20 @@
-import fetch from "@/api/scan/fetch";
-import { baseUrl } from "@/api/scan/config";
+import { baseUrl, compEquipQuery } from "@/api/scan/config";
 import http from "@/api/scan/httpUtil";
-import storage from "@/framework/utils/storage";
 
 //设备清单 - 查询设备信息
 export function queryEquip(param, success) {
-  let url = `${baseUrl}/datacenter4/object/equip/query`;
+  let url = `${baseUrl}${object}/equip/query`;
   http.postJson(url, param, success);
 }
 
 //设备清单 - 统计项目下所有设备数量
 export function countEquip(param, success) {
-  let url = `${baseUrl}/datacenter4/object/equip/count`;
+  let url = `${baseUrl}${object}/equip/count`;
   http.postJson(url, param, success);
 }
 
 //查询设备关联资产部件数量
 export function getEquipTableCon(param, success) {
-  let url = `${baseUrl}/equip-component4/equip-query/equip-components`;
+  let url = `${baseUrl}${compEquipQuery}/equip-components`;
   http.postJson(url, param, success);
 }

+ 4 - 6
src/api/object/floor.js

@@ -1,21 +1,19 @@
-import fetch from "@/api/scan/fetch";
-import { baseUrl } from "@/api/scan/config";
+import { baseUrl, dataCenter } from "@/api/scan/config";
 import http from "@/api/scan/httpUtil";
-import storage from "@/framework/utils/storage";
 
 //查询楼层信息
 export function floorQuery(param, success) {
-  let url = `${baseUrl}/datacenter4/object/floor/query`;
+  let url = `${baseUrl}${dataCenter}/floor/query`;
   http.postJson(url, param, success);
 }
 
 //建筑楼层管理-创建楼层
 export function manageCreateFloor(param, success) {
-  let url = `${baseUrl}/datacenter4/object/floor/create`;
+  let url = `${baseUrl}${dataCenter}/floor/create`;
   http.postJson(url, param, success)
 }
 //建筑楼层管理-修改楼层
 export function manageUpdateFloor(param, success) {
-  let url = `${baseUrl}/datacenter4/object/floor/update`;
+  let url = `${baseUrl}${dataCenter}/floor/update`;
   http.postJson(url, param, success)
 }

+ 25 - 25
src/api/relation/api.js

@@ -1,75 +1,76 @@
 import httpUtil from "../scan/httpUtil";
 import fetch from "../scan/fetch";
 import storage from '@/framework/utils/storage'
+import { baseUrl, graphicUrl, dataCenter, dictCustom } from "@/api/scan/config.js"
 
 
 //查询总览
 export function graphic(param, success) {
-  let url = '/api/datacenter4/graphic/overview'
+  let url = `${baseUrl}${graphicUrl}/overview`
   httpUtil.postJson(url, param, success)
 }
 
 // 查询总览数量
 export function graphicNumber(param, success) {
-  let url = '/api/datacenter4/graphic/query-count'
+  let url = `${baseUrl}${graphicUrl}/query-count`
   httpUtil.postJson(url, param, success)
 
 }
 
 //导入excel
 export function graphicUpload(param, success) {
-  let url = '/api/datacenter4/graphic/import'
+  let url = `${baseUrl}${graphicUrl}/import`
   httpUtil.postJson(url, param, success)
 }
 
 // 下载报告
 export function reportDownload(param, success) {
-  let url = '/api/datacenter4/graphic/report-downloads'
+  let url = `${baseUrl}${graphicUrl}/report-downloads`
   httpUtil.getJson(url, param, success)
 }
 
 // 下载模板
 export function templateDownloads(param, success) {
-  let url = '/api/datacenter4/graphic/template-downloads'
+  let url = `${baseUrl}${graphicUrl}/template-downloads`
   httpUtil.getJson(url, param, success)
 }
 
 
 //    建筑下的业务空间
 export function buildSpace(param, success) {
-  let url = '/api/datacenter4/calc_building/space'
+  let url = `${baseUrl}${dataCenter}/calc_building/space`
   httpUtil.postJson(url, param, success)
 }
 
 
 // 管网系统设备分块 1
 // export function calcSpecial(param, success) {
-//   let url = ` /api/datacenter4/calc_special/sys-block?Domain=${param.Domain}&SystemName=${param.SystemName}`
+//   let url = ` ${baseUrl}${dataCenter}/calc_special/sys-block?Domain=${param.Domain}&SystemName=${param.SystemName}`
 //   httpUtil.postJson(url, param, success)
 // }
 export function calcSpecial(param, success) {
-  let url = ` /api/datacenter4/calc_special/sys-block?relationType=${param.RelationType}`
+  let url = `${baseUrl}${dataCenter}/calc_special/sys-block?relationType=${param.RelationType}`
   httpUtil.postJson(url, param, success)
 }
 
 
 //    获取源末端 2
 export function blockQuery(param, success) {
-  let url = '/api/datacenter4/graphic/connected-block-query'
+  let url = `${baseUrl}${graphicUrl}/connected-block-query`
   httpUtil.postJson(url, param, success)
 }
 
 
 // 覆盖源末端 3
 export function blockSource(param, success) {
-  let url = '/api/datacenter4/graphic/replace-connected-block-source'
+  let url = `${baseUrl}${graphicUrl}/replace-connected-block-source`
   httpUtil.postJson(url, param, success)
 }
 
 //    管网系统确定流向 4
 export function sysDirection(param, success) {
   let buildId = param.BuildingId ? `BuildingId=${param.BuildingId}&` : ''
-  let url = `/api/datacenter4/calc_special/sys-direction?BlockId=${param.BlockId}&${buildId}Domain=${param.Domain}&SystemName=${param.SystemName}&isSource=${param.isSource}`
+  let url = `${baseUrl}${dataCenter}/calc_special/sys-direction?BlockId=${param.BlockId}&${buildId}Domain=${param.Domain}&SystemName=${param.SystemName}&isSource=${param.isSource}`
   httpUtil.postJson(url, param, success)
 }
 
@@ -82,7 +83,7 @@ export function businessSpaceAll(param) {
   let objectTypes = zone_type ? "?objectTypes=" + zone_type : ''
   return fetch({
     method: 'POST',
-    url: "/api/datacenter4/relation-calc/" + relation_type + objectTypes,
+    url: `${baseUrl}${dataCenter}/relation-calc/` + relation_type + objectTypes,
     data: proId,
     headers: {'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName}
   })
@@ -92,13 +93,13 @@ export function businessSpaceAll(param) {
 
 // 项目化字典-统计数量
 export function dictCount(param, success) {
-  let url = '/api/equip-component4/dict-custom/project-dict-count'
+  let url = `${baseUrl}${dictCustom}/project-dict-count`
   httpUtil.postJson(url, param, success)
 }
 
 // 项目化字典-需补充转换规则数量
 export function dictSwitchCount(param, success) {
-  let url = '/api/equip-component4/dict-custom/project-dict-switch-count'
+  let url = `${baseUrl}${dictCustom}/project-dict-switch-count`
   httpUtil.postJson(url, param, success)
 }
 
@@ -109,7 +110,7 @@ export function dectInfo(param) {
   let ProjectId = localStorage.getItem("projectId")
   return fetch({
     method: 'POST',
-    url: `/api/equip-component4/dict-custom/project-dict-info`,
+    url: `${baseUrl}${dictCustom}/project-dict-info`,
     data,
     headers: {'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName}
   })
@@ -117,31 +118,31 @@ export function dectInfo(param) {
 
 //数据中心-物理世界数据转换
 export function dictDataCenter(param, success) {
-  let url = '/api/equip-component4/dict-custom/project-dict-datacenter4'
+  let url = `${baseUrl}${dictCustom}/project-dict-datacenter`
   httpUtil.postJson(url, param, success)
 }
 
 //物理世界-数据中心数据转换
 export function dictDataPlatFrom(param, success) {
-  let url = '/api/equip-component4/dict-custom/project-dict-dataplatfrom'
+  let url = `${baseUrl}${dictCustom}/project-dict-dataplatfrom`
   httpUtil.postJson(url, param, success)
 }
 
 // 同步设备
 export function createEquip(param, success) {
-  let url = `/api/dataplatform-sync/project-sync/create-equip?projectId=${param.projectId}`
+  let url = `${baseUrl}/dataplatform-sync/project-sync/create-equip?projectId=${param.projectId}`
   httpUtil.postJson(url, {}, success)
 }
 
 //更新自定义自定脚本
 export function dictUpdate(param, success) {
-  let url = '/api/equip-component4/dict-custom/update'
+  let url = `${baseUrl}${dictCustom}/update`
   httpUtil.postJson(url, param, success)
 }
 
 // 查询关系数据
 export function relQuery(param,success) {
-  let url = '/api/datacenter4/relation-manual-calc/rel-query'
+  let url = `${baseUrl}${dataCenter}/relation-manual-calc/rel-query`
   httpUtil.postJson(url,param,success)
 }
 //添加关系数据
@@ -150,7 +151,7 @@ export function relAdd(data) {
   let ProjectId = localStorage.getItem("projectId")
   return fetch({
     method: 'POST',
-    url: `/api/datacenter4/relation-manual-calc/rel-add`,
+    url: `${baseUrl}${dataCenter}/relation-manual-calc/rel-add`,
     data,
     headers: {'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName}
   })
@@ -158,20 +159,19 @@ export function relAdd(data) {
 
 //删除关系
 export function relDelete(param, success) {
-  let url = '/api/datacenter4/relation-manual-calc/rel-del'
+  let url = `${baseUrl}${dataCenter}/relation-manual-calc/rel-del`
   httpUtil.postJson(url, param, success)
 }
 
 
 // 添加源设备
 export function addSource(param, success) {
-  let url = '/api/datacenter4/mep-system-calc/source/add'
+  let url = `${baseUrl}${dataCenter}/mep-system-calc/source/add`
   httpUtil.postJson(url, param, success)
 }
 
 //查看源设备
 export function sourceQuery(param, success) {
-  let url = '/api/datacenter4/mep-system-calc/source/query'
+  let url = `${baseUrl}${dataCenter}/mep-system-calc/source/query`
   httpUtil.postJson(url, param, success)
-
 }

+ 18 - 1
src/api/scan/config.js

@@ -6,7 +6,24 @@ export const sass = 'sass';
 export const physics = '/data-platform-3';
 export const business = '/business-space'
 export const venders = '/venders'
-export const dataCenter = '/datacenter4/object'
+export const dataCenter = '/datacenter4'
+export const component = '/equip-component4'
+export const object = dataCenter + '/object'
+export const shaft = dataCenter + '/shaft'
+export const tenant = dataCenter + '/tenant'
+export const system = dataCenter + '/general-system'
+export const floor = dataCenter + '/floor'
+export const dict = dataCenter + '/dict'
+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 statistics = dataCenter + '/statistics'
+export const graphicUrl = dataCenter + '/graphic'
+export const compSpace = component + '/space'
+export const compEquipQuery = component + '/equip-query'
+export const dictCustom = component + '/dict-custom'
 export const zone = {
   GeneralZone: 'zone-general', //默认分区
   PowerSupplyZone: 'zone-power-supply', //供电分区

File diff suppressed because it is too large
+ 229 - 229
src/api/scan/request.js


+ 4 - 4
src/components/business_space/business/handsontable.vue

@@ -928,10 +928,10 @@
         Filters: `Code="OtherZone"`
       }
       queryAllZoneType(param, res => {
-        if (res.Content[0].ZoneType && res.Content[0].ZoneType.length) {
-          this.OtherList = res.Content[0].ZoneType.map(t => {
-            t.value = t.Code
-            t.label = t.Name
+        if (res.content[0].zoneType && res.content[0].zoneType.length) {
+          this.OtherList = res.content[0].zoneType.map(t => {
+            t.value = t.code
+            t.label = t.name
             return t
           })
         } else {

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

@@ -322,10 +322,10 @@
         Filters: `Code="OtherZone"`
       }
       queryAllZoneType(pa, res => {
-        if (res.Content[0].ZoneType && res.Content[0].ZoneType.length) {
-          this.options = res.Content[0].ZoneType.map(t => {
-            t.value = t.Code;
-            t.label = t.Name;
+        if (res.content[0].zoneType && res.content[0].zoneType.length) {
+          this.options = res.content[0].zoneType.map(t => {
+            t.value = t.code;
+            t.label = t.name;
             return t;
           })
         } else {
@@ -1100,7 +1100,7 @@
         Filters: `Outline isNull;ObjectType="${ObjectType}"`
       }
       zoneCount(pa, res => {
-        this.num = res.Count;
+        this.num = res.count;
       })
     },
     // 计算平均值 作为业务空间BIMLocation

+ 1 - 1
src/components/ledger/lib/spaceSelect.vue

@@ -45,7 +45,7 @@ export default {
     getOptionData() {
       let params1 = {Cascade: [{ Name: 'zoneType', Filters: `ProjectId='${this.projectId}'` }]}
       queryAllZoneType(params1, res => {
-        this.options = res.Content;
+        this.options = res.content;
         this.changeVal(this.value);
       })
     },

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

@@ -159,13 +159,13 @@ export default {
         })
         Promise.all([promise1, promise2]).then(values => {
           let val1 = values[0], val2 = values[1]
-          this.spaceList = val1.Content.map(t => {
-            if (t.Name != "元空间") {
-              this.spaceType[t.Code] = t.Name;
+          this.spaceList = val1.content.map(t => {
+            if (t.name != "元空间") {
+              this.spaceType[t.code] = t.name;
             }
             return t;
           });
-          this.space = [val2.Content[0].ObjectType];
+          this.space = [val2.content[0].objectType];
           this.ObjectType = this.space[0];
           //加载楼层信息
           this.loadBuildingData();

+ 17 - 17
src/views/ledger/spacelist/index.vue

@@ -160,18 +160,18 @@ export default {
     // 获取项目下建筑
     getBuilding() {
       queryBFloorWithState({}, res => {
-        this.options = res.Content.map(t => {
-          t.value = t.BuildID;
-          t.label = t.BuildLocalName || t.BuildName;
-          t.Count = 0;
-          if (t.Floor) {
-            t.children = t.Floor.map(item => {
-              item.value = item.FloorID;
-              item.label = item.FloorLocalName || item.FloorName;
-              item.buildName = t.BuildLocalName || t.BuildName;
-              this.floorToMap[item.FloorID] = item;
-              if (item.Count > 0) {
-                t.Count++;
+        this.options = res.content.map(t => {
+          t.value = t.id;
+          t.label = t.localName || t.localId;
+          t.count = 0;
+          if (t.floor) {
+            t.children = t.floor.map(item => {
+              item.value = item.id;
+              item.label = item.localName || item.name;
+              item.buildName = t.localName || t.name;
+              this.floorToMap[item.id] = item;
+              if (item.count > 0) {
+                t.count++;
               }
               return item;
             })
@@ -200,9 +200,9 @@ export default {
       }
       zoneCount(pa, res => {
         if (floor) {
-          this.infectedCurfloor = res.Count
+          this.infectedCurfloor = res.count
         } else {
-          this.infectedTotal = res.Count
+          this.infectedTotal = res.count
         }
       })
     },
@@ -219,8 +219,8 @@ export default {
         pa.FloorId = floorid
       }
       queryAllZoneType(pa, res => {
-        this.tabsList = res.Content.map(t => {
-          if (t.Name == "元空间") {
+        this.tabsList = res.content.map(t => {
+          if (t.name == "元空间") {
             return undefined;
           }
           return t;
@@ -238,7 +238,7 @@ export default {
     // 获取多建筑楼层统计
     getMutiCount() {
       getSpaceBdFlCount({}, res => {
-        this.mutiCount = res.Count;
+        this.mutiCount = res.count;
         if (this.mutiCount > 0) {
           this.getTips();
         }