shaun-sheep 5 éve
szülő
commit
e272f256a9

+ 6 - 1
src/api/scan/request.js

@@ -1892,4 +1892,9 @@ export function postRelationInforAtpism(param, success) {
 export function getAllEqPaType(param, success) {
   let url = `${baseUrl}/datacenter/class-def/query-equip-comm-type`
   http.postJson(url, param, success)
-}
+}
+//查询信息
+export function getZoneQuery(param,success) {
+let url = `${baseUrl}/datacenter/class-def/query-equip-comm-type`
+  http.postJson(url,param,success)
+}

+ 8 - 3
src/components/business_space/newGraphy/graphy.vue

@@ -18,6 +18,7 @@
           </el-select>
         </div>
         <div>
+<!--添加分区-->
           <el-button @click="addZoneBtn">添加分区</el-button>
           <el-select v-model="zoneValue" placeholder="请选择">
             <el-option
@@ -112,6 +113,7 @@
         <el-button size="small" type="primary" @click="confirm">确认</el-button>
       </span>
     </el-dialog>
+    <dialogZone ref="zone"/>
   </div>
 </template>
 <script>
@@ -122,6 +124,7 @@ import { DivideFloorScene, SpaceItem, ZoneItem, FloorView } from "@saga-web/cad-
 import { colorArr } from "@/utils/spaceColor"
 import unRelateBSP from "./unRelateBSP";
 import createBSP from "./createBSP";
+import dialogZone from "../../ledger/addDialog/dialogZone";
 import {
   buildingQuery,
   queryZone,
@@ -130,14 +133,16 @@ import {
   countZone,
   getIspNotInSpace,
   createRelateInZoneAndISp,
-  groupCreRelaZoneAndISp
+  groupCreRelaZoneAndISp,
+  getZoneQuery
 } from "@/api/scan/request"
 
 export default {
   components: {
     canvasFun,
     unRelateBSP,
-    createBSP
+    createBSP,
+    dialogZone
   },
   data() {
     return {
@@ -1144,7 +1149,7 @@ export default {
       float: left;
     }
     /deep/ .el-autocomplete {
-      display: block;
+      display: inline-block;
       width: 320px;
       margin-right: 10px;
     }