Browse Source

adm:fix> 新版数据字典-建筑楼层管理,模型管理接口替换

shaun-sheep 4 years ago
parent
commit
3beef2b596
30 changed files with 719 additions and 602 deletions
  1. 2 3
      config/index.js
  2. 2 1
      src/api/object/build.js
  3. 12 1
      src/api/object/floor.js
  4. 54 14
      src/api/scan/request.js
  5. 4 2
      src/components/business_space/newGraphy/unRelateBSP.vue
  6. 3 1
      src/components/ledger/lib/buildfloorCascader.vue
  7. 5 2
      src/components/ledger/lib/noAllDataFloor.vue
  8. 4 2
      src/components/ledger/rentList/roomCountDrawer.vue
  9. 3 1
      src/components/point/dynamicdata/buildRules.vue
  10. 3 2
      src/components/point/dynamicdata/delRelationDialog.vue
  11. 3 1
      src/components/point/dynamicdata/locationCascader.vue
  12. 3 2
      src/components/point/report/objectInstance.vue
  13. 3 3
      src/components/ready/buildfloor/addConnectivity.vue
  14. 28 22
      src/components/ready/buildfloor/buildfloorCascader.vue
  15. 117 117
      src/components/ready/buildfloor/formItems.vue
  16. 3 2
      src/views/business_space/dataUtil/index.vue
  17. 7 1
      src/views/data_admin/buildAssets/index.vue
  18. 4 2
      src/views/data_admin/buildData/index-2.vue
  19. 4 2
      src/views/data_admin/buildData/index.vue
  20. 2 1
      src/views/data_admin/buildGraphy/index.vue
  21. 8 1
      src/views/ledger/cenotelist/relatedSpace.vue
  22. 43 34
      src/views/ledger/facility/parts/index.vue
  23. 8 8
      src/views/ledger/facility/partsmanage/index.vue
  24. 9 2
      src/views/ledger/rentlist/manageTenantZone.vue
  25. 2 2
      src/views/ledger/system/addsystem.vue
  26. 2 2
      src/views/ledger/system/systemDetail/index.vue
  27. 2 1
      src/views/point/dynamicdata/addRelation/buildRela/index.vue
  28. 1 1
      src/views/ready/buildfloor/addFloor/index.vue
  29. 374 366
      src/views/ready/buildfloor/index.vue
  30. 4 3
      src/views/relation/overview/detail/index.vue

+ 2 - 3
config/index.js

