From 2764916039e76e7002577e78347746172f560c41 Mon Sep 17 00:00:00 2001
From: wanghx <wanghx@yisa.com>
Date: Tue, 12 Dec 2023 18:09:59 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                       |  1 +
 src/components/Export/ExportBtnNew/index.jsx       | 37 ++---------
 src/components/Export/ExportBtnNew/index.scss      |  5 ++
 src/config/character.config.js                     |  4 +-
 .../ArrearageAly/ParkArrear/index.jsx              |  2 +-
 .../ParkingIncomeAly/ArrearageAly/loadable.jsx     |  3 +-
 .../ArrearageRecoverAly/loadable.jsx               |  2 +-
 .../ParkingIncomeAly/CityArrearageAly/loadable.jsx |  2 +-
 .../ParkingIncomeAly/CityIncomeAly/loadable.jsx    | 28 +++++++-
 .../OrderArrearageAly/loadable.jsx                 |  3 +-
 .../ParkingIncomeAly/PriceAly/loadable.jsx         |  4 +-
 src/pages/InRoadMgm/EquipmentMgm/BarMgm/index.scss |  8 +++
 .../InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx     | 16 ++++-
 .../EquipmentMgm/EquipmentStatus/Device/index.jsx  | 76 ++++++++++++++--------
 .../EquipmentMgm/EquipmentStatus/Device/index.scss |  8 +++
 .../SystemMgm/AreaManage/ModalAreaAdd/index.jsx    |  2 +-
 src/pages/SystemMgm/OrgnizationMgm/loadable.jsx    | 33 +++++-----
 17 files changed, 145 insertions(+), 89 deletions(-)

diff --git a/package.json b/package.json
index 7f594ed..45e9876 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "antd": "^4.21.4",
     "autoprefixer": "^10.4.2",
     "babel-loader": "^8.2.3",
+    "bignumber.js": "^9.1.2",
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^9.1.0",
     "cross-env": "^7.0.3",
