From d067752179be7001baadb6ee655d5309b41cc7cf Mon Sep 17 00:00:00 2001 From: deartibers <947466799@qq.com> Date: Tue, 5 Jul 2022 13:50:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=8C=85=E5=92=8C=E5=A4=87?= =?UTF-8?q?=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/client/assets/video/remarks.mp4 | Bin 0 -> 11203 bytes code/VideoAccess-VCMP/web/client/index.ejs | 1 + .../components/remarksModal.jsx | 91 ++++++++++++++++++ .../equipmentWarehouse/containers/camera.jsx | 26 +++++ .../web/webpack.config.prod.js | 9 +- 5 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 code/VideoAccess-VCMP/web/client/assets/video/remarks.mp4 create mode 100644 code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/remarksModal.jsx diff --git a/code/VideoAccess-VCMP/web/client/assets/video/remarks.mp4 b/code/VideoAccess-VCMP/web/client/assets/video/remarks.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..4c11720abc3e3708f7c6f77068d1f1ad48a3a846 GIT binary patch literal 11203 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 literal 0 HcmV?d00001 diff --git a/code/VideoAccess-VCMP/web/client/index.ejs b/code/VideoAccess-VCMP/web/client/index.ejs index 3f13bdb..ee1e2d7 100644 --- a/code/VideoAccess-VCMP/web/client/index.ejs +++ b/code/VideoAccess-VCMP/web/client/index.ejs @@ -6,6 +6,7 @@ + diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/remarksModal.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/remarksModal.jsx new file mode 100644 index 0000000..7b08608 --- /dev/null +++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/remarksModal.jsx @@ -0,0 +1,91 @@ +import React, { useState, useRef, useEffect } from "react"; +import { connect } from "react-redux"; +import { Modal, Spin,Input } from "@douyinfe/semi-ui"; +import TextScroll from "../../../components/textScroll"; + +function remarksModal (props) { + const { + close, + visible, + } = props; + + const [videoObj, setVideoObj] = useState(); //播放条件 + useEffect(() => { + setVideoObj({ + type: 'remarks', + // serialNo: row.serialNo, + // yingshiToken: row.secretYingshi?.token, + // playUrlSd: row.gbCamera?.playUrl?.liveUrl?.sd?.ezopen, + // playUrlHd: row.gbCamera?.playUrl?.liveUrl?.hd?.ezopen, + }) + }, []); + function handleOk () { + //点击弹框确定 右边按钮 + close(); + } + function handleAfterClose () { + //在关闭之后 + } + function handleCancel () { + close(); + //点击弹框取消 左边按钮 + } + return ( + <> + +

+
+
+
请添加备注信息
+
（3/3）
+
+
+ 01
} showClear> +
+
+ 02
} showClear> +
+
+ 03
} showClear> + + +
+
+ +
+
+ + + + ); +} +function mapStateToProps (state) { + const { auth, global, members, CameraKind, CameraAbility } = state; + return { + loading: members.isRequesting, + user: auth.user, + actions: global.actions, + CameraKind: CameraKind.data || [], + CameraAbility: CameraAbility.data || [], + }; +} + +export default connect(mapStateToProps)(remarksModal); 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 a173f33..907f8b1 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 @@ -16,6 +16,7 @@ import { import { SimpleFileDownButton, VideoPlayModal } from "$components"; import "../style.less"; import CameraModal from "../components/cameraModal"; +import RemarksModal from "../components/remarksModal"; import Setup from "../components/setup"; import SideSheets from "../components/sideSheet"; import { skeletonScreen } from "../components/skeletonScreen"; @@ -24,6 +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 [videoPlay, setVideoPlay] = useState(false); const [modalName, setModalName] = useState(""); const [setup, setSetup] = useState(false); @@ -268,6 +270,21 @@ const CameraHeader = (props) => { > + ); }, @@ -809,6 +826,15 @@ const CameraHeader = (props) => { }} /> : "" } + { + remarksModal? + { + setRemarksModal(false) + }} > + :'' + } ); }; diff --git a/code/VideoAccess-VCMP/web/webpack.config.prod.js b/code/VideoAccess-VCMP/web/webpack.config.prod.js index af8ef36..fb9a046 100644 --- a/code/VideoAccess-VCMP/web/webpack.config.prod.js +++ b/code/VideoAccess-VCMP/web/webpack.config.prod.js @@ -1,6 +1,7 @@ var path = require('path'); var webpack = require('webpack'); var HtmlWebpackPlugin = require('html-webpack-plugin'); +const SemiWebpackPlugin = require('@douyinfe/semi-webpack-plugin').default; const PATHS = { app: path.join(__dirname, 'client/src'), @@ -30,7 +31,13 @@ module.exports = { new HtmlWebpackPlugin({ filename: '../index.html', template: './client/index.ejs' - }) + }), + new SemiWebpackPlugin({ + theme: { + name: '@semi-bot/semi-theme-fscamera', + include: '~@semi-bot/semi-theme-fscamera/scss/local.scss' + } + }), ], optimization: { splitChunks: {