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

NVR跳转传参功能完成,NVR摄像头获取视频流时交互样式

release_0.0.2
wenlele 3 years ago
parent
0594201af5
commit
2d9f850a9f
5 changed files with 433 additions and 380 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. 19
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cameraModal.jsx
  2. 117
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx
  3. 15
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrModal.jsx
  4. 36
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
  5. 12
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx

19
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cameraModal.jsx
View File

@ -20,7 +20,9 @@ function cameraModal (props) {
CameraAbility, CameraAbility,
cameraData, //修改时传来的值 cameraData, //修改时传来的值
modify, modify,
parentCamera parentCamera,
addNvr,
nvrNumber
} = props; } = props;
const { equipmentWarehouse } = actions; const { equipmentWarehouse } = actions;
const fluoriteRef = useRef(); const fluoriteRef = useRef();
@ -37,7 +39,7 @@ function cameraModal (props) {
? 1 ? 1
: cameraData.type == "ipc" : cameraData.type == "ipc"
? 3 ? 3
: cameraData.type == "nvr" : cameraData.type == "nvr" || addNvr
? 2 ? 2
: cameraData.type == "cascade" : cameraData.type == "cascade"
? 4 ? 4
@ -47,7 +49,7 @@ function cameraModal (props) {
useEffect(() => { useEffect(() => {
dispatch(equipmentWarehouse.getCameraKind()); dispatch(equipmentWarehouse.getCameraKind());
dispatch(equipmentWarehouse.getAbility()); dispatch(equipmentWarehouse.getAbility());
cameraData.type == "nvr" ? setcameraList(cameraList.slice(1, 4)) : ""; cameraData.type == "nvr" || addNvr ? setcameraList(cameraList.slice(1, 4)) : "";
}, []); }, []);
const cameraList = [ const cameraList = [
//循环摄像头列表 //循环摄像头列表
@ -149,20 +151,19 @@ function cameraModal (props) {
} }
function handleChoose (id) { function handleChoose (id) {
//选择摄像头接入类型 //选择摄像头接入类型
if (!modify) { if (!addNvr && !modify) {
setclickNum(id); setclickNum(id);
} }
} }
function turnLift () { function turnLift () {
//轮播图向左 //轮播图向左
if (!modify) { if (!addNvr && !modify) {
setcameraList(cameraList.slice(0, 3)); setcameraList(cameraList.slice(0, 3));
} }
} }
function turnRight () { function turnRight () {
//轮播图向右 //轮播图向右
if (!modify) { if (!addNvr && !modify) {
setcameraList(cameraList.slice(1, 4)); setcameraList(cameraList.slice(1, 4));
} }
} }
@ -337,7 +338,7 @@ function cameraModal (props) {
}} }}
onClick={() => handleChoose(item.id)} onClick={() => handleChoose(item.id)}
> >
{modify ? item.id == clickNum ? "" : <div style={{ {modify || addNvr ? item.id == clickNum ? "" : <div style={{
width: 266, width: 266,
height: 146, height: 146,
borderRadius: 3, borderRadius: 3,
@ -490,7 +491,7 @@ function cameraModal (props) {
cameraData={cameraData} cameraData={cameraData}
/> />
) : clickNum == 2 ? ( ) : clickNum == 2 ? (
<NvrCamera nvrRef={nvrRef} cameraData={cameraData} /> <NvrCamera nvrRef={nvrRef} cameraData={cameraData} addNvr={addNvr} nvrNumber={nvrNumber} />
) : clickNum == 3 ? ( ) : clickNum == 3 ? (
<IpcCamera <IpcCamera
aRef={ipcRef} aRef={ipcRef}

117
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx
View File

@ -9,14 +9,15 @@ import {
Checkbox, Checkbox,
Radio, Radio,
Input, Input,
Spin,
} from "@douyinfe/semi-ui"; } from "@douyinfe/semi-ui";
import { IconEdit, IconPlayCircle } from "@douyinfe/semi-icons"; import { IconEdit, IconPlayCircle, IconTickCircle } from "@douyinfe/semi-icons";
import "./cameraModal.less"; import "./cameraModal.less";
import PerfectScrollbar from "perfect-scrollbar"; import PerfectScrollbar from "perfect-scrollbar";
import { isIndexed } from "immutable"; import { isIndexed } from "immutable";
let equipmentScrollbar; let equipmentScrollbar;
function nvrCamera({ dispatch, actions, nvrRef, cameraData }) { function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber }) {
const { equipmentWarehouse } = actions; const { equipmentWarehouse } = actions;
const cameraDataNvr = cameraData.nvr || ""; const cameraDataNvr = cameraData.nvr || "";
const form = useRef(); const form = useRef();
@ -24,6 +25,10 @@ function nvrCamera({ dispatch, actions, nvrRef, cameraData }) {
const [NVRcameraList, setNVRcameraList] = useState([]); //nvr视频流列表 const [NVRcameraList, setNVRcameraList] = useState([]); //nvr视频流列表
const [isAllChoose, setIsAllChoose] = useState(false); //全选 const [isAllChoose, setIsAllChoose] = useState(false); //全选
const [equipmentNum, setEquipmentNum] = useState(""); //nvr视频编号 const [equipmentNum, setEquipmentNum] = useState(""); //nvr视频编号
const [isloading, setloading] = useState(false); //是否显示loading
const [loadingTip, setloadingTip] = useState("正在接入视频流..."); //loading tip的值
const [step, setstep] = useState("none");
const [stepp, setstepp] = useState("none");
useEffect(() => { useEffect(() => {
NVRcameraList NVRcameraList
@ -39,19 +44,19 @@ function nvrCamera({ dispatch, actions, nvrRef, cameraData }) {
} }
}); });
useEffect(() => { useEffect(() => {
cameraDataNvr if (cameraDataNvr) {
? dispatch( setloading(true);
setstep("block");
dispatch(
equipmentWarehouse.getVideoStreaming({ equipmentWarehouse.getVideoStreaming({
streamId: cameraDataNvr.serialNo, streamId: cameraDataNvr.serialNo,
}) })
).then((res) => { ).then((res) => {
console.log(res)
let oneData = res.payload.data[0]; let oneData = res.payload.data[0];
let modifyData = res.payload.data.find( let modifyData = res.payload.data.find(
(item) => item.camera.name == cameraData.name (item) => item.camera == null ? false : item.camera.name == cameraData.name
); );
console.log(oneData);
console.log(modifyData);
let data = res.payload.data.map((item, index) => { let data = res.payload.data.map((item, index) => {
if (index == 0) { if (index == 0) {
item = modifyData; item = modifyData;
@ -68,17 +73,57 @@ function nvrCamera({ dispatch, actions, nvrRef, cameraData }) {
if (item.camera) { if (item.camera) {
item.name = item.camera.name; item.name = item.camera.name;
} }
return item; return item;
}); });
console.log(data);
setNVRcameraList(data); setNVRcameraList(data);
setNvrCheckList([data[0].id]); setNvrCheckList([data[0].id]);
if (res.success) {
setTimeout(() => {
setloadingTip("接入完成");
setTimeout(() => {
setstep("none");
setloading(false);
setstepp("block");
setloadingTip("正在接入视频流...");
}, 800);
}, 800)
}
}) })
: ""; }
//NVR添加页面跳到nvr摄像头添加页面
if (addNvr) {
setloading(true);
setstep("block");
dispatch(equipmentWarehouse.getVideoStreaming({ streamId: nvrNumber })).then((res) => {
let chooseList = [];
let data = res.payload.data.map((item) => {
item.change = false;
item.support = false;
return item;
});
setNVRcameraList(data);
for (let index = 0; index < data.length; index++) {
chooseList.push(data[index].id);
}
setNvrCheckList(chooseList);
setIsAllChoose(true);
if (res.success) {
setTimeout(() => {
setloadingTip("接入完成");
setTimeout(() => {
setstep("none");
setloading(false);
setstepp("block");
setloadingTip("正在接入视频流...");
}, 800);
}, 800)
}
})
}
}, []); }, []);
function NvrChangeName(e, index, name) { function NvrChangeName (e, index, name) {
//nvr摄像头视频流获取修改名称 //nvr摄像头视频流获取修改名称
let NvrchangeList = JSON.parse(JSON.stringify(NVRcameraList)); let NvrchangeList = JSON.parse(JSON.stringify(NVRcameraList));
if (!cameraDataNvr || cameraData.name == name) { if (!cameraDataNvr || cameraData.name == name) {
@ -87,29 +132,26 @@ function nvrCamera({ dispatch, actions, nvrRef, cameraData }) {
e.stopPropagation(); e.stopPropagation();
} }
} }
function nvronBlur(index) { function nvronBlur (index) {
//nvr摄像头名称修改失去焦点 //nvr摄像头名称修改失去焦点
let NvrchangeList = JSON.parse(JSON.stringify(NVRcameraList)); let NvrchangeList = JSON.parse(JSON.stringify(NVRcameraList));
NvrchangeList[index].change = false; NvrchangeList[index].change = false;
setNVRcameraList(NvrchangeList); setNVRcameraList(NvrchangeList);
} }
function inputchange(e, index) { function inputchange (e, index) {
//nvr摄像头名称修改 //nvr摄像头名称修改
let NvrchangeList = JSON.parse(JSON.stringify(NVRcameraList)); let NvrchangeList = JSON.parse(JSON.stringify(NVRcameraList));
console.log(e);
NvrchangeList[index].name = e; NvrchangeList[index].name = e;
setNVRcameraList(NvrchangeList); setNVRcameraList(NvrchangeList);
} }
function toggle(e, index) { function toggle (e, index) {
//nvr云台支持 //nvr云台支持
console.log(e)
let NvrchangeList = JSON.parse(JSON.stringify(NVRcameraList)); let NvrchangeList = JSON.parse(JSON.stringify(NVRcameraList));
console.log(NvrchangeList)
NvrchangeList[index].support = e.target.checked; NvrchangeList[index].support = e.target.checked;
setNVRcameraList(NvrchangeList); setNVRcameraList(NvrchangeList);
e.stopPropagation(); e.stopPropagation();
} }
function getVideoList() { function getVideoList () {
form.current form.current
.validate() .validate()
.then((values) => { .then((values) => {
@ -118,20 +160,31 @@ function nvrCamera({ dispatch, actions, nvrRef, cameraData }) {
let valuess = JSON.parse(JSON.stringify(values)); let valuess = JSON.parse(JSON.stringify(values));
valuess.streamId = values.serialNo; valuess.streamId = values.serialNo;
delete valuess.serialNo; delete valuess.serialNo;
setloading(true);
setstep("block");
dispatch(equipmentWarehouse.getVideoStreaming(valuess)).then((res) => { dispatch(equipmentWarehouse.getVideoStreaming(valuess)).then((res) => {
let data = res.payload.data.map((item) => { let data = res.payload.data.map((item) => {
item.change = false; item.change = false;
item.support = false; item.support = false;
return item; return item;
}); });
console.log(data);
setNVRcameraList(data); setNVRcameraList(data);
for (let index = 0; index < data.length; index++) { for (let index = 0; index < data.length; index++) {
chooseList.push(data[index].id); chooseList.push(data[index].id);
} }
console.log(chooseList);
setNvrCheckList(chooseList); setNvrCheckList(chooseList);
setIsAllChoose(true); setIsAllChoose(true);
if (res.success) {
setTimeout(() => {
setloadingTip("接入完成");
setTimeout(() => {
setstep("none");
setloading(false);
setstepp("block");
setloadingTip("正在接入视频流...");
}, 800);
}, 800)
}
}); });
}) })
.catch((errors) => { .catch((errors) => {
@ -139,7 +192,7 @@ function nvrCamera({ dispatch, actions, nvrRef, cameraData }) {
console.log("errors", errors); console.log("errors", errors);
}); });
} }
function allChoose(e) { function allChoose (e) {
//全选/全不选 //全选/全不选
let chooseList = []; let chooseList = [];
if (NVRcameraList.length == nvrCheckList.length) { if (NVRcameraList.length == nvrCheckList.length) {
@ -153,12 +206,12 @@ function nvrCamera({ dispatch, actions, nvrRef, cameraData }) {
setIsAllChoose(true); setIsAllChoose(true);
} }
} }
function playVideo(e) { function playVideo (e) {
//nvr播放视频 //nvr播放视频
console.log("22222222222222222"); console.log("22222222222222222");
e.stopPropagation(); e.stopPropagation();
} }
function onDisabled(name) { function onDisabled (name) {
if ((cameraDataNvr && cameraData.name == name) || !cameraDataNvr) { if ((cameraDataNvr && cameraData.name == name) || !cameraDataNvr) {
return false; return false;
} else { } else {
@ -169,7 +222,7 @@ function nvrCamera({ dispatch, actions, nvrRef, cameraData }) {
//传给父组件方法 //传给父组件方法
//aa即为子组件暴露给父组件的方法 //aa即为子组件暴露给父组件的方法
resetFluoriteCamera: form.current.reset, resetFluoriteCamera: form.current.reset,
equipmentNum: cameraDataNvr ? cameraDataNvr.serialNo : equipmentNum, equipmentNum: cameraDataNvr ? cameraDataNvr.serialNo : addNvr ? nvrNumber : equipmentNum,
NVRcameraList: NVRcameraList.filter((v) => NVRcameraList: NVRcameraList.filter((v) =>
nvrCheckList.some((e) => e == v.id) nvrCheckList.some((e) => e == v.id)
), ),
@ -191,8 +244,8 @@ function nvrCamera({ dispatch, actions, nvrRef, cameraData }) {
field="serialNo" field="serialNo"
maxLength="39" maxLength="39"
label="设备编号:" label="设备编号:"
disabled={cameraDataNvr ? true : false} disabled={cameraDataNvr ? true : addNvr ? true : false}
initValue={cameraDataNvr ? cameraDataNvr.serialNo : ""} initValue={cameraDataNvr ? cameraDataNvr.serialNo : addNvr ? nvrNumber : ""}
placeholder="请输入设备编号" placeholder="请输入设备编号"
style={{ width: 307 }} style={{ width: 307 }}
rules={[ rules={[
@ -248,6 +301,8 @@ function nvrCamera({ dispatch, actions, nvrRef, cameraData }) {
id="video_streaming" id="video_streaming"
style={{ maxHeight: 300, position: "relative" }} style={{ maxHeight: 300, position: "relative" }}
> >
<Spin tip={loadingTip} spinning={isloading}>
<div style={{ display: stepp }}>
{NVRcameraList.length > 0 {NVRcameraList.length > 0
? NVRcameraList.map((item, index) => ( ? NVRcameraList.map((item, index) => (
<Col <Col
@ -339,13 +394,17 @@ function nvrCamera({ dispatch, actions, nvrRef, cameraData }) {
)) ))
: ""} : ""}
</div> </div>
<div style={{ height: 50, width: "100%", display: step }}></div>
</Spin>
</div>
</CheckboxGroup> </CheckboxGroup>
</Row> </Row>
</Form> </Form>
</> </>
); );
} }
function mapStateToProps(state) { function mapStateToProps (state) {
const { auth, global, members } = state; const { auth, global, members } = state;
return { return {
loading: members.isRequesting, loading: members.isRequesting,

15
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrModal.jsx
View File

@ -1,4 +1,4 @@
import React, { useState, useRef, useEffect } from "react"; import React, { useState, useRef, useEffect,useImperativeHandle } from "react";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { Modal, Form, Row, Col, Spin } from "@douyinfe/semi-ui"; import { Modal, Form, Row, Col, Spin } from "@douyinfe/semi-ui";
import { IconTickCircle } from "@douyinfe/semi-icons"; import { IconTickCircle } from "@douyinfe/semi-icons";
@ -6,7 +6,7 @@ import { IconTickCircle } from "@douyinfe/semi-icons";
import moment from "moment"; import moment from "moment";
function nvrModal(props) { function nvrModal(props) {
const { modalName } = props; const { modalName ,nvrRef} = props;
const { dispatch, actions, vender, close } = props; const { dispatch, actions, vender, close } = props;
const nvrData = props.nvrData || {}; //修改时传来的值 const nvrData = props.nvrData || {}; //修改时传来的值
const form = useRef(); const form = useRef();
@ -18,10 +18,6 @@ function nvrModal(props) {
const [cancelText, setcancelText] = useState("取消"); //取消弹框text 左边 const [cancelText, setcancelText] = useState("取消"); //取消弹框text 左边
const [formObj, setformObj] = useState(); //接口入参 const [formObj, setformObj] = useState(); //接口入参
useEffect(() => {
console.log(props.user.id);
}, []);
function showDialog() { function showDialog() {
//打开弹框 //打开弹框
setVisible(true); setVisible(true);
@ -47,6 +43,7 @@ function nvrModal(props) {
.validate() .validate()
.then((values) => { .then((values) => {
//表单校验 //表单校验
console.log(values)
let valuesObj = JSON.parse(JSON.stringify(values)); let valuesObj = JSON.parse(JSON.stringify(values));
valuesObj.longitude = values.position.split(",")[0]; valuesObj.longitude = values.position.split(",")[0];
valuesObj.latitude = values.position.split(",")[1]; valuesObj.latitude = values.position.split(",")[1];
@ -61,7 +58,6 @@ function nvrModal(props) {
serialNo: valuesObj.serialNo, serialNo: valuesObj.serialNo,
}) })
).then((res) => { ).then((res) => {
console.log(res);
var after = new moment(); //验证后时间 var after = new moment(); //验证后时间
var duration = moment.duration(after.diff(front))._data.milliseconds; var duration = moment.duration(after.diff(front))._data.milliseconds;
if (res.success) { if (res.success) {
@ -127,6 +123,11 @@ function nvrModal(props) {
//高德经纬度 //高德经纬度
window.open("https://lbs.amap.com/tools/picker", "_blank"); window.open("https://lbs.amap.com/tools/picker", "_blank");
} }
useImperativeHandle(nvrRef, () => ({
//传给父组件方法
//aa即为子组件暴露给父组件的方法
nvrNumber: ()=>formObj.serialNo
}));
return ( return (
<> <>
<div onClick={showDialog}>{modalName == "add" ? "添加NVR" : "修改"}</div> <div onClick={showDialog}>{modalName == "add" ? "添加NVR" : "修改"}</div>

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

@ -37,6 +37,8 @@ const CameraHeader = (props) => {
const [cameraData, setCameraData] = useState({}); //表格数据 const [cameraData, setCameraData] = useState({}); //表格数据
const [modify, setModify] = useState(false); //修改 const [modify, setModify] = useState(false); //修改
const [parentCamera, setParentCamera] = useState(""); //级联摄像头父级设备 const [parentCamera, setParentCamera] = useState(""); //级联摄像头父级设备
const [addNvr, setAddNvr] = useState(false); //nvr页面传递参数打开NVR摄像头添加弹框
const [nvrNumber, setNvrNumber] = useState();
const { equipmentWarehouse } = actions; const { equipmentWarehouse } = actions;
const api = useRef(); const api = useRef();
const searchb = useRef(search) const searchb = useRef(search)
@ -44,8 +46,14 @@ const CameraHeader = (props) => {
const CAMERAS = "cameras"; const CAMERAS = "cameras";
useEffect(() => { useEffect(() => {
console.log(props) console.log(props)
if (props.location.query) {
setAddNvr(props.location.query.addNvr)
setNvrNumber(props.location.query.serialNo)
setCameraModal(true);
}
dispatch(actions.equipmentWarehouse.getVender()).then((res) => { dispatch(actions.equipmentWarehouse.getVender()).then((res) => {
setvenderList(res.payload.data); setvenderList(res.payload.data);
attribute(res.payload.data); attribute(res.payload.data);
@ -115,7 +123,6 @@ const CameraHeader = (props) => {
width: "20%", width: "20%",
dataIndex: "", dataIndex: "",
render: (_, row) => { render: (_, row) => {
console.log(row);
return ( return (
<div style={{ display: "flex" }}> <div style={{ display: "flex" }}>
<Button <Button
@ -220,26 +227,6 @@ const CameraHeader = (props) => {
}, },
]; ];
const device_ = (r) => {
console.log(searchb)
if (deviceClick) {
// if (r.type == "nvr") {
// console.log(search)
// setearch({ ...search, nvrId: r.nvr.id })
// } else {
// setearch({ ...search, externalDomain: r.externalDomain })
// }
setDeviceClick(false)
} else {
// if (r.type == "nvr") {
// setearch({ ...search, nvrId: null })
// } else {
// setearch({ ...search, externalDomain: null })
// }
setDeviceClick(true)
}
}
//获取表格属性设置 //获取表格属性设置
function attribute (data) { function attribute (data) {
const arr = localStorage.getItem(CAMERAS) const arr = localStorage.getItem(CAMERAS)
@ -706,14 +693,17 @@ const CameraHeader = (props) => {
venderList={venderList} venderList={venderList}
cameraData={cameraData} cameraData={cameraData}
modify={modify} modify={modify}
addNvr={addNvr}
nvrNumber={nvrNumber}
parentCamera={parentCamera} parentCamera={parentCamera}
close={() => { close={() => {
setCameraModal(false); setCameraModal(false);
setCameraData({}); setCameraData({});
setModify(false) setModify(false)
setParentCamera("") setParentCamera("")
setAddNvr(false)
setNvrNumber("")
equipmentGetCamera(); equipmentGetCamera();
}} }}
modalName={modalName} modalName={modalName}
/> />

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

@ -1,6 +1,6 @@
import React, { useState, useEffect, useRef } from "react"; import React, { useState, useEffect, useRef } from "react";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { push } from "react-router-redux"; // import { push } from "react-router-redux";
import moment from "moment"; import moment from "moment";
import { import {
Button, Button,
@ -30,7 +30,7 @@ export const accessType = [
]; ];
const NvrHeader = (props) => { const NvrHeader = (props) => {
const { dispatch, actions, user, loading, equipmentWarehouseNvr } = props; const { history,dispatch, actions, user, loading, equipmentWarehouseNvr } = props;
const { equipmentWarehouse } = actions; const { equipmentWarehouse } = actions;
const [setup, setSetup] = useState(false); const [setup, setSetup] = useState(false);
const [sideSheet, setSideSheet] = useState(false); const [sideSheet, setSideSheet] = useState(false);
@ -39,12 +39,13 @@ const NvrHeader = (props) => {
const [query, setQuery] = useState({ limit: 10, page: 0 }); //页码信息 const [query, setQuery] = useState({ limit: 10, page: 0 }); //页码信息
const [search, setearch] = useState({}); //搜索条件 const [search, setearch] = useState({}); //搜索条件
const [rowId, setRowId] = useState(); //表格数据id const [rowId, setRowId] = useState(); //表格数据id
const [reminder, setReminder] = useState(false); //提醒弹框 const [reminder, setReminder] = useState(false); //提醒弹框
const api = useRef(); const api = useRef();
const SETUPS = "setups"; const SETUPS = "setups";
const nvrRef = useRef(); //获取子组件的设备编号
useEffect(() => { useEffect(() => {
console.log(props)
dispatch(actions.equipmentWarehouse.getVender()).then((res) => { dispatch(actions.equipmentWarehouse.getVender()).then((res) => {
setvenderList(res.payload.data); setvenderList(res.payload.data);
attribute(res.payload.data); attribute(res.payload.data);
@ -157,7 +158,6 @@ const NvrHeader = (props) => {
dataIndex: "venderId", dataIndex: "venderId",
key: "manufactor", key: "manufactor",
render: (_, r, index) => { render: (_, r, index) => {
console.log(r);
let manufactorName = data.find((item) => item.id == r.venderId); let manufactorName = data.find((item) => item.id == r.venderId);
return manufactorName ? manufactorName.name : ""; return manufactorName ? manufactorName.name : "";
}, },
@ -327,7 +327,9 @@ const NvrHeader = (props) => {
<NvrModal <NvrModal
modalName="add" modalName="add"
venderList={venderList} venderList={venderList}
nvrRef={nvrRef}
close={() => { close={() => {
setReminder(true)
equipmentGetNvr(); equipmentGetNvr();
}} }}
/> />
@ -592,7 +594,7 @@ const NvrHeader = (props) => {
toadd="去添加" toadd="去添加"
visible={reminder} visible={reminder}
onOk={() => { onOk={() => {
dispatch(push('/equipmentWarehouse/camera/:addNvr=true')); history.push({pathname:'/equipmentWarehouse/camera',query:{addNvr:true,serialNo:nvrRef.current.nvrNumber()}});
setReminder(false) setReminder(false)
}} }}
/> />

Write Preview
Loading…
Cancel
Save