diff --git a/src/components/Export/ExportBtnNew/index.jsx b/src/components/Export/ExportBtnNew/index.jsx
index fbd18eb..4dd006b 100644
--- a/src/components/Export/ExportBtnNew/index.jsx
+++ b/src/components/Export/ExportBtnNew/index.jsx
@@ -67,7 +67,7 @@ function ExportBtn(props) {
   const [percent, setPercent] = useState(0);
 
   // 选项
-  const [checkedType, setCheckedType] = useState("1");
+  const [checkedType, setCheckedType] = useState("2");
 
   // 输入最小值
   const [min, setMin] = useState(1);
@@ -80,7 +80,7 @@ function ExportBtn(props) {
     if (val === exportType) return;
     setMaxExportNum(val === "hasImg" ? 10000 : 100000);
     setExportType(val);
-    setCheckedType("1");
+    setCheckedType("2");
     setMin(1);
     setMax(1);
   };
@@ -105,32 +105,7 @@ function ExportBtn(props) {
 
   // [导出当前页,导出全部,导出指定条数]----选项
   const options = [
-    { label: "导出当前页", value: "1" },
-    { label: "导出全部 （全部导出需等待较长时间，请耐心等候） ", value: "2" },
-    {
-      label: (
-        <div className='piecewise'>
-          <span>导出</span>
-          <div className='countInput'>
-            <InputNumber
-              key="min"
-              min={1}
-              value={min}
-              onChange={(e) => handleChangeNum(e, "min")}
-            />
-            ~
-            <InputNumber
-              key="max"
-              min={1}
-              value={max}
-              onChange={(e) => handleChangeNum(e, "max")}
-            />
-          </div>
-          <div className='count'>{Math.abs(max - min + 1)}条</div>
-        </div>
-      ),
-      value: "3",
-    },
+    { label: "导出全部 （全部导出需等待较长时间，请耐心等候） ", value: "2" }
   ];
 
   // 导出确认
@@ -233,7 +208,7 @@ function ExportBtn(props) {
   // 重置
   const handleReset = () => {
     setExportType(modalType);
-    setCheckedType("1");
+    setCheckedType("2");
     setMin(1);
     setMax(1);
     setInProcess("1");
@@ -356,13 +331,13 @@ function ExportBtn(props) {
                   </Space>
                 </Radio.Group>
               </div>
-              <div className='alert'>
+              {/* <div className='alert'>
                 <ExclamationCircleFilled className='alertIcon' />
                 <div className='message'>
                   <div>分段导出每次最多支持导出<span style={{color:'#3B97FF'}}> {maxExportNum} </span>条</div>
                   <div>本次查询包含<span style={{color:'#3B97FF'}}> {totalRecords} </span>条数据可供导出</div>
                 </div>
-              </div>
+              </div> */}
             </div>
           </div>
         )}
diff --git a/src/components/Export/ExportBtnNew/index.scss b/src/components/Export/ExportBtnNew/index.scss
index 95a11ac..342384e 100644
--- a/src/components/Export/ExportBtnNew/index.scss
+++ b/src/components/Export/ExportBtnNew/index.scss
@@ -1,3 +1,8 @@
+
+.export-container {
+  display: flex;
+  justify-content: flex-end;
+}
 .export {
   .title {
     margin: 18px 0 24px;
diff --git a/src/config/character.config.js b/src/config/character.config.js
index f4d9e3a..3948e76 100644
--- a/src/config/character.config.js
+++ b/src/config/character.config.js
@@ -935,9 +935,9 @@ export const lineChartOption = {
       name: '',
       type: 'line',
       // stack: 'Total',
-      symbolSize: 1,
+      symbolSize: 6,
       symbol: 'circle',
-      showSymbol: false,
+      showSymbol: true,
       smooth: true,
       lineStyle: {
         width: 3
diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.jsx
index 9174210..434278d 100644
--- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.jsx
@@ -28,7 +28,7 @@ const ParkArrear = forwardRef((props, ref) => {
             title: "序号",
             width: 60,
             align: 'center',
-            render: (text, record, index) => index + 1,
+            render: (text, record, index) => (pageInfo.pn - 1) * pageInfo.length + index + 1,
         },
         {
             title: "停车场名称",
diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/loadable.jsx
index 2dbf53b..d81ef50 100644
--- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/loadable.jsx
@@ -229,11 +229,12 @@ function ArrearageAly(props) {
                                         /> */}
                                         <Select
                                             showSearch
+                                            allowClear
                                             className="form-con"
                                             value={formData.park_text}
                                             onSearch={(newValue) => handleSearchPark(newValue)}
                                             onChange={(v) => setFormData({...formData, park_text: v})}
-                                            placeholder=""
+                                            placeholder="全部"
                                             defaultActiveFirstOption={false}
                                             filterOption={false}
                                             
diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx
index 3fa3b7a..47e69f7 100644
--- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx
@@ -52,7 +52,7 @@ function ArrearageRecoverAly(props) {
             dataIndex: "area",
         },
         {
-            title: "区间范围",
+            title: "期间范围",
             align: 'center',
             dataIndex: "date",
         },
diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx
index 8db2436..6fec94f 100644
--- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx
@@ -52,7 +52,7 @@ function CityArrearageAly(props) {
             dataIndex: "area",
         },
         {
-            title: "区间范围",
+            title: "期间范围",
             align: 'center',
             dataIndex: "date",
         },
diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeAly/loadable.jsx
index 667c208..945bfb7 100644
--- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeAly/loadable.jsx
@@ -1,5 +1,6 @@
 import React, { useState, useRef, useEffect } from "react"
 import { Select, Input, Button, Table, message, Pagination, DatePicker, Cascader, Tooltip } from "antd"
+import { QuickMenu } from '@/components'
 import { QuestionCircleFilled } from '@ant-design/icons'
 import { dictionary } from "@/config/common"
 import ReactEcharts from "echarts-for-react"
@@ -8,6 +9,7 @@ import utils from "@/config/utils"
 import ajax from "@/services"
 import moment from "moment"
 import './index.scss'
+const BigNumber = require('bignumber.js')
 
 function CityIncomeAly(props) {
     const {
@@ -104,9 +106,9 @@ function CityIncomeAly(props) {
     }
 
     const initPieChart = (data, chartName, unit) => {
-        let total = 0
+        let total = new BigNumber(0)
         data.map((item) => {
-            total += item.value
+            total = total.plus(item.value)
         })
         if (chartName == 'ys') {
             setYsPieChartOption({
@@ -236,6 +238,14 @@ function CityIncomeAly(props) {
         })
     }
 
+    const toDeftime = (v) => {
+        setFormData({
+            ...formData,
+            start_time: moment(v.startDateTime),
+            end_time: moment(v.endDateTime)
+        })
+    }
+
     const handleSearch = () => {
         let days = moment(formData.end_time).diff(moment(formData.start_time), 'days')
         if (formData.date_type == 'day' && days > 31) {
@@ -428,6 +438,20 @@ function CityIncomeAly(props) {
                                 }
                             />
                         </div>
+                        <div className="yisa-search">
+                        <QuickMenu
+                            dropdownData={[
+                                { text: '昨日', value: 1 },
+                                { text: '今日', value: 0 },
+                                { text: '近三日', value: 2 },
+                                { text: '近一周', value: 6 },
+                                { text: '近一月', value: 29 },
+                                { text: '近半年', value: 180 },
+                                { text: '近一年', value: 365 },
+                                { text: '近两年', value: 730 }
+                            ]}
+                            onChange={(v) => toDeftime(v)} />
+                        </div>
                         <div className="form-btn">
                             <Button
                                 className="reset"
diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx
index a996710..3f53e39 100644
--- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx
@@ -359,11 +359,12 @@ function OrderArrearageAly(props) {
                             /> */}
                             <Select
                                 showSearch
+                                allowClear
                                 className="form-con"
                                 value={formData.park_text}
                                 onSearch={(newValue) => handleSearchPark(newValue)}
                                 onChange={(v) => setFormData({...formData, park_text: v})}
-                                placeholder=""
+                                placeholder="全部"
                                 defaultActiveFirstOption={false}
                                 filterOption={false}
                                 options={(parkList).map((d) => ({
diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx
index 27359e2..5b8b112 100644
--- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx
@@ -324,14 +324,14 @@ function PriceAly(props) {
                             /> */}
                             <Select
                                 showSearch
+                                allowClear
                                 className="form-con"
                                 value={formData.park_text}
                                 onSearch={(newValue) => handleSearchPark(newValue)}
                                 onChange={(v) => setFormData({...formData, park_text: v})}
-                                placeholder=""
+                                placeholder="全部"
                                 defaultActiveFirstOption={false}
                                 filterOption={false}
-                                
                                 options={(parkList).map((d) => ({
                                     value: d.value,
                                     label: d.text
diff --git a/src/pages/InRoadMgm/EquipmentMgm/BarMgm/index.scss b/src/pages/InRoadMgm/EquipmentMgm/BarMgm/index.scss
index ab76db2..b5472dd 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/BarMgm/index.scss
+++ b/src/pages/InRoadMgm/EquipmentMgm/BarMgm/index.scss
@@ -142,6 +142,14 @@ $color-primary: var(--color-primary);
     }
   }
 }
+.black {
+  .yisa-btn {
+    user-select: none;
+    &:hover {
+      cursor: pointer;
+    }
+  }
+}
 .fence {
   // width: 660px !important;
   .ant-modal-body {
diff --git a/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx
index f5f5095..afab44e 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useRef, useEffect } from "react";
 import { ResultFlowResult, BaseMap, Marker, ExportBtnNew, ImportBtn } from "@/components"
-import { Select, Input, Button, Table, message, Pagination, Cascader, Modal, TreeSelect } from 'antd'
+import { Select, Input, Button, Table, message, Pagination, Cascader, Modal, TreeSelect, Popover } from 'antd'
 import {
     pageSizeOptions
 } from '@/config/character.config.js'
@@ -133,11 +133,21 @@ function Fence(props) {
     // },
     {
         title: '操作',
+        // render: (text, record) => {
+        //     return <>
+        //         <Button type="primary" shape="circle" size="middle" icon={<InfoCircleOutlined />} onClick={() => handleDetail(record)}/>
+        //     </>
+        // },
         render: (text, record) => {
             return <>
-                <Button type="primary" shape="circle" size="middle" icon={<InfoCircleOutlined />} onClick={() => handleDetail(record)}/>
+                <Popover content={
+                    <div className="black">
+                        <div className="yisa-btn" onClick={() => handleDetail(record)}>查看设备</div>
+                    </div>}>
+                    <Button type="primary" size="middle">操作</Button>
+                </Popover>
             </>
-        }
+        },
     }
     ]
     //编辑按钮
diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx
index 0dda25b..08a17be 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx
@@ -163,13 +163,23 @@ function Road(props) {
     {
         title: '操作',
         width: 135,
-        render: (text, record, index) => {
+        // render: (text, record, index) => {
+        //     return <>
+        //         <div className="action-wrapper">
+        //             <Button type="primary" shape="circle" s size="middle" icon={<InfoCircleOutlined />} onClick={() => handleEdit(record)}/>
+        //         </div>
+        //     </>
+        // },
+        render: (text, record) => {
             return <>
-                <div className="action-wrapper">
-                    <Button type="primary" shape="circle" s size="middle" icon={<InfoCircleOutlined />} onClick={() => handleEdit(record)}/>
-                </div>
+                <Popover content={
+                    <div className="black">
+                        <div className="yisa-btn" onClick={() => handleEdit(record)}>查看设备</div>
+                    </div>}>
+                    <Button type="primary" size="middle">操作</Button>
+                </Popover>
             </>
-        }
+        },
     }
   ]
 
@@ -362,31 +372,41 @@ useEffect(() => {
                     label: '下线'
                   }
                 ]}
-                onChange={(v) => setFormData({...formData, operate_status: v})}
-              />
-            </div>
-            <div className="yisa-search">
-              <label>设备状态</label>
-              <Select
-                style={{ width: 260, marginLeft: 14 }}
-                placeholder="请选择"
-                value={formData.device_status}
-                options={[
-                  {
-                    value: -1,
-                    label: '全部'
-                  },
-                  {
-                    value: '1',
-                    label: '在线'
-                  }, {
-                    value: '2',
-                    label: '离线'
-                  }
-                ]}
-                onChange={(v) => setFormData({...formData, device_status: v})}
+                onChange={(v) => {
+                    if (v == 2) {
+                        setFormData({...formData, operate_status: v, device_status: -1})
+                    } else {
+                        setFormData({...formData, operate_status: v})
+                    }
+                }}
               />
             </div>
+            {
+                formData.operate_status != 2 ? (
+                    <div className="yisa-search">
+                        <label>设备状态</label>
+                        <Select
+                            style={{ width: 260, marginLeft: 14 }}
+                            placeholder="请选择"
+                            value={formData.device_status}
+                            options={[
+                            {
+                                value: -1,
+                                label: '全部'
+                            },
+                            {
+                                value: '1',
+                                label: '在线'
+                            }, {
+                                value: '2',
+                                label: '离线'
+                            }
+                            ]}
+                            onChange={(v) => setFormData({...formData, device_status: v})}
+                        />
+                        </div>
+                ) : (<></>)
+            }
             <div className="timePicker yisa-search">
                 <div className="btnBox">
                     <Button type="primary" className="yisa-btn colorBtn" icon={<SearchOutlined />} onClick={() => { getSearchData() }}>
diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.scss b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.scss
index f19583b..c6af609 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.scss
+++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.scss
@@ -134,6 +134,14 @@ $color-primary : var(--color-primary);
   }
   }
 }
+.black {
+  .yisa-btn {
+    user-select: none;
+    &:hover {
+      cursor: pointer;
+    }
+  }
+}
 .tabchange {
   height: 100%;
   .yisa-tabs {
diff --git a/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx b/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx
index c9e0431..60a601f 100644
--- a/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx
+++ b/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx
@@ -77,7 +77,7 @@ function ModalAreaAdd(props) {
             offset: 0
           }}
           initialValues={{
-            type: "1"
+            type: 1
           }}
           onValuesChange={onValuesChange}
         >
diff --git a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
index 8c3a4ec..b32735b 100644
--- a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
+++ b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
@@ -116,6 +116,7 @@ function OrgnizationMgm() {
                     if (e.status == 20000) {
                         message.success(e.message)
                         getAreaTree()
+                        getOrgTree()
                     } else {
                         message.error(e.message)
                     }
@@ -222,8 +223,8 @@ function OrgnizationMgm() {
 
     const handleTreeClick = (e, { node }) => {
 
-        // 第三层级不予配置
-        if (node.level > 2) {
+        // 第三层级以上不予配置
+        if (node.level > 3) {
             setActiveOrg({})
             message.error('不允许配置')
             return
@@ -403,7 +404,6 @@ function OrgnizationMgm() {
     }
 
     const tabRender = useMemo(() => {
-        // console.log(areaTree)
         return [
             {
                 label: `基础配置`,
@@ -489,17 +489,17 @@ function OrgnizationMgm() {
                     <div className="sys-form-container">
                         <div className="role-tree-container">
                             <div className="tree-title">权限分配</div>
-                            <Tree
-                                disabled={!editStatus}
-                                checkable
-                                treeData={roleTree}
-                                onCheck={handleRoleTreeChange}
-                                checkedKeys={roleCheckedKeys}
-                                fieldNames={{
-                                    title: 'name',
-                                    key: 'id'
-                                }}
-                            />
+                                <Tree
+                                    disabled={!editStatus}
+                                    checkable
+                                    treeData={roleTree}
+                                    onCheck={handleRoleTreeChange}
+                                    checkedKeys={roleCheckedKeys}
+                                    fieldNames={{
+                                        title: 'name',
+                                        key: 'id'
+                                    }}
+                                />
                         </div>
                     </div>
                 ),
@@ -560,7 +560,10 @@ function OrgnizationMgm() {
             <div className="org-content">
                 <Tabs
                     defaultActiveKey="1"
-                    onChange={(v) => setTabActive(v)}
+                    onChange={(v) => {
+                        setAreaTreeUpdate(areaTreeUpdate+1)
+                        setTabActive(v)
+                    }}
                     items={Object.keys(activeOrg).length ? (activeOrg.level < 3 ? tabRender : null) : null}
                 />
                 {