diff --git a/app.js b/app.js
index 11d945a37..d7f9b1b21 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 c4bf79a25..1c386d020 100644
--- a/public/components/property/editMachine/editMachine.html
+++ b/public/components/property/editMachine/editMachine.html
@@ -127,8 +127,9 @@
                                     </select>
                                 </div>
                             </div>
+                        </div>
+
 
-                        
                         <div class="ibox-content">
                             <button class="btn btn-primary float-right" type="button" v-on:click="editMachine()"><i
                                     class="fa fa-check"></i>&nbsp;保存