From bc95dd4c1562335f973ca5502c9f7399e0aa4da6 Mon Sep 17 00:00:00 2001
From: guoxin <guoxin@yisa.com>
Date: Mon, 4 Dec 2023 18:39:26 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E5=A4=84=E7=90=86=E8=B7=AF=E5=86=85bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InRoadMgm/BusinessMgm/Blacklist/index.scss     |   2 +
 .../InRoadMgm/BusinessMgm/Blacklist/loadable.jsx   |  55 +++++--
 .../InRoadMgm/BusinessMgm/SpecialRecord/index.scss |   4 +-
 .../BusinessMgm/SpecialRecord/loadable.jsx         | 165 +++++++++++++++------
 .../PersonMgm/Performance/WorkerStat/loadable.jsx  |  10 ++
 .../InRoadMgm/Stuff/CategroyConf/loadable.jsx      |  13 +-
 src/pages/InRoadMgm/Stuff/ModelConf/index.scss     |   1 +
 src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx   |  41 +++--
 src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx    |   7 +-
 src/pages/InRoadMgm/Stuff/StuffStat/loadable.jsx   |  18 ++-
 .../GeoSignalIgnoreAudit/loadable.jsx              |   2 +-
 .../BusinessConfig/BusinessConf/index.scss         |   4 +-
 12 files changed, 224 insertions(+), 98 deletions(-)

