From 25e7a6353d109bdc302cb2992881d164c84c7e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Wed, 24 Jan 2024 09:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=95=E5=83=8F=E6=9C=BAip?=
 =?UTF-8?q?=E5=92=8C=E7=90=83=E6=9C=BA=E9=80=9A=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cameraManage/index.vue |  8 ++++
 src/views/cameraManage/model.vue | 72 +++++++-------------------------
 2 files changed, 22 insertions(+), 58 deletions(-)

diff --git a/src/views/cameraManage/index.vue b/src/views/cameraManage/index.vue
index 02683a3..ff37538 100644
--- a/src/views/cameraManage/index.vue
+++ b/src/views/cameraManage/index.vue
@@ -66,6 +66,14 @@ const columns = [
         title: '视频流IP',
         dataIndex: 'rtcServer',
     },
+    {
+        title: '录像机IP',
+        dataIndex: 'recorderIp',
+    },
+    {
+        title: '球机通道号',
+        dataIndex: 'channel',
+    },
     {
         title: '连接状态',
         dataIndex: 'status',
diff --git a/src/views/cameraManage/model.vue b/src/views/cameraManage/model.vue
index 0108628..4eb9ab7 100644
--- a/src/views/cameraManage/model.vue
+++ b/src/views/cameraManage/model.vue
@@ -30,66 +30,20 @@
                              v-decorator="['rtcServer']"
                          />
                      </a-form-item>
+                      <a-form-item label="录像机IP" :label-col="formItemVerticalLayout.labelCol">
+                         <a-input
+                             v-decorator="['recorderIp']"
+                         />
+                     </a-form-item> 
+                     <a-form-item label="球机通道号" :label-col="formItemVerticalLayout.labelCol">
+                         <a-input
+                             v-decorator="['channel']"
+                         />
+                     </a-form-item>
                  </a-form>
              </a-modal>
          </template>
-         <!-- <template v-else-if="type=='test'">
-             <a-modal
-                 v-model="isShow"
-                 @cancel="handleCancel"
-                 :footer="null"
-                 :maskClosable="false"
-                 width="1600px"
-                 :bodyStyle="{padding:0,display:'flex'}"
-                 :centered="true"
-                 class="config-model"
-             >
-                <div class="test-model">
-                    <video 
-                    
-                    width="80%"
-                            height="80%"
-                    :id="`camera${id}`" 
-                    autoplay muted ></video>
-                    
-                    <div class="operation-list">
-                        <div class="operation-item">
-                            <img :src="zoomSubUrl" alt="" @mousedown="zoomDecStart"
-                                @mouseup="zoomDecStop">
-                            <span>变倍</span>
-                            <img :src="zoomAddUrl" alt="" @mousedown="zoomAddStart"
-                                @mouseup="zoomAddStop">
-                        </div>
-                        <div class="operation-item">
-                            <img :src="focusSubUrl" alt="" @mousedown="focusDecStart" @mouseup="focusDecStop">
-                            <span>变焦</span>
-                            <img :src="focusAddUrl" alt="" @mousedown="focusAddStart" @mouseup="focusAddStop">
-                        </div>
-                        <div class="operation-item">
-                            <img :src="irisSubUrl" alt="" @mousedown="irisDecStart" @mouseup="irisDecStop">
-                            <span>光圈</span>
-                            <img :src="irisAddUrl" alt="" @mousedown="irisAddStart" @mouseup="irisAddStop">
-                        </div>
-                    </div>
-                    <div class="direction-list">
-                        <div class="direction-item">
-                            <img :src="leftUpUrl" alt="" @mousedown="leftUpStart" @mouseup="leftUpStop">
-                            <img :src="upUrl" alt="" @mousedown="upStart" @mouseup="upStop">
-                            <img :src="rightUpUrl" alt="" @mousedown="rightUpStart" @mouseup="rightUpStop">
-                        </div>
-                        <div class="direction-item">
-                            <img :src="leftUrl" alt="" @mousedown="leftStart" @mouseup="leftStop">
-                            <img :src="rightUrl" alt="" @mousedown="rightStart" @mouseup="rightStop">
-                        </div>
-                        <div class="direction-item">
-                            <img :src="leftDownUrl" alt="" @mousedown="leftDownStart" @mouseup="leftDownStop">
-                            <img :src="downUrl" alt="" @mousedown="downStart" @mouseup="downStop">
-                            <img :src="rightDownUrl" alt="" @mousedown="rightDownStart" @mouseup="rightDownStop">
-                        </div>
-                    </div>
-                </div>
-             </a-modal>
-         </template> -->
+        
 
          <template v-else-if="type=='config'">
              <a-modal
@@ -215,7 +169,7 @@ export default {
             this.type = newVal;
         },
         modelData: function(newVal){
-            // console.log(newVal)
+            console.log(newVal)
             this.mdata=newVal
             console.log(this.type)
             if(newVal.id && this.type=='edit'){
@@ -227,6 +181,8 @@ export default {
                         ip:newVal.ip,
                         rtsp:newVal.rtsp,
                         rtcServer:newVal.rtcServer,
+                        channel:newVal.channel,
+                        recorderIp:newVal.recorderIp,
                         rtcServerPort:newVal.rtcServerPort
                     })
                 })