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

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

@@ -91,7 +91,7 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData ,parentCamera}) {
                             </Form.Select.Option>
                         </Form.Select>
                     </Col>
-                    <Col span={12}>
+                    <Col span={14}>
                         <Form.Select
                             label="SIP编号:"
                             field="sip"

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

@@ -122,7 +122,6 @@ const CameraHeader = (props) => {
                         <sapn style={{ color: "blue" }}
                             onClick={() => {
                                 if (deviceClickb.current) {
-
                                     if (row.type == "nvr") {
                                         setearch({ ...searchb.current, nvrId: row.nvr.id })
                                     } else {
@@ -145,7 +144,6 @@ const CameraHeader = (props) => {
                 );
             },
         },
-
         {
             title: "操作",
             width: "20%",
@@ -610,8 +608,8 @@ const CameraHeader = (props) => {
                             }}
                             onClick={() => {
                                 api.current.validate().then((v) => {
-                                    setearch(v);
+                                    setearch({ ...v, limit: 10, page: 0 });
-                                    searchb.current = v
+                                    searchb.current = { ...v, limit: 10, page: 0 }
                                 });
                                 equipmentGetCamera();
                             }}
@@ -684,7 +682,7 @@ const CameraHeader = (props) => {
                                 style={{ width: 18, height: 18 }}
                             />
                         </Button>
-                        <SimpleFileDownButton src="nvr/export" />
+                        <SimpleFileDownButton src="camera/export" />
                     </div>
                 </div>
                 <Skeleton

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

@@ -9,6 +9,7 @@ import Setup from "../components/setup";
 import SideSheets from "../components/sideSheet";
 import { skeletonScreen } from "../components/skeletonScreen";
 import { ReminderBox } from "../../../components/index";
+import { SimpleFileDownButton } from "$components";
 
 export const accessType = [
     { name: "萤石云", key: "yingshi" },
@@ -451,7 +452,7 @@ const NvrHeader = (props) => {
                             }}
                             onClick={() => {
                                 api.current.validate().then((v) => {
-                                    setearch(v);
+                                    setearch({ ...v, limit: 10, page: 0 });
                                 });
                                 equipmentGetNvr();
                             }}
@@ -523,19 +524,7 @@ const NvrHeader = (props) => {
                                 style={{ width: 18, height: 18 }}
                             />
                         </Button>
-                        <a href={`/_api/${ApiTable.getExport}`}>
+                        <SimpleFileDownButton src="nvr/export" />
-                            <Button
-                                style={{
-                                    width: 65,
-                                    height: 32,
-                                    background: "#FFFFFF",
-                                    borderRadius: 3,
-                                    border: "1px solid #1859C1",
-                                }}
-                            >
-                                导出
-                            </Button>
-                        </a>
                     </div>
                 </div>
                 <Skeleton

code/VideoAccess-VCMP/web/package.json

@@ -7,7 +7,7 @@
       "test": "mocha",
       "start-vite": "cross-env NODE_ENV=developmentVite npm run start-params",
       "start": "cross-env NODE_ENV=development npm run start-params",
-      "start-params": "node server -p 5000 -u http://localhost:4000 --apiAuthUrl http://10.8.30.7:4200 --apiAnxinyunUrl http://10.8.30.7:4100  --iotAuthWeb http://localhost:5200",
+      "start-params": "node server -p 5000 -u http://10.8.30.7:4000 --apiAuthUrl http://10.8.30.7:4200 --apiAnxinyunUrl http://10.8.30.7:4100  --iotAuthWeb http://localhost:5200",
       "deploy": "export NODE_ENV=production&& npm run build && node server",
       "build-dev": "cross-env NODE_ENV=development&&webpack --config webpack.config.js",
       "build": "export NODE_ENV=production&&webpack --config webpack.config.prod.js"