From c417c1fe04f17b2562918c283541b86169c4d291 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 29 Jan 2021 13:49:35 +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

---
 app.js                                        |  8 +-
 .../property/editMachine/editMachine.html     | 75 ++-----------------
 .../property/editMachine/editMachine.js       | 17 -----
 3 files changed, 11 insertions(+), 89 deletions(-)

diff --git a/app.js b/app.js
index 366efffb1..a1ec5b097 100644
--- a/app.js
+++ b/app.js
@@ -36,11 +36,11 @@ let opts = {
 //app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
 
 
-app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
-app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts));
+//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
+//app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts));
 
-//app.use('/callComponent',proxy('http://127.0.0.1:8012',opts));
-//app.use('/app',proxy('http://127.0.0.1:8012',opts));
+app.use('/callComponent',proxy('http://127.0.0.1:8012',opts));
+app.use('/app',proxy('http://127.0.0.1:8012',opts));
 
 //app.use('/callComponent',proxy('http://192.168.1.16:8012',opts));
 //app.use('/app',proxy('http://192.168.1.16:8012',opts));
diff --git a/public/components/property/editMachine/editMachine.html b/public/components/property/editMachine/editMachine.html
index 8a9f9a550..9ff4096d5 100644
--- a/public/components/property/editMachine/editMachine.html
+++ b/public/components/property/editMachine/editMachine.html
@@ -36,7 +36,8 @@
                                         <option value="9996">车辆道闸</option>
                                         <option value="9997">考勤机</option>
                                         <option value="9995">第三方道闸平台</option>
-                                    </select></div>
+                                    </select>
+                                </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">设备方向</label>
@@ -45,7 +46,8 @@
                                         <option selected disabled value="">必填，请选择设备方向</option>
                                         <option value="3306">进场</option>
                                         <option value="3307">出场</option>
-                                    </select></div>
+                                    </select>
+                                </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">厂家</label>
@@ -54,75 +56,12 @@
                                         class="form-control">
                                 </div>
                             </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">设备位置</label>
-                                <div class="col-sm-10">
-                                    <select class="custom-select" v-model="editMachineInfo.locationTypeCd"
-                                        @change="onAddChangeLocation">
-                                        <option selected disabled value="">必填，请选择设备位置</option>
-                                        <option v-for="item in editMachineInfo.locations" :label="item.locationName"
-                                            :value="item.locationId">{{item.locationName}}
-                                        </option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="form-group row"
-                            v-show="editMachineInfo.locationType == '2000' || editMachineInfo.locationType == '3000'  ">
-                            <label class="col-sm-2 col-form-label">归属楼栋</label>
-                            <div class="col-sm-10">
-                                <vc:create path="property/floorSelect2" parentModal="editMachineModel"
-                                    namespace="editMachine"></vc:create>
-                            </div>
-                        </div>
-                        <div class="form-group row"
-                            v-show="editMachineInfo.locationType == '2000' || editMachineInfo.locationType == '3000'  ">
-                            <label class="col-sm-2 col-form-label">归属单元</label>
-                            <div class="col-sm-10">
-                                <vc:create path="property/unitSelect2" parentModal="editMachineModel"
-                                    callBackListener="editMachine" callBackFunction="notify" namespace="editMachine">
-                                </vc:create>
-                            </div>
-                        </div>
-                        <div class="form-group row" v-show="editMachineInfo.locationType == '3000'  ">
-                            <label class="col-sm-2 col-form-label">归属房屋</label>
-                            <div class="col-sm-10">
-                                <vc:create path="property/roomSelect2" parentModal="editMachineModel"
-                                    callBackListener="editMachine" callBackFunction="notify" namespace="editMachine">
-                                </vc:create>
-                            </div>
-                        </div>
-                        <div class="form-group row" v-show="editMachineInfo.locationType == '4000'  ">
-                            <label class="col-sm-2 col-form-label">归属停车场</label>
-                            <div class="col-sm-10">
-                                <vc:create path="property/parkingAreaSelect2" parentModal="editMachineModel"
-                                    callBackListener="editMachine" callBackFunction="notify" namespace="editMachine">
-                                </vc:create>
-                            </div>
-                        </div>
-
-                        <div class="form-group row" v-show="editMachineInfo.locationType == '5000'  ">
-                            <label class="col-sm-2 col-form-label">归属部门</label>
-                            <div class="col-sm-10">
-                                <div class="row">
-                                    <div class="col-sm-6">
-                                      <vc:create path="frame/orgSelect2" parentModal="editMachineModel"
-                                        callBackListener="editMachine" callBackFunction="notify"
-                                        namespace="editMachine"></vc:create>
-                                    </div>
-                                    <div class="col-sm-6">
-                                      <vc:create path="frame/departmentSelect2" parentModal="editMachineModel"
-                                        callBackListener="editMachine" callBackFunction="notify"
-                                        namespace="editMachine"></vc:create>
-                                    </div>
-                                  </div>
-                            </div>
                         </div>
                         <div class="form-group row">
                             <label class="col-sm-2 col-form-label">设备IP</label>
                             <div class="col-sm-10">
-                                <input v-model="editMachineInfo.machineIp" type="text" placeholder="选填，请填写设备IP,如 192.168.1.10:8090"
-                                    class="form-control">
+                                <input v-model="editMachineInfo.machineIp" type="text"
+                                    placeholder="选填，请填写设备IP,如 192.168.1.10:8090" class="form-control">
                             </div>
                         </div>
                         <div class="form-group row">
@@ -170,5 +109,5 @@
             </div>
         </div>
     </div>
-</div>
+
 </div>
\ No newline at end of file
diff --git a/public/components/property/editMachine/editMachine.js b/public/components/property/editMachine/editMachine.js
index 93e7d15b8..8ff8704de 100644
--- a/public/components/property/editMachine/editMachine.js
+++ b/public/components/property/editMachine/editMachine.js
@@ -243,23 +243,6 @@
             },
             editMachine: function () {
                 vc.component.editMachineInfo.communityId = vc.getCurrentCommunity().communityId;
-                if (vc.component.editMachineInfo.locationType != '2000'
-                    && vc.component.editMachineInfo.locationType != '3000'
-                    && vc.component.editMachineInfo.locationType != '4000'
-                    && vc.component.editMachineInfo.locationType != '5000') { //大门时直接写 小区ID
-                    vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.communityId;
-                } else if (vc.component.editMachineInfo.locationType == '2000') {
-                    vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.unitId;
-                } else if (vc.component.editMachineInfo.locationType == '3000') {
-                    vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.roomId;
-                } else if (vc.component.editMachineInfo.locationType == '4000') {
-                    vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.paId;
-                } else if (vc.component.addMachineInfo.locationType == '5000') {
-                    vc.component.editMachineInfo.locationObjId = vc.component.editMachineInfo.orgId;
-                } else {
-                    vc.toast("设备位置值错误");
-                    return;
-                }
                 if (!vc.component.editMachineValidate()) {
                     vc.toast(vc.validate.errInfo);
                     return;