Browse Source

adm:feat > datacenter2,equip-componnet2后台字段替换

shaun-sheep 4 years ago
parent
commit
7e6cdb4ff3

+ 5 - 2
config/index.js

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

+ 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}/datacenter/scan-task-base/count`;
+  // let url = `${baseUrl}/datacenter2/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}/datacenter/model-scan-task/create`;
+  let url = `${baseUrl}/datacenter2/model-scan-task/create`;
   http.postJson(url, param, success);
 }
 
 //根据id删除模型任务
 export function deleteModelTask(param, success) {
-  let url = `${baseUrl}/datacenter/model-scan-task/delete`;
+  let url = `${baseUrl}/datacenter2/model-scan-task/delete`;
   http.postJson(url, param, success);
 }
 
 //查询:根据模型空间ID查询设备信息
 export function queryModelDiglog(param, success) {
-  let url = `${baseUrl}/datacenter/model-scan-task/equip-query`;
+  let url = `${baseUrl}/datacenter2/model-scan-task/equip-query`;
   http.postJson(url, param, success);
 }
 
 //查询模型任务
 export function queryModelTask(param, success) {
-  let url = `${baseUrl}/datacenter/model-scan-task/page-query`;
+  let url = `${baseUrl}/datacenter2/model-scan-task/page-query`;
   http.postJson(url, param, success);
 }
 
 //更新模型任务
 export function updateModelTask(param, success) {
-  let url = `${baseUrl}/datacenter/model-scan-task/update`;
+  let url = `${baseUrl}/datacenter2/model-scan-task/update`;
   http.postJson(url, param, success);
 }
 
 //查询设备分类
 export function queryModelCategory(param, success) {
-  let url = `${baseUrl}/datacenter/model-scan-task/model-category-query`;
+  let url = `${baseUrl}/datacenter2/model-scan-task/model-category-query`;
   http.postJson(url, param, success);
 }
 
 //查询模型文件夹和文件
 export function queryModelFile(param, success) {
   //todo
-  let url = `${baseUrl}/datacenter/model-scan-task/model-file-query`;
+  let url = `${baseUrl}/datacenter2/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}/datacenter/model-scan-task/category-count`;
+  let url = `${baseUrl}/datacenter2/model-scan-task/category-count`;
   http.postJson(url, param, success);
 }
 
 /*************************设备台账任务接口****************************/
 //创建设备台账任务
 export function createDeviceTask(param, success) {
-  let url = `${baseUrl}/datacenter/equip-scan-task/create`;
+  let url = `${baseUrl}/datacenter2/equip-scan-task/create`;
   http.postJson(url, param, success);
 }
 
 //根据id删除设备台账任务
 export function deleteDeviceTask(param, success) {
-  let url = `${baseUrl}/datacenter/equip-scan-task/delete`;
+  let url = `${baseUrl}/datacenter2/equip-scan-task/delete`;
   http.postJson(url, param, success);
 }
 
 //查询设备台账任务
 export function queryDeviceTask(param, success) {
-  // let url = `${baseUrl}/datacenter/equip-scan-task/page-query`;
+  // let url = `${baseUrl}/datacenter2/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}/datacenter/equip-scan-task/update`;
+  let url = `${baseUrl}/datacenter2/equip-scan-task/update`;
   http.postJson(url, param, success)
 }
 
 //查询设备分类
 export function queryDeviceCategory(param, success) {
-  // let url = `${baseUrl}/datacenter/equip-scan-task/equip-category-query`;
+  // let url = `${baseUrl}/datacenter2/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}/datacenter/equip-scan-task/category-count`
+  let url = `${baseUrl}/datacenter2/equip-scan-task/category-count`
   http.postJson(url, param, success)
 }
 
 /*************************资产台账任务接口****************************/
 //统计数量
 export function countAssetsTask(param, success) {
-  // let url = `${baseUrl}/datacenter/property-scan-task/count`;
+  // let url = `${baseUrl}/datacenter2/property-scan-task/count`;
   let url = `${scan}/task/property/count`;
   http.postJson(url, param, success)
 }
 
 //创建设备台账任务
 export function createAssetsTask(param, success) {
-  // let url = `${baseUrl}/datacenter/property-scan-task/create`;
+  // let url = `${baseUrl}/datacenter2/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}/datacenter/property-scan-task/page-query`;
+  // let url = `${baseUrl}/datacenter2/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}/datacenter/property-scan-task/property-category-query`;
+  // let url = `${baseUrl}/datacenter2/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}/datacenter/dict/category`;
+  let url = `${baseUrl}/datacenter2/dict/category`;
   http.postJson(url, param, success);
 }
 
 //查询项目下类型的信息点
 export function getDataDictionary(param, success) {
-  let url = `${baseUrl}/datacenter/dict/query`;
+  let url = `${baseUrl}/datacenter2/dict/query`;
   http.postJson(url, param, success);
 }
 
 //批量处理字典信息操作
 export function setInfoPoint(param, success) {
-  let url = `${baseUrl}/datacenter/dict/dict-batch`;
+  let url = `${baseUrl}/datacenter2/dict/dict-batch`;
   http.postJson(url, param, success)
 }
 
 //设置-项目定制化字典
 export function setDataDictionary(param, success) {
-  let url = `${baseUrl}/datacenter/dict/setting-dic-project`;
+  let url = `${baseUrl}/datacenter2/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}/datacenter/object/building/query`;
+  let url = `${baseUrl}/datacenter2/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}/datacenter/object/equip/query`;
+  let url = `${baseUrl}/datacenter2/object/equip/query`;
   http.postJson(url, param, success);
 }
 
 //设备清单 - 统计项目下所有设备数量
 export function countEquip(param, success) {
-  let url = `${baseUrl}/datacenter/object/equip/count`;
+  let url = `${baseUrl}/datacenter2/object/equip/count`;
   http.postJson(url, param, success);
 }
 
 //查询设备关联资产部件数量
 export function getEquipTableCon(param, success) {
-  let url = `${baseUrl}/equip-componnet/equip-query/equip-components`;
+  let url = `${baseUrl}/equip-componet2/equip-query/equip-components`;
   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}/datacenter/object/floor/query`;
