diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js
index c9da053..7e9b573 100644
--- a/src/api/http/http-api.js
+++ b/src/api/http/http-api.js
@@ -68,17 +68,17 @@ export default  {
     },
     getAllCameras1:{
         method: "GET",
-        url: "/realTime/allCameras1",
+        url: "/realTime/allCameras/1",
         name: "获取全部球机"
     },
     getAllCameras2:{
         method: "GET",
-        url: "/realTime/allCameras2",
+        url: "/realTime/allCameras/2",
         name: "获取全部球机"
     },
     getAllCameras3:{
         method: "GET",
-        url: "/realTime/allCameras3",
+        url: "/realTime/allCameras/3",
         name: "获取全部球机"
     },
     getWallStyle:{
diff --git a/src/views/cameraManage/model.vue b/src/views/cameraManage/model.vue
index 566c6f2..8106a70 100644
--- a/src/views/cameraManage/model.vue
+++ b/src/views/cameraManage/model.vue
@@ -20,9 +20,9 @@
                              v-decorator="['name', { rules: [{ required: true, message: '请输入球机名称!' }] }]"
                          />
                      </a-form-item>
-                     <a-form-item label="cpe设备IP" :label-col="formItemVerticalLayout.labelCol">
+                     <a-form-item label="设备IP" :label-col="formItemVerticalLayout.labelCol">
                          <a-input
-                             v-decorator="['ip', { rules: [{ required: true, message: '请输入cpe设备ip!' }] }]"
+                             v-decorator="['ip', { rules: [{ required: true, message: '请输入设备ip!' }] }]"
                          />
                      </a-form-item>
                      
@@ -228,8 +228,9 @@ export default {
         modelData: function(newVal){
             // console.log(newVal)
             this.mdata=newVal
-            console.log(this.type)
+            console.log(this.mdata)
             if(newVal.id && this.type=='edit'){
+                console.log("1111")
                 this.id = newVal.id
                 // console.log('触发了watch，重新赋值')
                 this.$nextTick(()=>{   //this.$nextTick解决不能在表单渲染之前赋值的报错问题
@@ -238,7 +239,8 @@ export default {
                         ip:newVal.ip,
                         rtsp:newVal.rtsp,
                         rtcServer:newVal.rtcServer,
-                        rtcServerPort:newVal.rtcServerPort
+                        rtspPort:newVal.rtspPort,
+                        port:newVal.port
                     })
                 })
             }else if (newVal.id && this.type=='config'){
diff --git a/src/views/deviceManage/configuration.vue b/src/views/deviceManage/configuration.vue
index da4d9f9..326182e 100644
--- a/src/views/deviceManage/configuration.vue
+++ b/src/views/deviceManage/configuration.vue
@@ -20,9 +20,9 @@
                             v-decorator="['name', { rules: [{ required: true, message: '请输入球机名称!' }] }]"
                         />
                     </a-form-item>
-                    <a-form-item label="cpe设备IP" :label-col="formItemVerticalLayout.labelCol">
+                    <a-form-item label="设备IP" :label-col="formItemVerticalLayout.labelCol">
                         <a-input
-                            v-decorator="['ip', { rules: [{ required: true, message: '请输入cpe设备ip!' }] }]"
+                            v-decorator="['ip', { rules: [{ required: true, message: '请输入设备ip!' }] }]"
                         />
                     </a-form-item>
                     
diff --git a/src/views/deviceManage/model.vue b/src/views/deviceManage/model.vue
index e4c8d82..ddc20cf 100644
--- a/src/views/deviceManage/model.vue
+++ b/src/views/deviceManage/model.vue
@@ -23,10 +23,10 @@
                         <a-input v-decorator="['name', { rules: [{ required: true, message: '请输入球机名称!' }] }]" />
                     </a-form-item>
                     <a-form-item
-                        label="cpe设备IP"
+                        label="设备IP"
                         :label-col="formItemVerticalLayout.labelCol"
                     >
-                        <a-input v-decorator="['ip', { rules: [{ required: true, message: '请输入cpe设备ip!' }] }]" />
+                        <a-input v-decorator="['ip', { rules: [{ required: true, message: '请输入设备ip!' }] }]" />
                     </a-form-item>
 
                     <a-form-item