diff --git a/src/pages/InRoadMgm/BusinessMgm/Blacklist/index.scss b/src/pages/InRoadMgm/BusinessMgm/Blacklist/index.scss
index 87cb2ac..0fd1d23 100644
--- a/src/pages/InRoadMgm/BusinessMgm/Blacklist/index.scss
+++ b/src/pages/InRoadMgm/BusinessMgm/Blacklist/index.scss
@@ -181,6 +181,7 @@ $color-primary : var(--color-primary);
 }
 .addModal{
   .yisa-search{
+    display: flex;
     margin: 20px 0 0 20px;
   }
   .line{
@@ -211,6 +212,7 @@ $color-primary : var(--color-primary);
 }
 .editModal{
   .yisa-search{
+    display: flex;
     margin: 20px 0 0 20px;
   }
   .line{
diff --git a/src/pages/InRoadMgm/BusinessMgm/Blacklist/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/Blacklist/loadable.jsx
index d4a8de0..0b6a1ff 100644
--- a/src/pages/InRoadMgm/BusinessMgm/Blacklist/loadable.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/Blacklist/loadable.jsx
@@ -20,7 +20,7 @@ function Blacklist(props) {
     })
     const parameter = {
         plate: '',//车牌号
-        operator_id: '',//商户名称
+        operator_id: '0',//商户名称
         pn: 1,
         size: Number(pageSizeOptions[0]),  // 每页条数
     }
@@ -66,7 +66,11 @@ function Blacklist(props) {
         }
         if (getAddData.plate == '') {
             message.error('请输入车牌号')
-        }  else {
+        } else if (getAddData.operator_id == '') {
+            message.error('请选择商户名称')
+        } else if (getAddData.plate_color_id == '') {
+            message.error('请选择车牌颜色')
+        }else {
             ajax.addChange(data).then(res => {
                 if (res.status === 20000) {
                     setGetAddVisible(false)
@@ -172,12 +176,21 @@ function Blacklist(props) {
             ...getEditData,
             black_id: getValueId.id
         }
-        ajax.detailChange(data).then(res => {
-            if (res.status === 20000) {
-                setEditVisible(false)
-                getData(formData)
-            }
-        })
+        if (getEditData.plate == '') {
+            message.error('请输入车牌号')
+        } else if (getEditData.operator_id == '') {
+            message.error('请选择商户名称')
+        } else if (getEditData.plate_color_id == '') {
+            message.error('请选择车牌颜色')
+        }else{
+            ajax.detailChange(data).then(res => {
+                if (res.status === 20000) {
+                    setEditVisible(false)
+                    getData(formData)
+                }
+            })
+        }
+      
     }
     //删除
     const [getDeleteData, setGetDeleteData] = useState({})
@@ -231,10 +244,10 @@ function Blacklist(props) {
     //切换分页
     const changePn = (pn, length) => {
         if (lastFormData.size === length) {
-            setFormData(Object.assign({}, formData, { pn: pn,size: length}))
-            setLastFormData(Object.assign({}, lastFormData, { pn: pn ,size: length}))
-            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn,size: length })
-            getData(Object.assign({}, formData, { pn: pn,size: length }))
+            setFormData(Object.assign({}, formData, { pn: pn, size: length }))
+            setLastFormData(Object.assign({}, lastFormData, { pn: pn, size: length }))
+            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn, size: length })
+            getData(Object.assign({}, formData, { pn: pn, size: length }))
         }
     }
     //切换每页条数
@@ -262,9 +275,13 @@ function Blacklist(props) {
         setGetAddVisible(true)
     }
     const [getOperationName, setGetOperationName] = useState([])
+    const [getNewOperationName, setNewGetOperationName] = useState([])
     const operationName = () => {
         ajax.getOperator().then(res => {
+            let arr = res.data
+            let newArr = arr.slice(1)
             setGetOperationName(res.data)
+            setNewGetOperationName(newArr)
         })
     }
     const [getPlateColor, setGetPlateColor] = useState([])
@@ -369,6 +386,7 @@ function Blacklist(props) {
             title='添加黑名单'>
             <div className="add">
                 <div className="yisa-search">
+                    <div className="redLogo">*</div>
                     <label>车牌号</label>
                     <Input
                         placeholder="请输入"
@@ -379,15 +397,17 @@ function Blacklist(props) {
                     />
                 </div>
                 <div className="yisa-search">
+                    <div className="redLogo">*</div>
                     <label>商户名称</label>
                     <Select
                         style={{ width: 256, marginLeft: 15 }}
                         value={getAddData.operator_id}
-                        options={getOperationName}
+                        options={getNewOperationName}
                         onChange={handleOperatorName}
                     />
                 </div>
                 <div className="yisa-search">
+                    <div className="redLogo">*</div>
                     <label>车牌颜色</label>
                     <Select
                         style={{ width: 256, marginLeft: 15 }}
@@ -396,7 +416,7 @@ function Blacklist(props) {
                         onChange={handlePlateColor}
                     />
                 </div>
-                <div className="yisa-search">
+                <div className="yisa-search" style={{ marginLeft: 38 }}>
                     <label className="line">备注</label>
                     <TextArea
                         placeholder="请输入"
@@ -419,6 +439,7 @@ function Blacklist(props) {
             title='修改黑名单'>
             <div className="add">
                 <div className="yisa-search">
+                    <div className="redLogo">*</div>
                     <label>车牌号</label>
                     <Input
                         placeholder="请输入"
@@ -432,11 +453,12 @@ function Blacklist(props) {
                     />
                 </div>
                 <div className="yisa-search">
+                    <div className="redLogo">*</div>
                     <label>商户名称</label>
                     <Select
                         style={{ width: 256, marginLeft: 15 }}
                         value={getEditData.operator_id}
-                        options={getOperationName}
+                        options={getNewOperationName}
                         onChange={(v) => {
                             setGetEditData(
                                 Object.assign({}, getEditData, { operator_id: v })
@@ -445,6 +467,7 @@ function Blacklist(props) {
                     />
                 </div>
                 <div className="yisa-search">
+                    <div className="redLogo">*</div>
                     <label>车牌颜色</label>
                     <Select
                         style={{ width: 256, marginLeft: 15 }}
@@ -457,7 +480,7 @@ function Blacklist(props) {
                         }}
                     />
                 </div>
-                <div className="yisa-search">
+                <div className="yisa-search" style={{ marginLeft: 38 }}>
                     <label className="line">备注</label>
                     <TextArea
                         placeholder="请输入"
diff --git a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/index.scss b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/index.scss
index 6497c21..19a5dbb 100644
--- a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/index.scss
+++ b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/index.scss
@@ -68,7 +68,7 @@ $color-primary: var(--color-primary);
 
     .paid-result {
       width: 100%;
-      height: 800px;
+      height:750px;
       background: #505a6f;
       border-radius: 20px;
       margin-left: 17px;
@@ -108,7 +108,7 @@ $color-primary: var(--color-primary);
           border-left: none !important;
         }
         .ant-table.ant-table-bordered > .ant-table-container > .ant-table-content {
-          max-height: 664px;
+          max-height: 640px;
           overflow: auto;
         }
         .ant-table-content::-webkit-scrollbar {
diff --git a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
index 5e9c37f..bd8e88f 100644
--- a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
@@ -24,9 +24,10 @@ function CollectorWorkStat(props) {
         phone: '',//手机号
         region_id: '',
         vehicle_type: '',//分类
-        operator_id: '',//所属运营商
-        vehicle_status: '',//车辆状态
-        status: '',//审核状态
+        operator_id: '0',//所属运营商
+        vehicle_status: '0',//车辆状态
+        status: '0',//审核状态
+        plate_color_id:'',
         tab: '1',
         pn: 1,
         size: Number(pageSizeOptions[0]),  // 每页条数
@@ -83,7 +84,7 @@ function CollectorWorkStat(props) {
     }
     //车牌颜色
     const handlePlateColorList = (value) => {
-        setFormData({ ...formData, status: value })
+        setFormData({ ...formData, plate_color_id: value })
     }
     //重置数据
     const getResetData = () => {
@@ -94,15 +95,17 @@ function CollectorWorkStat(props) {
     }
     const getApproveResetData = () => {
         setFormData({
-            ...parameter
+            ...parameter,
+            tab: '2'
         })
-        getApproveData({ ...parameter })
+        getApproveData({ ...parameter, tab: '2' })
     }
     const getDeployResetData = () => {
         setFormData({
-            ...parameter
+            ...parameter,
+            tab: '3'
         })
-        getDeployData({ ...parameter })
+        getDeployData({ ...parameter, tab: '3' })
     }
     // 切换Tab
     const changeTab = (key) => {
@@ -414,6 +417,8 @@ function CollectorWorkStat(props) {
             if (res.status === 20000) {
                 setApplyDeleteVisible(false)
                 getApproveData(formData)
+            }else{
+                message.error(res.message)
             }
         })
     }
@@ -453,6 +458,8 @@ function CollectorWorkStat(props) {
                     data: resDataArr,
                     total_records: res.data.total_records
                 })
+            }else{
+                message.error(res.message)
             }
         })
     }
@@ -506,6 +513,15 @@ function CollectorWorkStat(props) {
     }
     const creatCancel = () => {
         setChangeVisible(false)
+        setFileList([])
+    }
+    const creatApplycancel=()=>{
+        setChangeApplyVisible(false)
+        setFileList([])
+    }
+    const addcancel=()=>{
+        setCreatVisible(false)
+        setFileList([])
     }
     const deleteApplyBtn = (record) => {
         setChangeApplyVisible(true)
@@ -528,27 +544,40 @@ function CollectorWorkStat(props) {
             ...getEditData,
             white_id: getCarStatus.id
         }
-        ajax.changeModify(data).then(res => {
-            if (res.status === 20000) {
-                setChangeApplyVisible(false)
-                getApproveData(formData)
-            }
-        })
+        if (getEditData.image.length == []) {
+            message.error('请上传图片')
+        }else{
+            ajax.changeModify(data).then(res => {
+                if (res.status === 20000) {
+                    setChangeApplyVisible(false)
+                    getApproveData(formData)
+                    setFileList([])
+                }else{
+                    message.error(res.message)
+                }
+            })
+        }
+       
     }
     const creatSubmit = () => {
         let data = {
             ...getEditData,
             white_id: getCarStatus.id
         }
-        ajax.changeModify(data).then(res => {
-            if (res.status === 20000) {
-                setChangeVisible(false)
-                getData(formData)
-            } else {
-                message.error(res.message)
-                setChangeVisible(false)
-            }
-        })
+        if (getEditData.image.length == []) {
+            message.error('请上传图片')
+        }else{
+            ajax.changeModify(data).then(res => {
+                if (res.status === 20000) {
+                    setChangeVisible(false)
+                    getData(formData)
+                    setFileList([])
+                } else {
+                    message.error(res.message)
+                }
+            })
+        }
+     
     }
 
     //查看白名单
@@ -584,6 +613,11 @@ function CollectorWorkStat(props) {
                 if (res.status === 20000) {
                     setExamineVisible(false)
                     getDeployData(formData)
+                    setGetOpinion({
+                        content: ''  
+                    })
+                }else{
+                    message.error(res.message)
                 }
             })
         }
@@ -603,11 +637,22 @@ function CollectorWorkStat(props) {
                 if (res.status === 20000) {
                     setExamineVisible(false)
                     getDeployData(formData)
+                    setGetOpinion({
+                        content: ''  
+                    })
+                }else{
+                    message.error(res.message)
                 }
             })
         }
 
     }
+    const examinecancel=()=>{
+        setExamineVisible(false)
+        setGetOpinion({
+            content: ''  
+        })
+    }
     // 获取列表数据
     const getData = (data = formData) => {
         setAjaxLoading(true)
@@ -770,9 +815,13 @@ function CollectorWorkStat(props) {
         setChangeVisible(false)
     }
     const [getOperationName, setGetOperationName] = useState([])
+    const [getNewOperationName, setNewGetOperationName] = useState([])
     const operationName = () => {
         ajax.getAllOperator().then(res => {
+            let arr = res.data
+            let newArr = arr.slice(1)
             setGetOperationName(res.data)
+            setNewGetOperationName(newArr)
         })
     }
     const [getSpecial, setGetSpecial] = useState([])
@@ -812,16 +861,14 @@ function CollectorWorkStat(props) {
                     marginTop: 8,
                 }}
             >
-                Upload
+                上传图片
             </div>
         </div>
     );
     const cancel = () => {
         setApplyVisible(false)
         setDeactivateVisible(false)
-        setChangeApplyVisible(false)
         setApplyDeleteVisible(false)
-        setExamineVisible(false)
         setCreatVisible(false)
     }
     const enableSubmit = () => {
@@ -833,6 +880,8 @@ function CollectorWorkStat(props) {
             if (res.status === 20000) {
                 setDeactivateVisible(false)
                 getData(formData)
+            }else{
+                message.error(res.message)
             }
         })
     }