+  let url = `${baseUrl}/datacenter2/object/floor/query`;
   http.postJson(url, param, success);
 }
 
 //建筑楼层管理-创建楼层
 export function manageCreateFloor(param, success) {
-  let url = `${baseUrl}/datacenter/object/floor/create`;
+  let url = `${baseUrl}/datacenter2/object/floor/create`;
   http.postJson(url, param, success)
 }
 //建筑楼层管理-修改楼层
 export function manageUpdateFloor(param, success) {
-  let url = `${baseUrl}/datacenter/object/floor/update`;
+  let url = `${baseUrl}/datacenter2/object/floor/update`;
   http.postJson(url, param, success)
 }

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

@@ -5,71 +5,71 @@ import storage from '@/framework/utils/storage'
 
 //查询总览
 export function graphic(param, success) {
-  let url = '/api/datacenter/graphic/overview'
+  let url = '/api/datacenter2/graphic/overview'
   httpUtil.postJson(url, param, success)
 }
 
 // 查询总览数量
 export function graphicNumber(param, success) {
-  let url = '/api/datacenter/graphic/query-count'
+  let url = '/api/datacenter2/graphic/query-count'
   httpUtil.postJson(url, param, success)
 
 }
 
 //导入excel
 export function graphicUpload(param, success) {
-  let url = '/api/datacenter/graphic/import'
+  let url = '/api/datacenter2/graphic/import'
   httpUtil.postJson(url, param, success)
 }
 
 // 下载报告
 export function reportDownload(param, success) {
-  let url = '/api/datacenter/graphic/report-downloads'
+  let url = '/api/datacenter2/graphic/report-downloads'
   httpUtil.getJson(url, param, success)
 }
 
 // 下载模板
 export function templateDownloads(param, success) {
-  let url = '/api/datacenter/graphic/template-downloads'
+  let url = '/api/datacenter2/graphic/template-downloads'
   httpUtil.getJson(url, param, success)
 }
 
 
 //    建筑下的业务空间
 export function buildSpace(param, success) {
-  let url = '/api/datacenter/calc_building/space'
+  let url = '/api/datacenter2/calc_building/space'
   httpUtil.postJson(url, param, success)
 }
 
 
 // 管网系统设备分块 1
 // export function calcSpecial(param, success) {