@@ -210,7 +210,6 @@ module.exports = {
         }
       },
       '/api': {
-        // target: 'http://api.sagacloud.cn/',
         target: 'http://60.205.177.43:8080',
         changeOrigin: true,
         pathRewrite: {
@@ -292,11 +291,11 @@ module.exports = {
       },
       '/modelapi': {
         // target: 'http://172.16.42.210:8082',
-        target: 'http://mbi.sagacloud.cn:8080',
+        target: 'http://mbi.sagacloud.cn:8080/',
         // target: 'http://192.168.20.218:8082',//景灏
         changeOrigin: true,
         pathRewrite: {
-          "^/modelapi": "/"
+          "^/modelapi": "/revit-algorithm/"
         }
       },
       '/schedulerapi': {

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

@@ -1,5 +1,5 @@
 import fetch from "@/api/scan/fetch";
-import { baseUrl } from "@/api/scan/config";
+import {baseUrl} from "@/api/scan/config";
 import http from "@/api/scan/httpUtil";
 import storage from "@/framework/utils/storage";
 
@@ -8,3 +8,4 @@ export function buildingQuery(param, success) {
   let url = `${baseUrl}/datacenter/object/building/query`;
   http.postJson(url, param, success);
 }
+

+ 12 - 1
src/api/object/floor.js

@@ -7,4 +7,15 @@ import storage from "@/framework/utils/storage";
 export function floorQuery(param, success) {
   let url = `${baseUrl}/datacenter/object/floor/query`;
   http.postJson(url, param, success);
-}
+}
+
+//建筑楼层管理-创建楼层
+export function manageCreateFloor(param, success) {
+  let url = `${baseUrl}/datacenter/object/floor/create`;
+  http.postJson(url, param, success)
+}
+//建筑楼层管理-修改楼层
+export function manageUpdateFloor(param, success) {
+  let url = `${baseUrl}/datacenter/object/floor/update`;
+  http.postJson(url, param, success)
+}

+ 54 - 14
src/api/scan/request.js

@@ -1069,44 +1069,66 @@ export function getEquipTableCon(param, success) {
 }
 
 //根据模型id查询待删除的设备数量
+// export function getToBeDelEquip(param, success) {
+//   let url = `${baseUrl}/equip-component/equip-query/equip-del-com`;
+//   let data = param.data;
+//   http.postJson(url, data, success)
+// }
 export function getToBeDelEquip(param, success) {
-  let url = `${baseUrl}/equip-component/equip-query/equip-del-com`;
+  let url = `${baseUrl}/equip-componnet/equip-query/equip-del-com`;
   let data = param.data;
   http.postJson(url, data, success)
 }
 
 //根据模型id查询待补充的设备数量
+// export function getSupplement(param, success) {
+//   let url = `${baseUrl}/equip-component/equip-query/equip-supply`;
+//   let data = param.data;
+//   http.postJson(url, data, success)
+// }
 export function getSupplement(param, success) {
-  let url = `${baseUrl}/equip-component/equip-query/equip-supply`;
+  let url = `${baseUrl}/equip-componnet/equip-query/equip-supply`;
   let data = param.data;
   http.postJson(url, data, success)
 }
 
 // 模型质量报告 待删除的设备
+// export function toBeDelEquipPage(params, success) {
+//   let url = `${baseUrl}/equip-component/equip-query/equip-comm-del`;
+//   http.postJson(url, params, success)
+// }
 export function toBeDelEquipPage(params, success) {
-  let url = `${baseUrl}/equip-component/equip-query/equip-comm-del`;
+  let url = `${baseUrl}/equip-componnet/equip-query/equip-comm-del`;
   http.postJson(url, params, success)
 }
 
 // 模型质量报告 待补充的设备
+// export function toBeSupplementEquip(params, success) {
+//   let url = `${baseUrl}/equip-component/equip-query/property-equip-supp`;
+//   http.postJson(url, params, success)
+// }
 export function toBeSupplementEquip(params, success) {
-  let url = `${baseUrl}/equip-component/equip-query/property-equip-supp`;
+  let url = `${baseUrl}/equip-componnet/equip-query/property-equip-supp`;
   http.postJson(url, params, success)
 }
 
 //设备清单-查询当前设备下的部件分类
+// export function getEquipPartsType(param, success) {
+//   let url = `${baseUrl}/equip-component/equip-query/components-count`;
+//   http.postJson(url, param, success)
+// }
 export function getEquipPartsType(param, success) {
-  let url = `${baseUrl}/equip-component/equip-query/components-count`;
+  let url = `${baseUrl}/equip-componnet/equip-query/components-count`;
   http.postJson(url, param, success)
 }
 
 //设备清单-查询当前设备类下的部件分类
 export function getPartsAllType(param, success) {
-  let url = `${baseUrl}/equip-component/equip-query/equip-compon`;
+  let url = `${baseUrl}/equip-componnet/equip-query/equip-compon`;
   http.getJson(url, param, success)
 }
 
-//all - 查询数据字典 --列表表头
+//all - 查询数据字典 --列表表头 api/dict
 export function getDataDictionary(param, success) {
   let url = `${baseUrl}/datacenter/data-dictionary/project/query?type=${param.type}`;
   let data = param.data
@@ -1119,21 +1141,25 @@ export function cacheDictionary(param, success) {
   http.postJson(url, param, success)
 }
 
-//批量处理字典信息操作
+//批量处理字典信息操作 api/dict
 export function setInfoPoint(param, success) {
   let url = `${baseUrl}/datacenter/data-dictionary/project/dict-batch`;
   http.postJson(url, param, success)
 }
 
-//设置项目数据字典显隐 --列表表头
+//设置项目数据字典显隐 --列表表头 api/dict
 export function setDataDictionary(param, success) {
   let url = `${baseUrl}/datacenter/data-dictionary/project/setting-dic-project`;
   http.postJson(url, param, success)
 }
 
 //设备清单 - 根据分类查询部件列表内容
+// export function getEquipPartsCon(param, success) {
+//   let url = `${baseUrl}/equip-component/equip-query/components-property`;
+//   http.postJson(url, param, success)
+// }
 export function getEquipPartsCon(param, success) {
-  let url = `${baseUrl}/equip-component/equip-query/components-property`;
+  let url = `${baseUrl}/equip-componnet/equip-query/components-property`;
   http.postJson(url, param, success)
 }
 
@@ -1579,8 +1605,13 @@ export function floorQuery(param, success) {
 }
 
 //查询楼层信息+sign
+// export function floorQueryAndSign(param, success) {
+//   let url = `${baseUrl}/equip-component/floor/query`;
+//   http.postJson(url, param, success)
+// }
+//查询楼层信息+sign
 export function floorQueryAndSign(param, success) {
-  let url = `${baseUrl}/equip-component/floor/query`;
+  let url = `${baseUrl}/equip-componnet/floor/query`;
   http.postJson(url, param, success)
 }
 
@@ -1590,9 +1621,14 @@ export function buildingQuery(param, success) {
   http.postJson(url, param, success)
 }
 
+// //查询建筑信息+count
+// export function buildingQueryAndCount(param, success) {
+//   let url = `${baseUrl}/equip-component/building/query`;
+//   http.postJson(url, param, success)
+// }
 //查询建筑信息+count
 export function buildingQueryAndCount(param, success) {
-  let url = `${baseUrl}/equip-component/building/query`;
+  let url = `${baseUrl}/equip-componnet/building/query`;
   http.postJson(url, param, success)
 }
 
@@ -1716,8 +1752,12 @@ export function manageUpdateFloor(param, success) {
 }
 
 //建筑楼层管理-创建楼层关联关系
+// export function createRelationInFloor(param, success) {
+//   let url = `${baseUrl}/datacenter/fl-through-fl/link-or`;
+//   http.postJson(url, param, success)
+// }
 export function createRelationInFloor(param, success) {
-  let url = `${baseUrl}/datacenter/fl-through-fl/link-or`;
+  let url = `${baseUrl}/datacenter/rel/fl-through-fl/link-fl`;
   http.postJson(url, param, success)
 }
 
@@ -2278,4 +2318,4 @@ export function objectDeleteBuild(param, success) {
 export function problemQuery(param, success) {
   let url = `${baseUrl}/datacenter/problems/query`
   http.postJson(url, param, success)
-}
+}

+ 4 - 2
src/components/business_space/newGraphy/unRelateBSP.vue

@@ -38,9 +38,11 @@
 
 <script>
 import {
-  buildingQuery,
+  // buildingQuery,
   zoneQuery
 } from "@/api/scan/request"
+import { buildingQuery } from '@/api/object/build';
+
 export default {
   name: "unRelateBSP",
   data() {
@@ -176,4 +178,4 @@ export default {
     height: 350px;
   }
 }
-</style>
+</style>

+ 3 - 1
src/components/ledger/lib/buildfloorCascader.vue

@@ -2,7 +2,9 @@
   <el-cascader v-model="value" :options="options" :props="props" clearable ref="elCascader" @remove-tag="removeTag"></el-cascader>
 </template>
 <script>
-import { buildingQuery } from "@/api/scan/request";
+// import { buildingQuery } from "@/api/scan/request";
+import { buildingQuery } from '@/api/object/build';
+
 export default {
   data() {
     return {

+ 5 - 2
src/components/ledger/lib/noAllDataFloor.vue

@@ -6,7 +6,10 @@
 </template>
 <script>
     import tools from "@/utils/scan/tools"
-    import { floorQuery, buildingQuery } from '@/api/scan/request'
+    // import { floorQuery, buildingQuery } from '@/api/scan/request'
+    import { buildingQuery } from '@/api/object/build'
+    import { floorQuery } from '@/api/object/floor'
+
     import { mapGetters, mapActions } from "vuex"
     export default {
         props: {
@@ -98,7 +101,7 @@
                     data.forEach(build => {
                         floorData.forEach(floor => {
                             this.floorToMap[floor.FloorID] = floor;
-                            if (build.value == floor.BuildID && floor.FloorID && floor.FloorLocalName && this.type == "yes") {   
+                            if (build.value == floor.BuildID && floor.FloorID && floor.FloorLocalName && this.type == "yes") {
                                 if (build.children) {
                                     build.children.push({
                                         value: floor.FloorID,

+ 4 - 2
src/components/ledger/rentList/roomCountDrawer.vue

@@ -51,9 +51,11 @@ import {
   tnRelateGeneralZone, //关联默认空间
   tnRelateOneZone,// 关联业务空间
   delTnRelateZone, // 删除关系业务空间与租户
-  buildingQuery, //建筑查询
+  // buildingQuery, //建筑查询
   queryParentZone, //业务空间查询GeneralZone-TenantZone
 } from '@/api/scan/request'
+import { buildingQuery } from '@/api/object/build'
+
 import { mapGetters } from "vuex";
 export default {
   data() {
@@ -335,4 +337,4 @@ export default {
     text-align: right;
   }
 }
-</style>
+</style>

+ 3 - 1
src/components/point/dynamicdata/buildRules.vue

@@ -107,8 +107,10 @@ import {
   dynamicQuery,
   dynamicQueryPoint,
   dynamicPointTypeList,
-  buildingQuery, //数据中心建筑查询
+  // buildingQuery, //数据中心建筑查询
 } from "@/api/scan/request";
+import { buildingQuery } from '@/api/object/build'
+
 export default {
   computed: {
     ...mapGetters("layout", ["projectId"])

+ 3 - 2
src/components/point/dynamicdata/delRelationDialog.vue

@@ -81,13 +81,14 @@ import {
   dynamicQueryPrompt,
   queryEquip, //数据中心设备查询
   floorQuery, //数据中心查询楼层
-  buildingQuery, //数据中心建筑查询
   projectQuery, //数据中心查询项目信息
   zoneQuery, //数据中心所有空间实例
   queryLinkSys, //数据中心系统查询
   queryTenant, //数据中心查询租户
   partsQuery, //数据中心部件查询
 } from "@/api/scan/request";
+import { buildingQuery } from '@/api/object/build'
+
 export default {
   data() {
     return {
@@ -517,4 +518,4 @@ export default {
     text-overflow: ellipsis;
   }
 }
-</style>
+</style>

+ 3 - 1
src/components/point/dynamicdata/locationCascader.vue

@@ -5,11 +5,13 @@
 <script>
 import {
   // dynamicLocationList,
-  buildingQuery, //数据中心查询建筑
+  // buildingQuery, //数据中心查询建筑
   floorQuery, //数据中型查询楼层
   queryDictionaryHead, //数据中心查询分区类型
   zoneQuery, //数据中心查询所有空间
 } from "@/api/scan/request";
+import { buildingQuery } from '@/api/object/build'
+
 import { mapGetters, mapActions } from "vuex";
 export default {
   data() {

+ 3 - 2
src/components/point/report/objectInstance.vue

@@ -41,7 +41,7 @@ import {
   getTabFunNumObjInstance,
   queryEquip, //数据中心设备查询
   floorQuery, //数据中心查询楼层
-  buildingQuery, //数据中心建筑查询
+  // buildingQuery, //数据中心建筑查询
   projectQuery, //数据中心查询项目信息
   zoneQueryOutline, //数据中心所有空间实例
   queryLinkSys, //数据中心系统查询
@@ -49,6 +49,7 @@ import {
   partsQuery, //数据中心部件查询
   getDataDictionary, // 项目数据字典
 } from '@/api/scan/request'
+import { buildingQuery } from '@/api/object/build'
 
 export default {
   data() {
@@ -369,4 +370,4 @@ export default {
   padding: 10px 10px;
   height: 600px;
 }
-</style>
+</style>

+ 3 - 3
src/components/ready/buildfloor/addConnectivity.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-dialog title="楼层贯通关系维护" :visible.sync="connectDialogVis" width="730px" id="messageDialog">
-    <el-row>
+  <el-dialog title="楼层贯通关系维护" :visible.sync="connectDialogVis" width="730px" id="messageDialog" >
+    <el-row style="height: 80px">
       <div style="line-height:32px;">添加与{{floor.FloorLocalName}}层有贯通关系的楼层 : </div>
       <div style="width:70%">
         <bfCascader ref="bfCascader" :FloorID="floor.FloorID"></bfCascader>
@@ -77,4 +77,4 @@ export default {
     vertical-align: baseline;
   }
 }
-</style>
+</style>

+ 28 - 22
src/components/ready/buildfloor/buildfloorCascader.vue

@@ -2,16 +2,18 @@
   <el-cascader v-model="value" :options="options" :props="props" clearable></el-cascader>
 </template>
 <script>
-import { buildingQuery } from "@/api/scan/request";
+// import { buildingQuery } from "@/api/scan/request";
+import {buildingQuery} from '@/api/object/build'
+
 export default {
   data() {
     return {
       value: [],
       props: {
         multiple: true,
-        value: 'BuildID',
-        label: 'BuildLocalName',
-        children: 'Floor'
+        value: 'id',
+        label: 'name',
+        children: 'floor'
       },
       options: []
     }
@@ -21,29 +23,33 @@ export default {
       default: ''
     }
   },
-  created() { },
+  created() {
+  },
   methods: {
     getCascader() {
       let param = {
-        Cascade: [
-          { Name: "floor", Orders: "FloorSequenceID desc" }
+        cascade: [
+          // { Name: "floor", Orders: "FloorSequenceID desc" }
+          {name: "floor", orders: "floorSequenceID desc"}
         ],
-        Orders: "BuildLocalName asc",
-        PageNumber: 1,
-        PageSize: 50
+        // Orders: "BuildLocalName asc",
+        pageNumber: 1,
+        pageSize: 50
       }
       buildingQuery(param, res => {
-        res.Content.map(t => {
-          if (t.Floor && t.Floor.length) {
-            t.Floor = t.Floor.map(item => {
-              if (item.FloorID == this.FloorID) return
-              item.BuildID = item.FloorID
-              item.BuildLocalName = item.FloorLocalName || item.FloorName
-              return item
-            }).filter(it => it)
-          }
-        })
-        this.options = res.Content
+        // res.content.map(t => {
+        //   if (t.floor && t.floor.length) {
+        //     t.floor = t.floor.map(item => {
+        //       if (item.floorID == this.floorID) return
+        //       item.buildID = item.floorID
+        //       item.buildLocalName = item.floorLocalName || item.floorName
+        //       return item
+        //     }).filter(it => it)
+        //   }
+        // })
+        // this.options = res.content
+        this.options = res.content
+        console.log(this.options)
       })
     },
   }
@@ -53,4 +59,4 @@ export default {
 .el-cascader {
   width: 100%;
 }
-</style>
+</style>

+ 117 - 117
src/components/ready/buildfloor/formItems.vue

@@ -1,39 +1,39 @@
 <template>
   <div id="inforsPoint">
     <el-form ref="ruleForm" :model="form" label-width="150px" :rules="rules" :inline="true" :label-position="'right'">
-      <div v-for="item in InforsList" :key="item.InfoPointCode" style="width:50%;display: inline-block">
+      <div v-for="item in InforsList" :key="item.infoPointCode" style="width:50%;display: inline-block">
         <el-form-item
-          :label="item.InfoPointName"
-          :prop="item.InfoPointCode"
+          :label="item.infoPointName"
+          :prop="item.infoPointCode"
           v-if="all||item.Visible"
-          :class="{FloorTypeSelect:item.InputMode == 'D1'||item.Unit}">
+          :class="{FloorTypeSelect:item.inputMode == 'D1'||item.unit}">
 
           <el-input
-            v-model="form[item.Path]"
-            v-if="item.InfoPointCode == 'BIMLocation' || item.InfoPointCode =='ModelID'"
+            v-model="form[item.path]"
+            v-if="item.infoPointCode == 'BIMLocation' || item.infoPointCode =='ModelID'"
             disabled/>
 
           <!--二维码相关-->
-          <span v-else-if="item.InfoPointCode == 'DefaultQRCode' ">
-            <el-input v-if="!form[item.Path]" v-model="form[item.Path]" disabled/>
+          <span v-else-if="item.infoPointCode == 'DefaultQRCode' ">
+            <el-input v-if="!form[item.path]" v-model="form[item.path]" disabled/>
             <el-popover v-else placement="right" width="210" trigger="click">
               <div style="overflow:hidden;">
                 <img
                   style="width:200px;height:200px;"
-                  :src="'/image-service/common/file_get/'+ form[item.Path] +'?systemId=dataPlatform'"
+                  :src="'/image-service/common/file_get/'+ form[item.path] +'?systemId=dataPlatform'"
                   alt="二维码">
               </div>
               <el-button slot="reference" type="text">点击查看</el-button>
             </el-popover>
           </span>
 
-          <span v-else-if="item.InfoPointCode == 'QRCodePic' ">
-            <el-input v-if="!form[item.Path]" v-model="form[item.Path]" disabled/>
+          <span v-else-if="item.infoPointCode == 'QRCodePic' ">
+            <el-input v-if="!form[item.path]" v-model="form[item.path]" disabled/>
             <el-popover v-else placement="right" width="210" trigger="click">
               <div style="overflow:hidden;">
                 <img
                   style="width:200px;height:200px;"
-                  :src="'/image-service/common/file_get/'+ form[item.Path] +'?systemId=dataPlatform'"
+                  :src="'/image-service/common/file_get/'+ form[item.path] +'?systemId=dataPlatform'"
                   alt="二维码">
               </div>
               <el-button slot="reference" type="text">点击查看</el-button>
@@ -41,136 +41,136 @@
           </span>
 
           <!--/二维码相关-->
-          <span v-else-if="item.InputMode == 'B1'">
-            <el-input v-model="form[item.Path]" :placeholder="(item.InputMode === 'B1' && item.Path==='FloorLocalID') ? '填写示例:F1、B1?':'' "/>
-              <div v-if="item.InputMode === 'B1' && item.Path==='FloorLocalID' && isShowTitle" style="color: gray;font-size: 12px" >
+          <span v-else-if="item.inputMode == 'B1'">
+            <el-input v-model="form[item.path]"
+                      :placeholder="(item.inputMode === 'B1' && item.path==='FloorLocalID') ? '填写示例:F1、B1?':'' "/>
+              <div v-if="item.inputMode === 'B1' && item.path==='FloorLocalID' && isShowTitle"
+                   style="color: gray;font-size: 12px">
                 用于楼层平面图切换
               </div>
           </span>
 
-          <el-input v-model="form[item.Path]" v-else-if="item.InputMode == 'A1'||item.InputMode == 'A2'" type="number">
-            <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
+          <el-input v-model="form[item.path]" v-else-if="item.inputMode == 'A1'||item.inputMode == 'A2'" type="number">
+            <template slot="append" v-if="item.unit">{{ item.unit }}</template>
           </el-input>
 
-          <el-select v-model="form[item.Path]" placeholder="请选择" v-else-if="item.InputMode == 'D1'">
-            <el-option v-for="op in item.options" :key="op.Code" :label="op.Name" :value="op.Code"></el-option>
+          <el-select v-model="form[item.path]" placeholder="请选择" v-else-if="item.inputMode == 'D1'">
+            <el-option v-for="op in item.options" :key="op.code" :label="op.name" :value="op.code"></el-option>
           </el-select>
 
           <el-cascader
-              v-else-if="item.InputMode == 'D1L'"
-              placeholder="请选择"
-              :options="item.options"
-              v-model="form[item.Path]"
-              :props="item.props"
-              filterable
-              :show-all-levels="false"
-              clearable
-              style="width: 200px"/>
+            v-else-if="item.inputMode == 'D1L'"
+            placeholder="请选择"
+            :options="item.options"
+            v-model="form[item.path]"
+            :props="item.props"
+            filterable
+            :show-all-levels="false"
+            clearable
+            style="width: 200px"/>
 
-          <el-input v-else-if="item.InputMode == 'L'||item.InputMode == 'L1'||item.InputMode == 'L2'||item.InputMode == 'M'" v-model="form[item.Path]">
-            <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
+          <el-input
+            v-else-if="item.inputMode == 'L'||item.inputMode == 'L1'||item.inputMode == 'L2'||item.inputMode == 'M'"
+            v-model="form[item.path]">
+            <template slot="append" v-if="item.unit">{{ item.unit }}</template>
           </el-input>
-          <el-input v-model="form[item.Path]" v-else disabled title="暂不支持"></el-input>
-          <!--                    <div>{{item.InputMode}}{{item.InfoPointCode}}</div>-->
+          <el-input v-model="form[item.path]" v-else disabled title="暂不支持"></el-input>
         </el-form-item>
       </div>
     </el-form>
   </div>
 </template>
 <script>
-  import {getDataDictionary} from "@/api/scan/request";
+import {getDataDictionary} from "@/api/dict";
 
-  export default {
-    props: {
-      type: {
-        default: 'Floor'
-      }
-    },
-    data() {
-      let validateId = (rule, value, callback) => {
-        if (!value) {
-          this.isShowTitle = false
-          return callback(new Error('请输入楼层本地编码'));
-        } else {
-          this.isShowTitle = true
-          callback()
-        }
+export default {
+  props: {
+    type: {
+      default: 'Floor'
+    }
+  },
+  data() {
+    let validateId = (rule, value, callback) => {
+      if (!value) {
+        this.isShowTitle = false
+        return callback(new Error('请输入楼层本地编码'));
+      } else {
+        this.isShowTitle = true
+        callback()
       }
-      // }
-      return {
-        form: {},
-        isShowTitle: true,
-        InforsList: [],
-        all: true, // 默认显示全部
-        rules: {
-          "FloorLocalID": [
-            {validator: validateId, trigger: 'blur', "required": true}
-          ],
-          "FloorLocalName": [
-            {"required": true, "message": "请输入楼层本地名称", "trigger": "blur"}
-          ],
-          "FloorSequenceID": [
-            {"required": true, "message": "请输入楼层顺序号", "trigger": "blur"}
-          ]
-        }
-      };
-    },
-
-    created() {
-      this.getInforsPoint()
     }
-    ,
-    methods: {
+    // }
+    return {
+      form: {},
+      isShowTitle: true,
+      InforsList: [],
+      all: true, // 默认显示全部
+      rules: {
+        "FloorLocalID": [
+          {validator: validateId, trigger: 'blur', "required": true}
+        ],
+        "FloorLocalName": [
+          {"required": true, "message": "请输入楼层本地名称", "trigger": "blur"}
+        ],
+        "FloorSequenceID": [
+          {"required": true, "message": "请输入楼层顺序号", "trigger": "blur"}
+        ]
+      }
+    };
+  },
 
-      getInforsPoint() {
-        let params = {
-          data: {
-            Orders: "sort asc,InfoPointCode asc",
-            PageNumber: 1,
-            PageSize: 1000
-          },
-          type: this.type
-        };
-        getDataDictionary(params, res => {
-          let arr = res.Content.map(item => {
-            if ((item.InputMode === 'D1' || item.InputMode === 'D2' || item.InputMode === 'E2' || item.InputMode === 'D1L') && item.DataSource) {
-              item.options = JSON.parse(item.DataSource)
-              if (item.options[0] && item.options[0].Content) {
-                item.props = {
-                  value: 'Code',
-                  label: 'Name',
-                  children: 'Content',
-                  checkStrictly: true
-                }
+  created() {
+    this.getInforsPoint()
+  }
+  ,
+  methods: {
+    getInforsPoint() {
+      let params = {
+        type: this.type,
+        // orders: "sort asc,infoPointCode asc",
+        pageNumber: 1,
+        pageSize: 1000
+      };
+      getDataDictionary(params, res => {
+        let arr = res.content.map(item => {
+          if ((item.inputMode === 'D1' || item.inputMode === 'D2' || item.inputMode === 'E2' || item.inputMode === 'D1L') && item.dataSource) {
+            item.options = JSON.parse(item.dataSource)
+            if (item.options[0] && item.options[0].content) {
+              item.props = {
+                value: 'code',
+                label: 'name',
+                children: 'content',
+                checkStrictly: true
               }
             }
-            switch (item.InfoPointCode) { //过滤掉待删除的
-              case 'FloorIdentity':
-              case 'RelatedSchedule':
-              case 'OutPeopleFlow':
-              case 'InPeopleFlow':
-              case 'ExsitPeopleNum':
-                break;
-              default:
-                return item
-            }
-          })
-          //手动删除掉数据字典中不存在的字段,等待后台同步
-          this.InforsList = arr.filter(t => t && t.InfoPointCode != 'FloorQRCode')
-        })
-      },
-      submitForm(call) {
-        this.$refs.ruleForm.validate((valid) => {
-          if (valid) {
-            call()
-          } else {
-            return false;
           }
-        });
-      },
+          switch (item.infoPointCode) { //过滤掉待删除的
+            case 'FloorIdentity':
+            case 'RelatedSchedule':
+            case 'OutPeopleFlow':
+            case 'InPeopleFlow':
+            case 'ExsitPeopleNum':
+              break;
+            default:
+              return item
+          }
+        })
+        //手动删除掉数据字典中不存在的字段,等待后台同步
+        this.InforsList = arr.filter(t => t && t.infoPointCode != 'FloorQRCode')
+      })
+    },
+    submitForm(call) {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          call()
+        } else {
+          return false;
+        }
+      });
+    },
 
-    }
-  };
+  }
+};
 </script>
 <style lang="scss" scoped>
 #inforsPoint {

+ 3 - 2
src/views/business_space/dataUtil/index.vue

@@ -14,13 +14,14 @@ import {
   getAllbusiness,
   getSpaceFloor,
   queryDictionaryHead,
-  buildingQuery, //数据中心-建筑查询
+  // buildingQuery, //数据中心-建筑查询
   queryZone,
   updateZone,
   getGraphyId, // 物理世界获取图实例关系
   getRelation, // 物理世界获取业务空间与元空间关系
   getBussines2, //
 } from "@/api/scan/request";
+import { buildingQuery } from '@/api/object/build';
 import { mapGetters } from "vuex";
 import pako from '@/assets/pako/pako'
 import axios from "axios";
@@ -620,4 +621,4 @@ export default {
     }
   }
 }
-</script>
+</script>

+ 7 - 1
src/views/data_admin/buildAssets/index.vue

@@ -64,7 +64,13 @@
   // import assetsList from './assetsList'
   import {mapActions, mapGetters, mapState} from 'vuex'
   //api
-  import {buildingQuery, getAllbusiness, getEquipBelongs, problemQuery} from '@/api/scan/request'
+  import {
+    // buildingQuery,
+    getAllbusiness,
+    getEquipBelongs,
+    problemQuery
+  } from '@/api/scan/request'
+  import { buildingQuery } from '@/api/object/build';
 
   export default {
     name: 'build-assets',

+ 4 - 2
src/views/data_admin/buildData/index-2.vue

@@ -322,8 +322,8 @@ import {
   delErrAssets, //删除设备资产
   getdelMain, //获取过滤掉后的表格主体
   getBasicMatch, //获取完全匹配的厂商库id
-  buildingQuery, //数据中心-建筑查询
-  floorQuery, //数据中心-楼层查询
+  // buildingQuery, //数据中心-建筑查询
+  // floorQuery, //数据中心-楼层查询
   queryLocationPoint, //数据中心-点位标签查询
   updateLocationPoint, //数据中心-更新点位标签
   getEquipBelongs, //数据中心-获取设备族
@@ -334,6 +334,8 @@ import {
   queryPropertyTypeCount, //数据中心-资产分类及数量
   queryPropertyPoint, //数据中心-位置标签及对应资产数量
 } from "@/api/scan/request";
+import { buildingQuery } from '@/api/object/build';
+import { floorQuery } from '@/api/object/floor';
 import { mapGetters, mapActions } from "vuex"
 export default {
   components: {

+ 4 - 2
src/views/data_admin/buildData/index.vue

@@ -332,9 +332,11 @@
         defaultFloor, //获取默认楼层
         getdelMain, //获取过滤掉后的表格主体
         getBasicMatch, //获取完全匹配的厂商库id
-        buildingQuery, //数据中心-建筑查询
-        floorQuery, //数据中心-楼层查询
+        // buildingQuery, //数据中心-建筑查询
+        // floorQuery, //数据中心-楼层查询
     } from "@/api/scan/request";
+    import { buildingQuery } from '@/api/object/build';
+    import { floorQuery } from '@/api/object/floor';
     import { mapGetters, mapActions } from "vuex"
     export default {
         components: {

+ 2 - 1
src/views/data_admin/buildGraphy/index.vue

@@ -35,11 +35,12 @@ import {
 } from 'vuex';
 import {
   getPT,
-  buildingQuery,
+  // buildingQuery,
   getFloor
 } from "@/api/scan/request"; //获取点位坐标
 import tools from "@/utils/scan/tools"
 import Handsontable from "handsontable-pro"
+import { buildingQuery } from '@/api/object/build';
 import 'handsontable-pro/dist/handsontable.full.css'
 import zhCN from 'handsontable-pro/languages/zh-CN';
 export default {

+ 8 - 1
src/views/ledger/cenotelist/relatedSpace.vue

@@ -73,9 +73,16 @@ import spaceSelect from "@/components/ledger/lib/spaceSelect";
 import relatedSpaceList from "@/components/ledger/cenote/relatedSpaceList";
 import elevationMap from "@/components/ledger/cenote/elevationMap";
 import addSpaceDialog from '@/components/ledger/cenote/dialog/addSpaceDialog';
-import { queryAllZoneType, buildingQuery, shaftSpaceTypeQuery, shaftSpaceBuildingQuery, verticalSpace } from '@/api/scan/request';
+import {
+  queryAllZoneType,
+  // buildingQuery,
+  shaftSpaceTypeQuery,
+  shaftSpaceBuildingQuery,
+  verticalSpace
+} from '@/api/scan/request';
 import cenoteGraphy from '@/components/ledger/lib/cenoteGraphy'
 import { mapGetters } from 'vuex'
+import { buildingQuery } from '@/api/object/build';
 export default {
   data() {
     return {

+ 43 - 34
src/views/ledger/facility/parts/index.vue

@@ -2,7 +2,8 @@
   <div id="partsList">
     <el-row>
       <el-tabs @tab-click="getTableHeader" v-model="tabVal">
-        <el-tab-pane v-for="t in partsTypeList" :key="t.Category" :name="t.Category" :label="t.CategoryName+'('+t.count+')'"></el-tab-pane>
+        <el-tab-pane v-for="t in partsTypeList" :key="t.Category" :name="t.Category"
+                     :label="t.CategoryName+'('+t.count+')'"></el-tab-pane>
       </el-tabs>
     </el-row>
     <el-row class="left">
@@ -28,14 +29,18 @@
         <handson-table ref="table"></handson-table>
       </div>
     </div>
-    <el-pagination class="right" v-show="tableData && tableData.length" @size-change="handleSizeChange" @current-change="handleCurrentChange"
-      :current-page="page.pageNumber" :page-sizes="page.pageSizes" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper"
-      :total="page.total"></el-pagination>
+    <el-pagination class="right" v-show="tableData && tableData.length" @size-change="handleSizeChange"
+                   @current-change="handleCurrentChange"
+                   :current-page="page.pageNumber" :page-sizes="page.pageSizes" :page-size="page.pageSize"
+                   layout="total, sizes, prev, pager, next, jumper"
+                   :total="page.total"></el-pagination>
     <!-- 二维码弹窗 -->
     <qrcode :dialog="myDialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
-    <upload-files-dialog :read="onlyRead ? true : false" ref="upload" @changeFile="fileChange" :keysArr="filesArr" :dialog="myDialog">
+    <upload-files-dialog :read="onlyRead ? true : false" ref="upload" @changeFile="fileChange" :keysArr="filesArr"
+                         :dialog="myDialog">
     </upload-files-dialog>
-    <upload-img-dialog :read="onlyRead ? true : false" @changeFile="imgChange" :keysArr="imgsArr" :dialog="myDialog"></upload-img-dialog>
+    <upload-img-dialog :read="onlyRead ? true : false" @changeFile="imgChange" :keysArr="imgsArr"
+                       :dialog="myDialog"></upload-img-dialog>
     <pic-dialog :read="onlyRead ? true : false" :dialog="myDialog" :keysArr="picsArr" @change="changePics"></pic-dialog>
   </div>
 </template>
@@ -59,12 +64,13 @@ import systemType from "@/components/dialogs/list/systemType";
 import handsonTable from "@/components/common/handsontable";
 import {
   getEquipPartsType,
-  getDataDictionary,
   getEquipPartsCon,
   deleteParts,
   BeatchQueryParam
 } from "@/api/scan/request";
-import { mapGetters, mapActions } from "vuex";
+import {getDataDictionary} from "@/api/dict";
+import {mapGetters, mapActions} from "vuex";
+
 export default {
   components: {
     qrcode, //二维码页面
@@ -94,8 +100,8 @@ export default {
         total: 0
       },
       showTypes: [
-        { value: "Visible", label: '只看采集信息' },
-        { value: "all", label: '全部' }
+        {value: "Visible", label: '只看采集信息'},
+        {value: "all", label: '全部'}
       ],
       showType: "Visible",
       tableData: [],
@@ -145,14 +151,14 @@ export default {
     //获取当前设备下的部件类
     async getTypes() {
       let params = {
-        Filters: `id='${this.deviceId}'`,
-        PageNumber: 1,
-        PageSize: 50
+        filters: `id='${this.deviceId}'`,
+        pageNumber: 1,
+        pageSize: 50
       };
       await getEquipPartsType(params, res => {
-        this.partsTypeList = res.Content;
+        this.partsTypeList = res.content;
         if (this.partsTypeList.length) {
-          this.tabVal = this.partsTypeList[0].Category;
+          this.tabVal = this.partsTypeList[0].category;
           this.getTableHeader();
         }
       });
@@ -160,33 +166,31 @@ export default {
     // 获取表头数据(初始化表格)
     async getTableHeader() {
       let params = {
-        data: {
-          Orders: "sort asc, InfoPointName desc",
-          PageNumber: 1,
-          PageSize: 1000
-        },
+        orders: "sort asc, infoPointName desc",
+        pageNumber: 1,
+        pageSize: 1000,
         type: this.tabVal
       };
       await getDataDictionary(params, res => {
-        this.tableHeader = res.Content;
+        this.tableHeader = res.content;
         this.getTableData();
       });
     },
     //获取表格数据
     async getTableData() {
       let params = {
-        PageNumber: this.page.pageNumber,
-        PageSize: this.page.PageSize,
-        Orders: "createTime desc, EquipLocalName desc, EquipLocalID desc, EquipID desc",
-        Filters: `category='${this.tabVal}';parentId='${this.deviceId}'`
+        pageNumber: this.page.pageNumber,
+        pageSize: this.page.PageSize,
+        orders: "createTime desc, EquipLocalName desc, EquipLocalID desc, EquipID desc",
+        filters: `category='${this.tabVal}';parentId='${this.deviceId}'`
       };
       await getEquipPartsCon(params, res => {
-        this.tableData = res.Content;
-        this.copyTableData = tools.deepCopy(res.Content);
-        this.page.pageNumber = res.PageNumber;
-        this.page.total = res.Total;
+        this.tableData = res.content;
+        this.copyTableData = tools.deepCopy(res.content);
+        this.page.pageNumber = res.pageNumber;
+        this.page.total = res.total;
         if (this.tableData && this.tableData.length) {
-          this.getBatch(res.Content);
+          this.getBatch(res.content);
           this.initTable();
         }
       });
@@ -262,16 +266,16 @@ export default {
         let sortArr = this.myHotArr.getPlugin("columnSorting").rowsMapper
           .__arrayMap;
         let infos = this.tableData[trimmedArr[sortArr[rowArr.row]]];
-        this.getInfors(infos, { row: sortArr[rowArr.row], col: rowArr.col });
+        this.getInfors(infos, {row: sortArr[rowArr.row], col: rowArr.col});
       } else if (isSort) {
         //排序后的数组
         let sortArr = this.tableExample.getPlugin("columnSorting").rowsMapper
           .__arrayMap;
         let infos = this.tableData[sortArr[rowArr.row]];
-        this.getInfors(infos, { row: sortArr[rowArr.row], col: rowArr.col });
+        this.getInfors(infos, {row: sortArr[rowArr.row], col: rowArr.col});
       } else if (trimmedArr.length) {
         let infos = this.tableData[trimmedArr[rowArr.row]];
-        this.getInfors(infos, { row: trimmedArr[rowArr.row], col: rowArr.col });
+        this.getInfors(infos, {row: trimmedArr[rowArr.row], col: rowArr.col});
       } else {
         let infos = this.tableData[rowArr.row];
         this.getInfors(infos, rowArr);
@@ -420,7 +424,7 @@ export default {
         data: []
       };
       params.map(item => {
-        param.data.push({ EquipID: item.EquipID });
+        param.data.push({EquipID: item.EquipID});
       });
       this.$confirm("此操作将删除部件,是否继续?", "提示", {
         confirmButtonText: "确定",
@@ -534,23 +538,28 @@ export default {
   background-color: #fff;
   padding: 10px;
   position: relative;
+
   .right {
     background: #fff;
   }
+
   .search-header {
     overflow: hidden;
     padding: 0 10px 10px 10px;
     border-bottom: 1px solid #bcbcbc;
   }
+
   .tableBox {
     display: flex;
     height: calc(100% - 150px);
     margin-top: 10px;
+
     .tableLeft {
       flex: 1;
     }
   }
 }
+
 .el-pagination button,
 .el-pagination span:not([class*="suffix"]) {
   vertical-align: middle;

+ 8 - 8
src/views/ledger/facility/partsmanage/index.vue

@@ -256,16 +256,16 @@ export default {
     //获取表格数据
     async getTableData() {
       let params = {
-        PageNumber: this.page.pageNumber,
-        PageSize: this.page.pageSize,
-        Orders: "createTime desc, EquipLocalName desc, EquipLocalID desc, EquipID desc",
-        Filters: `category='${this.tabVal}';parentId='${this.deviceId}'`
+        pageNumber: this.page.pageNumber,
+        pageSize: this.page.pageSize,
+        orders: "createTime desc, EquipLocalName desc, EquipLocalID desc, EquipID desc",
+        filters: `category='${this.tabVal}';parentId='${this.deviceId}'`
       };
       await getEquipPartsCon(params, res => {
-        this.tableData = res.Content;
-        this.copyTableData = tools.deepCopy(res.Content);
-        this.page.pageNumber = res.PageNumber;
-        this.page.total = res.Total;
+        this.tableData = res.content;
+        this.copyTableData = tools.deepCopy(res.content);
+        this.page.pageNumber = res.pageNumber;
+        this.page.total = res.total;
         if (this.tableData && this.tableData.length) {
           this.initTable();
         }

+ 9 - 2
src/views/ledger/rentlist/manageTenantZone.vue

@@ -85,7 +85,14 @@ import { mapGetters } from "vuex";
 import { SColor, SPoint } from "@saga-web/draw/lib";
 import { DivideFloorScene, SpaceItem, ZoneItem, FloorView, Opt } from "@saga-web/cad-engine/lib";
 import { colorArr } from "@/utils/spaceColor"
-import { buildingQuery, queryTnRelateFloor, queryRentTableData, tnRelateZone, zoneQueryOutline } from '@/api/scan/request'
+import {
+  // buildingQuery,
+  queryTnRelateFloor,
+  queryRentTableData,
+  tnRelateZone,
+  zoneQueryOutline
+} from '@/api/scan/request'
+import { buildingQuery } from '@/api/object/build';
 export default {
   data() {
     return {
@@ -294,7 +301,7 @@ export default {
       let pa = {
         Cascade: [
           { Name: 'zoneTenantList' },
-          // , Cascade: [{ Name: 'building' }, { Name: 'floor' }] 
+          // , Cascade: [{ Name: 'building' }, { Name: 'floor' }]
           { Name: 'zoneGeneraltList' }
         ],
         Orders: "TenantID asc",

+ 2 - 2
src/views/ledger/system/addsystem.vue

@@ -44,10 +44,10 @@ import handsonTable from "@/components/common/handsontable";
 import {
   getDataDictionary,
   createSystemBuildFloor,
-  buildingQuery
+  // buildingQuery
 } from "@/api/scan/request";
 import { mapGetters, mapActions } from "vuex";
-
+import { buildingQuery } from '@/api/object/build';
 import qrcode from "@/components/ledger/lib/qrcode";
 export default {
   components: {

+ 2 - 2
src/views/ledger/system/systemDetail/index.vue

@@ -59,13 +59,13 @@
 <script>
   import {mapGetters} from "vuex";
   import {
-    buildingQuery,
+    // buildingQuery,
     deleteGeneralSys,
     getDataDictionary,
     queryDictionaryHead,
     queryLinkSys
   } from '@/api/scan/request';
-
+  import { buildingQuery } from '@/api/object/build';
   import cenoteTable from '@/components/ledger/system/table/cenoteTable';
   import deviceTable from '@/components/ledger/system/table/deviceTable';
   import spaceTable from '@/components/ledger/system/table/spaceTable';

+ 2 - 1
src/views/point/dynamicdata/addRelation/buildRela/index.vue

@@ -161,9 +161,10 @@ import {
   dynamicDeleteRelation,
   dynamicPointTypeList,
   dynamicQueryAI,
-  buildingQuery, //数据中心建筑查询
+  // buildingQuery, //数据中心建筑查询
   dynamicRelatedObj
 } from "@/api/scan/request";
+import { buildingQuery } from '@/api/object/build';
 export default {
   components: {
     historyDialog,

+ 1 - 1
src/views/ready/buildfloor/addFloor/index.vue

@@ -10,7 +10,7 @@
   </el-dialog>
 </template>
 <script>
-  import {manageCreateFloor, manageUpdateFloor} from "@/api/scan/request";
+  import {manageCreateFloor, manageUpdateFloor} from "@/api/object/floor";
   import formItems from "@/components/ready/buildfloor/formItems";
   import tools from "@/utils/buildfloor/tools";
 

+ 374 - 366
src/views/ready/buildfloor/index.vue

@@ -29,7 +29,7 @@
                @click="changeBuild(index)"
                v-for="(item,index) in buildList">
             <span>
-              {{item.BuildLocalName || item.BuildName}}
+              {{ item.BuildLocalName || item.BuildName }}
               <el-badge :value="item.Count" class="mark" v-if="item.Count>0"/>
             </span>
           </div>
@@ -44,17 +44,17 @@
           <el-table :data="tableData" :header-cell-style="headerStyle" height="100%" style="width: 100%"
                     v-loading="loading">
             <el-table-column label="楼层本地名">
-              <template slot-scope="scope">{{scope.row.FloorLocalName||scope.row.FloorName}}</template>
+              <template slot-scope="scope">{{ scope.row.FloorLocalName || scope.row.FloorName }}</template>
             </el-table-column>
             <el-table-column label="楼层顺序号">
-              <template slot-scope="scope">{{scope.row.FloorSequenceID}}</template>
+              <template slot-scope="scope">{{ scope.row.FloorSequenceID }}</template>
             </el-table-column>
             <el-table-column label="楼层信息">
               <template slot-scope="scope">
                 <el-button @click="editFloorData(scope.row)" icon="el-icon-edit-outline" plain size="mini"></el-button>
               </template>
             </el-table-column>
-            <el-table-column label="平面图" prop="Datasource">
+            <el-table-column label="平面图" prop="dataSource">
               <template slot-scope="scope">
                 <p @click="checkDrawImg(scope.row,2)" v-if="scope.row.Sign>0">
                   <el-badge is-dot>
@@ -76,7 +76,9 @@
             <el-table-column label="楼层贯通关系" prop="SubTypeName">
               <template slot-scope="scope">
                 <span
-                  style="margin-right:20px">{{scope.row.FloorThroughList?scope.row.FloorThroughList.length:0}}</span>
+                  style="margin-right:20px">{{
+                    scope.row.FloorThroughList ? scope.row.FloorThroughList.length : 0
+                  }}</span>
                 <el-button @click="changeConnection(scope.row)" icon="el-icon-edit-outline" plain size="mini"/>
               </template>
             </el-table-column>
@@ -88,10 +90,10 @@
           </el-table>
         </div>
       </div>
-      <div v-else class="r-table" >
-      <div class="center" style="margin-top:300px;">
-        <i class="icon-wushuju iconfont"></i> 请先在左侧创建建筑
-      </div>
+      <div v-else class="r-table">
+        <div class="center" style="margin-top:300px;">
+          <i class="icon-wushuju iconfont"></i> 请先在左侧创建建筑
+        </div>
       </div>
     </el-row>
     <!-- 添加-修改楼层 -->
@@ -113,10 +115,10 @@
       width="20%"
 
     >
-      <div>确定要删除该{{delText}}?</div>
+      <div>确定要删除该{{ delText }}?</div>
       <span class="dialog-footer" slot="footer">
         <el-button @click="delDialogVis=false" size="small">取消</el-button>
-        <el-button @click="confirmDel" size="small" type="primary"  :disabled="buildDisabled">确认</el-button>
+        <el-button @click="confirmDel" size="small" type="primary" :disabled="buildDisabled">确认</el-button>
       </span>
     </el-dialog>
     <!-- 添加贯通关系弹窗 -->
@@ -128,406 +130,412 @@
 </template>
 
 <script>
-  import addFloor from "@/views/ready/buildfloor/addFloor/index";
-  import addBuild from "@/components/ready/buildfloor/addBuild";
-  import {mapGetters} from "vuex";
-  import addConnectivity from "@/components/ready/buildfloor/addConnectivity";
-  import checkGraphy from "./drawGraphy/checkGraphy"; //查看图片
-  import tools from "@/utils/buildfloor/tools";
-  import {
-    buildingQueryAndCount,
-    floorQueryAndSign,
-    getDataDictionary,
-    manageDeleteFloor,
-    objectCreateBuild,
-    objectDeleteBuild,
-    objectQueryBuild,
-    objectUpdateBuild
-  } from "@/api/scan/request";
+import addFloor from "@/views/ready/buildfloor/addFloor/index";
+import addBuild from "@/components/ready/buildfloor/addBuild";
+import {mapGetters} from "vuex";
+import addConnectivity from "@/components/ready/buildfloor/addConnectivity";
+import checkGraphy from "./drawGraphy/checkGraphy"; //查看图片
+import tools from "@/utils/buildfloor/tools";
+import {
+  buildingQueryAndCount,
+  floorQueryAndSign,
+  manageDeleteFloor,
+  objectCreateBuild,
+  objectDeleteBuild,
+  objectQueryBuild,
+  objectUpdateBuild
+} from "@/api/scan/request";
+import {getDataDictionary} from "@/api/dict";
 
-  export default {
-    components: {
-      addFloor,
-      addBuild,
-      addConnectivity,
-      checkGraphy
-    },
-    data() {
-      return {
-        repetitionGraphyVisible: false, // 替换平面图弹窗
-        floorTitle: "添加楼层",
-        buildTitle: "添加建筑",
-        delDialogVis: false,
-        buildDisabled: false,
-        delText: "建筑",
-        headerStyle: {
-          backgroundColor: "#d9d9d9",
-          color: "#2b2b2b",
-          lineHeight: "30px"
-        },
-        buildList: [],
-        tableData: [],
-        page: {
-          pageSize: 500,
-          pageSizes: [10, 20, 50, 100],
-          pageNumber: 1,
-          total: 0
-        },
-        loading: false, //列表loading
-        curBuildId: "", //当前选中的建筑id
-        curBuildName: "", //当前选中建筑的名称
-        curFloorId: "", //当前选中的楼层id
-        modelId: "",
-        alreadyRelatedModel: [],
-        // currentType: 'add'
-        buildMessage: {},
-        selectedBuildIndex: 0
+
+export default {
+  components: {
+    addFloor,
+    addBuild,
+    addConnectivity,
+    checkGraphy
+  },
+  data() {
+    return {
+      repetitionGraphyVisible: false, // 替换平面图弹窗
+      floorTitle: "添加楼层",
+      buildTitle: "添加建筑",
+      delDialogVis: false,
+      buildDisabled: false,
+      delText: "建筑",
+      headerStyle: {
+        backgroundColor: "#d9d9d9",
+        color: "#2b2b2b",
+        lineHeight: "30px"
+      },
+      buildList: [],
+      tableData: [],
+      page: {
+        pageSize: 500,
+        pageSizes: [10, 20, 50, 100],
+        pageNumber: 1,
+        total: 0
+      },
+      loading: false, //列表loading
+      curBuildId: "", //当前选中的建筑id
+      curBuildName: "", //当前选中建筑的名称
+      curFloorId: "", //当前选中的楼层id
+      modelId: "",
+      alreadyRelatedModel: [],
+      // currentType: 'add'
+      buildMessage: {},
+      selectedBuildIndex: 0
+    };
+  },
+  computed: {
+    ...mapGetters("layout", ["projectId"])
+  },
+  mounted() {
+  },
+  created() {
+    this.init();
+    this.handleBuildQuery()
+    this.handleSearchBuildKey()
+  },
+  methods: {
+    init() {
+      let bdParam = {
+        Orders: "BuildLocalName asc",
+        PageNumber: 1,
+        PageSize: 500
       };
+      buildingQueryAndCount(bdParam, res => {
+        this.buildList = res.content;
+        if (this.buildList.length) {
+          this.changeBuild(this.selectedBuildIndex);
+        }
+      });
     },
-    computed: {
-      ...mapGetters("layout", ["projectId"])
-    },
-    mounted() {
+    //change build
+    changeBuild(index) {
+      this.selectedBuildIndex = index;
+      this.buildList.map(item => {
+        item.active = false;
+        return item;
+      });
+      this.buildList[index].active = true;
+      this.curBuildId = this.buildList[index].BuildID;
+      this.curBuildName = this.buildList[index].BuildLocalName || this.buildList[index].BuildName;
+      this.getFloorTableData();
+      this.$forceUpdate();
     },
-    created() {
-      this.init();
-      this.handleBuildQuery()
+    //add build
+    addBuild() {
+      // this.$message.warning("开发中...");
+      // return;
+      this.buildTitle = '添加建筑';
+      this.$refs.addBuildDialog.showDialog();
       this.handleSearchBuildKey()
     },
-    methods: {
-      init() {
-        let bdParam = {
-          Orders: "BuildLocalName asc",
-          PageNumber: 1,
-          PageSize: 500
-        };
-        buildingQueryAndCount(bdParam, res => {
-          this.buildList = res.Content;
-          if (this.buildList.length) {
-            this.changeBuild(this.selectedBuildIndex);
-          }
-        });
-      },
-      //change build
-      changeBuild(index) {
-        this.selectedBuildIndex = index;
-        this.buildList.map(item => {
-          item.active = false;
-          return item;
-        });
-        this.buildList[index].active = true;
-        this.curBuildId = this.buildList[index].BuildID;
-        this.curBuildName = this.buildList[index].BuildLocalName || this.buildList[index].BuildName;
-        this.getFloorTableData();
-        this.$forceUpdate();
-      },
-      //add build
-      addBuild() {
-        // this.$message.warning("开发中...");
-        // return;
-        this.buildTitle = '添加建筑';
-        this.$refs.addBuildDialog.showDialog();
-        this.handleSearchBuildKey()
-      },
-      handleSearchBuildKey() {
-        let params = {
-          projectId: this.projectId,
-          data: {
-            Orders: "sort asc,InfoPointCode asc",
-            PageNumber: 1,
-            PageSize: 1000
-          },
-          type: 'Building'
-        };
-        getDataDictionary(params, res => {
-          let first = {}
-          //一级循环出来一级标签
-          let list = res.Content.filter(i => (i.FirstName !== '工作历') && (i.FirstName !== '能耗信息') && (i.FirstName !== '人员信息'))
-          list.map(item => {
-            // console.log(item.FirstName)
-            if ((item.InputMode === 'D1' || item.InputMode === 'D2' || item.InputMode === 'E2' || item.InputMode === 'D1L') && item.DataSource) {
-              item.options = JSON.parse(item.DataSource)
-              if (item.options[0] && item.options[0].Content) {
-                item.props = {
-                  value: 'Code',
-                  label: 'Name',
-                  children: 'Content',
-                  checkStrictly: true
-                }
+    handleSearchBuildKey() {
+      let params = {
+        type: 'Building',
+        // orders: "sort asc,infoPointCode asc",
+        pageNumber: 1,
+        pageSize: 1000
+      };
+      getDataDictionary(params, res => {
+        let first = {}
+        //一级循环出来一级标签
+        let list = res.content.filter(i => (i.firstName !== '工作历') && (i.firstName !== '能耗信息') && (i.firstName !== '人员信息'))
+        list.map(item => {
+          if ((item.inputMode === 'D1' || item.inputMode === 'D2' || item.inputMode === 'E2' || item.inputMode === 'D1L') && item.dataSource) {
+            item.options = JSON.parse(item.dataSource)
+            if (item.options[0] && item.options[0].content) {
+              item.props = {
+                value: 'Code',
+                label: 'Name',
+                children: 'Content',
+                checkStrictly: true
               }
             }
-            if (first[item.FirstName] && first[item.FirstName].length) {
-            } else {
-              first[item.FirstName] = []
-            }
-            if (
-              item.Path !== 'BuildingInfo.AreaInfo.AreaTree' &&
-              item.Path !== 'DefaultQRCode' &&
-              item.Path !== 'BuildQRCode'
-            ) {
-              first[item.FirstName].push({
-                InfoPointName: item.InfoPointName,
-                InfoPointCode: item.InfoPointCode,
-                Visible: item.Visible,
-                UnDisabled: item.UnDisabled,
-                SecondName: item.SecondName ? item.SecondName : "",
-                InputMode: item.InputMode,
-                options: item.options,
-                props:item.props,
-                Unit: item.Unit,
-                Path: item.Path
-              })
-            }
-          })
-          this.buildMessage = first
+          }
+          if (first[item.firstName] && first[item.firstName].length) {
+          } else {
+            first[item.firstName] = []
+          }
+          if (
+            item.path !== 'BuildingInfo.AreaInfo.AreaTree' &&
+            item.path !== 'DefaultQRCode' &&
+            item.path !== 'BuildQRCode'
+          ) {
+            first[item.firstName].push({
+              InfoPointName: item.infoPointName,
+              InfoPointCode: item.infoPointCode,
+              Visible: item.visible,
+              UnDisabled: item.unDisabled,
+              SecondName: item.secondName ? item.secondName : "",
+              inputMode: item.inputMode,
+              options: item.options,
+              props: item.props,
+              Unit: item.unit,
+              path: item.path
+            })
+          }
+        })
+        this.buildMessage = first
 
+      })
+    },
+    //delete build ,根据id删除建筑信息
+    delBuild() {
+      this.delText = '建筑'
+      this.delDialogVis = true;
+    },
+    //edit build
+    editBuild() {
+      this.buildTitle = '编辑建筑';
+      this.handleSearchBuildKey()
+      let list = this.currentBuildList.filter(i => i.BuildID === this.curBuildId)
+      let obj = {}
+      for (let i = 0; i < list.length; i++) {
+        obj = list[i]
+      }
+      this.$refs.addBuildDialog.showDialog(obj);
+    },
+    handleFile(val, name) {
+    },
+    // handleBuild 获取建筑信息
+    handleBuild(val) {
+      let newform = tools.formatData(val)
+      let Param = {
+        content: [newform]
+      }
+      if (newform.BuildID) {
+        objectUpdateBuild(Param, res => {
+          this.$message.success('更新成功')
+          this.$refs.addBuildDialog.closeDialog()
         })
-      },
-      //delete build ,根据id删除建筑信息
-      delBuild() {
-        this.delText = '建筑'
-        this.delDialogVis = true;
-      },
-      //edit build
-      editBuild() {
-        this.buildTitle = '编辑建筑';
-        this.handleSearchBuildKey()
-        let list = this.currentBuildList.filter(i => i.BuildID === this.curBuildId)
-        let obj = {}
-        for (let i = 0; i < list.length; i++) {
-          obj = list[i]
-        }
-        this.$refs.addBuildDialog.showDialog(obj);
-      },
-      handleFile(val,name) {
-      },
-      // handleBuild 获取建筑信息
-      handleBuild(val) {
-        let newform = tools.formatData(val)
-        let Param = {
-          Content: [newform]
-        }
-        if (newform.BuildID) {
-          objectUpdateBuild(Param, res => {
-            this.$message.success('更新成功')
-            this.$refs.addBuildDialog.closeDialog()
-          })
-        } else {
-          objectCreateBuild(Param, res => {
-            this.$message.success('创建成功')
-            this.$refs.addBuildDialog.closeDialog()
-          })
-        }
-        setTimeout(() => {
-          this.handleBuildQuery()
-          this.init()
-        },500)
-      },
-      //delete floor
-      handleDelete(floor) {
-        this.delText = "楼层";
-        this.delDialogVis = true;
-        this.curFloorId = floor.FloorID;
-      },
-      //确认删除弹窗关闭
-      handleClose() {
-      },
-      addFloor() {
-        this.curFloorId = "";
-        this.floorTitle = "添加楼层";
-        this.$refs.addFloorDialog.showDialog();
-      },
-      // 获取列表
-      getFloorTableData() {
-        let floorParam = {
-          Cascade: [{Name: "floorThroughList"}],
-          Orders: "FloorSequenceID desc",
-          PageNumber: this.page.pageNumber,
-          PageSize: this.page.pageSize,
-          Filters: `BuildID='${this.curBuildId}'`
-        };
-        floorQueryAndSign(floorParam, res => {
-          this.tableData = res.Content;
-          this.page.total = res.Total;
-          this.alreadyRelatedModel = res.Content.map(t => {
-            return t.ModelId
-          }).filter(t => t);
+      } else {
+        // if(Object.keys(newform).length > 0) {
+        //   objectCreateBuild(Param, res => {
+        //     this.$message.success('创建成功')
+        //     this.$refs.addBuildDialog.closeDialog()
+        //   })
+        // } else {
+        //   this.$refs.addBuildDialog.closeDialog()
+        //   return false
+        // }
+        objectCreateBuild(Param, res => {
+          this.$message.success('创建成功')
+          this.$refs.addBuildDialog.closeDialog()
+        })
+      }
+      setTimeout(() => {
+        this.handleBuildQuery()
+        this.init()
+      }, 500)
+    },
+    //delete floor
+    handleDelete(floor) {
+      this.delText = "楼层";
+      this.delDialogVis = true;
+      this.curFloorId = floor.FloorID;
+    },
+    //确认删除弹窗关闭
+    handleClose() {
+    },
+    addFloor() {
+      this.curFloorId = "";
+      this.floorTitle = "添加楼层";
+      this.$refs.addFloorDialog.showDialog();
+    },
+    // 获取列表
+    getFloorTableData() {
+      let floorParam = {
+        Cascade: [{Name: "floorThroughList"}],
+        Orders: "FloorSequenceID desc",
+        PageNumber: this.page.pageNumber,
+        PageSize: this.page.pageSize,
+        Filters: `BuildID='${this.curBuildId}'`
+      };
+      floorQueryAndSign(floorParam, res => {
+        this.tableData = res.content;
+        this.page.total = res.total;
+        this.alreadyRelatedModel = res.content.map(t => {
+          return t.ModelId
+        }).filter(t => t);
+      });
+    },
+    // 绑定图以后刷新
+    bindRefresh() {
+      this.init();
+    },
+    // 创建楼层成功-修改关系成功
+    refresh() {
+      this.getFloorTableData();
+    },
+    // 确认删除(删除建筑-楼层公用)
+    confirmDel() {
+      this.buildDisabled = true
+      if (this.delText == "楼层") {
+        let delParam = [{FloorID: this.curFloorId}];
+        this.delDialogVis = false;
+        manageDeleteFloor(delParam, res => {
+          this.$message.success("删除成功");
+          this.buildDisabled = false
+          this.init();
         });
-      },
-      // 绑定图以后刷新
-      bindRefresh() {
-        this.init();
-      },
-      // 创建楼层成功-修改关系成功
-      refresh() {
-        this.getFloorTableData();
-      },
-      // 确认删除(删除建筑-楼层公用)
-      confirmDel() {
-        this.buildDisabled = true
-        if (this.delText == "楼层") {
-          let delParam = [{FloorID: this.curFloorId}];
+      } else {
+        // 删除建筑
+        if (this.tableData && this.tableData.length) {
+          this.buildDisabled = false
+          this.$message.error("当前建筑中包含楼层,不可删除");
           this.delDialogVis = false;
-          manageDeleteFloor(delParam, res => {
-            this.$message.success("删除成功");
-            this.buildDisabled = false
-            this.init();
-          });
         } else {
-          // 删除建筑
-          if (this.tableData && this.tableData.length) {
+          let param = [{BuildId: this.curBuildId}];
+          this.delDialogVis = false;
+          objectDeleteBuild(param, res => {
+            this.$message.success("删除成功");
             this.buildDisabled = false
-            this.$message.error("当前建筑中包含楼层,不可删除");
-            this.delDialogVis = false;
-          } else {
-            let param = [{BuildId: this.curBuildId}];
-            this.delDialogVis = false;
-            objectDeleteBuild(param, res => {
-              this.$message.success("删除成功");
-              this.buildDisabled = false
-              this.handleBuildQuery()
-              this.init()
-            })
-          }
-
-        }
-      },
-      // 修改楼层信息
-      editFloorData(floor) {
-        this.floorTitle = "编辑楼层信息";
-        this.curFloorId = floor.FloorID;
-        this.$refs.addFloorDialog.showDialog(floor);
-      },
-      // 修改楼层贯通关系
-      changeConnection(row) {
-        this.$refs.addConnectivity.showDialog();
-        this.$refs.addConnectivity.floor = row;
-      },
-      // 查看平面图
-      checkDrawImg(row, index) {
-        if (3 == index) {
-          this.$refs.checkGraphy.showDialog(row);
-          this.modelId = "";
-        } else if(index ==1){
-            this.modelId = row.StructureInfo.FloorMap
-            let pa = {modelId: this.modelId, FloorID: row.FloorID, BuildID: row.BuildID, BuildName: this.curBuildName};
-            this.$router.push({name: "repetitionGraphy", query: pa});
-        } else {
-          this.modelId = row.ModelId;
-          let pa = {modelId: this.modelId, FloorID: row.FloorID, BuildID: row.BuildID, BuildName: this.curBuildName};
-          this.$router.push({name: "repetitionGraphy", query: pa});
+            this.handleBuildQuery()
+            this.init()
+          })
         }
-      },
-      //  查询建筑信息
-      handleBuildQuery() {
-        let param = {
-          projectId: this.projectId,
-          Orders: "BuildLocalName asc",
-          PageNumber: 1,
-          PageSize: 500
-        };
-        objectQueryBuild(param, res => {
-          this.currentBuildList = res.Content
-        });
-      },
 
+      }
     },
-    watch: {
-      projectId() {
-        this.init();
+    // 修改楼层信息
+    editFloorData(floor) {
+      this.floorTitle = "编辑楼层信息";
+      this.curFloorId = floor.FloorID;
+      this.$refs.addFloorDialog.showDialog(floor);
+    },
+    // 修改楼层贯通关系
+    changeConnection(row) {
+      this.$refs.addConnectivity.showDialog();
+      this.$refs.addConnectivity.floor = row;
+    },
+    // 查看平面图
+    checkDrawImg(row, index) {
+      if (3 == index) {
+        this.$refs.checkGraphy.showDialog(row);
+        this.modelId = "";
+      } else if (index == 1) {
+        this.modelId = row.StructureInfo.FloorMap
+        let pa = {modelId: this.modelId, FloorID: row.FloorID, BuildID: row.BuildID, BuildName: this.curBuildName};
+        this.$router.push({name: "repetitionGraphy", query: pa});
+      } else {
+        this.modelId = row.ModelId;
+        let pa = {modelId: this.modelId, FloorID: row.FloorID, BuildID: row.BuildID, BuildName: this.curBuildName};
+        this.$router.push({name: "repetitionGraphy", query: pa});
       }
+    },
+    //  查询建筑信息
+    handleBuildQuery() {
+      let param = {
+        projectId: this.projectId,
+        // Orders: "BuildLocalName asc",
+        PageNumber: 1,
+        PageSize: 500
+      };
+      objectQueryBuild(param, res => {
+        this.currentBuildList = res.Content
+      });
+    },
+
+  },
+  watch: {
+    projectId() {
+      this.init();
     }
-  };
+  }
+};
 </script>
 <style lang="less" scoped>
-  #bd-fl-manage {
-    overflow: hidden;
-    height: 100%;
-    position: relative;
+#bd-fl-manage {
+  overflow: hidden;
+  height: 100%;
+  position: relative;
 
-    .el-row {
-      height: 100%;
+  .el-row {
+    height: 100%;
 
-      .el-col-4 {
-        width: 17%;
-      }
+    .el-col-4 {
+      width: 17%;
+    }
 
-      .el-col-20 {
-        width: 82%;
-      }
+    .el-col-20 {
+      width: 82%;
+    }
 
-      & > div {
-        float: left;
-        height: 100%;
-        overflow: hidden;
-        background-color: #fff;
-        box-sizing: border-box;
-        border: 1px solid #dfe6ec;
+    & > div {
+      float: left;
+      height: 100%;
+      overflow: hidden;
+      background-color: #fff;
+      box-sizing: border-box;
+      border: 1px solid #dfe6ec;
 
-        .action-box {
-          padding: 10px;
+      .action-box {
+        padding: 10px;
 
-          .el-button--small {
-            padding: 10px 11px;
-          }
+        .el-button--small {
+          padding: 10px 11px;
         }
       }
+    }
 
-      .l-list {
-        width: 17%;
-        overflow-y: auto;
+    .l-list {
+      width: 17%;
+      overflow-y: auto;
 
-        h4 {
-          padding-left: 10px;
-          border-top: 1px solid #d9d9d9;
-          border-bottom: 1px solid #d9d9d9;
-          background: #d9d9d9;
-          color: #2b2b2b;
-          line-height: 44px;
-        }
+      h4 {
+        padding-left: 10px;
+        border-top: 1px solid #d9d9d9;
+        border-bottom: 1px solid #d9d9d9;
+        background: #d9d9d9;
+        color: #2b2b2b;
+        line-height: 44px;
+      }
 
-        .build-list {
-          line-height: 48px;
+      .build-list {
+        line-height: 48px;
 
-          .floor-item {
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
+        .floor-item {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
 
-            span {
-              margin-left: 10px;
-            }
+          span {
+            margin-left: 10px;
           }
+        }
 
-          .floor-item.active,
-          .floor-item:hover {
-            background-color: #f5f7fa;
-            color: #000;
-          }
+        .floor-item.active,
+        .floor-item:hover {
+          background-color: #f5f7fa;
+          color: #000;
         }
       }
+    }
 
-      .r-table {
-        width: 82%;
-        margin-left: 1%;
+    .r-table {
+      width: 82%;
+      margin-left: 1%;
 
-        .table-box {
-          height: calc(100% - 54px);
-          margin-bottom: 8px;
+      .table-box {
+        height: calc(100% - 54px);
+        margin-bottom: 8px;
 
-          .iconfont {
-            vertical-align: middle;
-          }
+        .iconfont {
+          vertical-align: middle;
+        }
 
-          /deep/ .el-badge__content.is-fixed {
-            transform: translateY(-6%) translateX(-100%);
-          }
+        /deep/ .el-badge__content.is-fixed {
+          transform: translateY(-6%) translateX(-100%);
+        }
 
-          p {
-            cursor: pointer;
-          }
+        p {
+          cursor: pointer;
         }
       }
     }
   }
+}
 </style>

+ 4 - 3
src/views/relation/overview/detail/index.vue

@@ -44,7 +44,7 @@
 </template>
 <script>
 import {
-  buildingQuery, //数据中心-建筑查询
+  // buildingQuery, //数据中心-建筑查询
   zoneQueryOutline, // 业务空间查询
   queryDictionaryHead, //空间类型查询
   createSpaceNeighborhood, //创建邻接关系
@@ -52,6 +52,7 @@ import {
   delSpaceNeighborhood, //删除选中
   delFloorNeighborhood, //删除所有
 } from "@/api/scan/request";
+import { buildingQuery } from '@/api/object/build';
 import { SColor, SPoint } from "@saga-web/draw/lib";
 import { RelationScene, FloorView } from "@saga-web/cad-engine/lib";
 import canvasFun from "@/components/business_space/newGraphy/canvasFun"
@@ -163,7 +164,7 @@ export default {
       this.scene.isAbsorbing = true;
       this.description = '添加'
     },
-    // 
+    //
     removeAll() {
       let temp = {
         FloorId: this.buildFloor[1],
@@ -394,4 +395,4 @@ export default {
     }
   }
 }
-</style>
+</style>