From 35ab0b2fa6967071d83f9a8e1caea48315699afe Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Fri, 24 Jun 2022 08:55:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/cascadeCamera.jsx              |  2 +-
 .../equipmentWarehouse/containers/camera.jsx  | 24 +++++++++----------
 .../equipmentWarehouse/containers/nvr.jsx     | 17 +++----------
 code/VideoAccess-VCMP/web/package.json        |  2 +-
 4 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
index f3603d8..471e7a3 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
+++ b/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"
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 f27aa16..18a4cf0 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
@@ -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%",
@@ -406,27 +404,27 @@ const CameraHeader = (props) => {
             r.station.map((v) => {
                 if (exhibition == "structure") {
                     datas.push(v.structure.name)
-                }else{
-                    if(exhibition == "point"){
+                } else {
+                    if (exhibition == "point") {
                         datas.push(v.name)
-                    }else{
+                    } else {
                         datas.push(v.factor.name)
                     }
                 }
             })
         }
-        let dataSet =[...(new Set(datas))]
-        return dataSet.length>0?<Popover
+        let dataSet = [...(new Set(datas))]
+        return dataSet.length > 0 ? <Popover
             key="updateTime"
             position="top"
             content={
                 <article style={{ padding: 12 }}>
-                     {dataSet.length>0?dataSet.map((v,index)=><div key={index}>{v}</div>):""}
+                    {dataSet.length > 0 ? dataSet.map((v, index) => <div key={index}>{v}</div>) : ""}
                 </article>
             }
         >
-            <Tag>{dataSet.length>0?`${dataSet[0]}...`:""}</Tag>
-        </Popover>:""
+            <Tag>{dataSet.length > 0 ? `${dataSet[0]}...` : ""}</Tag>
+        </Popover> : ""
 
     }
     //条件赛选样式
@@ -610,8 +608,8 @@ const CameraHeader = (props) => {
                             }}
                             onClick={() => {
                                 api.current.validate().then((v) => {
-                                    setearch(v);
-                                    searchb.current = v
+                                    setearch({ ...v, limit: 10, page: 0 });
+                                    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
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx
index d9c9db5..8a4e556 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx
+++ b/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}`}>
-                            <Button
-                                style={{
-                                    width: 65,
-                                    height: 32,
-                                    background: "#FFFFFF",
-                                    borderRadius: 3,
-                                    border: "1px solid #1859C1",
-                                }}
-                            >
-                                导出
-                            </Button>
-                        </a>
+                        <SimpleFileDownButton src="nvr/export" />
                     </div>
                 </div>
                 <Skeleton
diff --git a/code/VideoAccess-VCMP/web/package.json b/code/VideoAccess-VCMP/web/package.json
index ea1335d..8916608 100644
--- a/code/VideoAccess-VCMP/web/package.json
+++ b/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"