From 0096be64de0133b2e958eae7bf22e1a4873228ab Mon Sep 17 00:00:00 2001
From: wanghx <wanghx@yisa.com>
Date: Fri, 20 Oct 2023 15:29:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix():=20NVR=E7=AE=A1=E7=90=86=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx     | 29 ++++----
 src/pages/SystemMgm/OrgnizationMgm/loadable.jsx    | 81 +++++++++++++++-------
 2 files changed, 73 insertions(+), 37 deletions(-)

diff --git a/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
index 18c7b10..4f9a789 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
@@ -45,6 +45,7 @@ function Fence(props) {
         road_name: '',//路段名称
         operator: -1,//运营商
         export: false,
+        road_id: '',//所属路段
         pn: 1,
         length: Number(pageSizeOptions[0]),  // 每页条数
     }
@@ -60,6 +61,7 @@ function Fence(props) {
         password: "",
         port: "",
         road_name: "",
+        road_id: "",
         type: "",
         user_name: "",
         video_port: ""
@@ -128,6 +130,9 @@ function Fence(props) {
     }
     const handleEdit = (item) => {
         setEditStatus(true)
+        getRoadById(item.operator_id).then((data) => {
+            setRoadData(data)
+        })
         form.setFieldsValue({
             ...item
         })
@@ -524,23 +529,23 @@ function Fence(props) {
                                         </Form.Item>
                                     </Col>
                                     <Col span={12}>
-                                        {/* <Form.Item 
-                                            label={"所属商户"}
-                                            name={"operator"}
-                                            rules={[{ required: true, message: '所属商户不能为空' }]}
+                                        <Form.Item 
+                                            label={""}
+                                            name={"id"}
+                                            hidden
                                         >
                                             <Input/>
-                                        </Form.Item> */}
+                                        </Form.Item>
                                         <Form.Item 
                                             label={"设备类型"}
-                                            name={"id"}
+                                            name={"type"}
                                             rules={[{ required: true, message: '设备类型不能为空' }]}
                                         >
                                             <Select
                                                 ref={roadSelectRef}
                                                 placeholder="请选择"
-                                                value={form.device_id}
-                                                onChange={(v) => console.log(v)}
+                                                value={form.type}
+                                                onChange={(v) => form.setFieldValue('type', v)}
                                                 options={deviceTypeData}
                                             />
                                         </Form.Item>
@@ -571,14 +576,14 @@ function Fence(props) {
                                     <Col span={12}>
                                         <Form.Item 
                                             label={"所属路段"}
-                                            name={"road_name"}
+                                            name={"road_id"}
                                             rules={[{ required: true, message: '所属路段不能为空' }]}
                                         >
                                             <Select
                                                 ref={roadSelectRef}
                                                 placeholder="请选择"
                                                 className="road-selector"
-                                                value={form.road_name}
+                                                value={form.road_id}
                                                 onChange={handleRoadChange}
                                                 options={roadData}
                                             />
@@ -619,11 +624,11 @@ function Fence(props) {
                                                 value={form.network_mode}
                                                 options={[
                                                     {
-                                                        value: "固网",
+                                                        value: "1",
                                                         label: "固网"   
                                                     },
                                                     {
-                                                        value: '无线网络',
+                                                        value: '2',
                                                         label: "无线网络"
                                                     }
                                                 ]}
diff --git a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
index d2fe56f..5989890 100644
--- a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
+++ b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
@@ -5,6 +5,8 @@ import ajax from "@/services"
 import "./index.scss";
 
 const isDev = window.location.href.indexOf('localhost') > -1
+let testTemp = []
+
 function OrgnizationMgm() {
 
     const [editStatus, setEditStatus] = useState(false)
@@ -52,8 +54,8 @@ function OrgnizationMgm() {
         })
     }
 
-    const getRoleTree = () => {
-        ajax.getOrgRoleNodeList().then((e) => {
+    const getRoleTree = (id) => {
+        ajax.getOrgRoleNodeList({id: id}).then((e) => {
             if (e.status == 20000) {
                 setRoleTree(e.data)
             }
@@ -63,8 +65,10 @@ function OrgnizationMgm() {
     const getOrgTree = () => {
         ajax.getOrgTree().then((e) => {
             if (e.status == 20000) {
-                setOrgTree(e.data)
-                handleTreeClick(undefined, {node: e.data[0]})
+                testTemp = e.data
+                recursionTree(testTemp)
+                setOrgTree(testTemp)
+                handleTreeClick(undefined, {node: testTemp[0]})
             }
         })
     }
@@ -166,15 +170,28 @@ function OrgnizationMgm() {
     }
 
     const handleTreeClick = (e, {node}) => {
+
+        // 第三层级不予配置
+        if (node.level > 2) {
+            setActiveOrg({})
+            message.error('不允许配置')
+            return
+        }
+
+        getRoleTree(node.id)
+        let ids = node.ids.split("-").filter(item => item != "undefined")
+        ids.push(node.id)
         ajaxGetOrgDetail(node.id).then((data) => {
             setActiveOrg({
                 id: node.id,
+                ids: ids,
                 key: node.key,
                 name: node.name,
                 level: node.level,
                 img_url: node.img_url,
                 control_area: node.control_area,
-                ...data
+                ...data,
+                role_auth: data.role_auth ? data.role_auth.map((id) => Number(id)) : []
             })
             baseForm.setFieldsValue({
                 platform: data.platform,
@@ -183,7 +200,7 @@ function OrgnizationMgm() {
                 img_url: data.img_url
             })
             setImgUrl(data.img_url)
-            setRoleCheckedKeys(data.role_auth)
+            setRoleCheckedKeys(data.role_auth ? data.role_auth.map((id) => Number(id)) : [])
         }).catch(err => {
             message.error(err)
         })
@@ -220,12 +237,22 @@ function OrgnizationMgm() {
 
     }
 
+    const recursionTree = (treeData, pid) => {
+        treeData.map((item) => {            
+            item.ids += '-' + pid
+            if (item.children) {
+                recursionTree(item.children, item.id)
+            }
+            return item
+        })
+    }
+
 
     const handleAreaTreeChange = (checkedKeys) => {
         baseForm.setFieldValue('control_area', checkedKeys.join(','))
     }
 
-    const handleRoleTreeChange = (checkedKeys) => {
+    const handleRoleTreeChange = (checkedKeys, _) => {
         setRoleCheckedKeys(checkedKeys)
     }
 
@@ -249,7 +276,8 @@ function OrgnizationMgm() {
     const handleConfirm = () => {
         ajaxOrgDetailSave(Object.assign({}, baseForm.getFieldsValue(), {
             id: activeOrg.id,
-            role: roleCheckedKeys.join(',')
+            role: roleCheckedKeys.join(','),
+            control_area: baseForm.getFieldValue('control_area').join(',')
         })).then((msg) => {
             message.success(msg)
             setEditStatus(false)
@@ -345,7 +373,7 @@ function OrgnizationMgm() {
                                 </Upload>
                             </Form.Item>
                             {
-                                activeOrg.level > 2 ? <>
+                                activeOrg.level > 1 ? <>
                                     <Form.Item label="管辖范围" name="control_type">
                                         <Select disabled={!editStatus}>
                                             <Option value={1}>按区管理</Option>
@@ -371,7 +399,7 @@ function OrgnizationMgm() {
                     </div>
                 ),
             },
-            activeOrg.level > 2 ? {
+            activeOrg.level > 1 ? {
                 label: `功能配置`,
                 key: '2',
                 children: (
@@ -381,10 +409,9 @@ function OrgnizationMgm() {
                             <Tree
                                 disabled={!editStatus}
                                 checkable
-                                defaultCheckedKeys={roleCheckedKeys || []}
                                 treeData={roleTree}
                                 onCheck={handleRoleTreeChange}
-                                // checkedKeys={roleCheckedKeys}
+                                checkedKeys={roleCheckedKeys}
                                 fieldNames={{
                                     title: 'name',
                                     key: 'id'
@@ -395,12 +422,12 @@ function OrgnizationMgm() {
                 ),
             } : undefined
         ]
-    }, [JSON.stringify(activeOrg), editStatus, imgUrl])
+    }, [JSON.stringify(activeOrg), editStatus, imgUrl, roleCheckedKeys])
 
     useEffect(() => {
         getOrgTree()
         getAreaTree()
-        getRoleTree()
+        // getRoleTree()
     }, [])
 
     const treeTitleRender = ({name, children, level, pid, id, virtually_code, lng_lat, code}) => {
@@ -437,18 +464,22 @@ function OrgnizationMgm() {
                 <Tabs
                     defaultActiveKey="1"
                     onChange={(v) => setTabActive(v)}
-                    items={tabRender}
+                    items={Object.keys(activeOrg).length ? (activeOrg.level < 3 ? tabRender : null) : null }
                 />
-                <div className="form-confirm">
-                    {
-                        !editStatus ? (
-                            <Button type="primary" className="yisa-btn" onClick={() => handleEdit()}>编辑</Button>
-                        ) : <>
-                            <Button type="primary" className="yisa-btn" onClick={() => handleConfirm()}>确认</Button>
-                            <Button type="ghost" className="yisa-btn" onClick={() => handleCancel()}>取消</Button>
-                        </>
-                    }
-                </div>
+                {
+                    Object.keys(activeOrg).length ? (
+                        <div className="form-confirm">
+                            {
+                                !editStatus ? (
+                                    <Button type="primary" className="yisa-btn" onClick={() => handleEdit()}>编辑</Button>
+                                ) : <>
+                                    <Button type="primary" className="yisa-btn" onClick={() => handleConfirm()}>确认</Button>
+                                    <Button type="ghost" className="yisa-btn" onClick={() => handleCancel()}>取消</Button>
+                                </>
+                            }
+                        </div>
+                    ) : null
+                }
             </div>
         </div>
         <Modal

From 7c7d45f9372254f3a32ebcb220b8500e19c66795 Mon Sep 17 00:00:00 2001
From: chenqiang <chenqiang@yisa.com>
Date: Fri, 20 Oct 2023 15:56:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix():=20=E8=A7=A3=E5=86=B3=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=AD=9B=E9=80=89=E8=A2=AB=E8=A6=86=E7=9B=96=E7=9A=84?=
 =?UTF-8?q?went?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinancialMgm/FinancialReport/BookReport/index.scss   | 16 ++++++++++------
 .../FinancialMgm/FinancialReport/BookReport/loadable.jsx |  8 +++++++-
 .../FinancialReport/OperationReport/index.scss           | 10 +++++-----
 .../FinancialReport/ParkCardReport/index.scss            |  8 ++++----
 .../FinancialReport/ParkingIncomeReport/index.scss       |  8 ++++----
 .../FinancialReport/PayChannelStat/index.scss            |  8 ++++----
 .../FinancialReport/PaySummaryReport/index.scss          |  7 ++++---
 .../FinancialMgm/FinancialReport/PdaStat/index.scss      |  8 ++++----
 8 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/src/pages/FinancialMgm/FinancialReport/BookReport/index.scss b/src/pages/FinancialMgm/FinancialReport/BookReport/index.scss
index f29e44a..530828e 100644
--- a/src/pages/FinancialMgm/FinancialReport/BookReport/index.scss
+++ b/src/pages/FinancialMgm/FinancialReport/BookReport/index.scss
@@ -118,7 +118,7 @@ $color-primary : var(--color-primary);
 
           .daf {
             margin-left: 4px;
-             //   border: 1px solid var(--color-table-border-bottom-color);
+            //   border: 1px solid var(--color-table-border-bottom-color);
           }
         }
 
@@ -131,14 +131,14 @@ $color-primary : var(--color-primary);
 
         .inputs {
           flex: 1;
-           //   border: 1px solid var(--color-table-border-bottom-color);
+          //   border: 1px solid var(--color-table-border-bottom-color);
           border-radius: 4px;
           overflow: hidden;
         }
 
         .inputst {
           // flex: 228px;
-           //   border: 1px solid var(--color-table-border-bottom-color);
+          //   border: 1px solid var(--color-table-border-bottom-color);
           border-radius: 4px;
           overflow: hidden;
         }
@@ -277,7 +277,7 @@ $color-primary : var(--color-primary);
           right: 21px;
           top: 202px;
           padding: 10px 8px;
-          z-index: 1;
+          z-index: 12;
 
           .colsa {
             color: #3AA9FF;
@@ -355,8 +355,8 @@ $color-primary : var(--color-primary);
 
 
 .selectcolBookReport {
-  width: 160px;
-  height: 470px;
+  width: 180px;
+  height: 340px;
 
   .tirl {
     font-size: 16px;
@@ -371,4 +371,8 @@ $color-primary : var(--color-primary);
 
   font-size: 14px;
   color: $color-text;
+}
+
+.ldads {
+  height: 380px;
 }
\ No newline at end of file
diff --git a/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx
index 660f2e0..75d18cb 100644
--- a/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx
@@ -321,7 +321,13 @@ function BookReport() {
 
   const SelectCol = (numb) => {
     return (
-      <div className="selectcolBookReport">
+      <div
+        className={
+          FormData.type == 1
+            ? "selectcolBookReport"
+            : "selectcolBookReport ldads"
+        }
+      >
         <p className="tirl">隐藏列</p>
         {col.map((ele) => {
           if (ele.children) {
diff --git a/src/pages/FinancialMgm/FinancialReport/OperationReport/index.scss b/src/pages/FinancialMgm/FinancialReport/OperationReport/index.scss
index f92ec56..4c2baba 100644
--- a/src/pages/FinancialMgm/FinancialReport/OperationReport/index.scss
+++ b/src/pages/FinancialMgm/FinancialReport/OperationReport/index.scss
@@ -84,27 +84,27 @@ $color-primary : var(--color-primary);
 
           .daf {
             margin-left: 4px;
-             //   border: 1px solid var(--color-table-border-bottom-color);
+            //   border: 1px solid var(--color-table-border-bottom-color);
           }
         }
 
         .labs {
           width: 120px;
           text-align: right;
-           //   border: 1px solid var(--color-table-border-bottom-color);
+          //   border: 1px solid var(--color-table-border-bottom-color);
           margin-right: 10px;
         }
 
         .inputs {
           flex: 1;
-           //   border: 1px solid var(--color-table-border-bottom-color);
+          //   border: 1px solid var(--color-table-border-bottom-color);
           border-radius: 4px;
           overflow: hidden;
         }
 
         .inputst {
           // flex: 228px;
-           //   border: 1px solid var(--color-table-border-bottom-color);
+          //   border: 1px solid var(--color-table-border-bottom-color);
           border-radius: 4px;
           overflow: hidden;
         }
@@ -359,7 +359,7 @@ $color-primary : var(--color-primary);
           right: 21px;
           top: 277px;
           padding: 10px 8px;
-          z-index: 1;
+          z-index: 12;
 
           .colsa {
             color: #3AA9FF;
diff --git a/src/pages/FinancialMgm/FinancialReport/ParkCardReport/index.scss b/src/pages/FinancialMgm/FinancialReport/ParkCardReport/index.scss
index 5987854..83d726c 100644
--- a/src/pages/FinancialMgm/FinancialReport/ParkCardReport/index.scss
+++ b/src/pages/FinancialMgm/FinancialReport/ParkCardReport/index.scss
@@ -84,7 +84,7 @@ $color-primary : var(--color-primary);
 
           .daf {
             margin-left: 4px;
-             //   border: 1px solid var(--color-table-border-bottom-color);
+            //   border: 1px solid var(--color-table-border-bottom-color);
           }
         }
 
@@ -97,14 +97,14 @@ $color-primary : var(--color-primary);
 
         .inputs {
           flex: 1;
-           //   border: 1px solid var(--color-table-border-bottom-color);
+          //   border: 1px solid var(--color-table-border-bottom-color);
           border-radius: 4px;
           overflow: hidden;
         }
 
         .inputst {
           // flex: 228px;
-           //   border: 1px solid var(--color-table-border-bottom-color);
+          //   border: 1px solid var(--color-table-border-bottom-color);
           border-radius: 4px;
           overflow: hidden;
         }
@@ -232,7 +232,7 @@ $color-primary : var(--color-primary);
           position: fixed;
           right: 21px;
           top: 202px;
-          z-index: 1;
+          z-index: 12;
           padding: 10px 8px;
 
           .colsa {
diff --git a/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/index.scss b/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/index.scss
index 365c66e..0339c40 100644
--- a/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/index.scss
+++ b/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/index.scss
@@ -84,7 +84,7 @@ $color-primary : var(--color-primary);
 
           .daf {
             margin-left: 4px;
-             //   border: 1px solid var(--color-table-border-bottom-color);
+            //   border: 1px solid var(--color-table-border-bottom-color);
           }
         }
 
@@ -97,14 +97,14 @@ $color-primary : var(--color-primary);
 
         .inputs {
           flex: 1;
-           //   border: 1px solid var(--color-table-border-bottom-color);
+          //   border: 1px solid var(--color-table-border-bottom-color);
           border-radius: 4px;
           overflow: hidden;
         }
 
         .inputst {
           // flex: 228px;
-           //   border: 1px solid var(--color-table-border-bottom-color);
+          //   border: 1px solid var(--color-table-border-bottom-color);
           border-radius: 4px;
           overflow: hidden;
         }
@@ -358,7 +358,7 @@ $color-primary : var(--color-primary);
           right: 21px;
           top: 277px;
           padding: 10px 8px;
-          z-index: 1;
+          z-index: 12;
 
           .colsa {
             color: #3AA9FF;
diff --git a/src/pages/FinancialMgm/FinancialReport/PayChannelStat/index.scss b/src/pages/FinancialMgm/FinancialReport/PayChannelStat/index.scss
index 6461133..8d84117 100644
--- a/src/pages/FinancialMgm/FinancialReport/PayChannelStat/index.scss
+++ b/src/pages/FinancialMgm/FinancialReport/PayChannelStat/index.scss
@@ -84,7 +84,7 @@ $color-primary : var(--color-primary);
 
           .daf {
             margin-left: 4px;
-             //   border: 1px solid var(--color-table-border-bottom-color);
+            //   border: 1px solid var(--color-table-border-bottom-color);
           }
         }
 
@@ -97,14 +97,14 @@ $color-primary : var(--color-primary);
 
         .inputs {
           flex: 1;
-           //   border: 1px solid var(--color-table-border-bottom-color);
+          //   border: 1px solid var(--color-table-border-bottom-color);
           border-radius: 4px;
           overflow: hidden;
         }
 
         .inputst {
           // flex: 228px;
-           //   border: 1px solid var(--color-table-border-bottom-color);
+          //   border: 1px solid var(--color-table-border-bottom-color);
           border-radius: 4px;
           overflow: hidden;
         }
@@ -216,7 +216,7 @@ $color-primary : var(--color-primary);
           right: 21px;
           top: 421px;
           padding: 10px 8px;
-          z-index: 1;
+          z-index: 12;
 
           .colsa {
             color: #3AA9FF;
diff --git a/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/index.scss b/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/index.scss
index 8f0602d..d38c8c0 100644
--- a/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/index.scss
+++ b/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/index.scss
@@ -84,7 +84,7 @@ $color-primary : var(--color-primary);
 
           .daf {
             margin-left: 4px;
-             //   border: 1px solid var(--color-table-border-bottom-color);
+            //   border: 1px solid var(--color-table-border-bottom-color);
           }
         }
 
@@ -97,14 +97,14 @@ $color-primary : var(--color-primary);
 
         .inputs {
           flex: 1;
-           //   border: 1px solid var(--color-table-border-bottom-color);
+          //   border: 1px solid var(--color-table-border-bottom-color);
           border-radius: 4px;
           overflow: hidden;
         }
 
         .inputst {
           // flex: 228px;
-           //   border: 1px solid var(--color-table-border-bottom-color);
+          //   border: 1px solid var(--color-table-border-bottom-color);
           border-radius: 4px;
           overflow: hidden;
         }
@@ -259,6 +259,7 @@ $color-primary : var(--color-primary);
           right: 21px;
           top: 277px;
           padding: 10px 8px;
+          z-index: 12;
 
           .colsa {
             color: #3AA9FF;
diff --git a/src/pages/FinancialMgm/FinancialReport/PdaStat/index.scss b/src/pages/FinancialMgm/FinancialReport/PdaStat/index.scss
index 90d3bad..b857f7a 100644
--- a/src/pages/FinancialMgm/FinancialReport/PdaStat/index.scss
+++ b/src/pages/FinancialMgm/FinancialReport/PdaStat/index.scss
@@ -84,7 +84,7 @@ $color-primary : var(--color-primary);
 
           .daf {
             margin-left: 4px;
-             //   border: 1px solid var(--color-table-border-bottom-color);
+            //   border: 1px solid var(--color-table-border-bottom-color);
           }
         }
 
@@ -97,14 +97,14 @@ $color-primary : var(--color-primary);
 
         .inputs {
           flex: 1;
-           //   border: 1px solid var(--color-table-border-bottom-color);
+          //   border: 1px solid var(--color-table-border-bottom-color);
           border-radius: 4px;
           overflow: hidden;
         }
 
         .inputst {
           // flex: 228px;
-           //   border: 1px solid var(--color-table-border-bottom-color);
+          //   border: 1px solid var(--color-table-border-bottom-color);
           border-radius: 4px;
           overflow: hidden;
         }
@@ -196,7 +196,7 @@ $color-primary : var(--color-primary);
           position: fixed;
           right: 21px;
           top: 167px;
-          z-index: 1;
+          z-index: 12;
           padding: 10px 8px;
 
           .colsa {