Переглянути джерело

adm:feat > 修改服务器接口地址,更改接口字段

shaun-sheep 4 роки тому
батько
коміт
7498084dd9

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

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

+ 4 - 4
src/api/dict/index.js

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

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

@@ -5,7 +5,7 @@ import storage from "@/framework/utils/storage";
 
 //查询建筑信息
 export function buildingQuery(param, success) {
-  let url = `${baseUrl}/datacenter2/object/building/query`;
+  let url = `${baseUrl}/datacenter4/object/building/query`;
   http.postJson(url, param, success);
 }
 

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

@@ -5,18 +5,18 @@ import storage from "@/framework/utils/storage";
 
 //设备清单 - 查询设备信息
 export function queryEquip(param, success) {
-  let url = `${baseUrl}/datacenter2/object/equip/query`;
+  let url = `${baseUrl}/datacenter4/object/equip/query`;
   http.postJson(url, param, success);
 }
 
 //设备清单 - 统计项目下所有设备数量
 export function countEquip(param, success) {
-  let url = `${baseUrl}/datacenter2/object/equip/count`;
+  let url = `${baseUrl}/datacenter4/object/equip/count`;
   http.postJson(url, param, success);
 }
 
 //查询设备关联资产部件数量
 export function getEquipTableCon(param, success) {
-  let url = `${baseUrl}/equip-componet2/equip-query/equip-components`;
+  let url = `${baseUrl}/equip-componet4/equip-query/equip-componet4s`;
   http.postJson(url, param, success);
 }

+ 3 - 3
src/api/object/floor.js

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

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

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

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

@@ -6,7 +6,7 @@ export const sass = 'sass';
 export const physics = '/data-platform-3';
 export const business = '/business-space'
 export const venders = '/venders'
