Quellcode durchsuchen

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

zhangyu vor 5 Jahren
Ursprung
Commit
162e781480

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

@@ -1522,12 +1522,6 @@ export function buildingQueryAndCount(param, success) {
   http.postJson(url, param, success)
 }
 
-// 查询分区统计信息
-export function countObjZone(param, success) {
-  let url = `${baseUrl}/datacenter/object/zone/count`;
-  http.postJson(url, param, success)
-}
-
 // 查询建筑楼层-统计业务空间state
 export function queryBFloorWithState(param, success) {
   let url = `${baseUrl}/datacenter/object/zone/building-floor`;
@@ -1575,12 +1569,6 @@ export function countZone(param, success) {
   http.postJson(url, data, success)
 }
 
-//查询所有空间信息
-export function queryAllZone(param, success) {
-  let url = `${baseUrl}/datacenter/object/zone/query`;
-  http.postJson(url, param, success)
-}
-
 //查询空间信息父类
 export function queryParentZone(param, success) {
     let url = `${baseUrl}/datacenter/zonespacebase/query`;
@@ -1969,21 +1957,27 @@ export function zoneCreate(param,success) {
   http.postJson(url,param,success)
 }
 
-//查询空间信息
-export function searchZoneQuery(param,success) {
-  let url = `${baseUrl}/datacenter/object/zone/query`
-  http.postJson(url,param,success)
-}
-// 根据id删除分区对象
-export function handleZoneDelete(param,success) {
+//跟据id删除分区对象
+export function zoneDelete(param,success) {
   let url = `${baseUrl}/datacenter/object/zone/delete`
   http.postJson(url,param,success)
 }
+
 //更新分区对象信息
-export function handleZoneObjectUpdate(param,success) {
+export function zoneUpdate(param,success) {
   let url = `${baseUrl}/datacenter/object/zone/update`
   http.postJson(url,param,success)
 }
+//查询分区对象信息
+export function zoneQuery(param,success) {
+  let url = `${baseUrl}/datacenter/object/zone/query`
+  http.postJson(url,param,success)
+}
+//查询分区对象信息
+export function zoneCount(param,success) {
+  let url = `${baseUrl}/datacenter/object/zone/count`
+  http.postJson(url,param,success)
+}
 //修改业务空间对象和建筑楼层的关系
 export function handleZoneUpdateBd(param,success) {
   let url = `${baseUrl}/datacenter/object/zone/update-fl-bd`

+ 6 - 6
src/components/business_space/business/handsontable.vue

@@ -60,11 +60,11 @@
   import qrcode from "@/components/ledger/lib/qrcode";
   import {
     BeatchQueryParam,
-    handleZoneDelete,
-    handleZoneObjectUpdate,
+    zoneDelete,
+    zoneUpdate,
     handleZoneUpdateBd,
     queryAllZoneType,
-    searchZoneQuery,
+    zoneQuery,
     zoneCreate
   } from "@/api/scan/request";
   import {mapGetters} from "vuex";
@@ -206,7 +206,7 @@
     },
     //查询空间信息
     getZoneMessage(param) {
-      searchZoneQuery(param, res => {
+      zoneQuery(param, res => {
         this.page.total = res.Total;
         this.main = res.Content.map((item) => {
           if (item.hasOwnProperty("BuildingId") && item.hasOwnProperty("FloorId")) {
@@ -444,7 +444,7 @@
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        handleZoneDelete(param, res => {
+        zoneDelete(param, res => {
           this.$message.success("删除成功!")
           this.getData()
         })
@@ -582,7 +582,7 @@
         let updateParam = {
           Content: obj
         };
-        handleZoneObjectUpdate(updateParam, res => {
+        zoneUpdate(updateParam, res => {
           this.$message.success('更新成功')
         })
       }

+ 7 - 7
src/components/business_space/newGraphy/graphy.vue

@@ -123,9 +123,9 @@ import {
   groupCreRelaZoneAndISp,
   queryAllZoneType, // 定制分区类型
   zoneCreate,
-  searchZoneQuery,
-  handleZoneObjectUpdate,
-  countObjZone
+  zoneQuery,
+  zoneUpdate,
+  zoneCount
 } from "@/api/scan/request"
 
 export default {
@@ -372,7 +372,7 @@ export default {
         pa.BuildingId = this.buildFloor[0];
         pa.FloorId = this.buildFloor[1];
       }
-      searchZoneQuery(pa, res => {
+      zoneQuery(pa, res => {
         // 所有业务空间
         this.businessSpaceList = res.Content;
         // 已关联元空间的业务空间
@@ -727,7 +727,7 @@ export default {
         Content: [space],
         Projection: ['State']
       }
-      handleZoneObjectUpdate(pa, res => {
+      zoneUpdate(pa, res => {
         this.curZoneItem.isInfected = false;
         this.$emit('updateState');
         this.$message.success('更新成功');
@@ -988,7 +988,7 @@ export default {
       let pa = {
         Content: [zoneObj]
       }
-      handleZoneObjectUpdate(pa, res => {
+      zoneUpdate(pa, res => {
         this.relationInBSPandISP(zoneObj.RoomID, IspaceIdList)
       })
     },
@@ -997,7 +997,7 @@ export default {
       let pa = {
         Filters: `Outline isNull;ObjectType="${this.tab.code}"`
       }
-      countObjZone(pa, res => {
+      zoneCount(pa, res => {
         this.num = res.Count;
       })
     },

+ 14 - 15
src/components/business_space/newGraphy/unRelateBSP.vue

@@ -39,7 +39,7 @@
 <script>
 import {
   buildingQuery,
-  queryZone
+  zoneQuery
 } from "@/api/scan/request"
 export default {
   name: "unRelateBSP",
@@ -97,7 +97,7 @@ export default {
       this.getTableData();
     },
     // 页码
-    handleCurrentChange(val) { 
+    handleCurrentChange(val) {
       this.page.pageNumber = val;
       this.getTableData();
     },
@@ -129,28 +129,27 @@ export default {
     // 查询未关联平面图的业务空间(项目下+当前分区)
     getTableData() {
       let pa = {
-        zone: this.code,
-        data: {
-          Filters: `Outline isNull`,
-          Orders: "createTime desc, RoomID asc",
-          PageSize: this.page.pageSize,
-          pageNumber: this.page.pageNumber
-        }
+        ZoneType: this.code,
+        Filters: `Outline isNull`,
+        Orders: "createTime desc, RoomID asc",
+        PageSize: this.page.pageSize,
+        pageNumber: this.page.pageNumber
       }
+
       if (this.floor[0] == 'isNull') {
-        pa.data.Filters += `;BuildingId isNull`
+        pa.BuildingId = `isnull`
       } else if (this.floor[0] && this.floor[0] != 'all') {
-        pa.data.Filters += `;BuildingId='${this.floor[0]}'`
+        pa.BuildingId = this.floor[0]
       }
       if (this.floor[1] == 'isNull') {
-        pa.data.Filters += `;FloorId isNull`
+        pa.FloorId = `isnull`
       } else if (this.floor[1] && this.floor[1] != 'all') {
-        pa.data.Filters += `;FloorId='${this.floor[1]}'`
+        pa.FloorId = this.floor[1]
       }
       if (this.keycode != '') {
-        pa.data.Filters += `;RoomLocalName contain "${this.keycode}" or RoomName contain "${this.keycode}"`
+        pa.Filters += `;RoomLocalName contain "${this.keycode}" or RoomName contain "${this.keycode}"`
       }
-      queryZone(pa, res => {
+      zoneQuery(pa, res => {
         this.page.total = res.Total;
         this.tableData = res.Content.map(t => {
           t.BNAME = this.bfData[t.BuildingId];

+ 10 - 12
src/components/business_space/newTables/eqToSpaceTable.vue

@@ -45,7 +45,7 @@
 
 <script>
 import {
-  queryZone,
+  zoneQuery,
   eqInSpaceDelete, //设备所在业务空间--删除关系
   eqForSpaceDelete, //设备服务业务空间--删除关系
 } from "@/api/scan/request";
@@ -133,18 +133,16 @@ export default {
     getTableData() {
       this.loading = true;
       let pa = {
-        data: {
-          Filters: `RoomID='${this.params.RoomID}'`,
-          Cascade: [
-            {
-              Name: this.type.replace(this.type[0], this.type[0].toLowerCase()),
-              Cascade: [{ Name: 'equipCategory' }]
-            }
-          ]
-        },
-        zone: this.params.zone
+        Filters: `RoomID='${this.params.RoomID}'`,
+        Cascade: [
+          {
+            Name: this.type.replace(this.type[0], this.type[0].toLowerCase()),
+            Cascade: [{ Name: 'equipCategory' }]
+          }
+        ],
+        ZoneType: this.params.zone
       }
-      queryZone(pa, res => {
+      zoneQuery(pa, res => {
         this.loading = false;
         this.tableData = res.Content[0][this.type] || []
         this.tableData.map(t => {

+ 5 - 7
src/components/business_space/newTables/syInSpaceTable.vue

@@ -37,7 +37,7 @@
 
 <script>
 import {
-  queryZone,
+  zoneQuery,
   syInSpaceDelete
 } from "@/api/scan/request";
 import { mapGetters } from "vuex";
@@ -102,13 +102,11 @@ export default {
     getTableData() {
       this.loading = true;
       let pa = {
-        data: {
-          Cascade: [{ Name: "generalSystem" }],
-          Filters: `RoomID="${this.params.RoomID}"`,
-        },
-        zone: this.params.zone
+        Cascade: [{ Name: "generalSystem" }],
+        Filters: `RoomID="${this.params.RoomID}"`,
+        ZoneType: this.params.zone
       }
-      queryZone(pa, res => {
+      zoneQuery(pa, res => {
         this.loading = false;
         this.tableData = res.Content[0].GeneralSystem || [];
         this.tableData.map(t => {

+ 8 - 9
src/components/ledger/lib/cenoteGraphy.vue

@@ -22,7 +22,7 @@ import { SColor, SPoint } from "@saga-web/draw/lib";
 import { DivideFloorScene, SpaceItem, ZoneItem } from "@saga-web/cad-engine/lib";
 import { FloorView } from "@saga-web/cad-engine/lib/FloorView";
 import { colorArr } from '@/utils/spaceColor';
-import { getFloorMsgByFloorID, queryZone, shaftSpaceQuery, shaftZoneLinkReplace } from '@/api/scan/request';
+import { getFloorMsgByFloorID, shaftSpaceQuery, shaftZoneLinkReplace, zoneQuery } from '@/api/scan/request';
 import { resolve, reject } from 'q';
 export default {
   data() {
@@ -124,17 +124,16 @@ export default {
       });
       let promise2 = new Promise((resolve, reject) => {
         let pa = {
-          zone: this.space,
-          data: {
-            Filters: ``,
-            Orders: "createTime desc, RoomID asc",
-            PageSize: 1000
-          }
+          Filters: `not RoomID isNull`,
+          Orders: "createTime desc, RoomID asc",
+          PageSize: 1000,
+          ZoneType: this.space
         }
         if (this.buildingData.length && this.buildingData.length > 1) {
-          pa.data.Filters = `BuildingId='${this.buildingData[0]}';FloorId='${this.buildingData[1]}'`
+          pa.BuildingId = this.buildingData[0];
+          pa.FloorId = this.buildingData[1];
         }
-        queryZone(pa, res => {
+        zoneQuery(pa, res => {
           resolve(res);
         })
       })

+ 52 - 53
src/components/ledger/lib/linkassets.vue

@@ -3,17 +3,17 @@
     <el-row>
       <span class="condition-title">设备类型:</span>
       <el-select v-model="deviceType" filterable size="small" @change="handleChangeDevice" style="width:350px;">
-        <el-option  v-for="item in deviceTypeList" :key="item.Category" :label="item.CategoryName" :value="item.Category"></el-option>
+        <el-option v-for="item in deviceTypeList" :key="item.Category" :label="item.CategoryName" :value="item.Category"></el-option>
       </el-select>
     </el-row>
     <el-row style="margin-top:30px;">
       <span class="condition-title">建筑楼层:</span>
       <el-cascader :options="bfoptions" v-model="buildFloor" filterable size="small" @change="handleChangeBf" style="width:350px;"></el-cascader>
     </el-row>
-    <el-row style="margin-top:30px;"  v-show="spaceShow">
+    <el-row style="margin-top:30px;" v-show="spaceShow">
       <span class="condition-title">分区类型:</span>
       <el-select v-model="zone" filterable size="small" @change="handleChangeZone" style="width:350px;">
-        <el-option  v-for="item in zoneList" :key="item.Code" :label="item.Name" :value="item.Code"></el-option>
+        <el-option v-for="item in zoneList" :key="item.Code" :label="item.Name" :value="item.Code"></el-option>
       </el-select>
     </el-row>
     <el-row style="margin-top:30px;" v-show="spaceShow && zone != 'all' && zone != 'noKnow'">
@@ -31,7 +31,7 @@
 </template>
 <script>
 
-import { floorQuery, buildingQuery, queryDictionaryHead, queryZone, TypePartsDie } from '@/api/scan/request'
+import { floorQuery, buildingQuery, queryDictionaryHead, zoneQuery, TypePartsDie } from '@/api/scan/request'
 
 import { mapGetters } from "vuex"
 export default {
@@ -69,7 +69,7 @@ export default {
   mounted() { },
   methods: {
     //打开弹窗回调,初始化选择
-    handleOpenReset(){
+    handleOpenReset() {
       this.deviceType = ''
       this.buildFloor = ['all']
       this.zone = 'all'
@@ -126,9 +126,9 @@ export default {
           value: "all",
           label: "全部"
         }, {
-            value: "noKnow",
-            label: "不在建筑内"
-          })
+          value: "noKnow",
+          label: "不在建筑内"
+        })
         data.forEach(build => {
           floorData.forEach(floor => {
             if (build.value == floor.BuildID && floor.FloorID && floor.FloorLocalName) {
@@ -144,13 +144,13 @@ export default {
                   value: "all",
                   label: "全部"
                 }, {
-                    value: 'noKnow',
-                    label: "不在楼层内"
-                  }, {
-                    value: floor.FloorID,
-                    label: floor.FloorLocalName,
-                    FloorSequenceID: floor.FloorSequenceID
-                  })
+                  value: 'noKnow',
+                  label: "不在楼层内"
+                }, {
+                  value: floor.FloorID,
+                  label: floor.FloorLocalName,
+                  FloorSequenceID: floor.FloorSequenceID
+                })
               }
             }
           })
@@ -159,16 +159,16 @@ export default {
       })
     },
     //获取空间分区数据
-    getSpaceData(){
+    getSpaceData() {
       let params = {
         Filters: "parentId = 'Space'",
         PageNumber: 1,
         PageSize: 1000,
-        Projection: [ "Code", "Name" ]
+        Projection: ["Code", "Name"]
       }
       queryDictionaryHead(params, res => {
         this.zoneList = res.Content.filter(item => {
-          if(item.Code != 'Ispace'){
+          if (item.Code != 'Ispace') {
             return item
           }
         })
@@ -195,9 +195,9 @@ export default {
       this.handleChangeSpaceItem()
     },
     //判断是否显示空间分区选择
-    zoneListIsShow(){
+    zoneListIsShow() {
       let lastVal = this.buildFloor.slice(-1)[0]
-      if(!lastVal || lastVal == 'noKnow' || this.buildFloor[0] == 'all' || this.deviceType.length != 4) {
+      if (!lastVal || lastVal == 'noKnow' || this.buildFloor[0] == 'all' || this.deviceType.length != 4) {
         this.spaceShow = false
       } else {
         this.spaceShow = true
@@ -212,30 +212,29 @@ export default {
     },
     // 获取空间实例
     handleChangeSpaceItem() {
-      if(this.zone != 'all' && this.zone != 'noKnow') {
+      if (this.zone != 'all' && this.zone != 'noKnow') {
         let nodes = []
         let recursionGetData = (pageNum, zone) => {
           pageNum = pageNum ? pageNum : 1
           let params = {
-            zone: zone,
-            data: {
-              Orders: "CreateTime desc, RoomID asc",
-              PageNumber: pageNum,
-              PageSize: 1000,
-              Projection: ["RoomID", "RoomName", "RoomLocalName", "CreateTime"]
-            },
+            Orders: "CreateTime desc, RoomID asc",
+            PageNumber: pageNum,
+            PageSize: 1000,
+            Projection: ["RoomID", "RoomName", "RoomLocalName", "CreateTime"],
+            ZoneType: zone
           }
-          if(this.spaceShow) {
-            if(this.buildFloor.length == 2 && this.buildFloor[1] != 'all') {
-              params.data.Filters = `buildingId='${this.buildFloor[0]}';floorId='${this.buildFloor[1]}'`
+          if (this.spaceShow) {
+            if (this.buildFloor.length == 2 && this.buildFloor[1] != 'all') {
+              pa.BuildingId = this.buildFloor[0];
+              pa.FloorId = this.buildFloor[1];
             } else {
-              params.data.Filters = `buildingId='${this.buildFloor[0]}'`
+              pa.BuildingId = this.buildFloor[0];
             }
           }
-          queryZone(params, res => {
+          zoneQuery(params, res => {
             nodes = nodes.concat(res.Content.map(item => ({
               value: item.RoomID,
-              label: item.RoomLocalName?item.RoomLocalName:item.RoomName
+              label: item.RoomLocalName ? item.RoomLocalName : item.RoomName
             })))
             if (res.Total / (res.PageSize * res.PageNumber) > 1) {
               recursionGetData(res.PageNumber + 1, zone)
@@ -255,21 +254,21 @@ export default {
     toLinkAssets() {
       let query = {}
       // 校验必填项
-      if(!this.deviceType) {
+      if (!this.deviceType) {
         this.$message.info('请选择设备类型!')
         return false
       } else if (!this.buildFloor.length) {
         this.$message.info('请选择建筑楼层!')
         return false
       }
-      if(this.spaceShow) { //选择了空间
-        if(this.zone == 'all'){//全部空间
+      if (this.spaceShow) { //选择了空间
+        if (this.zone == 'all') {//全部空间
           query = {
             deviceType: this.deviceType,
             buildFloor: this.buildFloor
           }
         } else {
-          if(this.space.length){//选择了具体的空间实例
+          if (this.space.length) {//选择了具体的空间实例
             query = {
               deviceType: this.deviceType,
               buildFloor: this.buildFloor,
@@ -296,24 +295,24 @@ export default {
     }
   },
   watch: {
-    
+
   }
 };
 </script>
 
 <style lang="less" scoped>
-  .condition-title{
-    width: 100px;
-    display: inline-block;
-    text-align: right;
-    margin-left: 10px;
-    margin-right: 12px;
-    color: #999999;
-    font-size: 14px;
-    vertical-align: top;
-  }
-  /deep/ .el-dialog__body {
-    max-height: 420px;
-    overflow-y: auto;
-  }
+.condition-title {
+  width: 100px;
+  display: inline-block;
+  text-align: right;
+  margin-left: 10px;
+  margin-right: 12px;
+  color: #999999;
+  font-size: 14px;
+  vertical-align: top;
+}
+/deep/ .el-dialog__body {
+  max-height: 420px;
+  overflow-y: auto;
+}
 </style>

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

@@ -83,7 +83,7 @@ import {
   floorQuery, //数据中心查询楼层
   buildingQuery, //数据中心建筑查询
   projectQuery, //数据中心查询项目信息
-  queryAllZone, //数据中心所有空间实例
+  zoneQuery, //数据中心所有空间实例
   queryLinkSys, //数据中心系统查询
   queryTenant, //数据中心查询租户
   partsQuery, //数据中心部件查询
@@ -296,7 +296,7 @@ export default {
               return undefined;
             }).filter(item => item);
             if (tempArr.length) {
-              queryAllZone({
+              zoneQuery({
                 PageSize: 500,
                 Filters: `RoomID in ${JSON.stringify(tempArr)}`,
                 Cascade: [{ Name: 'building' }, { Name: 'floor' }],

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

@@ -8,7 +8,7 @@ import {
   buildingQuery, //数据中心查询建筑
   floorQuery, //数据中型查询楼层
   queryDictionaryHead, //数据中心查询分区类型
-  queryAllZone, //数据中心查询所有空间
+  zoneQuery, //数据中心查询所有空间
 } from "@/api/scan/request";
 import { mapGetters, mapActions } from "vuex";
 export default {
@@ -62,9 +62,10 @@ export default {
           } else if (node.level == 3) {
             let pa = {
               PageSize: 1000,
-              Filters: `BuildingId='${node.path[0]}';FloorId='${node.path[1]}';ObjectType='${node.path[2]}'`
+              ObjectType: node.path[2],
+              Filters: `BuildingId='${node.path[0]}';FloorId='${node.path[1]}'`
             };
-            queryAllZone(pa, res => {
+            zoneQuery(pa, res => {
               const nodes = res.Content.map(t => {
                 t.value = t.RoomID;
                 t.label = t.RoomLocalName;

+ 2 - 2
src/components/point/dynamicdata/spaceRules.vue

@@ -102,7 +102,7 @@ import {
   dynamicQuery,
   dynamicQueryPoint,
   dynamicPointTypeList,
-  queryAllZone, //数据中心所有空间实例
+  zoneQuery, //数据中心所有空间实例
 } from "@/api/scan/request";
 export default {
   computed: {
@@ -207,7 +207,7 @@ export default {
           return undefined;
         }).filter(item => item);
         if (tempArr.length) {
-          queryAllZone({
+          zoneQuery({
             PageSize: this.page.pageSize,
             Filters: `RoomID in ${JSON.stringify(tempArr)}`,
             Cascade: [{ Name: 'building' }, { Name: 'floor' }],

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

@@ -44,7 +44,7 @@ import {
   floorQuery, //数据中心查询楼层
   buildingQuery, //数据中心建筑查询
   projectQuery, //数据中心查询项目信息
-  queryAllZone, //数据中心所有空间实例
+  zoneQuery, //数据中心所有空间实例
   queryLinkSys, //数据中心系统查询
   queryTenant, //数据中心查询租户
   partsQuery, //数据中心部件查询
@@ -101,7 +101,7 @@ export default {
               })
             } else if (item.TypeCode == 'Sp') {
               //获取空间信息
-              queryAllZone({
+              zoneQuery({
                 Filters: `RoomID='${item.TypeCode + item.ProjectId + item.ObjectID}'`
               }, zoneMsg => {
                 if (zoneMsg.Content[0] && zoneMsg.Content[0].Outline) {

+ 9 - 9
src/views/data_admin/buildGraphy/updatePointZone.vue

@@ -38,7 +38,7 @@
 
 <script>
 import locationPointMsg from '@/views/data_admin/buildGraphy/locationPointMsg'
-import { queryDictionaryHead, zoneQueryByPoint, queryZone, updateZonePic } from '@/api/scan/request';
+import { queryDictionaryHead, zoneQueryByPoint, zoneQuery, updateZonePic } from '@/api/scan/request';
 import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -163,15 +163,15 @@ export default {
       //业务空间
       else {
         let pa = {
-          zone: node.value,
-          data: {
-            "Filters": `buildingId='${node.parent.parent.value}';floorId='${node.parent.value}'`,
-            "Orders": "createTime desc, RoomID asc",
-            "PageNumber": 1,
-            "PageSize": 999
-          }
+          Filters: `not RoomID isNull`,
+          Orders: "createTime desc, RoomID asc",
+          PageNumber: 1,
+          PageSize: 1000,
+          ZoneType: node.value,
+          BuildingId: node.parent.parent.value,
+          FloorId: node.parent.value
         }
-        queryZone(pa, res => {
+        zoneQuery(pa, res => {
           let nodes = res.Content.map(item => {
             item.Building = { BuildLocalName: node.parent.parent.label };
             item.Floor = { FloorLocalName: node.parent.label };

+ 10 - 10
src/views/ledger/rentlist/manageTenantZone.vue

@@ -85,7 +85,7 @@ import { mapGetters, mapActions } from "vuex";
 import { SColor, SPoint } from "@saga-web/draw/lib";
 import { DivideFloorScene, SpaceItem, ZoneItem, FloorView } from "@saga-web/cad-engine/lib";
 import { colorArr } from "@/utils/spaceColor"
-import { buildingQuery, queryTnRelateFloor, queryRentTableData, tnRelateZone, queryZone } from '@/api/scan/request'
+import { buildingQuery, queryTnRelateFloor, queryRentTableData, tnRelateZone, zoneQuery } from '@/api/scan/request'
 export default {
   data() {
     return {
@@ -302,16 +302,16 @@ export default {
       if (buildid && floorid && this.value) {
         this.canvasLoading = true
         let pa = {
-          zone: this.value,
-          data: {
-            Filters: `BuildingId='${buildid}';FloorId='${floorid}'`,
-            Orders: "createTime desc, RoomID asc",
-            PageSize: 1000
-          }
+          Filters: `not RoomID isNull`,
+          Orders: "createTime desc, RoomID asc",
+          PageSize: 1000,
+          ZoneType: this.value,
+          BuildingId: buildid,
+          FloorId: floorid
         }
         this.canvasLoading = false;
         let promise1 = new Promise((resolve) => {
-          queryZone(pa, res => {
+          zoneQuery(pa, res => {
             resolve(res);
           })
         })
@@ -470,8 +470,8 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-@normal-border-color : #e4e4e4;
-@normal-border-active-color : #e8e8e8;
+@normal-border-color: #e4e4e4;
+@normal-border-active-color: #e8e8e8;
 #manageTenantZone {
   height: 100%;
   .main-container {

+ 4 - 4
src/views/ledger/spacelist/index.vue

@@ -71,13 +71,13 @@
   import roomInFloorDialog from "@/components/business_space/newAddDialogs/roomInFloorDialog";
   import handsontableMain from "@/components/business_space/business/handsontable";
   import {
-    countObjZone,
+    zoneCount,
     getDataDictionary,
     getrelationTypeProject,
     getSpaceBdFlCount,
     queryAllZoneType,
     queryBFloorWithState,
-    searchZoneQuery
+    zoneQuery
   } from "@/api/scan/request";
   import floorCascader from "@/components/ledger/lib/floorCascader";
   import {mapGetters} from "vuex";
@@ -185,7 +185,7 @@
       if (floor) {
         pa.Filters += `;FloorId="${floor}"`
       }
-      countObjZone(pa, res => {
+      zoneCount(pa, res => {
         if (floor) {
           this.infectedCurfloor = res.Count
         } else {
@@ -329,7 +329,7 @@
     //
     //     }
     //   }
-    //   searchZoneQuery(params, res => {
+    //   zoneQuery(params, res => {
     //
     //   })
     // },

+ 4 - 6
src/views/ledger/spacelist/spaceDetail/index.vue

@@ -31,7 +31,7 @@
 
 <script>
 import { mapGetters } from "vuex"
-import { queryZone, zoneCreate } from '@/api/scan/request'
+import { zoneQuery, zoneCreate } from '@/api/scan/request'
 import eqToSpaceTable from '@/components/business_space/newTables/eqToSpaceTable'
 import syInSpaceTable from '@/components/business_space/newTables/syInSpaceTable'
 export default {
@@ -76,12 +76,10 @@ export default {
     // 查询空间详情
     getSpaceDetails() {
       let pa = {
-        data: {
-          Filters: `RoomID="${this.params.RoomID}"`
-        },
-        zone: this.params.zone
+        Filters: `RoomID="${this.params.RoomID}"`,
+        ZoneType: this.params.zone
       }
-      queryZone(pa, res => {
+      zoneQuery(pa, res => {
         this.spaceDetails = res.Content[0];
       })
     },

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

@@ -162,7 +162,7 @@ import {
   dynamicDeleteRelation,
   dynamicPointTypeList,
   dynamicQueryAI,
-  queryAllZone, //数据中心所有空间实例
+  zoneQuery, //数据中心所有空间实例
   dynamicRelatedObj, //动参-查询已关联实例
 } from "@/api/scan/request";
 export default {
@@ -425,7 +425,7 @@ export default {
         if (tempArr.length) {
           pa.Filters += `;not RoomID in ${JSON.stringify(tempArr)}`
         }
-        queryAllZone(pa, res => {
+        zoneQuery(pa, res => {
           this.rPage.total = res.Total;
           let tempArr = res.Content.map(t => {
             t.ObjectID = t.RoomID.substr(12);

+ 8 - 9
src/views/relation/overview/detail/index.vue

@@ -45,7 +45,7 @@
 <script>
 import {
   buildingQuery, //数据中心-建筑查询
-  queryZone, // 业务空间查询
+  zoneQuery, // 业务空间查询
   queryDictionaryHead, //空间类型查询
   createSpaceNeighborhood, //创建邻接关系
   querySpaceNeighborhood, // 查询邻接关系
@@ -287,19 +287,18 @@ export default {
     getBusinessSpace() {
       this.canvasLoading = true
       let pa = {
-        zone: this.zoneType,
-        data: {
-          Filters: ``,
-          Orders: "createTime desc, RoomID asc",
-          PageSize: 1000
-        }
+        Filters: `not RoomID isNull`,
+        Orders: "createTime desc, RoomID asc",
+        PageSize: 1000,
+        ZoneType: this.zoneType
       }
       if (this.buildFloor.length && this.buildFloor.length > 1) {
-        pa.data.Filters = `BuildingId='${this.buildFloor[0]}';FloorId='${this.buildFloor[1]}'`
+        pa.BuildingId = this.buildFloor[0];
+        pa.FloorId = this.buildFloor[1];
       } else {
         this.$message.warning("请选择建筑楼层");
       }
-      queryZone(pa, res => {
+      zoneQuery(pa, res => {
         // 所有业务空间
         this.businessSpaceList = res.Content;
         // 已关联元空间的业务空间

+ 21 - 22
src/views/screen/splitscreen/integrateresults/index.vue

@@ -8,8 +8,8 @@
   <div>
     <div class='page-bar'>
       <el-breadcrumb separator='/'>
-      <el-breadcrumb-item>系统集成</el-breadcrumb-item>
-      <el-breadcrumb-item>系统集成成果管理</el-breadcrumb-item>                       
+        <el-breadcrumb-item>系统集成</el-breadcrumb-item>
+        <el-breadcrumb-item>系统集成成果管理</el-breadcrumb-item>
       </el-breadcrumb>
     </div>
     <div class="page-content">
@@ -24,7 +24,8 @@
       <div class="content-right" id="cadBox" v-loading="loading">
         <canvas v-show="drawCanvas" :height="cadHeight" :width="cadWidth" id="exampleCanvas" :k="refreshCanvas"></canvas>
         <div v-show="drawCanvas" class="operate">
-          <canvasFun @fit="fit" @savePng="savePng" @saveSvg="saveSvg" @scale="scale" @saveJson="saveJson" :config="config" ref="canvasFun"></canvasFun>
+          <canvasFun @fit="fit" @savePng="savePng" @saveSvg="saveSvg" @scale="scale" @saveJson="saveJson" :config="config" ref="canvasFun">
+          </canvasFun>
         </div>
         <div class="no-data" v-show="!drawCanvas">
           <div class="position-icon">
@@ -41,7 +42,7 @@
 import { SGraphyView } from "@saga-web/graphy/lib";
 import { LocationPointScene, DivideFloorScene } from "@saga-web/cad-engine";
 import { SColor } from "@saga-web/draw/lib";
-import { queryEquip, floorQuery, queryZone } from '@/api/scan/request';
+import { queryEquip, floorQuery, zoneQuery } from '@/api/scan/request';
 //组件
 import realtimeData from '@/components/screen/integrateresults/realtimeData';
 import exampleList from '@/components/screen/integrateresults/exampleList';
@@ -73,7 +74,7 @@ export default {
       },
     }
   },
-  methods:{
+  methods: {
     handleChangeExample(example) {
       this.drawCanvas = false;
       //存在实例ID
@@ -100,15 +101,13 @@ export default {
             }
           })
         } else if (example.TypeCode == 'Sp') {//空间
-          if(example.SubTypeCode) {
+          if (example.SubTypeCode) {
             let pa = {
-              data: {
-                Filters: `RoomID='${example.TypeCode + localStorage.getItem('projectId').substring(2) + example.ObjectID}'`
-              },
-              zone: example.SubTypeCode
+              Filters: `RoomID='${example.TypeCode + localStorage.getItem('projectId').substring(2) + example.ObjectID}'`,
+              ZoneType: example.SubTypeCode
             }
             //获取空间信息
-            queryZone(pa, zoneMsg => {
+            zoneQuery(pa, zoneMsg => {
               if (zoneMsg.Content[0] && zoneMsg.Content[0].Outline) {
                 let canvasOption = {
                   RoomLocalName: zoneMsg.Content[0].RoomLocalName,
@@ -168,7 +167,7 @@ export default {
             }
           })
         }
-        else{
+        else {
           this.loading = false;
           this.drawCanvas = false;
         }
@@ -204,7 +203,7 @@ export default {
     }
   },
   watch: {
-    $route(to,from){
+    $route(to, from) {
       this.queryParams = this.$route.query;
       this.ObjectLocalName = '';
       this.drawCanvas = false;
@@ -222,7 +221,7 @@ export default {
 
 <style lang="scss" scoped>
 $borderColor: rgba(201, 201, 201, 1);
-.page-bar{
+.page-bar {
   flex-grow: 0;
   flex-shrink: 0;
   height: 24px;
@@ -233,31 +232,31 @@ $borderColor: rgba(201, 201, 201, 1);
     font-size: 14px;
   }
 }
-.page-content{
+.page-content {
   display: flex;
   flex-grow: 1;
   flex-shrink: 1;
   flex-direction: row;
   justify-content: flex-start;
   overflow-y: auto;
-  .content-left{
+  .content-left {
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
     width: 260px;
     margin-right: 15px;
-    .data-box{
+    .data-box {
       height: 140px;
       margin-bottom: 15px;
     }
-    .example-box{
+    .example-box {
       flex-grow: 1;
       flex-shrink: 1;
       height: calc(100% - 160px);
       border: 1px solid $borderColor;
     }
   }
-  .content-right{
+  .content-right {
     flex-grow: 1;
     flex-shrink: 1;
     border: 1px solid $borderColor;
@@ -270,16 +269,16 @@ $borderColor: rgba(201, 201, 201, 1);
       transform: translateX(-50%);
       z-index: 99;
     }
-    .no-data{
+    .no-data {
       height: 100%;
       text-align: center;
       box-sizing: border-box;
       position: relative;
-      .position-icon{
+      .position-icon {
         position: absolute;
         top: 50%;
         left: 50%;
-        transform: translate(-50%,-50%);
+        transform: translate(-50%, -50%);
       }
     }
   }

+ 6 - 8
src/views/screen/splitscreen/spaceledger/index.vue

@@ -101,7 +101,7 @@
 
 <script>
 import { mapGetters } from "vuex";
-import { queryZone, getAllbusiness, getDataDictionary, floorQuery, buildingQuery, BeatchQueryParam } from '@/api/scan/request'
+import { zoneQuery, getAllbusiness, getDataDictionary, floorQuery, buildingQuery, BeatchQueryParam } from '@/api/scan/request'
 import eqToSpaceTable from '@/components/business_space/newTables/eqToSpaceTable'
 import syInSpaceTable from '@/components/business_space/newTables/syInSpaceTable'
 import { DivideFloorScene, SpaceItem, ZoneItem, FloorView } from "@saga-web/cad-engine/lib";
@@ -162,12 +162,10 @@ export default {
       this.params = this.$route.query;
       // 获取空间数据
       let params = {
-        data: {
-          Filters: `RoomID="${this.$route.query.RoomID}"`
-        },
-        zone: this.$route.query.zone
+        Filters: `RoomID="${this.$route.query.RoomID}"`,
+        ZoneType: this.$route.query.zone
       }
-      queryZone(params, res => {
+      zoneQuery(params, res => {
         this.spaceDetails = res.Content[0];
         if (this.spaceDetails.Outline && this.spaceDetails.Outline[0] && this.spaceDetails.Outline[0].length) {
           this.getSpaceFloor();
@@ -407,10 +405,10 @@ export default {
   overflow-x: hidden !important;
   overflow-y: auto !important;
 }
-.objectRelationship{
+.objectRelationship {
   height: calc(100% - 46px) !important;
 }
-/deep/ .el-tabs__content{
+/deep/ .el-tabs__content {
   height: 100%;
 }
 </style>