-//   let url = ` /api/datacenter/calc_special/sys-block?Domain=${param.Domain}&SystemName=${param.SystemName}`
+//   let url = ` /api/datacenter2/calc_special/sys-block?Domain=${param.Domain}&SystemName=${param.SystemName}`
 //   httpUtil.postJson(url, param, success)
 // }
 export function calcSpecial(param, success) {
-  let url = ` /api/datacenter/calc_special/sys-block?relationType=${param.RelationType}`
+  let url = ` /api/datacenter2/calc_special/sys-block?relationType=${param.RelationType}`
   httpUtil.postJson(url, param, success)
 }
 
 
 //    获取源末端 2
 export function blockQuery(param, success) {
-  let url = '/api/datacenter/graphic/connected-block-query'
+  let url = '/api/datacenter2/graphic/connected-block-query'
   httpUtil.postJson(url, param, success)
 }
 
 
 // 覆盖源末端 3
 export function blockSource(param, success) {
-  let url = '/api/datacenter/graphic/replace-connected-block-source'
+  let url = '/api/datacenter2/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/datacenter/calc_special/sys-direction?BlockId=${param.BlockId}&${buildId}Domain=${param.Domain}&SystemName=${param.SystemName}&isSource=${param.isSource}`
+  let url = `/api/datacenter2/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/datacenter/relation-calc/" + relation_type + objectTypes,
+    url: "/api/datacenter2/relation-calc/" + relation_type + objectTypes,
     data: proId,
     headers: {'ProjectId': ProjectId, 'Comming': 'adm', 'Account': userName}
   })
@@ -117,7 +117,7 @@ export function dectInfo(param) {
 
 //数据中心-物理世界数据转换
 export function dictDataCenter(param, success) {
-  let url = '/api/equip-component/dict-custom/project-dict-datacenter'
+  let url = '/api/equip-component/dict-custom/project-dict-datacenter2'
   httpUtil.postJson(url, param, success)
 }
 
@@ -141,7 +141,7 @@ export function dictUpdate(param, success) {
 
 // 查询关系数据
 export function relQuery(param,success) {
-  let url = '/api/datacenter/relation-manual-calc/rel-query'
+  let url = '/api/datacenter2/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/datacenter/relation-manual-calc/rel-add`,
+    url: `/api/datacenter2/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/datacenter/relation-manual-calc/rel-del'
+  let url = '/api/datacenter2/relation-manual-calc/rel-del'
   httpUtil.postJson(url, param, success)
 }
 
 
 // 添加源设备
 export function addSource(param, success) {
-  let url = '/api/datacenter/mep-system-calc/source/add'
+  let url = '/api/datacenter2/mep-system-calc/source/add'
   httpUtil.postJson(url, param, success)
 }
 
 //查看源设备
 export function sourceQuery(param, success) {
-  let url = '/api/datacenter/mep-system-calc/source/query'
+  let url = '/api/datacenter2/mep-system-calc/source/query'
   httpUtil.postJson(url, param, success)
 
 }

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


+ 3 - 3
src/api/topo/index.js

@@ -3,12 +3,12 @@ const baseUrl = '/api';
 
 // 创建拓扑图
 export function topoCreate(param, success) {
-  let url = `${baseUrl}/datacenter/topo/create`;
+  let url = `${baseUrl}/datacenter2/topo/create`;
   httputils.postJson(url, param, success)
 }
 
 // 查询拓扑图
 export function topoQuery(param, success) {
-  let url = `${baseUrl}/datacenter/topo/query?type=${param.type}`;
+  let url = `${baseUrl}/datacenter2/topo/query?type=${param.type}`;
   httputils.postJson(url, param.data||{}, success)
-}
+}

+ 20 - 13
src/components/dialogs/list/systemType.vue

@@ -15,18 +15,21 @@
               </el-select>
             </el-col>
             <el-col :span="14">
-              <el-input placeholder="输入名称或编码进行查询" v-model="search" size="small" style="width:300px; margin-right:10px" clearable></el-input>
+              <el-input placeholder="输入名称或编码进行查询" v-model="search" size="small" style="width:300px; margin-right:10px"
+                        clearable></el-input>
               <el-button size="small" @click="getTableData">查找</el-button>
             </el-col>
           </el-row>
         </div>
-        <el-table class='data-table' border :data="type == 'read'?linkSystemData:tableData" @selection-change="handleSelectionChange" style="width: 100%" ref="multipleTable">
-          <el-table-column v-if="type != 'read' " type="selection" :reserve-selection="true" :disabled="true" width="55"></el-table-column>
+        <el-table class='data-table' border :data="type == 'read'?linkSystemData:tableData"
+                  @selection-change="handleSelectionChange" style="width: 100%" ref="multipleTable">
+          <el-table-column v-if="type != 'read' " type="selection" :reserve-selection="true" :disabled="true"
+                           width="55"></el-table-column>
           <el-table-column label="系统名称" header-align='center'>
-            <template slot-scope="scope">{{scope.row.localName || scope.row.name}}</template>
+            <template slot-scope="scope">{{ scope.row.localName || scope.row.name }}</template>
           </el-table-column>
           <el-table-column label="本地编码" header-align='center'>
-            <template slot-scope="scope">{{scope.row.localId || '--'}}</template>
+            <template slot-scope="scope">{{ scope.row.localId || '--' }}</template>
           </el-table-column>
           <el-table-column label="专业" prop="MajorName" header-align='center'></el-table-column>
           <el-table-column label="详情" header-align='center' width="100" align="center">
@@ -41,8 +44,9 @@
       <el-button type="primary" @click="getChange">确 定</el-button>
     </span>
     <el-dialog title="系统详情" :visible.sync="iframeShow" v-if="iframeShow" width="500px" append-to-body>
-      <iframe id="google_ads_frame2" name="google_ads_frame2" frameborder="0" :src="iframeSrc" marginwidth="0" marginheight="0" vspace="0" hspace="0"
-        style="width:100%;height:500px;" allowtransparency="true" scrolling="no" allowfullscreen="true"></iframe>
+      <iframe id="google_ads_frame2" name="google_ads_frame2" frameborder="0" :src="iframeSrc" marginwidth="0"
+              marginheight="0" vspace="0" hspace="0"
+              style="width:100%;height:500px;" allowtransparency="true" scrolling="no" allowfullscreen="true"></iframe>
     </el-dialog>
   </el-dialog>
 </template>
@@ -51,6 +55,7 @@ import myPagination from "@/components/ledger/lib/myPagination";
 import { queryLinkSys, getSpaceFloor, equipLinkSys } from "@/api/scan/request"
 import tools from "@/utils/scan/tools"
 import { mapGetters } from 'vuex'
+
 export default {
   components: {
     myPagination
@@ -96,7 +101,8 @@ export default {
   computed: {
     ...mapGetters("layout", ["projectId", "secret", "userId"])
   },
-  mounted() { },
+  mounted() {
+  },
   methods: {
     //获取查询条件-建筑
     // getData() { // 物理世界 已无接口
@@ -152,12 +158,12 @@ export default {
     },
     //设置默认
     toggleSelection(rows) {
-      debugger
       this.$refs.multipleTable.clearSelection();
-      if (rows.length&&this.list.length) {
+      if (rows.length && this.list.length) {
+        debugger
         rows.map(row => {
           this.list.map(t => {
-            if(row.SysID == t.SysID){
+            if (row.SysID == t.SysID) {
               this.$refs.multipleTable.toggleRowSelection(row)
             }
           })
@@ -210,7 +216,7 @@ export default {
     },
     //获取关联的系统
     getLinkSystemData() {
-       this.linkSystemData = this.list?JSON.parse(JSON.stringify(this.list)):[]
+      this.linkSystemData = this.list ? JSON.parse(JSON.stringify(this.list)) : []
     },
     //添加设备关联系统关系
     createRelatSys() {
@@ -231,7 +237,7 @@ export default {
   watch: {
     dialog: {
       deep: true,
-      handler () {
+      handler() {
         if (this.dialog.systemType) {
           // this.getData()
           if (this.type == 'read') {
@@ -255,6 +261,7 @@ export default {
 #systemType {
   height: 455px;
   overflow-y: auto;
+
   .el-table thead {
     tr {
       th {

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

@@ -339,34 +339,34 @@ export default {
       //type存在发送请求
       if (!!this.mess.deviceId) {
         let param = {
-          PageSize: this.page.size,
-          Orders: "createTime desc, EquipLocalName desc, EquipLocalID desc, EquipID desc",
-          PageNumber: this.page.currentPage,
-          Filters: `Family='${this.mess.deviceId}'`
+          pageSize: this.page.size,
+          orders: "createTime desc, localName desc, localId desc, id desc",
+          pageNumber: this.page.currentPage,
+          filters: `family='${this.mess.deviceId}'`
         }
         if (this.mess.buildId == "noKnow") {
-          param.Filters += `;buildingId isNull`
+          param.filters += `;buildingId isNull`
         } else if (this.mess.buildId && this.mess.buildId != "all") {
-          param.Filters += `;buildingId='${this.mess.buildId}'`
+          param.filters += `;buildingId='${this.mess.buildId}'`
         }
 
         if (this.mess.floorId == "noKnow") {
-          param.Filters += `;floorId isNull`
+          param.filters += `;floorId isNull`
         } else if (this.mess.floorId && this.mess.floorId != "all") {
-          param.Filters += `;floorId='${this.mess.floorId}'`
+          param.filters += `;floorId='${this.mess.floorId}'`
         }
         propertyLinkEq(param, res => {
           this.loading = false
-          this.tableData = res.Content.map((item) => {
-            if (item.hasOwnProperty("BuildingId") && item.hasOwnProperty("FloorId")) {
-              item.flowBuild = item.BuildingId + "-" + item.FloorId
-            } else if (item.hasOwnProperty("BuildingId") && !item.hasOwnProperty("FloorId")) {
-              item.flowBuild = item.BuildingId
+          this.tableData = res.content.map((item) => {
+            if (item.hasOwnProperty("buildingId") && item.hasOwnProperty("floorId")) {
+              item.flowBuild = item.buildingId + "-" + item.floorId
+            } else if (item.hasOwnProperty("buildingId") && !item.hasOwnProperty("floorId")) {
+              item.flowBuild = item.buildingId
             }
             return item
           })
           this.copyMain = tools.deepCopy(this.tableData)
-          this.page.total = res.Total
+          this.page.total = res.total
           if (this.tableData && this.tableData.length) {
             if (this.onlyRead) {
               this.getBatch(this.tableData)

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

@@ -243,7 +243,7 @@
       <el-upload
           class="upload-demo"
           drag
-          action="/api/datacenter/graphic/import"
+          action="/api/datacenter2/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/datacenter/graphic/export?code=对象ID${relType}${zoneType}`
+          // url = `/api/datacenter2/graphic/export?code=对象ID${relType}${zoneType}`
           if (zoneType) {
-            url = '/api/datacenter/graphic/export?code=对象ID' + relType + zoneType
+            url = '/api/datacenter2/graphic/export?code=对象ID' + relType + zoneType
 
           } else {
-            url = '/api/datacenter/graphic/export?code=对象ID' + relType
+            url = '/api/datacenter2/graphic/export?code=对象ID' + relType
           }
         } else {
-          url = `/api/datacenter/graphic/report-downloads${relType}${zoneType}`
+          url = `/api/datacenter2/graphic/report-downloads${relType}${zoneType}`
         }
         return url
       },