-export const dataCenter = '/datacenter2/object'
+export const dataCenter = '/datacenter4/object'
 export const zone = {
   GeneralZone: 'zone-general', //默认分区
   PowerSupplyZone: 'zone-power-supply', //供电分区

Різницю між файлами не показано, бо вона завелика
+ 222 - 222
src/api/scan/request.js


+ 2 - 2
src/components/dialogs/list/batchDialog.vue

@@ -317,8 +317,8 @@ export default {
       // DPSupplierID 供应商 DPManufacturerID 生产商 DPBrandID 品牌
       // DPSpecificationID 型号 DPInsurerID 保险商 DPMaintainerID 维修商
       this.multipleSelection.forEach(item => {
-        let id = item.id
-        arr.push({ id })
+        let equipId = item.id
+        arr.push({ equipId })
       })
 
       let Id = {}

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

@@ -1409,7 +1409,7 @@ export default {
       } else if (type === 'multiple') {
         let nArr = [];
         arr.content.forEach(i => {
-          let { id, ...value } = i
+          let { equipId, ...value } = i
           nArr.push({ infos: value })
         })
         for (let j of nArr) {

+ 1 - 1
src/components/ledger/handsontables/device.vue

@@ -1810,7 +1810,7 @@ export default {
       } else if (type === "multiple") {
         let nArr = [];
         arr.content.forEach(i => {
-          let { id, ...value } = i;
+          let { equipId, ...value } = i;
           nArr.push({ infos: value });
         });
         for (let j of nArr) {

+ 1 - 1
src/components/ledger/system/dialog/addEquipDialog.vue

@@ -161,7 +161,7 @@ export default {
     savaRelation() {
       if (this.selections.length) {
         let params = {
-          id: this.$route.query.SysID,
+          sysId: this.$route.query.SysID,
           equipIdList: this.selections.map(item => {
             return item.id;
           })

+ 1 - 1
src/components/ledger/system/dialog/addSpaceDialog.vue

@@ -147,7 +147,7 @@ export default {
         params.data.filters += `;objectType='${this.Spacecategory}'`;
       }
       if (this.keycode != "") {
-        params.data.filters += `;roomName contain '${this.keycode}' or roomLocalName contain '${this.keycode}'`;
+        params.data.filters += `;name contain '${this.keycode}' or localName contain '${this.keycode}'`;
       }
 
       unSysZoneSpace(params, res => {

+ 1 - 1
src/components/ledger/tableTransfers.vue

@@ -301,7 +301,7 @@ export default {
     //更新设备 系统关系
     relationChange(arr) {
       let param = {
-        id: this.id,
+        sysId: this.id,
         equipIdList: arr
       }
       sysLinkEquip(param, res => {

+ 5 - 5
src/components/relation/overview/Modal/RelationMaintain.vue

@@ -243,7 +243,7 @@
       <el-upload
           class="upload-demo"
           drag
-          action="/api/datacenter2/graphic/import"
+          action="/api/datacenter4/graphic/import"
           multiple
           :show-file-list='false'
           name="file"
@@ -485,15 +485,15 @@
         let url;
         if (str === 'excel') {
           relType = this.ManualMaintenance.RelationType ? `&relType=${this.ManualMaintenance.RelationType}` : ''
-          // url = `/api/datacenter2/graphic/export?code=对象ID${relType}${zoneType}`
+          // url = `/api/datacenter4/graphic/export?code=对象ID${relType}${zoneType}`
           if (zoneType) {
-            url = '/api/datacenter2/graphic/export?code=对象ID' + relType + zoneType
+            url = '/api/datacenter4/graphic/export?code=对象ID' + relType + zoneType
 
           } else {
-            url = '/api/datacenter2/graphic/export?code=对象ID' + relType
+            url = '/api/datacenter4/graphic/export?code=对象ID' + relType
           }
         } else {
-          url = `/api/datacenter2/graphic/report-downloads${relType}${zoneType}`
+          url = `/api/datacenter4/graphic/report-downloads${relType}${zoneType}`
         }
         return url
       },

+ 4 - 4
src/components/relation/relationShip/Modal/exportExcel.vue

@@ -14,7 +14,7 @@
 
           <a :href="downloadProject('excel')">
 
-            <!--          <a :href=`/api/datacenter2/graphic/export?code=对象ID${localStorage.getItem('RelationType')?relType=${localStorage.getItem('RelationType')} : null}${ localStorage.getItem('ZoneType') ? `&zoneType=${localStorage.getItem('ZoneType')}` : null}` >-->
+            <!--          <a :href=`/api/datacenter4/graphic/export?code=对象ID${localStorage.getItem('RelationType')?relType=${localStorage.getItem('RelationType')} : null}${ localStorage.getItem('ZoneType') ? `&zoneType=${localStorage.getItem('ZoneType')}` : null}` >-->
             <el-button
               type="primary"
               class="mt-10"
@@ -30,7 +30,7 @@
       <el-upload
         class="upload-demo"
         :drag="true"
-        action="/api/datacenter2/graphic/import"
+        action="/api/datacenter4/graphic/import"
         multiple
         :show-file-list='false'
         name="file"
@@ -137,9 +137,9 @@
         let url;
         if (str === 'excel') {
           relType = localStorage.getItem('RelationType') ? `&relType=${localStorage.getItem('RelationType')}` : '';
-          url = `/api/datacenter2/graphic/export?projectId=${this.projectId}&code=对象ID${relType}${zoneType}`
+          url = `/api/datacenter4/graphic/export?projectId=${this.projectId}&code=对象ID${relType}${zoneType}`
         } else {
-          url = `/api/datacenter2/graphic/report-downloads${relType}${zoneType}`
+          url = `/api/datacenter4/graphic/report-downloads${relType}${zoneType}`
         }
         return url
       },

+ 1 - 1
src/framework/components/messagesever/index.vue

@@ -204,7 +204,7 @@ export default {
       this.unsubscribe()
     },
     handleClickSendMessage() {//发送消息
-      this.send('/topic/datacenter2.broadcast', this.sendMessage)
+      this.send('/topic/datacenter4.broadcast', this.sendMessage)
     },
     allDetails() {
       this.noticeListShow = false;