From 525d99c736176f7a09295c2561cb2523853c2412 Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Thu, 28 Apr 2022 16:34:23 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipmentWarehouse/components/setup.jsx   | 69 +++++++++++++++----
 .../equipmentWarehouse/containers/nvr.jsx     | 15 ++--
 2 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/setup.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/setup.jsx
index 276670b..d2c111f 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/setup.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/setup.jsx
@@ -1,12 +1,19 @@
 import React, { useState, useEffect } from "react";
-import { Modal, CheckboxGroup, Checkbox } from "@douyinfe/semi-ui";
+import {
+  Modal,
+  CheckboxGroup,
+  Checkbox,
+  TabPane,
+  Tabs,
+} from "@douyinfe/semi-ui";
 
 function Setup(props) {
   const { dispatch, actions, user, loading, visible, close, editData } = props;
   return (
     <Modal
-      title="基本对话框"
+      title="表格属性设置"
       visible={visible}
+      style={{ width: 580 }}
       onOk={() => {
         close();
       }}
@@ -14,18 +21,52 @@ function Setup(props) {
         close();
       }}
     >
-      <CheckboxGroup
-        options={[
-          { label: "抖音", value: "abc" },
-          { label: "火山", value: "hotsoon" },
-          { label: "皮皮虾", value: "pipixia" },
-          { label: "今日头条", value: "toutiao" },
-        ]}
-        style={{ width: "100%" }}
-        direction="horizontal"
-        defaultValue={["hotsoon"]}
-        onChange={()=>{}}
-      />
+      <div
+        style={{
+          width: 529,
+          height: 121,
+          border: "1px solid #EAEAEA",
+          padding: "0px 5px",
+          borderRadius: 4,
+        }}
+      >
+        <div style={{ borderBottom: "1px solid #EAEAEA", fontSize: 14,marginLeft:"10px",padding: "8px 0px",}}>
+          设备信息
+        </div>
+        <CheckboxGroup
+          options={[
+            { label: "设备厂家", value: "a" },
+            { label: "添加账号", value: "b" },
+            { label: "通道数", value: "c" },
+            { label: "端口", value: "d" },
+            { label: "设备状态", value: "e" },
+            { label: "创建时间", value: "f" },
+          ]}
+          style={{ width: "100%",fontSize: 14 }}
+          direction="horizontal"
+          defaultValue={["hotsoon"]}
+        //   name={style}
+          onChange={(checked) => {
+            console.log(checked);
+          }}
+        />
+      </div>
+      <div style={{ width: 529, height: 92 ,borderRadius: 4,border: "1px solid #EAEAEA",}}>
+        <div>项目信息</div>
+        <CheckboxGroup
+          options={[
+            { label: "项目名称", value: "g" },
+            { label: "things名称", value: "h" },
+            { label: "things数量", value: "i" },
+          ]}
+          style={{ width: "100%", }}
+          direction="horizontal"
+          defaultValue={["hotsoon"]}
+          onChange={(checked) => {
+            console.log(checked);
+          }}
+        />
+      </div>
     </Modal>
   );
 }
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 9c66f97..473bbd3 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
@@ -36,9 +36,8 @@ const NvrHeader = (props) => {
                 width: "10px",
                 height: "10px",
                 borderRadius: "50%",
-                display: "inline-block",
-              }}
-            ></span>
+                display: "inline-block",marginRight:"10px"
+              }} />
             {record.name}
           </div>
         );
@@ -64,10 +63,11 @@ const NvrHeader = (props) => {
       title: "操作",
       width: "20%",
       dataIndex: "",
-      render: (y) => {
+      render: (_, row) => {
+        //   console.log(row);
         return (
           <>
-            <Button theme="borderless"><NvrModal modalName="修改" /></Button>
+            <Button theme="borderless"><NvrModal row1={row} modalName="修改" /></Button>
             <Button theme="borderless">查看</Button>
             <Button theme="borderless">删除</Button>
           </>
@@ -192,6 +192,7 @@ const NvrHeader = (props) => {
               label="厂家筛选："
               labelPosition="left"
               style={screen}
+              field="type1"
               placeholder="全部"
             >
               <Form.Select.Option value="f1">飞尚科技1</Form.Select.Option>
@@ -200,7 +201,7 @@ const NvrHeader = (props) => {
             <Form.Select
               label="状态查询："
               labelPosition="left"
-              field="type"
+              field="type2"
               style={screen}
               placeholder="全部"
             >
@@ -210,7 +211,7 @@ const NvrHeader = (props) => {
             <Form.Select
               label="关联项目："
               labelPosition="left"
-              field="type"
+              field="type3"
               style={screen}
               placeholder="全部"
             >