diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx index 9c910e6..376708c 100644 --- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx +++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx @@ -56,7 +56,7 @@ const VideoPlay = ({ // audio: false, // serialNo: '34020000001310000001', // 设备序列号 必须 // topSerialNo: '34020000001110000077', // 设备顶级序列号 必须 - // playUrlSd: 'ws://221.230.55.27:8081/jessica/34020000001110000077/34020000001310000001', // 必须 + // playUrlSd: 'http://221.230.55.27:8081/jessica/34020000001110000077/34020000001310000001', // 必须 // // playUrlHd: 'ezopen://open.ys7.com/G75922040/1.hd.live', // // replayUrl: 'ezopen://open.ys7.com/G75922040/1.rec', // }, @@ -291,7 +291,7 @@ const VideoPlay = ({ // }, err => {. // console.log(err); // }) - + console.log(videoObj); const inviteRes_ = await request.get(`${iotVideoServer}/api/gb28181/invite?id=${videoObj.topSerialNo}&channel=${videoObj.serialNo}`) } catch (error) { console.log(error.response); @@ -402,7 +402,7 @@ const VideoPlay = ({ videoHeight = (containerWidth / 16) * 9 } } - + if (videoObj.type == 'yingshi' && player) { player.reSize(videoWidth, videoHeight) } diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx index b1e123c..e0dbdda 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx @@ -13,11 +13,11 @@ import { Popconfirm, Row, } from "@douyinfe/semi-ui"; -import { SimpleFileDownButton, VideoPlayModal,SkeletonScreen } from "$components"; +import { SimpleFileDownButton, VideoPlayModal, SkeletonScreen } from "$components"; import "../style.less"; import CameraModal from "../components/cameraModal"; import RemarksModal from "../components/remarksModal"; -import {Setup} from "$components"; +import { Setup } from "$components"; import SideSheets from "../components/sideSheet"; import { skeletonScreen } from "../../../components/skeletonScreen"; import { accessType } from "./nvr"; @@ -25,7 +25,7 @@ import { accessType } from "./nvr"; const CameraHeader = (props) => { const { dispatch, actions, user, loading, equipmentWarehouseCamera } = props; const [cameraModal, setCameraModal] = useState(false); - const [remarksModal,setRemarksModal] = useState(false); + const [remarksModal, setRemarksModal] = useState(false); const [videoPlay, setVideoPlay] = useState(false); const [modalName, setModalName] = useState(""); const [setup, setSetup] = useState(false); @@ -53,8 +53,8 @@ const CameraHeader = (props) => { const CAMERAS = "cameras"; const tableList = [//表格属性 { - title:'设备信息', - list:[ + title: '设备信息', + list: [ { name: "设备厂家", value: "manufactor" }, { name: "接入类型", value: "type" }, { name: "设备状态", value: "state" }, @@ -65,8 +65,8 @@ const CameraHeader = (props) => { ] }, { - title:'项目信息', - list:[ + title: '项目信息', + list: [ { name: "项目名称", value: "name" }, { name: "pcode", value: "pcode" }, { name: "结构物", value: "structure" }, @@ -217,16 +217,16 @@ const CameraHeader = (props) => {