解决冲突

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

@@ -13,7 +13,7 @@ import {
     Skeleton,
     Popconfirm,
 } from "@douyinfe/semi-ui";
-import { SimpleFileDownButton } from "$components";
+import { SimpleFileDownButton, VideoPlayModal } from "$components";
 import "../style.less";
 import CameraModal from "../components/cameraModal";
 import NvrModal from "../components/nvrModal";
@@ -34,7 +34,7 @@ const CameraHeader = (props) => {
     const [query, setQuery] = useState({ limit: 10, page: 0 }); //页码信息
     const [search, setearch] = useState({}); //搜索条件
     const [rowId, setRowId] = useState(); //表格数据id
-    const [cameraData, setCameraData] = useState({}); //表格数据id
+    const [cameraData, setCameraData] = useState({}); //表格数据
 
     const { equipmentWarehouse } = actions;
     const api = useRef();
@@ -119,6 +119,14 @@ const CameraHeader = (props) => {
                         >
                             查看
                         </Button>
+                        <Button
+                            theme="borderless"
+                            onClick={() => {
+                                setRowId(row.id);
+                            }}
+                        >
+                            播放
+                        </Button>
                         {row.forbidden ? (
                             <Button
                                 theme="borderless"