free-sun
/
FS-IOT
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial

release_0.0.2
deartibers 2 years ago
parent
d067752179 06fc355304
commit
36052b634c
5 changed files with 24 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
  2. 3
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx
  3. 30
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/ipcCamera.jsx
  4. 2
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
  5. 12
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx

4
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
View File

@ -196,7 +196,7 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, tes
labelWidth="115px" labelWidth="115px"
onValueChange={(values) => { onValueChange={(values) => {
setFormData(values) setFormData(values)
let setting = ["externalDomain", "cascadeType", "sip"] let setting = ["externalDomain", "cascadeType", "streamId"]
let b = {} let b = {}
setting.map((item) => { setting.map((item) => {
if (values.hasOwnProperty(item)) { if (values.hasOwnProperty(item)) {
@ -242,7 +242,7 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, tes
label="SIP编号:" label="SIP编号:"
field="streamId" field="streamId"
disabled={cameraData.id ? true : false} disabled={cameraData.id ? true : false}
initValue={parentCamera || ""} initValue={cameraData?.topSerialNo || ""}
placeholder="请选择SIP编号" placeholder="请选择SIP编号"
style={{ width: 307 }} style={{ width: 307 }}
rules={[{ required: true, message: "请选择SIP编号" }]} rules={[{ required: true, message: "请选择SIP编号" }]}

3
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/fluoriteCamera.jsx
View File

@ -82,6 +82,7 @@ function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData, ashTrue,
labelAlign="left" labelAlign="left"
labelWidth="115px" labelWidth="115px"
onValueChange={(values) => { onValueChange={(values) => {
console.log(values);
let setting = ["abilityId", "cloudControl", "highDefinition", "kindId", "name", "position", "rtmp", "serialNo",] let setting = ["abilityId", "cloudControl", "highDefinition", "kindId", "name", "position", "rtmp", "serialNo",]
let b = {} let b = {}
setting.map((item) => { setting.map((item) => {
@ -95,7 +96,7 @@ function fluoriteCamera ({ cRef, CameraKind, CameraAbility, cameraData, ashTrue,
}} }}
initValues={{ initValues={{
name: cameraData.name || "", name: cameraData.name || "",
highDefinition: cameraData.highDefinition || "", highDefinition: cameraData?.highDefinition || "",
memoryCard: cameraData.memoryCard || "", memoryCard: cameraData.memoryCard || "",
position: cameraData.longitude position: cameraData.longitude
? `${cameraData.longitude},${cameraData.latitude}` ? `${cameraData.longitude},${cameraData.latitude}`

30
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/ipcCamera.jsx
View File

@ -87,7 +87,8 @@ function ipcCamera ({
labelAlign="left" labelAlign="left"
labelWidth="115px" labelWidth="115px"
onValueChange={(values) => { onValueChange={(values) => {
let setting = ["abilityId", "cloudControl", "highDefinition", "kindId", "name", "position", "rtmp", "serialNo"] console.log(values);
let setting = ["abilityId", "cloudControl", "kindId", "name", "position", "rtmp", "serialNo"]
let b = {} let b = {}
setting.map((item) => { setting.map((item) => {
if (values.hasOwnProperty(item)) { if (values.hasOwnProperty(item)) {
@ -96,26 +97,23 @@ function ipcCamera ({
return b.false = values.hasOwnProperty(item) return b.false = values.hasOwnProperty(item)
} }
}) })
console.log(b);
Object.keys(b).length == 1 ? ashTrue() : ashFalse() Object.keys(b).length == 1 ? ashTrue() : ashFalse()
}} }}
initValues={{ initValues={{
name: cameraData ? cameraData.name : "", name: cameraData.name || "",
venderId: cameraData ? cameraData.venderId : "", venderId: cameraData.venderId || "",
memoryCard: cameraData ? cameraData.memoryCard : "", memoryCard: cameraData.memoryCard || "",
position: cameraData.longitude position: cameraData.longitude
? `${cameraData.longitude},${cameraData.latitude}` ? `${cameraData.longitude},${cameraData.latitude}`
: "", : "",
kindId: cameraData ? cameraData.kindId : "", kindId: cameraData.kindId || "",
abilityId: cameraData abilityId: cameraData.cameraAbilities ? cameraData.cameraAbilities.map((item) => item.id) : "",
? cameraData.cameraAbilities cloudControl: cameraData.cloudControl || "",
? cameraData.cameraAbilities.map((item) => item.id) voice: cameraData.voice || "",
: "" serialNo: cameraData.serialNo || "",
: "", rtmp: cameraData.rtmp || "",
cloudControl: cameraData ? cameraData.cloudControl : "",
voice: cameraData ? cameraData.voice : "",
serialNo: cameraData ? cameraData.serialNo : "",
rtmp: cameraData ? cameraData.rtmp : "",
}} }}
getFormApi={(formApi) => (form.current = formApi)} getFormApi={(formApi) => (form.current = formApi)}
> >
@ -394,7 +392,7 @@ function ipcCamera ({
field="serialNo" field="serialNo"
label="设备编号接入:" label="设备编号接入:"
maxLength="39" maxLength="39"
disabled={cameraData.id ? true : false} disabled={cameraData.id ? true : false}
placeholder="请输入设备编号" placeholder="请输入设备编号"
style={{ width: 307 }} style={{ width: 307 }}
rules={[{ required: true, message: "请输入设备编号" }]} rules={[{ required: true, message: "请输入设备编号" }]}
@ -404,7 +402,7 @@ function ipcCamera ({
style={{ width: 320, height: 90 }} style={{ width: 320, height: 90 }}
field="rtmp" field="rtmp"
label="RTMP地址接入:" label="RTMP地址接入:"
disabled={cameraData.id ? true : false} disabled={cameraData.id ? true : false}
placeholder="请输入RTMP地址接入" placeholder="请输入RTMP地址接入"
rules={[{ required: true, message: "请输入RTMP地址" }]} rules={[{ required: true, message: "请输入RTMP地址" }]}
/> />

2
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
View File

@ -161,7 +161,7 @@ const CameraHeader = (props) => {
setCameraData(row); setCameraData(row);
if (row.type == "cascade") { if (row.type == "cascade") {
dispatch(equipmentWarehouse.getParentCamera({ cameraSerialNo: row.serialNo })).then((res) => { dispatch(equipmentWarehouse.getParentCamera({ cameraSerialNo: row.serialNo })).then((res) => {
setParentCamera(res.payload.data.sipip) setParentCamera(res.payload.data.topSerialNo)
if (res.success) { if (res.success) {
setCameraModal(true); setCameraModal(true);
setModify(true) setModify(true)

12
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx
View File

@ -85,23 +85,22 @@ const NvrHeader = (props) => {
const columns = [ const columns = [
{ {
title: "序号", title: "序号",
render: (text, record, index) => { render: (_, record, index) => {
return index + 1; return index + 1;
}, },
}, },
{ {
title: "设备名称", title: "设备名称",
dataIndex: "name", dataIndex: "name",
render: (text, r, index) => { render: (_, r, index) => {
return r.name return r.name
}, },
}, },
{ {
title: "SIP地址", title: "SIP地址",
dataIndex: "owner", dataIndex: "owner",
render: (text, r, index) => { render: (_, r, index) => {
let sipState = r.gbNvr; return r?.gbNvr?.sipip
return sipState ? sipState.sipip : "";
}, },
}, },
{ {
@ -170,8 +169,7 @@ const NvrHeader = (props) => {
dataIndex: "createUserId", dataIndex: "createUserId",
key: "accountNumber", key: "accountNumber",
render: (_, r, index) => { render: (_, r, index) => {
let createUserName = r.createUser; return r?.createUser?.name
return createUserName ? createUserName.name : "";
}, },
}, },
{ {

Write Preview
Loading…
Cancel
Save