Browse Source

整合,采用传入的更改

LXXXY 5 years ago
parent
commit
fa49a92197
1 changed files with 0 additions and 64 deletions
  1. 0 64
      src/api/scan/request.js

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

@@ -1474,69 +1474,6 @@ export function groupCreRelaZoneAndISp(param, success) {
     let url = `${baseUrl}/datacenter/si-in-sp-base/link-list?type=${param.type}`;
     http.postJson(url, param.data, success)
 }
-<<<<<<< HEAD
-//关系-----业务空间所属建筑楼层修改
-export function updateRelateInSpAndBuild(param, success) {
-    let url = `${baseUrl}/datacenter/update-relationship/update-sp`;
-    http.postJson(url, param, success)
-}
-
-/**系统集成成果管理 */
-//系统集成统计条形图
-export function getIntegrateStatisticsToBar(param, success) {
-    let url = `/pointconfig/report/point-statis    `
-    http.postJson(url, param, success)
-}
-//系统集成统计环形图
-export function getIntegrateStatisticsToLoop(param, success) {
-    let url = `/pointconfig/report/meterfunc-statis`
-    http.postJson(url, param, success)
-}
-//表号功能号总览
-export function getTabFunNumOverview(param, success) {
-    let url = `/pointconfig/report/meterfunc-overview`
-    http.postJson(url, param, success)
-}
-//表号功能号对应历史数据
-export function getHistoryData(query, param, success) {
-    let url = `/data-platform-3/hisdata/batch_query_period_data_by_metfun`
-    url += `?projectId=${query.projectId}&secret=${query.secret}`
-    fetch({ url: url, method: 'post', data: param, headers: { 'ProjectId': query.projectId, 'Comming': 'adm', 'Account': query.userInfo.username } }).then((response) => {
-        success(response.data);
-    }).catch(error => {
-        console.error(error);
-    });
-}
-//获取表号功能号的源数据
-export function getTabFunNumSourceData(param, success) {
-    let url = `/pointconfig/report/query-point`
-    http.postJson(url, param, success)
-}
-//获取表号功能号对应的对象实例
-export function getTabFunNumObjInstance(param, success) {
-    let url = `/pointconfig/report/query-instance`
-    http.postJson(url, param, success)
-}
-//添加表号功能号
-export function addTabFunNum(param, success) {
-    let url = `/pointconfig/report/custom-meter-func`
-    http.postJson(url, param, success)
-}
-//表号功能号对应总览
-export function tableFuncRelatedOverview(param, success) {
-    let url = `/pointconfig/report/meter-related`
-    http.postJson(url, param, success)
-}
-//实例中查询设备信息
-export function getEquipByEqID(param, success) {
-    let url = `${baseUrl}/datacenter/equip/query`
-    http.postJson(url, param, success)
-}
-//获取楼层信息
-export function getFloorMsgByFloorID(param, success) {
-    let url = `${baseUrl}/datacenter/floor/query`
-    http.postJson(url, param, success)
-=======
 //扫楼作业-扫楼日志查看
 export function queryUserLog(param, success) {
     let url = `${baseUrl}/scanbuilding-2/user-log/query`;
@@ -1570,5 +1507,4 @@ export function queryPropertyTypeCount(param, success) {
 export function queryPropertyPoint(param, success) {
     let url = `${baseUrl}/equip-component/point/point-property`;
     http.getJson(url, param, success)
->>>>>>> 2098857d48253e551fdc444edf39d3fa5a9fd69c
 }