@@ -519,7 +519,7 @@
       },
 
       promptly() {
-    
+
         if (this.isComputed.IsAutomatic && !this.isComputed.IsSource) { //需要自动计算并且不需要配置云末端
           this.$emit('RelationType', this.isComputed.RelationType, this.isComputed.ZoneType)
         }

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

@@ -14,7 +14,7 @@
 
           <a :href="downloadProject('excel')">
 
-            <!--          <a :href=`/api/datacenter/graphic/export?code=对象ID${localStorage.getItem('RelationType')?relType=${localStorage.getItem('RelationType')} : null}${ localStorage.getItem('ZoneType') ? `&zoneType=${localStorage.getItem('ZoneType')}` : null}` >-->
+            <!--          <a :href=`/api/datacenter2/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/datacenter/graphic/import"
+        action="/api/datacenter2/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/datacenter/graphic/export?projectId=${this.projectId}&code=对象ID${relType}${zoneType}`
+          url = `/api/datacenter2/graphic/export?projectId=${this.projectId}&code=对象ID${relType}${zoneType}`
         } else {
-          url = `/api/datacenter/graphic/report-downloads${relType}${zoneType}`
+          url = `/api/datacenter2/graphic/report-downloads${relType}${zoneType}`
         }
         return url
       },

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhangyu
  * @Date: 2019-08-26 15:22:13