@@ -846,8 +895,8 @@ function CollectorWorkStat(props) {
             window.open(res.data.url)
         })
     }
+    console.log(getImage);
     const detdailPic = (index) => {
-        console.log(index);
         let arr = [...getImage]
         arr.splice(index, 1)
         setGetEditData({ ...getEditData, image: [...arr] })
@@ -869,7 +918,7 @@ function CollectorWorkStat(props) {
         owner: '',
         phone: '',
         vehicle_type: '',
-        vehicle_status: ''
+        vehicle_status: '0'
     })
     const getCreatData = () => {
         setCreatVisible(true)
@@ -892,6 +941,8 @@ function CollectorWorkStat(props) {
             message.error('请选择分类')
         } else if (getCreatDataList.vehicle_status === '') {
             message.error('请选择车辆状态')
+        }else if (getCreatDataList.image.length == []) {
+            message.error('请上传图片')
         } else {
             ajax.modifyCreat(data).then(res => {
                 if (res.status === 20000) {
@@ -905,8 +956,10 @@ function CollectorWorkStat(props) {
                         phone: '',
                         vehicle_type: '',
                         vehicle_status: '',
-                        fileList: []
                     })
+                    setFileList([])
+                }else{
+                    message.error(res.message)
                 }
             })
         }
@@ -1057,6 +1110,10 @@ function CollectorWorkStat(props) {
                                     value={formData.vehicle_status}
                                     options={[
                                         {
+                                            value: '0',
+                                            label: '全部'
+                                        },
+                                        {
                                             value: '1',
                                             label: '启用'
                                         }, {
@@ -1549,6 +1606,10 @@ function CollectorWorkStat(props) {
                     value={getEditData.vehicle_status}
                     options={[
                         {
+                            value: '0',
+                            label: '全部'
+                        },
+                        {
                             value: '1',
                             label: '启用'
                         }, {
@@ -1567,16 +1628,7 @@ function CollectorWorkStat(props) {
             <div className="yisa-search">
                 <label>图片</label>
                 {
-                    getImage.length == 0 ?
-                        <Upload
-                            action="/PMS/api/com/common/file_upload"
-                            listType="picture-card"
-                            fileList={fileList}
-                            onPreview={handlePreview}
-                            onChange={handleChange}
-                        // defaultFileList
-                        >
-                        </Upload> :
+                    getImage.length != 0 ?
                         <div className="imag-pic" >
                             <Upload
                                 action="/PMS/api/com/common/file_upload"
@@ -1586,7 +1638,7 @@ function CollectorWorkStat(props) {
                                 onChange={handleChange}
                                 defaultFileList={getEditData.image}
                             >
-                                {fileList.length >= 8 ? null : uploadButton}
+                                 {fileList.length >= 2 ||getImage.length >= 2 ||fileList.length+getImage.length>=2? null : uploadButton}
                             </Upload>
                             <div className="img-pic">
                                 {
@@ -1602,7 +1654,17 @@ function CollectorWorkStat(props) {
                                 }
                             </div>
                         </div>
-
+                        :
+                            <Upload
+                                action="/PMS/api/com/common/file_upload"
+                                listType="picture-card"
+                                fileList={fileList}
+                                onPreview={handlePreview}
+                                onChange={handleChange}
+                                defaultFileList={getEditData.image}
+                            >
+                                  {fileList.length >= 2 ||getImage.length >= 2 ||fileList.length+getImage.length>=2? null : uploadButton}
+                            </Upload>
                 }
 
                 {/* <Modal open={previewOpen} title={previewTitle} footer={null} onCancel={handleCancel}>
@@ -1718,6 +1780,10 @@ function CollectorWorkStat(props) {
                     value={getEditData.vehicle_status}
                     options={[
                         {
+                            value: '0',
+                            label: '全部'
+                        },
+                        {
                             value: '1',
                             label: '启用'
                         }, {
@@ -1745,6 +1811,7 @@ function CollectorWorkStat(props) {
                             onChange={handleChange}
                         // defaultFileList
                         >
+                            {fileList.length >= 2 ||getImage.length >= 2 ||fileList.length+getImage.length>=2? null : uploadButton}
                         </Upload> :
                         <div className="imag-pic" >
                             <Upload
@@ -1755,7 +1822,7 @@ function CollectorWorkStat(props) {
                                 onChange={handleChange}
                                 defaultFileList={getEditData.image}
                             >
-                                {fileList.length >= 8 ? null : uploadButton}
+                              {fileList.length >= 2 ||getImage.length >= 2 ||fileList.length+getImage.length>=2? null : uploadButton}
                             </Upload>
                             <div className="img-pic">
                                 {
@@ -1785,7 +1852,7 @@ function CollectorWorkStat(props) {
             </div>
             <div className="submitBtn">
                 <button className="submit colorBtn" onClick={() => { creatApplySubmit() }}>提交</button>
-                <button className="cancel colorReset" onClick={() => { cancel() }}>取消</button>
+                <button className="cancel colorReset" onClick={() => {  creatApplycancel() }}>取消</button>
             </div>
         </Modal>
         <Modal
@@ -1801,7 +1868,7 @@ function CollectorWorkStat(props) {
                 <Select
                     style={{ width: 256, marginLeft: 10 }}
                     value={getCreatDataList.operator_id}
-                    options={getOperationName}
+                    options={getNewOperationName}
                     onChange={(v) => {
                         setGetCreatDataList(
                             Object.assign({}, getCreatDataList, { operator_id: v })
@@ -1888,6 +1955,10 @@ function CollectorWorkStat(props) {
                     value={getCreatDataList.vehicle_status}
                     options={[
                         {
+                            value: '0',
+                            label: '全部'
+                        },
+                        {
                             value: '1',
                             label: '启用'
                         }, {
@@ -1914,7 +1985,7 @@ function CollectorWorkStat(props) {
                     onChange={handleChangePic}
                 // defaultFileList
                 >
-                    {fileList.length >= 8 ? null : uploadButton}
+                     {fileList.length >= 2 ? null : uploadButton}
                 </Upload>
                 <Modal open={previewOpen} title={previewTitle} footer={null} onCancel={handleCancel}>
                     <img
@@ -1928,7 +1999,7 @@ function CollectorWorkStat(props) {
             </div>
             <div className="submitBtn">
                 <button className="submit colorBtn" onClick={() => { creatSubmitBtn() }}>提交</button>
-                <button className="cancel colorReset" onClick={() => { cancel() }}>取消</button>
+                <button className="cancel colorReset" onClick={() => { addcancel() }}>取消</button>
             </div>
         </Modal>
         <Modal
@@ -2024,7 +2095,7 @@ function CollectorWorkStat(props) {
                 <div className="modalBtn">
                     <button className="passBtn colorBtn" onClick={() => { examineDataModal() }}>通过</button>
                     <button className="failBtn colorBtn" onClick={() => { examineFailModal() }}>驳回</button>
-                    <button className="specialBtn colorReset" onClick={() => { cancel() }}>关闭</button>
+                    <button className="specialBtn colorReset" onClick={() => {  examinecancel() }}>关闭</button>
                 </div>
                 <div className="system-log">
                     <div className="carTitle">
diff --git a/src/pages/InRoadMgm/PersonMgm/Performance/WorkerStat/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Performance/WorkerStat/loadable.jsx
index 449f7b8..8952a3b 100644
--- a/src/pages/InRoadMgm/PersonMgm/Performance/WorkerStat/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Performance/WorkerStat/loadable.jsx
@@ -88,6 +88,16 @@ function WorkerStat(props) {
         key: 'name',
     },
     {
+        title: '当日实收',
+        dataIndex: 'today_sale',
+        key: 'today_sale',
+    },
+    {
+        title: '当日追缴',
+        dataIndex: 'today_rate',
+        key: 'today_rate',
+    },
+    {
         title: '收费员收费率',
         dataIndex: 'sale_rate',
         key: 'sale_rate',
diff --git a/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx b/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx
index d97fe2b..b4f0715 100644
--- a/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx
+++ b/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx
@@ -18,12 +18,13 @@ function CategroyConf(props) {
         process_url: ""
     })
     const parameter={
-        brand_id: '',//物品类型
-        operatorid: '',//商户名称
+        brand_id: '0',//物品类型
+        operatorid: '0',//商户名称
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
     }
     const [formData, setFormData] = useState(parameter)
+    const lastFormDataRef = useRef(formData)
     const [lastFormData, setLastFormData] = useState(formData)
     const [checkVisible, setCheckVisible] = useState(false)
     const [editVisible, setEditVisible] = useState(false)
@@ -192,7 +193,8 @@ function CategroyConf(props) {
     const changePn = (pn, length) => {
         if (formData.page_size === length) {
             setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
-            setLastFormData(Object.assign({}, lastFormData, { pn: pn, page_size: length  }))
+            setLastFormData(Object.assign({}, lastFormData, { pn: pn , page_size: length }))
+            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn,page_size: length })
             getData(Object.assign({}, formData, { pn: pn, page_size: length  }))
         }
     }
@@ -200,6 +202,7 @@ function CategroyConf(props) {
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn,page_size: length })
         getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
@@ -371,8 +374,8 @@ function CategroyConf(props) {
                             showQuickJumper
                             showTotal={() => `共 ${resultData.total_records} 条`}
                             total={resultData.total_records}
-                            current={formData.pn}
-                            pageSize={formData.page_size}
+                            current={lastFormData.pn}
+                            pageSize={lastFormData.page_size}
                             pageSizeOptions={pageSizeOptions}
                             onChange={changePn}
                             onShowSizeChange={changeLength}
diff --git a/src/pages/InRoadMgm/Stuff/ModelConf/index.scss b/src/pages/InRoadMgm/Stuff/ModelConf/index.scss
index f1747f2..417b707 100644
--- a/src/pages/InRoadMgm/Stuff/ModelConf/index.scss
+++ b/src/pages/InRoadMgm/Stuff/ModelConf/index.scss
@@ -244,6 +244,7 @@ $color-primary : var(--color-primary);
 .add{
   margin-left: 100px;
   .yisa-search{
+    display: flex;
     margin-top: 20px;
   }
   .submitBtn{
diff --git a/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx b/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx
index ba3ca45..e82dd1a 100644
--- a/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx
+++ b/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx
@@ -56,8 +56,7 @@ function ModelConf(props) {
     const deployListColumns = [
         {
             title: '序号',
-            dataIndex: 'id',
-            key: 'id',
+            render: (text, record, index) => index + 1,
         },
         {
             title: '商户名称',
@@ -209,6 +208,7 @@ function ModelConf(props) {
         if (formData.page_size === length) {
             setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn , page_size: length }))
+            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn,page_size: length })
             getData(Object.assign({}, formData, { pn: pn, page_size: length  }))
         }
     }
@@ -216,6 +216,7 @@ function ModelConf(props) {
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn,page_size: length })
         getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
@@ -269,8 +270,10 @@ function ModelConf(props) {
         }
         if (checkData.name == '') {
             message.error('请选择商户')
-        } else if (checkData.brand_name == '') {
-            message.error('请选择物品类型')
+        } else if (checkData.brand_name =='') {
+            message.error('请选择所属类型')
+        }else if (checkData.model_name == '') {
+            message.error('请输入型号名称')
         } else {
             ajax.brandData(data).then((res) => {
                 if (res.status === 20000) {
@@ -288,8 +291,10 @@ function ModelConf(props) {
         }
         if (getEditData.name == '') {
             message.error('请选择商户')
-        } else if (getEditData.brand_name == '') {
-            message.error('请选择物品类型')
+        } else if (getEditData.brand_name =='') {
+            message.error('请选择所属类型')
+        }else if (getEditData.model_name == '') {
+            message.error('请输入型号名称')
         } else {
             ajax.brandEditData(data).then((res) => {
                 if (res.status === 20000) {
@@ -400,8 +405,8 @@ function ModelConf(props) {
                             showQuickJumper
                             showTotal={() => `共 ${resultData.total_records} 条`}
                             total={resultData.total_records}
-                            current={formData.pn}
-                            pageSize={formData.page_size}
+                            current={lastFormData.pn}
+                            pageSize={lastFormData.page_size}
                             pageSizeOptions={pageSizeOptions}
                             onChange={changePn}
                             onShowSizeChange={changeLength}
@@ -434,10 +439,11 @@ function ModelConf(props) {
             visible={addVisible}
             onCancel={addModal}
             footer={null}
-            title='添加物品'
+            title='添加型号配置'
         >
             <div className="add">
                 <div className="yisa-search">
+                <div className="redLogo">*</div>
                     <label>所属商户</label>
                     <Select
                         style={{ width: 180, marginLeft: 20 }}
@@ -447,7 +453,8 @@ function ModelConf(props) {
                     />
                 </div>
                 <div className="yisa-search">
-                    <label>类型名称</label>
+                <div className="redLogo">*</div>
+                    <label>所属类型</label>
                     <Select
                         value={checkData.model_id}
                         style={{ width: 180, marginLeft: 20 }}
@@ -456,7 +463,8 @@ function ModelConf(props) {
                     />
                 </div>
                 <div className="yisa-search">
-                    <label>物品型号</label>
+                <div className="redLogo">*</div>
+                    <label>型号名称</label>
                     <Input
                         placeholder="请输入"
                         value={checkData.model_name}
@@ -464,7 +472,7 @@ function ModelConf(props) {
                         onChange={handleAssetsTypeName}
                     />
                 </div>
-                <div className="yisa-search">
+                <div className="yisa-search" style={{marginLeft:15}}>
                     <label>备注</label>
                     <TextArea
                         placeholder="请输入"
@@ -491,6 +499,7 @@ function ModelConf(props) {
         >
             <div className="add">
                 <div className="yisa-search">
+                <div className="redLogo">*</div>
                     <label>所属商户</label>
                     <Select
                         style={{ width: 180, marginLeft: 20 }}
@@ -504,7 +513,8 @@ function ModelConf(props) {
                     />
                 </div>
                 <div className="yisa-search">
-                    <label>类型名称</label>
+                <div className="redLogo">*</div>
+                    <label>所属类型</label>
                     <Select
                         value={getEditData.brand_name}
                         style={{ width: 180, marginLeft: 20 }}
@@ -517,7 +527,8 @@ function ModelConf(props) {
                     />
                 </div>
                 <div className="yisa-search">
-                    <label>物品型号</label>
+                <div className="redLogo">*</div>
+                    <label>型号名称</label>
                     <Input
                         placeholder="请输入"
                         value={getEditData.model_name}
@@ -529,7 +540,7 @@ function ModelConf(props) {
                         }}
                     />
                 </div>
-                <div className="yisa-search">
+                <div className="yisa-search" style={{marginLeft:15}}> 
                     <label>备注</label>
                     <TextArea
                         placeholder="请输入"
diff --git a/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx b/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
index 994cda3..355696f 100644
--- a/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
@@ -34,6 +34,7 @@ function StuffMgm(props) {
         page_size: Number(pageSizeOptions[0]),  // 每页条数
     }
     const [formData, setFormData] = useState(parameter )
+    const lastFormDataRef = useRef(formData)
     const [lastFormData, setLastFormData] = useState(formData)
     const [checkVisible, setCheckVisible] = useState(false)
     const [editVisible, setEditVisible] = useState(false)
@@ -318,6 +319,7 @@ function StuffMgm(props) {
         if (formData.page_size === length) {
             setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
             setLastFormData(Object.assign({}, lastFormData, { pn: pn , page_size: length }))
+            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn,page_size: length })
             getData(Object.assign({}, formData, { pn: pn, page_size: length  }))
         }
     }
@@ -325,6 +327,7 @@ function StuffMgm(props) {
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn,page_size: length })
         getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
@@ -690,8 +693,8 @@ function StuffMgm(props) {
                             showQuickJumper
                             showTotal={() => `共 ${resultData.total_records} 条`}
                             total={resultData.total_records}
-                            current={formData.pn}
-                            pageSize={formData.page_size}
+                            current={lastFormData.pn}
+                            pageSize={lastFormData.page_size}
                             pageSizeOptions={pageSizeOptions}
                             onChange={changePn}
                             onShowSizeChange={changeLength}
diff --git a/src/pages/InRoadMgm/Stuff/StuffStat/loadable.jsx b/src/pages/InRoadMgm/Stuff/StuffStat/loadable.jsx
index 95a36da..caf2453 100644
--- a/src/pages/InRoadMgm/Stuff/StuffStat/loadable.jsx
+++ b/src/pages/InRoadMgm/Stuff/StuffStat/loadable.jsx
@@ -24,6 +24,7 @@ function StuffStat(props) {
         page_size: Number(pageSizeOptions[0]),  // 每页条数
     }
     const [formData, setFormData] = useState(parameter)
+    const lastFormDataRef = useRef(formData)
     const [lastFormData, setLastFormData] = useState(formData)
     //物品型号
     const handleJobStatus = (value) => {
@@ -61,8 +62,7 @@ function StuffStat(props) {
     const deployListColumns = [
         {
             title: '序号',
-            dataIndex: 'id',
-            key: 'id',
+            render: (text, record, index) => index + 1,
         },
         {
             title: '商户名称',
@@ -129,18 +129,20 @@ function StuffStat(props) {
             console.log(err)
         })
     }
-    //切换分页
-    const changePn = (pn, length) => {
+     //切换分页
+     const changePn = (pn, length) => {
         if (formData.page_size === length) {
             setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
-            setLastFormData(Object.assign({}, lastFormData, { pn: pn, page_size: length }))
-            getData(Object.assign({}, formData, { pn: pn, page_size: length }))
+            setLastFormData(Object.assign({}, lastFormData, { pn: pn , page_size: length }))
+            lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn,page_size: length })
+            getData(Object.assign({}, formData, { pn: pn, page_size: length  }))
         }
     }
     //切换每页条数
     const changeLength = (pn, length) => {
         setFormData(Object.assign({}, formData, { pn: 1, page_size: length }))
         setLastFormData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
+        lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn,page_size: length })
         getData(Object.assign({}, formData, { pn: 1, page_size: length }))
     }
     //检索数据
@@ -265,8 +267,8 @@ function StuffStat(props) {
                             showQuickJumper
                             showTotal={() => `共 ${resultData.total_records} 条`}
                             total={resultData.total_records}
-                            current={formData.pn}
-                            pageSize={formData.page_size}
+                            current={lastFormData.pn}
+                            pageSize={lastFormData.page_size}
                             pageSizeOptions={pageSizeOptions}
                             onChange={changePn}
                             onShowSizeChange={changeLength}
diff --git a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx
index 1bbcc33..9ee87da 100644
--- a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx
+++ b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx
@@ -301,7 +301,7 @@ function GeoSignalIgnoreAudit(props) {
 
     const [getCanCaDer, setGetCanCaDer] = useState([])
     const getCascaderList = () => {
-        ajax.cascaderList(data).then(res => {
+        ajax.cascaderList().then(res => {
             if (res.status === 20000) {
                 setGetCanCaDer(res.data)
             }
diff --git a/src/pages/SystemMgm/BusinessConfig/BusinessConf/index.scss b/src/pages/SystemMgm/BusinessConfig/BusinessConf/index.scss
index 2ab5296..dec7581 100644
--- a/src/pages/SystemMgm/BusinessConfig/BusinessConf/index.scss
+++ b/src/pages/SystemMgm/BusinessConfig/BusinessConf/index.scss
@@ -71,7 +71,7 @@ $color-primary: var(--color-primary);
 
   .paid-result {
     width: 100%;
-    height: 826px;
+    height: 800px;
     background: #505a6f;
     border-radius: 20px;
     margin-left: 17px;
@@ -111,7 +111,7 @@ $color-primary: var(--color-primary);
         border-left: none !important;
       }
       .ant-table.ant-table-bordered > .ant-table-container > .ant-table-content {
-        max-height: 715px;
+        max-height: 687px;
         overflow: auto;
       }
       .ant-table-content::-webkit-scrollbar {