双球机混用

src/views/cameraManage/index.vue

@@ -19,6 +19,9 @@
             :pagination="pagination"
             @change="handleGetCameraList"
         >
+        <span slot="type" slot-scope="text" >
+               {{ text.type == "1" ? "小球机" :"大球机"}} 
+          </span>
           <span slot="action" slot-scope="text, record">
           <!-- <a @click="showModel('test',record)">
             测试
@@ -66,6 +69,10 @@ const columns = [
         title: '视频流IP',
         dataIndex: 'rtcServer',
     },
+    {
+        title: '球机类型',
+        scopedSlots: { customRender: 'type' }
+    },
     {
         title: '连接状态',
         dataIndex: 'status',

src/views/cameraManage/model.vue

@@ -30,6 +30,12 @@
                              v-decorator="['rtcServer']"
                          />
                      </a-form-item>
+                     <a-form-item label="球机类型" :label-col="formItemVerticalLayout.labelCol">
+                         <a-select  v-decorator="['type', { rules: [{ required: true, message: '请选择!' }] }]">
+                             <a-select-option :value="1">小球机</a-select-option>
+                             <a-select-option :value="0">大球机</a-select-option>
+                         </a-select>
+                     </a-form-item>
                  </a-form>
              </a-modal>
          </template>
@@ -227,7 +233,8 @@ export default {
                         ip:newVal.ip,
                         rtsp:newVal.rtsp,
                         rtcServer:newVal.rtcServer,
-                        rtcServerPort:newVal.rtcServerPort
+                        rtcServerPort:newVal.rtcServerPort,
+                        type:newVal.type
                     })
                 })
             }else if (newVal.id && this.type=='config'){

src/views/roadwayManage/index.vue

@@ -110,10 +110,7 @@ const columns = [
         title: 'RFID',
         scopedSlots: { customRender: 'RFID' }
     },
-    {
-        title: '扫码枪',
-        scopedSlots: { customRender: 'sensorGun' }
-    },
+    
     {
         title: '左货架类型',
         dataIndex: 'leftType',

src/views/roadwayManage/model.vue

@@ -99,18 +99,7 @@
                         </a-form-item>
                     </div>
 
-                    <div class="across-layout">
-                        <a-form-item label="扫码枪IP" :label-col="formItemAcrossLayout.labelCol">
-                            <a-input
-                                v-decorator="['leftSensorGunIp']"
-                            />
-                        </a-form-item>
-                        <a-form-item label="扫码枪PORT" :label-col="formItemAcrossLayout.labelCol">
-                            <a-input
-                                v-decorator="['leftSensorGunPort']"
-                            />
-                        </a-form-item>
-                    </div>
+                    
                     <a-divider></a-divider>
                 </div>
 
@@ -147,18 +136,7 @@
                             />
                         </a-form-item>
                     </div>
-                    <div class="across-layout">
-                        <a-form-item label="扫码枪IP" :label-col="formItemAcrossLayout.labelCol">
-                            <a-input
-                                v-decorator="['rightSensorGunIp']"
-                            />
-                        </a-form-item>
-                        <a-form-item label="扫码枪PORT" :label-col="formItemAcrossLayout.labelCol">
-                            <a-input
-                                v-decorator="['rightSensorGunPort']"
-                            />
-                        </a-form-item>
-                    </div>
+                    
                     <a-divider></a-divider>
                 </div>
                 <div  v-if="cameraList.length>0">