- * @Info: 
+ * @Info:
  * @LastEditTime : 2020-01-03 11:38:57
  -->
 <template>
@@ -167,7 +167,7 @@ export default {
         let sub = this.client.subscribe(item, this.onmessage, this.onFailed)
         this.subList.push(sub)
       })
-      // this.client.subscribe(topic, this.onmessage, this.onFailed) 
+      // this.client.subscribe(topic, this.onmessage, this.onFailed)
     },
     //接收到消息的回调
     onmessage(message) {
@@ -204,7 +204,7 @@ export default {
       this.unsubscribe()
     },
     handleClickSendMessage() {//发送消息
-      this.send('/topic/datacenter.broadcast', this.sendMessage)
+      this.send('/topic/datacenter2.broadcast', this.sendMessage)
     },
     allDetails() {
       this.noticeListShow = false;
@@ -425,4 +425,4 @@ export default {
 .info-color {
   color: #909399;
 }
-</style>
+</style>

+ 3 - 0
src/utils/handsontable/notShow.js

@@ -1194,6 +1194,9 @@ const showTools = {
         readOnly: !item.editable
       }
     }
+    if (!item.inputMode){
+      this.$message.error('新版字典不支持')
+    }
 
     if (item.inputMode == "D1" || item.inputMode == "E1" || item.inputMode == "D1L") { //单选输入
       return {

+ 2 - 3
src/views/ledger/facility/addfacility.vue

@@ -252,9 +252,9 @@ export default {
         // 处理建筑-楼层
         if (item.flowBuild) {
           let bid = item.flowBuild.split("-");
-          item.BuildingId = item.flowBuild.split("-")[0]
+          item.buildingId = item.flowBuild.split("-")[0]
           if (bid[1]) {
-            item.FloorId = item.flowBuild.split("-")[1]
+            item.floorId = item.flowBuild.split("-")[1]
           }
         }
         //处理管理的系统
@@ -529,7 +529,6 @@ export default {
       return dataArr || [];
     },
     getInfors(infos, row) {
-      console.log(infos, row, 'getInfos')
       let val = this.tableExample.colToProp(row.col);
       switch (val) {
         //操作

+ 1 - 0
src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -221,6 +221,7 @@ export default {
           if (newData[i].Checked) {//同时创建资产
             param.Content[0].EquipmentId = res.EntityList[0].EquipID
             await createPropertyData(param, res => {
+              // todo 创建资产
             })
           }
           if (i == newData.length - 1) {

+ 34 - 35
src/views/ledger/property/addproperty.vue

@@ -165,8 +165,8 @@ export default {
       }
       let flag = false;
       newData.map(item => {
-        item.Family = this.category.Family
-        if (!item.EquipLocalName) {
+        item.family = this.category.Family
+        if (!item.localName) {
           flag = true
         }
         // 处理建筑-楼层
@@ -174,20 +174,19 @@ export default {
           let BuildingId = item.flowBuild.split("-")[0]
           let FloorId = item.flowBuild.split("-")[1]
           if (BuildingId && FloorId) {
-            item.BuildingId = BuildingId
-            item.FloorId = FloorId
+            item.buildingId = BuildingId
+            item.gloorId = FloorId
           } else if (BuildingId && !FloorId) {
-            item.BuildingId = BuildingId
+            item.buildingId = BuildingId
           }
         }
       })
       // 添加资产
       if (flag) {
-        debugger
         this.$message.info("存在设备的本地名称为空,请检查")
         return;
       }
-      params.Content = newData
+      params.content = newData
       await createPropertyData(params, res => {
         this.$message.success("添加成功!")
         session.remove("propertyAddData")
@@ -296,28 +295,28 @@ export default {
       tools.setDataForKey(this.tableData[this.row], "DPManufacturerID", data.venderId)//生产商ID
       tools.setDataForKey(this.tableData[this.row], "DPBrandID", data.brandId)//品牌ID
       tools.setDataForKey(this.tableData[this.row], "DPSpecificationID", data.specificationId)//型号ID
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Manufacturer", data.venderName)
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Brand", data.brandName)
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Specification", data.name)
+      tools.setDataForKey(this.tableData[this.row], "infos.manufacturer", data.venderName)
+      tools.setDataForKey(this.tableData[this.row], "infos.brand", data.brandName)
+      tools.setDataForKey(this.tableData[this.row], "infos.specification", data.name)
     },
     supplyChange(data) {
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.SupplierContractID", { id: data })
+      tools.setDataForKey(this.tableData[this.row], "infos.supplierContractID", { id: data })
     },
     //如果选择供应商之后
     supplierChange(data) {
+      tools.setDataForKey(this.tableData[this.row], "infos.supplier", data.name)
       tools.setDataForKey(this.tableData[this.row], "DPSupplierID", data.venderId)
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.Supplier", data.name)
     },
     //保险合同
     guaranteeChange(data) {
       for (let key in data) {
-        this.utilToKey(key, "insuranceNo", data, "InsuranceNum");
+        this.utilToKey(key, "insuranceNo", data, "insuranceNum");
         if (key == "contractFile") {
           if (!!data[key]) {
             data[key] = [data[key]];
           }
         }
-        this.utilToKey(key, "contractFile", data, "InsuranceFile");
+        this.utilToKey(key, "contractFile", data, "insuranceFile");
       }
     },
     //上传文件弹窗触发事件
@@ -330,12 +329,12 @@ export default {
     },
     //维修商变更
     changeMaintainer(data) {
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.OperationMainte.Maintainer", data.name)
+      tools.setDataForKey(this.tableData[this.row], "infos.maintainer", data.name)
       tools.setDataForKey(this.tableData[this.row], "DPMaintainerID", data.venderId)
     },
     //保险商变更
     changeInsurer(data) {
-      tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.Insurer", data.name)
+      tools.setDataForKey(this.tableData[this.row], "infos.insurer", data.name)
       tools.setDataForKey(this.tableData[this.row], "DPInsurerID", data.venderId)
     },
     //设备图片弹窗改变事件
@@ -414,7 +413,7 @@ export default {
           }
           break;
         //供应合同编号
-        case 'LedgerParam.SupplyPurchase.SupplierContractID':
+        case 'infos.supplierContractID':
           if (!this.onlyRead) {
             let ContractIDflag = null;
             let DPSdata = this.tableData[row.row].DPSupplierID;
@@ -430,7 +429,7 @@ export default {
           }
           break;
         //保险单号
-        case 'LedgerParam.InsuranceDoc.InsuranceNum':
+        case 'infos.insuranceNum':
           if (!this.onlyRead) {
             let DPInsurerIDflag = null;
             let DPIdata = this.tableData[row.row].DPInsurerID;
@@ -446,33 +445,33 @@ export default {
           }
           break;
         //保险文件--设备文档--安装质检报告
-        case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
-        case 'LedgerParam.PhotoDoc.Archive': //设备文档
-        case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
-        case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
-        case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
-        case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
-        case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
-        case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
-        case 'LedgerParam.EquipManufactor.TestReport': //检测报告
-        case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
-        case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
-        case 'LedgerParam.SupplyPurchase.SupplierContract': //供应合同
-        case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
-        case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
+        case 'infos.insuranceFile': //保险文件
+        case 'infos.archive': //设备文档
+        case 'infos.checkReport': //安装质检报告
+        case 'infos.maintainManual': //维修保养手册
+        case 'infos.approachingAcceptance': //进场验收单
+        case 'infos.acceptanceReport': //验收报告
+        case 'infos.operationManual': //操作说明书
+        case 'infos.originalCertificate': //原厂证明
+        case 'infos.testReport': //检测报告
+        case 'infos.productCertification': //产品合格证
+        case 'infos.installInstruction': //安装说明书
+        case 'infos.supplierContract': //供应合同
+        case 'infos.drawing': //设备图纸
+        case 'infos.installDrawing': //安装图纸
           let IPSdata = tools.dataForKey(this.tableData[row.row], val);
           this.filesArr = IPSdata ? IPSdata : [];
           this.myDialog.uploadFiles = true;
           break;
         //安装照片--设备铭牌照片
-        case 'LedgerParam.Siteinstall.InstallPic':
-        case 'LedgerParam.PhotoDoc.Nameplate':
+        case 'infos.installPic':
+        case 'infos.nameplate':
           let SSPPdata = tools.dataForKey(this.tableData[row.row], val);
           this.imgsArr = SSPPdata ? SSPPdata : [];
           this.myDialog.uploadImgs = true;
           break;
         //设备照片
-        case 'LedgerParam.PhotoDoc.Pic':
+        case 'infos.pic':
           let Pdata = tools.dataForKey(this.tableData[row.row], val);
           this.picsArr = Pdata ? Pdata : [];
           this.myDialog.pic = true;

+ 4 - 5
src/views/ledger/system/addsystem.vue

@@ -185,18 +185,17 @@ export default {
       }
       let flag = false;
       newData.map(item => {
-        if (!item.SysLocalName) {
+        if (!item.localName) {
           flag = true;
         }
-        item.Category = this.category.Category
+        item.classCode = this.category.Category
       })
       if (flag) {
         this.$message.info("存在系统的本地名称为空,请检查")
         return;
       }
-      params.Content = newData
-      console.log(params)
-      // return
+      params.content = newData
+
       createSystemBuildFloor(params, res => {
         this.$message.success('创建成功')
         session.remove("systemAddData")