Browse Source

adm:feat > 修改服务器接口地址

shaun-sheep 4 years ago
parent
commit
9581921f46

+ 1 - 1
src/api/object/equip.js

@@ -17,6 +17,6 @@ export function countEquip(param, success) {
 
 //查询设备关联资产部件数量
 export function getEquipTableCon(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/equip-components`;
+  let url = `${baseUrl}/equip-component4/equip-query/equip-components`;
   http.postJson(url, param, success);
 }

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

@@ -92,13 +92,13 @@ export function businessSpaceAll(param) {
 
 // 项目化字典-统计数量
 export function dictCount(param, success) {
-  let url = '/api/equip-componet4/dict-custom/project-dict-count'
+  let url = '/api/equip-component4/dict-custom/project-dict-count'
   httpUtil.postJson(url, param, success)
 }
 
 // 项目化字典-需补充转换规则数量
 export function dictSwitchCount(param, success) {
-  let url = '/api/equip-componet4/dict-custom/project-dict-switch-count'
+  let url = '/api/equip-component4/dict-custom/project-dict-switch-count'
   httpUtil.postJson(url, param, success)
 }
 
@@ -109,7 +109,7 @@ export function dectInfo(param) {
   let ProjectId = localStorage.getItem("projectId")
   return fetch({
     method: 'POST',
-    url: `/api/equip-componet4/dict-custom/project-dict-info`,
+    url: `/api/equip-component4/dict-custom/project-dict-info`,
     data,
     headers: {'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName}
   })
@@ -117,13 +117,13 @@ export function dectInfo(param) {
 
 //数据中心-物理世界数据转换
 export function dictDataCenter(param, success) {
-  let url = '/api/equip-componet4/dict-custom/project-dict-datacenter4'
+  let url = '/api/equip-component4/dict-custom/project-dict-datacenter4'
   httpUtil.postJson(url, param, success)
 }
 
 //物理世界-数据中心数据转换
 export function dictDataPlatFrom(param, success) {
-  let url = '/api/equip-componet4/dict-custom/project-dict-dataplatfrom'
+  let url = '/api/equip-component4/dict-custom/project-dict-dataplatfrom'
   httpUtil.postJson(url, param, success)
 }
 
@@ -135,7 +135,7 @@ export function createEquip(param, success) {
 
 //更新自定义自定脚本
 export function dictUpdate(param, success) {
-  let url = '/api/equip-componet4/dict-custom/update'
+  let url = '/api/equip-component4/dict-custom/update'
   httpUtil.postJson(url, param, success)
 }
 

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

@@ -156,13 +156,13 @@ export function updateLocationPoint(param, success) {
 
 //根据点位标签推荐业务空间
 export function zoneQueryByPoint(param, success) {
-  let url = `${baseUrl}/equip-componet4/space/in-bdfl-zonespacebase?X=${param.X}&Y=${param.Y}`;
+  let url = `${baseUrl}/equip-component4/space/in-bdfl-zonespacebase?X=${param.X}&Y=${param.Y}`;
   http.postJson(url, param.data, success)
 }
 
 //更新业务空间图片
 export function updateZonePic(param, success) {
-  let url = `${baseUrl}/equip-componet4/space/update-space-picinfo`;
+  let url = `${baseUrl}/equip-component4/space/update-space-picinfo`;
   http.postJson(url, param, success)
 }
 
@@ -918,13 +918,13 @@ export function spaceInShaftUnlink(param, success) {
 
 //查询竖井关联的空间垂直交通关系
 export function shaftVerticalSpace(param, success) {
-  let url = `${baseUrl}/equip-componet4/shaft/shaft-vertical-space`
+  let url = `${baseUrl}/equip-component4/shaft/shaft-vertical-space`
   http.postJson(url, param, success)
 }
 
 //计算和当前竖井有关联的空间的垂直交通关系
 export function verticalSpace(param, success) {
-  let url = `${baseUrl}/equip-componet4/shaft/vertical-space`
+  let url = `${baseUrl}/equip-component4/shaft/vertical-space`
   http.postJson(url, param, success)
 }
 
@@ -1008,8 +1008,8 @@ export function delTnRelateZone(param, success) {
 
 //查询租户关联的业务空间所在的建筑楼层
 export function queryTnRelateFloor(param, success) {
-  // let url = `${baseUrl}/equip-componet4/tenant/tenant-building-floor?objectType=${param.objectType}&tenantId=${param.tenantId}`
-  let url = `${baseUrl}/equip-componet4/tenant/tenant-building-floor`
+  // let url = `${baseUrl}/equip-component4/tenant/tenant-building-floor?objectType=${param.objectType}&tenantId=${param.tenantId}`
+  let url = `${baseUrl}/equip-component4/tenant/tenant-building-floor`
   http.postJson(url, param, success)
 }
 
@@ -1070,67 +1070,67 @@ export function getBasicMatch(param) {
 
 //设备清单-查询设备内容
 export function getEquipTableCon(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/equip-components`;
+  let url = `${baseUrl}/equip-component4/equip-query/equip-components`;
   http.postJson(url, param, success)
 }
 
 //根据模型id查询待删除的设备数量
 // export function getToBeDelEquip(param, success) {
-//   let url = `${baseUrl}/equip-componet4/equip-query/equip-del-com`;
+//   let url = `${baseUrl}/equip-component4/equip-query/equip-del-com`;
 //   let data = param.data;
 //   http.postJson(url, data, success)
 // }
 export function getToBeDelEquip(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/equip-del-com`;
+  let url = `${baseUrl}/equip-component4/equip-query/equip-del-com`;
   let data = param.data;
   http.postJson(url, data, success)
 }
 
 //根据模型id查询待补充的设备数量
 // export function getSupplement(param, success) {
-//   let url = `${baseUrl}/equip-componet4/equip-query/equip-supply`;
+//   let url = `${baseUrl}/equip-component4/equip-query/equip-supply`;
 //   let data = param.data;
 //   http.postJson(url, data, success)
 // }
 export function getSupplement(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/equip-supply`;
+  let url = `${baseUrl}/equip-component4/equip-query/equip-supply`;
   let data = param.data;
   http.postJson(url, data, success)
 }
 
 // 模型质量报告 待删除的设备
 // export function toBeDelEquipPage(params, success) {
-//   let url = `${baseUrl}/equip-componet4/equip-query/equip-comm-del`;
+//   let url = `${baseUrl}/equip-component4/equip-query/equip-comm-del`;
 //   http.postJson(url, params, success)
 // }
 export function toBeDelEquipPage(params, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/equip-comm-del`;
+  let url = `${baseUrl}/equip-component4/equip-query/equip-comm-del`;
   http.postJson(url, params, success)
 }
 
 // 模型质量报告 待补充的设备
 // export function toBeSupplementEquip(params, success) {
-//   let url = `${baseUrl}/equip-componet4/equip-query/property-equip-supp`;
+//   let url = `${baseUrl}/equip-component4/equip-query/property-equip-supp`;
 //   http.postJson(url, params, success)
 // }
 export function toBeSupplementEquip(params, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/property-equip-supp`;
+  let url = `${baseUrl}/equip-component4/equip-query/property-equip-supp`;
   http.postJson(url, params, success)
 }
 
 //设备清单-查询当前设备下的部件分类
 // export function getEquipPartsType(param, success) {
-//   let url = `${baseUrl}/equip-componet4/equip-query/components-count`;
+//   let url = `${baseUrl}/equip-component4/equip-query/components-count`;
 //   http.postJson(url, param, success)
 // }
 export function getEquipPartsType(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/components-count`;
+  let url = `${baseUrl}/equip-component4/equip-query/components-count`;
   http.postJson(url, param, success)
 }
 
 //设备清单-查询当前设备类下的部件分类
 export function getPartsAllType(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/equip-compon`;
+  let url = `${baseUrl}/equip-component4/equip-query/equip-compon`;
   http.getJson(url, param, success)
 }
 
@@ -1144,7 +1144,7 @@ export function getDataDictionary(param, success) {
 //all - 查询数据字典 --列表表头  字典-查询所有字典信息M和L类型,包括自定义信息点
 export function cacheDictionary(param, success) {
   // let url = `${baseUrl}/datacenter4/class-def/query-dict`;
-  let url = `${baseUrl}/equip-componet4/dict/morl/query`;
+  let url = `${baseUrl}/equip-component4/dict/morl/query`;
   http.postJson(url, param, success)
 }
 
@@ -1163,11 +1163,11 @@ export function setDataDictionary(param, success) {
 
 //设备清单 - 根据分类查询部件列表内容
 // export function getEquipPartsCon(param, success) {
-//   let url = `${baseUrl}/equip-componet4/equip-query/components-property`;
+//   let url = `${baseUrl}/equip-component4/equip-query/components-property`;
 //   http.postJson(url, param, success)
 // }
 export function getEquipPartsCon(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/components-property`;
+  let url = `${baseUrl}/equip-component4/equip-query/components-property`;
   http.postJson(url, param, success)
 }
 
@@ -1205,8 +1205,8 @@ export function createEquip(param, success) {
 
 //设备清单 - 创建设备-关联资产-关联系统
 export function createEquipAndProperty(param, success) {
-  // let url = `${baseUrl}/equip-componet4/equip-query/creat-equip-pro`;
-  let url = `${baseUrl}/equip-componet4/equip-query/creat-equip-pro`;
+  // let url = `${baseUrl}/equip-component4/equip-query/creat-equip-pro`;
+  let url = `${baseUrl}/equip-component4/equip-query/creat-equip-pro`;
   http.postJson(url, param, success)
 }
 
@@ -1287,15 +1287,15 @@ export function queryEquip(param, success) {
 // }
 //查询项目下的设备或部件-根据项目、建筑、楼层、设备或部件分类、业务空间实例筛选设备 然后通过计算匹配资产
 export function equipCategoryProperty(param, success) {
-  // let url = `${baseUrl}/equip-componet4/equip-query/equip-category-property?category=${param.category}${param.spaceIdList ? param.spaceIdList : ''}`;
-  let url = `${baseUrl}/equip-componet4/equip-query/equip-category-property?category=${param.category}${param.spaceIdList ? param.spaceIdList : ''}`;
+  // let url = `${baseUrl}/equip-component4/equip-query/equip-category-property?category=${param.category}${param.spaceIdList ? param.spaceIdList : ''}`;
+  let url = `${baseUrl}/equip-component4/equip-query/equip-category-property?category=${param.category}${param.spaceIdList ? param.spaceIdList : ''}`;
   // let data = param.data;
   http.postJson(url, param, success)
 }
 
 //批量添加设备和资产的关系
 export function equipRproperty(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/equip-r-property`;
+  let url = `${baseUrl}/equip-component4/equip-query/equip-r-property`;
   http.postJson(url, param, success)
 }
 
@@ -1324,47 +1324,47 @@ export function queryProperty(param, success) {
 // 修改设备的附件功能
 export function queryUpdate(param, success) {
   // /equip-componnet2/equip-query/update
-  let url = `${baseUrl}/equip-componet4/equip-query/update`;
+  let url = `${baseUrl}/equip-component4/equip-query/update`;
   http.postJson(url, param, success)
 }
 
 // 修改资产的附件功能
 export function propertyUpdate(param, success) {
-  let url = `${baseUrl}/equip-componet4/property/update`;
+  let url = `${baseUrl}/equip-component4/property/update`;
   http.postJson(url, param, success)
 }
 
 //查询资产 同时关联设备信息
 export function propertyLinkEq(param, success) {
-  // let url = `${baseUrl}/equip-componet4/property/property-query`;
-  let url = `${baseUrl}/equip-componet4/property/property-query`;
+  // let url = `${baseUrl}/equip-component4/property/property-query`;
+  let url = `${baseUrl}/equip-component4/property/property-query`;
   http.postJson(url, param, success)
 }
 
 //查询设备或部件
 export function queryPartsDie(param, success) {
-  // let url = `${baseUrl}/equip-componet4/equip-query/pagequery`;
-  let url = `${baseUrl}/equip-componet4/equip-query/pagequery`;
+  // let url = `${baseUrl}/equip-component4/equip-query/pagequery`;
+  let url = `${baseUrl}/equip-component4/equip-query/pagequery`;
   http.postJson(url, param, success)
 }
 
 //查询项目下设备或部件的类别、以及名称
 export function TypePartsDie(success) {
-  // let url = `${baseUrl}/equip-componet4/equip-query/equip-compon-category`;
-  let url = `${baseUrl}/equip-componet4/equip-query/equip-compon-category`;
+  // let url = `${baseUrl}/equip-component4/equip-query/equip-compon-category`;
+  let url = `${baseUrl}/equip-component4/equip-query/equip-compon-category`;
   http.getJson(url, {}, success)
 }
 
 //根据条件查询项目下设备部件数量
 export function countPartsDie(param, success) {
-  // let url = `${baseUrl}/equip-componet4/equip-query/count`;
-  let url = `${baseUrl}/equip-componet4/equip-query/count`;
+  // let url = `${baseUrl}/equip-component4/equip-query/count`;
+  let url = `${baseUrl}/equip-component4/equip-query/count`;
   http.postJson(url, param, success)
 }
 
 //根据设备或部件批量创建资产
 export function createPropertys(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/creat-propertys`;
+  let url = `${baseUrl}/equip-component4/equip-query/creat-propertys`;
   http.postJson(url, param, success)
 }
 
@@ -1414,7 +1414,7 @@ export function createSystemBuildFloor(param, success) {
 
 //查询不在当前系统下的设备
 export function getEquipNotInSys(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/equip-sys?sysId=${param.sysId}`;
+  let url = `${baseUrl}/equip-component4/equip-query/equip-sys?sysId=${param.sysId}`;
   http.postJson(url, param.data, success)
 }
 
@@ -1432,25 +1432,25 @@ export function sysRelateFloor(param, success) {
 
 //查询当前系统下的设备
 export function getEquipInSys(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/sys-equip`;
+  let url = `${baseUrl}/equip-component4/equip-query/sys-equip`;
   http.postJson(url, param, success)
 }
 
 // 统计设备信息点与需采集数据占比
 export function gatherInfoPoint(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/gather-info-point`;
+  let url = `${baseUrl}/equip-component4/equip-query/gather-info-point`;
   http.postJson(url, param, success)
 }
 
 // 统计设备信息点与总数据占比
 export function infoPoint(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/info-point`;
+  let url = `${baseUrl}/equip-component4/equip-query/info-point`;
   http.postJson(url, param, success)
 }
 
 // 统计系统信息点与需采集数据占比
 export function systemInfoPoint(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/system-info-point`;
+  let url = `${baseUrl}/equip-component4/equip-query/system-info-point`;
   http.postJson(url, param, success)
 }
 
@@ -1595,19 +1595,19 @@ export function dynamicRelatedObj(param, success) {
 
 //动态数据关联-带关联实例(设备)
 export function dynamicEquipQuery(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/zone-query`;
+  let url = `${baseUrl}/equip-component4/equip-query/zone-query`;
   http.postJson(url, param, success)
 }
 
 //动态数据关联-带关联实例(部件)
 export function dynamicPartQuery(param, success) {
-  let url = `${baseUrl}/equip-componet4/equip-query/zone-component-query`;
+  let url = `${baseUrl}/equip-component4/equip-query/zone-component-query`;
   http.postJson(url, param, success)
 }
 
 //动态数据关联-带关联实例(租户)
 export function dynamicTenantQuery(param, success) {
-  let url = `${baseUrl}/equip-componet4/tenant/zone-query`;
+  let url = `${baseUrl}/equip-component4/tenant/zone-query`;
   http.postJson(url, param, success)
 }
 
@@ -1631,12 +1631,12 @@ export function floorQuery(param, success) {
 
 //查询楼层信息+sign
 // export function floorQueryAndSign(param, success) {
-//   let url = `${baseUrl}/equip-componet4/floor/query`;
+//   let url = `${baseUrl}/equip-component4/floor/query`;
 //   http.postJson(url, param, success)
 // }
 //查询楼层信息+sign
 export function floorQueryAndSign(param, success) {
-  let url = `${baseUrl}/equip-componet4/floor/query`;
+  let url = `${baseUrl}/equip-component4/floor/query`;
   http.postJson(url, param, success)
 }
 
@@ -1648,12 +1648,12 @@ export function buildingQuery(param, success) {
 
 // //查询建筑信息+count
 // export function buildingQueryAndCount(param, success) {
-//   let url = `${baseUrl}/equip-componet4/building/query`;
+//   let url = `${baseUrl}/equip-component4/building/query`;
 //   http.postJson(url, param, success)
 // }
 //查询建筑信息+count
 export function buildingQueryAndCount(param, success) {
-  let url = `${baseUrl}/equip-componet4/building/query`;
+  let url = `${baseUrl}/equip-component4/building/query`;
   http.postJson(url, param, success)
 }
 
@@ -1866,21 +1866,21 @@ export function unSysZoneSpace(param, success) {
 //查询没有和当前竖井绑定的设备
 export function unshaftInEq(param, success) {
   let data = param.data
-  let url = `${baseUrl}/equip-componet4/shaft/unshaft-in-eq?shaftId=${param.shaftId}`;
+  let url = `${baseUrl}/equip-component4/shaft/unshaft-in-eq?shaftId=${param.shaftId}`;
   http.postJson(url, data, success)
 }
 
 //查询没有和当前竖井贯通的其它竖井
 export function unshaftThroughShaft(param, success) {
   let data = param.data
-  let url = `${baseUrl}/equip-componet4/shaft/unshaft-through-shaft?shaftId=${param.shaftId}`;
+  let url = `${baseUrl}/equip-component4/shaft/unshaft-through-shaft?shaftId=${param.shaftId}`;
   http.postJson(url, data, success)
 }
 
 //查询没有和当前竖井绑定的系统
 export function unshaftInSys(param, success) {
   let data = param.data
-  let url = `${baseUrl}/equip-componet4/shaft/unshaft-in-sys?shaftId=${param.shaftId}`;
+  let url = `${baseUrl}/equip-component4/shaft/unshaft-in-sys?shaftId=${param.shaftId}`;
   http.postJson(url, data, success)
 }
 
@@ -1976,49 +1976,49 @@ export function syInSpaceCreate(param, success) {
 
 //关系-----没有和当前空间绑定的设备
 export function notEqInSpaceQuery(param, success) {
-  let url = `${baseUrl}/equip-componet4/space/unspace-in-eq?type=${param.type}&spaceId=${param.spaceId}`;
+  let url = `${baseUrl}/equip-component4/space/unspace-in-eq?type=${param.type}&spaceId=${param.spaceId}`;
   http.postJson(url, param.data, success)
 }
 
 //关系-----未服务当前空间的设备
 export function notEqForSpaceQuery(param, success) {
-  let url = `${baseUrl}/equip-componet4/space/unspace-for-eq?type=${param.type}&spaceId=${param.spaceId}`;
+  let url = `${baseUrl}/equip-component4/space/unspace-for-eq?type=${param.type}&spaceId=${param.spaceId}`;
   http.postJson(url, param.data, success)
 }
 
 //关系-----没有和当前空间绑定的系统
 export function notSyInSpaceQuery(param, success) {
-  let url = `${baseUrl}/equip-componet4/space/unspace-in-sys?type=${param.type}&spaceId=${param.spaceId}`;
+  let url = `${baseUrl}/equip-component4/space/unspace-in-sys?type=${param.type}&spaceId=${param.spaceId}`;
   http.postJson(url, param.data, success)
 }
 
 //关系-----空间内没有和空间关联的设备 根据坐标计算(专用接口)
 export function getEqNotInSpace(param, success) {
-  let url = `${baseUrl}/equip-componet4/space/unspace-fIn-eq-point?spaceId=${param.spaceId}&type=${param.type}`;
+  let url = `${baseUrl}/equip-component4/space/unspace-fIn-eq-point?spaceId=${param.spaceId}&type=${param.type}`;
   http.postJson(url, param.data, success)
 }
 
 //关系-----空间内没有服务空间的设备 根据坐标计算(专用接口)
 export function getEqNotForSpace(param, success) {
-  let url = `${baseUrl}/equip-componet4/space/unspace-for-eq-point?spaceId=${param.spaceId}&type=${param.type}`;
+  let url = `${baseUrl}/equip-component4/space/unspace-for-eq-point?spaceId=${param.spaceId}&type=${param.type}`;
   http.postJson(url, param.data, success)
 }
 
 //关系-----未关联业务空间的元空间
 export function getIspNotInSpace(param, success) {
-  let url = `${baseUrl}/equip-componet4/space/unspace-ispace?objectType=${param.objectType}`;
+  let url = `${baseUrl}/equip-component4/space/unspace-ispace?objectType=${param.objectType}`;
   http.postJson(url, param.data, success)
 }
 
 //关系-----统计 属于多建筑楼层的空间数据
 export function getSpaceBdFlCount(param, success) {
-  let url = `${baseUrl}/equip-componet4/space/space-bd-fl`;
+  let url = `${baseUrl}/equip-component4/space/space-bd-fl`;
   http.postJson(url, param, success)
 }
 
 //关系-----统计 属于多建筑楼层的空间数据
 export function getSpaceBdFlData(param, success) {
-  let url = `${baseUrl}/equip-componet4/space/space-bd-fl-data`;
+  let url = `${baseUrl}/equip-component4/space/space-bd-fl-data`;
   http.postJson(url, param, success)
 }
 
@@ -2061,13 +2061,13 @@ export function queryLocationPoint(param, success) {
 
 //扫楼作业-信息点整理-资产族及个数
 export function queryPropertyTypeCount(param, success) {
-  let url = `${baseUrl}/equip-componet4/property/property-family`;
+  let url = `${baseUrl}/equip-component4/property/property-family`;
   http.getJson(url, param, success)
 }
 
 //扫楼作业-信息点整理-位置标签及对应资产数量
 export function queryPropertyPoint(param, success) {
-  let url = `${baseUrl}/equip-componet4/point/point-property`;
+  let url = `${baseUrl}/equip-component4/point/point-property`;
   http.getJson(url, param, success)
 }
 
@@ -2244,8 +2244,8 @@ export function notSyncRelationData(param, success) {
 
 // 不能同步到物理世界的对象
 export function notSyncObject(param, success) {
-  // let url = `${baseUrl}/equip-componet4/dict-custom/data-count`
-  let url = `${baseUrl}/equip-componet4/dict/data-count`
+  // let url = `${baseUrl}/equip-component4/dict-custom/data-count`
+  let url = `${baseUrl}/equip-component4/dict/data-count`
   http.postJson(url, param, success)
 }
 

+ 2 - 2
src/components/ledger/handsontables/assets.vue

@@ -451,7 +451,7 @@ export default {
             let cur = tools.dataForKey(item, head.path);
             if (cur) {
               param.data.criterias.push({
-                id: item.EquipID,
+                id: item.id,
                 code: head.code
               });
             }
@@ -462,7 +462,7 @@ export default {
         BeatchQueryParam(param, res => {
           this.tableData = data.map(item => {
             res.Content.map(child => {
-              if (item.EquipID == child.id) {
+              if (item.id == child.id) {
                 if (child.data || child.data == 0) {
                   this.tableHeader.map(head => {
                     if (head.code == child.code) {