From 18dd2d085ec5866c6231dacd5293efa47eac1421 Mon Sep 17 00:00:00 2001
From: deartibers <947466799@qq.com>
Date: Mon, 8 Aug 2022 10:30:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E9=81=93=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipmentWarehouse/components/fluoriteCamera.jsx  | 11 +++++++++--
 .../src/sections/offline/components/pushModal.jsx     |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx
index e718330..8ab98ba 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx
@@ -82,9 +82,8 @@ function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData, ashTrue,
                 labelAlign="left"
                 labelWidth="115px"
                 onValueChange={(values) => {
-                    console.log(values);
                     // let setting = ["abilityId", "cloudControl", "highDefinition", "kindId", "name", "position", "rtmp", "serialNo",]
-                    let setting = ["abilityId", "cloudControl", "highDefinition", "kindId", "name", "position", "serialNo",]
+                    let setting = ["abilityId", "cloudControl", "highDefinition", "kindId", "name", "position", "serialNo","channelNo"]
                     let b = {}
                     setting.map((item) => {
                         if (values.hasOwnProperty(item)) {
@@ -110,6 +109,7 @@ function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData, ashTrue,
                     cloudControl: cameraData.cloudControl || "",
                     voice: cameraData.voice || "",
                     serialNo: cameraData.serialNo || "",
+                    channelNo: cameraData.channelNo || "",
                     // rtmp: cameraData.rtmp || "",
                     rtmp: '此处无效 自动生成',
                 }}
@@ -459,6 +459,13 @@ function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData, ashTrue,
                             style={{ width: 307 }}
                             rules={[{ required: true, message: "请输入设备序列号" }]}
                         />
+                        {/* 通道号 */}
+                        <Form.Input
+                            field="channelNo"
+                            label="通道号:"
+                            placeholder="请输入通道号"
+                            style={{ width: 307 }}
+                        />
                         {/* RTMP地址接入 */}
                         {/* <TextArea
                             style={{ width: 320, height: 90 }}
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx
index 4ecd79e..00ed2e5 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx
@@ -550,7 +550,7 @@ function pushModal (props) {
                         renderSelectedItem={renderSelectedItem}
                         renderSourceItem={renderSourceItem}
                         value={chooseCameraList}
-                        inputProps={{ placeholder: '搜项目或设备名称或设备编号' }}
+                        inputProps={{ placeholder: '搜索设备名称或设备编号' }}
                         onChange={(id, items) => CameraChooseList(id, items)}
                     />
                     <div style={{ margin: '20px -56px 0px', borderTop: '1px solid rgba(0,0,0,0.06)' }}></div>