chenglb
/
PMS_Frontend_v1.0.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0.git into develop

tags/PMS_V1.0.0_Alpha6
chenglb 1 year ago
parent
e9cbfdd571 5159aa80a7
commit
c50c16b125
4 changed files with 73 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/pages/InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx
  2. 93
      src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
  3. 44
      src/pages/InRoadMgm/Stuff/StuffStat/loadable.jsx
  4. 3
      src/pages/SystemMgm/AdminMgm/loadable.jsx

2
src/pages/InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx
View File

@ -290,7 +290,7 @@ function ChargeRules(props) {
const handleName = (v) => {
setBindData({
...bindData,
road_parent_id: v.target.value
road_parent_id: v
})
}
//绑定车场查询

93
src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
View File

@ -831,7 +831,7 @@ function CollectorWorkStat(props) {
lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1 })
setFormData(Object.assign({}, formData, { pn: 1 }))
setLastFormData(Object.assign({}, lastFormData, { pn: 1 }))
getData({...data, pn: 1})
getData({ ...data, pn: 1 })
}
const getApproveSearchData = (data = formData) => {
getApproveData(data)
@ -1042,9 +1042,9 @@ function CollectorWorkStat(props) {
message.error('请选择车牌颜色')
} else if (getCreatDataList.plate === undefined) {
message.error('请输入车牌号')
} else if (!utils?.validationPlate(getCreatDataList.plate) ) {
} else if (!utils?.validationPlate(getCreatDataList.plate)) {
message.error('请输入完整的车牌号码')
}else {
} else {
let data = {
plate_color_id: getCreatDataList.plate_color_id,
plate: getCreatDataList.plate
@ -1175,7 +1175,10 @@ function CollectorWorkStat(props) {
style={{ width: 256, marginLeft: 27 }}
// allowClear
value={formData.vehicle_type}
options={getSpecial}
options={[
{ value: 0, label: "全部" },
...getSpecial
]}
onChange={handleSpecialPlateType}
/>
</div>
@ -1263,50 +1266,50 @@ function CollectorWorkStat(props) {
<div className="btnBox">
{
formData.tab === '1' ?
<Button className="yisa-btn colorReset reset" onClick={() => { getResetData() }}>
<Button className="yisa-btn colorReset reset" onClick={() => { getResetData() }}>
重置
</Button> : ''
}
{
formData.tab === '2' ?
<Button className="yisa-btn colorReset reset" onClick={() => { getApproveResetData() }}>
<Button className="yisa-btn colorReset reset" onClick={() => { getApproveResetData() }}>
重置
</Button> : ''
}
{
formData.tab === '3' ?
<Button className="yisa-btn colorReset reset" onClick={() => { getDeployResetData() }}>
<Button className="yisa-btn colorReset reset" onClick={() => { getDeployResetData() }}>
重置
</Button> : ''
}
{
formData.tab === '1' ?
<Button type="primary" className="yisa-btn colorBtn submit" onClick={() => { getSearchData() }}>
<Button type="primary" className="yisa-btn colorBtn submit" onClick={() => { getSearchData() }}>
查询
</Button> : ''
}
{
formData.tab === '2' ?
<Button type="primary" className="yisa-btn colorBtn submit" onClick={() => { getApproveSearchData() }}>
<Button type="primary" className="yisa-btn colorBtn submit" onClick={() => { getApproveSearchData() }}>
查询
</Button> : ''
}
{
formData.tab === '3' ?
<Button type="primary" className="yisa-btn colorBtn submit" onClick={() => { getDeploySearchData() }}>
<Button type="primary" className="yisa-btn colorBtn submit" onClick={() => { getDeploySearchData() }}>
查询
</Button> : ''
}
</div>
</div>
</div>
@ -1335,8 +1338,8 @@ function CollectorWorkStat(props) {
onOk={handleExport}
/>
)
: '' }
: ''}
</div>
<Table
bordered
@ -1377,9 +1380,9 @@ function CollectorWorkStat(props) {
</Button> : ''
}
</div>
<Table
bordered
// className='yisa-table'
@ -1776,35 +1779,9 @@ function CollectorWorkStat(props) {
</div>
<div className="yisa-search">
<label>图片</label>
{getImage&&
{getImage &&
getImage?.length != 0 ?
<div className="imag-pic" >
<Upload
action="/PMS/api/com/common/file_upload"
listType="picture-card"
fileList={fileList}
onPreview={handlePreview}
onChange={handleChange}
beforeUpload={beforeUpload}
defaultFileList={getEditData.image}
>
{fileList.length >= 2 || getImage?.length >= 2 || fileList.length + getImage?.length >= 2 ? null : uploadButton}
</Upload>
<div className="img-pic">
{
getImage?.map((res, index) => {
return (
<div className="img" >
<Button type="circle" className="type" onClick={() => { detdailPic(index) }} > x</Button>
<Image src={res} className="image"></Image>
</div>
)
})
}
</div>
</div>
:
<div className="imag-pic" >
<Upload
action="/PMS/api/com/common/file_upload"
listType="picture-card"
@ -1816,6 +1793,32 @@ function CollectorWorkStat(props) {
>
{fileList.length >= 2 || getImage?.length >= 2 || fileList.length + getImage?.length >= 2 ? null : uploadButton}
</Upload>
<div className="img-pic">
{
getImage?.map((res, index) => {
return (
<div className="img" >
<Button type="circle" className="type" onClick={() => { detdailPic(index) }} > x</Button>
<Image src={res} className="image"></Image>
</div>
)
})
}
</div>
</div>
:
<Upload
action="/PMS/api/com/common/file_upload"
listType="picture-card"
fileList={fileList}
onPreview={handlePreview}
onChange={handleChange}
beforeUpload={beforeUpload}
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}>

44
src/pages/InRoadMgm/Stuff/StuffStat/loadable.jsx
View File

@ -211,28 +211,28 @@ function StuffStat(props) {
}
const [sessionTabList, setSessionTabList] = useSessionStorageState('stuffStat', {
value: {
}
})
useEffect(() => {
console.log(location)
if (sessionTabList && Object.values(sessionTabList).length > 0) {
setFormData({
brand_id: sessionTabList?.brand_id,
model_id: sessionTabList?.model_id,
operatorid: sessionTabList?.operatorid,
pn: sessionTabList?.pn,
page_size: sessionTabList?.page_size,
})
}
}, [])
console.log(formData);
useEffect(() => {
setSessionTabList({
...formData
})
}, [formData])
// const [sessionTabList, setSessionTabList] = useSessionStorageState('stuffStat', {
// value: {
// }
// })
// useEffect(() => {
// console.log(location)
// if (sessionTabList && Object.values(sessionTabList).length > 0) {
// setFormData({
// brand_id: sessionTabList?.brand_id,
// model_id: sessionTabList?.model_id,
// operatorid: sessionTabList?.operatorid,
// pn: sessionTabList?.pn,
// page_size: sessionTabList?.page_size,
// })
// }
// }, [])
// console.log(formData);
// useEffect(() => {
// setSessionTabList({
// ...formData
// })
// }, [formData])
useEffect(() => {
getData()
operationName()

3
src/pages/SystemMgm/AdminMgm/loadable.jsx
View File

@ -635,7 +635,7 @@ function AdminMgm(props) {
setGetPlateColor(res.data)
})
}
console.log(getImg);
useEffect(() => {
getData()
plateColor()
@ -1029,6 +1029,7 @@ function AdminMgm(props) {
onChange={(v, selectedOptions) => {
setGetRoleStatus(false)
setGetPartName(v)
getImg.role=''
if (selectedOptions.length === 1) {
setGovernmentStatus(false)
} else {

Write Preview
Loading…
Cancel
Save