From e826afe6ee1c1d6eb52fb9e7a3a92229504de4c8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 8 Jul 2021 22:07:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/components/property/addLocation/addLocation.html   | 1 +
 public/components/property/addMachine/addMachine.html     | 4 +++-
 public/components/property/addMachine/addMachine.js       | 3 +++
 public/components/property/editLocation/editLocation.html | 1 +
 public/pages/property/locationManage/locationManage.html  | 6 +++++-
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/public/components/property/addLocation/addLocation.html b/public/components/property/addLocation/addLocation.html
index 47be63ea8..f3310dfe5 100755
--- a/public/components/property/addLocation/addLocation.html
+++ b/public/components/property/addLocation/addLocation.html
@@ -20,6 +20,7 @@
                                     <select class="custom-select" v-model="addLocationInfo.locationType">
                                         <option selected disabled value="">必填，请选择位置类型</option>
                                         <option value="1000">小区</option>
+                                        <option value="6000">楼栋</option>
                                         <option value="2000">单元</option>
                                         <option value="3000">房屋</option>
                                         <option value="4000">停车场</option>
diff --git a/public/components/property/addMachine/addMachine.html b/public/components/property/addMachine/addMachine.html
index 323b6c6d1..312df6081 100755
--- a/public/components/property/addMachine/addMachine.html
+++ b/public/components/property/addMachine/addMachine.html
@@ -69,7 +69,9 @@
                             </div>
                         </div>
                         <div class="form-group row"
-                            v-show="addMachineInfo.locationType == '2000' || addMachineInfo.locationType == '3000'  ">
+                            v-show="addMachineInfo.locationType == '2000' 
+                            || addMachineInfo.locationType == '3000' 
+                            || addMachineInfo.locationType == '6000' ">
                             <label class="col-sm-2 col-form-label">归属楼栋</label>
                             <div class="col-sm-10">
                                 <vc:create path="property/floorSelect2" parentModal="addMachineModel"
diff --git a/public/components/property/addMachine/addMachine.js b/public/components/property/addMachine/addMachine.js
index f7963e202..a0f0809f1 100755
--- a/public/components/property/addMachine/addMachine.js
+++ b/public/components/property/addMachine/addMachine.js
@@ -175,6 +175,7 @@
                     && vc.component.addMachineInfo.locationType != '3000'
                     && vc.component.addMachineInfo.locationType != '4000'
                     && vc.component.addMachineInfo.locationType != '5000'
+                    && vc.component.addMachineInfo.locationType != '6000'
                 ) { //大门时直接写 小区ID
                     vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.communityId;
                 } else if (vc.component.addMachineInfo.locationType == '2000') {
@@ -185,6 +186,8 @@
                     vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.paId;
                 } else if (vc.component.addMachineInfo.locationType == '5000') {
                     vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.orgId;
+                } else if (vc.component.addMachineInfo.locationType == '6000') {
+                    vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.floorId;
                 } else {
                     vc.toast("设备位置值错误");
                     return;
diff --git a/public/components/property/editLocation/editLocation.html b/public/components/property/editLocation/editLocation.html
index 7fa29d2a6..219829443 100755
--- a/public/components/property/editLocation/editLocation.html
+++ b/public/components/property/editLocation/editLocation.html
@@ -20,6 +20,7 @@
                                     <select class="custom-select" v-model="editLocationInfo.locationType">
                                         <option selected disabled value="">必填，请选择位置类型</option>
                                         <option value="1000">小区</option>
+                                        <option value="6000">楼栋</option>
                                         <option value="2000">单元</option>
                                         <option value="3000">房屋</option>
                                         <option value="4000">停车场</option>
diff --git a/public/pages/property/locationManage/locationManage.html b/public/pages/property/locationManage/locationManage.html
index bcb29ae88..3a4c70f97 100755
--- a/public/pages/property/locationManage/locationManage.html
+++ b/public/pages/property/locationManage/locationManage.html
@@ -26,9 +26,13 @@
                             <select class="custom-select" v-model="locationManageInfo.conditions.locationType">
                                 <option selected value="">请选择位置类型</option>
                                 <option value="1000">小区</option>
+                                <option value="6000">楼栋</option>
                                 <option value="2000">单元</option>
                                 <option value="3000">房屋</option>
-                            </select> </div>
+                                <option value="4000">停车场</option>
+                                <option value="5000">部门</option>
+                            </select>
+                        </div>
                         <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryLocationMethod()">
                                 <i class="glyphicon glyphicon-search"></i> 查询