diff --git a/src/components/Export/ExportBtnNew/index.jsx b/src/components/Export/ExportBtnNew/index.jsx index 4dd006b..66c71d2 100644 --- a/src/components/Export/ExportBtnNew/index.jsx +++ b/src/components/Export/ExportBtnNew/index.jsx @@ -171,7 +171,7 @@ function ExportBtn(props) { } else { ajax({ url, type: ajaxType, data: { export_type: checkedType, start, end, isimg:0, ...formData, ...other } }).then((res) => { if (res.status === 20000) { - downloadFile(res.data.url) + downloadFile(res.data.url || res.data.export_url) handleCancel() // setInProcess("2"); // setProcess(res.data?.task_url) diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx index 19df23c..1e1b557 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx @@ -23,8 +23,8 @@ function CarTypeAly() { const [areaList, setAreaList] = useState([]); // 默认数据 const defaultData = { - start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"), - end_time: moment().endOf("day").format("YYYY-MM-DD"), + start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"), + end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"), date_type: '1', type: 'region', operator_id: '0', diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx index 1f65e12..90df4f0 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx @@ -23,8 +23,8 @@ function NightParkStat() { const [areaList, setAreaList] = useState([]); // 默认数据 const defaultData = { - start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"), - end_time: moment().endOf("day").format("YYYY-MM-DD"), + start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"), + end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"), car_parking_type: '3', operator_id: '0', area_id: '0', diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx index 0c039ee..7bd1a0f 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx @@ -184,6 +184,10 @@ function ParkBerthAly() { acr.push(item.date) acc.push(acr) }) + console.log(data, acc) + // acc.map((item)=>{ + + // }) // 构建X轴数据 const xAxisData = dates.map((date) => { return { @@ -270,6 +274,7 @@ function ParkBerthAly() { trigger: 'item', //formatter: '{b0}: 实到 {c0} 人' formatter: (params) => { + //console.log(params) return `
${moment(params.data[2]).format('YYYY年MM月DD日')}(${getWeek(params.data[2])})
全市日均泊位周转次数：${totalData.all_turnover + '(次)'}
@@ -536,7 +541,7 @@ function ParkBerthAly() {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx index 0853227..694ae6a 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx @@ -23,8 +23,8 @@ function ParkTurnoverAly() { const [areaList, setAreaList] = useState([]); // 默认数据 const defaultData = { - start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"), - end_time: moment().endOf("day").format("YYYY-MM-DD"), + start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"), + end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"), date_type: '1', // operator_id: '0', area_id: '0', diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx index 9b4b546..6e87e8d 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx @@ -24,8 +24,8 @@ function ParkUsageAly() { const [areaList, setAreaList] = useState([]); // 默认数据 const defaultData = { - start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"), - end_time: moment().endOf("day").format("YYYY-MM-DD"), + start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"), + end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"), car_parking_type: '3', operator_id: '0', area_id: '0', diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx index a7ff752..1a943b2 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx @@ -23,8 +23,8 @@ function ParkingAlyDuration() { const [areaList, setAreaList] = useState([]); // 默认数据 const defaultData = { - start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"), - end_time: moment().endOf("day").format("YYYY-MM-DD"), + start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"), + end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"), car_parking_type: '3', operator_id: '0', area_id: '0', diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx index bfbe6f9..17b1283 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx @@ -24,8 +24,8 @@ function ParkingAlyOverview() { const [areaList, setAreaList] = useState([]); // 默认数据 const defaultData = { - start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"), - end_time: moment().endOf("day").format("YYYY-MM-DD"), + start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"), + end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"), operator_id: '0', area_id: '0', date_type: '1', diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx index c444116..7706fdc 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx @@ -19,8 +19,8 @@ function ParkingAlyPeriod() { const [areaList, setAreaList] = useState([]); // 默认数据 const defaultData = { - start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"), - end_time: moment().endOf("day").format("YYYY-MM-DD"), + start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"), + end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"), operator_id: '0', area_id: '0', car_parking_type: '3', diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx index a2b90b1..d2dec7c 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx @@ -23,8 +23,8 @@ function ParkingAlyReport() { const [areaList, setAreaList] = useState([]); // 默认数据 const defaultData = { - start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"), - end_time: moment().endOf("day").format("YYYY-MM-DD"), + start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"), + end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"), date_type: '1', car_parking_type: '3', operator_id: '0', diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx index 2d95165..78b3213 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx @@ -24,8 +24,8 @@ function ParkingLiveData() { const [areaList, setAreaList] = useState([]); // 默认数据 const defaultData = { - start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"), - end_time: moment().endOf("day").format("YYYY-MM-DD"), + start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"), + end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"), operator_id: '0', area_id: '0', }; diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx index aa2a3e4..30008b1 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx @@ -23,8 +23,8 @@ function TemporaryParkStat() { const [areaList, setAreaList] = useState([]); // 默认数据 const defaultData = { - start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"), - end_time: moment().endOf("day").format("YYYY-MM-DD"), + start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"), + end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"), car_parking_type: '3', operator_id: '0', area_id: '0', diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx index d49e58d..237874a 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx @@ -194,7 +194,7 @@ const ModalDetail = (props) => { }) const [pageInfo, setPageInfo] = useState({ pn: 1, - length: 10 + length: 15 }) const tableColumns = [ @@ -232,19 +232,28 @@ const ModalDetail = (props) => { const paginationProps = { className: "pagination-common", - showQuickJumper: true, + // showQuickJumper: true, showSizeChanger: true, current: pageInfo.pn, + showTotal: (total) => `共 ${total} 条数据`, total: resultData?.totalRecords, pageSize: pageInfo.length, pageSizeOptions: Array.from( new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) ), onChange: (current, size) => { - setPageInfo({ - ...pageInfo, - ...{ pn: current, length: size } - }); + // 切换每页条数 + if (size != pageInfo.length) { + setPageInfo({ + ...pageInfo, + ...{ pn: 1, length: size } + }); + } else { // 翻页 + setPageInfo({ + ...pageInfo, + ...{ pn: current, length: size } + }); + } } } @@ -255,7 +264,7 @@ const ModalDetail = (props) => { setTableLoading(false) setResultData({ list: res.data, - totalRecords: res.totalRecords + totalRecords: Number(res.totalRecords || 0) }) } }) @@ -279,7 +288,7 @@ const ModalDetail = (props) => { className="yisa-modal detail-modal" title={"弹窗详情"} open={visible} - width={700} + width={1100} onCancel={onCancel} onOk={onOk} > @@ -295,7 +304,7 @@ const ModalDetail = (props) => { dataSource={resultData?.list || []} columns={tableColumns} pagination={false} - scroll={{y: 200}} + scroll={{y: 500}} loading={tableLoading} /> diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss b/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss index 6e47301..29a1694 100644 --- a/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss @@ -464,6 +464,31 @@ $color-primary : var(--color-primary); .bsdsj { background: rgba(1, 5, 14, 0.64); padding-bottom: 4px; + position: relative; + + .pos_zs { + position: absolute; + top: 5px; + right: 0; + border: 1px solid rgba(117, + 221, + 255, .5); + ; + border-radius: 4px; + display: flex; + overflow: hidden; + + span { + padding: 2px 3px; + cursor: pointer; + } + + .qse { + background-color: rgba(117, + 221, + 255, .3); + } + } } .day_select { diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx index 8ec2387..fd392b8 100644 --- a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx @@ -394,6 +394,8 @@ const ParkingOverview = connect(function mapStateToProps(state) { const [BoOpen, setBoOpen] = useState(false); //泊位详情 const [BoOpenDetail, setBoOpenDetail] = useState(false); + //泊车公司周转或收费 + const [Roadturn, setRoadturn] = useState(true); //商户 const [Yunying, setYunying] = useState([]); @@ -773,7 +775,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { show: false, boxHeight: boxHeight, //圆环的高度 left: 0, - top: 0, //3d饼图的位置 + top: 24, //3d饼图的位置 viewControl: { //3d效果可以放大、旋转等，请自己去查看官方配置 alpha: 30, //角度 @@ -1049,11 +1051,13 @@ const ParkingOverview = connect(function mapStateToProps(state) { { key: "", value: 0, + value_t: 0, }, ] ) => { // 获取所有地区名称 - let data = datas.sort((a, b) => a.key - b.key); + let data = datas; + // .sort((a, b) => a.key - b.key); setRightThree({ title: { text: "", @@ -1173,7 +1177,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { itemStyle: { color: "rgba(13,225,250, 1)", // 设置曲线上的点的颜色为蓝色 }, - data: data.map((ele) => ele.value), + data: data.map((ele) => ele.value_t), }, { name: "实收", @@ -1190,7 +1194,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { itemStyle: { color: "rgba(235, 39, 39,1)", // 设置曲线上的点的颜色为蓝色 }, - data: data.map((ele) => ele.value + 100), + data: data.map((ele) => ele.value), }, ], grid: { @@ -1448,7 +1452,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { } ); }; - //获取收费top5 + //泊车公司-概览-周转率 const GetrateRank = (val) => { ajax.ParkingOverview.GetrateRank({ dateType: val, @@ -1470,6 +1474,29 @@ const ParkingOverview = connect(function mapStateToProps(state) { } ); }; + //泊车公司-概览-路段收费率排行榜 + const GetParkoverview = (val) => { + ajax.ParkingOverview.GetParkoverview({ + dateType: val, + areaType: CarRoad[CarShow]?.type, + value: CarRoad[CarShow]?.value, + }).then( + (res) => { + if (parseInt(res?.status) === 20000) { + setDataTop(res?.data); + // getRevenueOption(res.data || []); + } else { + message.error(res?.message); + } + setLoading(true); + }, + (err) => { + console.log(err); + setLoading(true); + } + ); + }; + //概览-营收分析类型占比 const GetincomeType = (val, item) => { ajax.ParkingOverview.GetincomeType({ @@ -1516,7 +1543,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { } ); }; - //概览-车场收入排行榜 + //区大屏-路段周转次数排行榜 const GetParkparkIncomeRank = (val, item) => { ajax.ParkingOverview.GetParkparkIncomeRank({ type: val, @@ -1655,6 +1682,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { GetUseInfo(RoadSelect); GetRevenueAnalysis(RoadSelect, "1"); if (CarRoad[CarShow]?.type == 2) { + setRoadturn(true); GetrateRank("1"); GetincomeType(RoadSelect, "1"); GetOverviewData(RoadSelect); @@ -1935,11 +1963,30 @@ const ParkingOverview = connect(function mapStateToProps(state) {
{CarRoad[CarShow]?.type == 2 - ? "收费员排行Top5" + ? "周转率收费率排行榜" : "路段周转次数排行榜"}
{CarRoad[CarShow]?.type == 2 ? ( - "" +
+ { + setRoadturn(true); + GetrateRank("1"); + }} + > + 周转率 + + { + setRoadturn(false); + GetParkoverview("1"); + }} + > + 收费率 + +
) : (
{Dayfour.map((ele) => { @@ -1978,7 +2025,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { {CarRoad[CarShow]?.type == 2 ? ele.rate || 0 - : `${ele.paid_amount || 0}元`} + : `${ele.total || 0}次`}
@@ -2030,25 +2074,19 @@ const ParkingOverview = connect(function mapStateToProps(state) {
{/* */} TOP2 -

- {Cartop[1]?.rate || 0}/{Cartop[1]?.rate || 0} -

+

收费率{Cartop[1]?.rate || 0}

{Cartop[1]?.name || ""}
{/* */} TOP1 -

- {Cartop[0]?.rate || 0}/{Cartop[0]?.rate || 0} -

+

收费率{Cartop[0]?.rate || 0}

{Cartop[0]?.name || ""}
{/* */} TOP3 -

- {Cartop[2]?.rate || 0}/{Cartop[2]?.rate || 0} -

+

收费率{Cartop[2]?.rate || 0}

{Cartop[2]?.name || ""}
diff --git a/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx b/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx index 78d9147..fbfcacd 100644 --- a/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx +++ b/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx @@ -90,6 +90,7 @@ function GeneralBusiness() { { title: "支付商户", dataIndex: "tenantName", + width: 120, key: "tenantName", align: "center", }, diff --git a/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx index a717f74..0c451a1 100644 --- a/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx +++ b/src/pages/InRoadMgm/EquipmentMgm/BarMgm/loadable.jsx @@ -413,7 +413,7 @@ function Fence(props) { imgno={false} /> handleUploaded()} diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx index f409db6..1b35755 100644 --- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx +++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx @@ -430,7 +430,10 @@ function Fence(props) { @@ -462,7 +465,11 @@ function Fence(props) { @@ -471,7 +478,11 @@ function Fence(props) { diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx index 056dc4e..8b55d8e 100644 --- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx +++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx @@ -27,7 +27,7 @@ function Road(props) { device_name: '', device_code: '', pole_position_code: '', - type_id: "0", //设备类型 + type_id: -1, //设备类型 road_name: '', operator: "0", //所属商户 operate_status: -1, //运营状态 @@ -139,6 +139,10 @@ function Road(props) { }, { title: '设备厂商', + dataIndex: 'brand_name', + }, + { + title: '商户名称', dataIndex: 'operqator', }, { diff --git a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx index ba8ff47..7205e6f 100644 --- a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx +++ b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx @@ -85,10 +85,13 @@ function Fence(props) { }) } const getBerthDataByNvr = (nvr) => { - ajax.getBerthByNvr(Object.assign({}, {nvr_id: nvr}, editStatus ? {} :{is_bind_monitor_device: 1})).then((e) => { - if (e.status == 20000) { - setBerthData(e.data.map((item) => ({key: item.value, title: item.label}))) - } + return new Promise((resolved, rejected) => { + ajax.getBerthByNvr(Object.assign({}, {nvr_id: nvr}, editStatus ? {} :{is_bind_monitor_device: 1})).then((e) => { + if (e.status == 20000) { + setBerthData(e.data.map((item) => ({key: item.value, title: item.label}))) + resolved() + } + }) }) } const handleDelToServer = (id) => { @@ -108,8 +111,9 @@ function Fence(props) { ...item }) setEditId(item.id) - getBerthDataByNvr(item.nvr_id) - setBerthSelectData(item.berth_ids ? item.berth_ids.split(',').map((v) => v) : []) + getBerthDataByNvr(item.nvr_id).then(() => { + setBerthSelectData(item.berth_ids ? item.berth_ids.split(',').map((v) => v) : []) + }) setEditModalVisible(true) } const editModalCancel = () => { diff --git a/src/pages/MerchantMgm/FunctionMgm/index.scss b/src/pages/MerchantMgm/FunctionMgm/index.scss index e96872a..6500a9d 100644 --- a/src/pages/MerchantMgm/FunctionMgm/index.scss +++ b/src/pages/MerchantMgm/FunctionMgm/index.scss @@ -350,5 +350,12 @@ $color-primary : var(--color-primary); .rest { margin-left: 10px; } + .bind-tree { + .ant-tree-list { + max-height: 200px; + overflow-y: auto; + @include scrollBar("", ""); + } + } } } diff --git a/src/pages/MerchantMgm/FunctionMgm/loadable.jsx b/src/pages/MerchantMgm/FunctionMgm/loadable.jsx index dad33fd..778a5a6 100644 --- a/src/pages/MerchantMgm/FunctionMgm/loadable.jsx +++ b/src/pages/MerchantMgm/FunctionMgm/loadable.jsx @@ -88,1097 +88,10 @@ function FunctionMgm() { const [updateVisible, setUpdateVisible] = useState(false) //更新表单 const [updateForm]=Form.useForm() - //绑定功能 - const treeData = [ - { - title: '路内停车管理系统', - key: '0', - children: [ - { - title: '停车场管理', - key: '0-0', - children: [ - { - title: '停车场管理', - key: '0-0-0', - children: [ - { - title: '【按钮】查询', - key: '0-0-0-0', - }, - { - title: '【按钮】添加', - key: '', - }, - { - title: '【按钮】编辑', - key: '', - }, - { - title: '【按钮】查看', - key: '', - }, - { - title: '【按钮】停车场配置', - key: '', - }, - ] - }, - { - title: '停车记录查询', - key: '0-0-1', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】详情', - key: '', - }, - ] - }, - { - title: '泊位列表', - key: '0-0-0-1', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】查看', - key: '', - }, - ] - }, - ], - }, - { - title: '业务管理', - key: '0-0-1', - children: [ - { - title: '计费规则管理', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】添加', - key: '', - }, - { - title: '【按钮】编辑', - key: '', - }, - { - title: '【按钮】查看', - key: '', - }, - ] - }, - { - title: '白名单管理', - key: '', - children: [ - { - title: '白名单记录', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - { - title: '【按钮】查看', - key: '', - }, - { - title: '【按钮】修改', - key: '', - }, - { - title: '【按钮】启用', - key: '', - }, - ] - }, - { - title: '白名单申请', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】创建申请', - key: '', - }, - { - title: '【按钮】查看', - key: '', - }, - { - title: '【按钮】修改', - key: '', - }, - { - title: '【按钮】删除', - key: '', - }, - ] - }, - { - title: '白名单审核', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】审核', - key: '', - }, - ] - }, - ] - }, - ], - }, - { - title: '人员管理', - key: '0-0-1', - children: [ - { - title: '人员管理', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】添加', - key: '', - }, - { - title: '【按钮】编辑', - key: '', - }, - { - title: '【按钮】离职/在职', - key: '', - }, - ] - }, - { - title: '人员考勤', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】添加', - key: '', - }, - ] - }, - ], - }, - { - title: '设备管理', - key: '0-0-0-1', - children: [ - { - title: '路内车场设备监控', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】详情', - key: '', - }, - ] - }, - { - title: '路外车场设备监控', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】详情', - key: '', - }, - ] - }, - { - title: '视频监控设备管理', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】添加', - key: '', - }, - { - title: '【按钮】编辑', - key: '', - }, - { - title: '【按钮】删除', - key: '', - }, - { - title: '【按钮】查看监控', - key: '', - }, - ] - }, - { - title: '杆位管理', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】查看', - key: '', - }, - { - title: '【按钮】导入', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - ] - }, - { - title: 'PDA管理', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】添加', - key: '', - }, - { - title: '【按钮】编辑', - key: '', - }, - { - title: '【按钮】删除', - key: '', - }, - ] - }, - { - title: '品牌管理', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】添加', - key: '', - }, - { - title: '【按钮】编辑', - key: '', - }, - ] - }, - ] - }, - { - title: '运营统计', - key: '0-0-1', - children: [ - { - title: '停车场数据分析', - key: '', - children: [ - { - title: '停车场实况数据', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - ] - }, - { - title: '停车场运营分析', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - ] - }, - - ] - }, - ], - }, - { - title: '财务管理', - key: '0-0-1', - children: [ - { - title: '停车场欠费订单', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - ] - }, - { - title: '欠费追缴查询', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - ] - }, - { - title: '停车场收入报表', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - ] - }, - { - title: '营收总报表', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - ] - }, - { - title: '收费员收入统计', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - ] - }, - { - title: '支付渠道统计', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - } - ] - }, - { - title: '发票记录', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】冲红重开', - key: '', - }, - ] - }, - { - title: '停车支付订单', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - ] - }, - ], - }, - ], - }, - { - title: '路外停车管理系统', - key: '0-0', - children: [ - { - title: '停车场管理', - key: '0-0-0', - children: [ - { - title: '停车场管理', - key: '0-0-0-0', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】添加', - key: '', - }, - { - title: '【按钮】编辑', - key: '', - }, - { - title: '【按钮】查看', - key: '', - }, - { - title: '【按钮】二维码下载', - key: '', - }, - { - title: '【按钮】保存并同步', - key: '', - }, - { - title: '【按钮】停车场配置', - key: '', - }, - ] - }, - { - title: '计费规则管理', - key: '0-0-0-1', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】添加', - key: '', - }, - { - title: '【按钮】编辑', - key: '', - }, - { - title: '【按钮】删除', - key: '', - }, - { - title: '【按钮】查看', - key: '', - }, - ] - }, - { - title: '停车记录查询', - key: '0-0-0-1', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】详情', - key: '', - }, - ] - }, - ], - }, - { - title: '人员管理', - key: '0-0-1', - children: [ - { - title: '交接班报表', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】查看', - key: '', - }, - ] - }, - { - title: 'MS收费员管理', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】添加', - key: '', - }, - { - title: '【按钮】编辑', - key: '', - }, - { - title: '【按钮】在职/离职', - key: '', - }, - ] - }, - ], - }, - { - title: '设备管理', - key: '0-0-0-1', - children: [ - { - title: '视频监控设备管理', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】添加', - key: '', - }, - { - title: '【按钮】编辑', - key: '', - }, - { - title: '【按钮】删除', - key: '', - }, - { - title: '【按钮】查看监控', - key: '', - }, - ] - }, - { - title: '路外设备管理', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】查看', - key: '', - } - ] - } - ] - }, - { - title: '运营统计', - key: '0-0-1', - children: [ - { - title: '停车场数据分析', - key: '', - children: [ - { - title: '停车场实况数据', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - ] - }, - { - title: '停车场运营分析', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - ] - }, - - ] - }, - ], - }, - { - title: '异常管理', - key: '0-0-1', - children: [ - { - title: '抬杆记录', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - ] - }, - { - title: '特殊放行记录', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - ] - }, - { - title: '车牌修正记录', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - ] - } - ], - }, - { - title: '财务管理', - key: '0-0-1', - children: [ - { - title: '停车场支付订单', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - ] - }, - { - title: '营收总报表', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - ] - }, - { - title: '停车场收入报表', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - ] - }, - { - title: '支付渠道统计', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - ] - }, - ], - }, - ], - }, - { - title: '充电管理系统', - key: '0-0', - children: [ - { - title: '实时监控', - key: '0-0-0', - children: [ - { - title: '电桩监控', - key: '0-0-0-0', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】查看详情', - key: '', - }, - { - title: '【按钮】远程监控', - key: '', - }, - { - title: '【按钮】状态变更记录', - key: '', - }, - ] - }, - { - title: '充电监控', - key: '0-0-0-1', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】查看详情', - key: '', - }, - ] - }, - { - title: '地锁监控', - key: '0-0-0-1', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】查看详情', - key: '', - }, - ] - }, - { - title: '充电泊位监控', - key: '0-0-0-1', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】查看详情', - key: '', - }, - ] - }, - ], - }, - { - title: '记录查询', - key: '0-0-1', - children: [ - { - title: '充电订单', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - { - title: '【按钮】查看详情', - key: '', - }, - ] - }, - { - title: '开锁记录', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - } - ] - }, - { - title: '预约订单', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】导出', - key: '', - }, - { - title: '【按钮】查看', - key: '', - }, - ] - }, - { - title: '违规行为记录', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】详情', - key: '', - }, - ] - }, - ], - }, - ] - }, - { - title: '系统管理', - key: '0-0', - children: [ - { - title: '商户信息查看', - key: '0-0-0', - children: [ - { - title: '【按钮】查询', - key: '0-0-0-0', - }, - { - title: '【Tab】商户信息', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - ] - }, - { - title: '【Tab】发票配置', - key: '', - children: [ - { - title: '【按钮】查询', - key: '', - }, - ] - }, - { - title: '计费规则管理', - key: '0-0-0-1', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】添加', - key: '', - }, - { - title: '【按钮】编辑', - key: '', - }, - { - title: '【按钮】删除', - key: '', - }, - { - title: '【按钮】查看', - key: '', - }, - ] - }, - { - title: '停车记录查询', - key: '0-0-0-1', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】详情', - key: '', - }, - ] - }, - ], - }, - { - title: '管理员管理', - key: '0-0-1', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】添加', - key: '', - }, - { - title: '【按钮】编辑', - key: '', - }, - { - title: '【按钮】离职', - key: '', - }, - ], - }, - { - title: '角色管理', - key: '0-0-1', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】添加', - key: '', - }, - { - title: '【按钮】编辑', - key: '', - }, - { - title: '【按钮】删除', - key: '', - }, - ], - }, - { - title: '组织架构', - key: '0-0-1', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】添加', - key: '', - }, - { - title: '【按钮】编辑', - key: '', - }, - { - title: '【按钮】删除', - key: '', - }, - ], - }, - { - title: '系统日志', - key: '0-0-1', - children: [ - { - title: '【按钮】查询', - key: '', - }, - { - title: '【按钮】查看', - key: '', - } - ], - }, - ], - }, - ]; + // 功能绑定数据 + const [bindTreeData, setBindTreeData] = useState([]); + //功能绑定选中 + const [checkedKeys, setCheckedKeys] = useState([]); //获取商户名称的下拉 const getTenantNamePull = () => { ajax.ElectInvoice.getSelectOperator().then( @@ -1246,8 +159,40 @@ function FunctionMgm() { getTable({...parameter}) } + // 绑定功能全选 + const $onCheckEditBox = () => { + let arr = [] + if (!bindTreeData.length) return + bindTreeData.map(res => { + arr.push(res.id) + res.children.map(res => { + arr.push(res.id) + res.children?.map(res => { + arr.push(res.id) + res.children?.map(res => { + arr.push(res.id) + res.children?.map(res => { + arr.push(res.id) + }) + }) + }) + }) + }) + setCheckedKeys(arr) + } + //编辑 const updateBtn = (record) => { + ajax.getDepartId().then((res) => { + if (res.status === 20000 || res.status == 0) { + setBindTreeData(res?.data || []) + } else { + message.error(res.message); + } + }).catch((error) => { + setLoading(false); + message.error(error.message); + }); setUpdateVisible(true) updateForm.setFieldsValue( { @@ -1263,16 +208,15 @@ function FunctionMgm() { } //编辑后提交 const submitUpdate=()=>{ - + let value = updateForm.getFieldsValue(["note"]); + value = { + ...value, + bind: checkedKeys, + tenantName: formData.tenantName + }; + console.log(value); } - const onSelect = (selectedKeys, info) => { - console.log('selected', selectedKeys, info); - }; - const onCheck = (checkedKeys, info) => { - console.log('onCheck', checkedKeys, info); - }; - useEffect( () => { const value = searchForm.getFieldsValue(["operatorid", "phone", "name", "account", "status"]) @@ -1370,8 +314,8 @@ function FunctionMgm() { - - + + {/* { + // setGetImg( + // Object.assign({}, getImg, { auth: checkedKeysValue }) + // ); + setCheckedKeys(checkedKeysValue) + }} + checkedKeys={checkedKeys} + treeData={bindTreeData} + fieldNames={{ + title: 'name', + key: 'id', + children: 'children' + }} /> */} diff --git a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx index fa3948c..b0f6caf 100644 --- a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx +++ b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx @@ -897,7 +897,7 @@ const MerchantInfo = (props) => { > } diff --git a/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx b/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx index 90bb917..061ce06 100644 --- a/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx +++ b/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx @@ -203,8 +203,8 @@ function ArrearsCar() { ]; const formSearch = [ { - name: "plate", - type: "Input", + name: "carId", + type: "PlateSelect", label: "车牌号", placeholder: "请输入车牌号", }, diff --git a/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx b/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx index d9f799b..ec1bcbb 100644 --- a/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx +++ b/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx @@ -247,7 +247,7 @@ function CarInfo() { name: "timePeriod", type: "RangePicker", label: "时间段", - defaultValue: [moment().subtract(90, "day"), moment()], + defaultValue: [moment().subtract(89, "day"), moment()], }, ]; //退费记录检索条件 diff --git a/src/pages/OperationCenter/UserMgm/UserInfo/index.scss b/src/pages/OperationCenter/UserMgm/UserInfo/index.scss index 1d21e8e..531f924 100644 --- a/src/pages/OperationCenter/UserMgm/UserInfo/index.scss +++ b/src/pages/OperationCenter/UserMgm/UserInfo/index.scss @@ -5,6 +5,7 @@ $color-text: var(--color-text); $color-primary: var(--color-primary); .userinfo-box { + position: relative; .ant-tabs-tabpane-hidden { display: none; } @@ -419,5 +420,5 @@ $color-primary: var(--color-primary); background: #ffffff; color: #000; cursor: pointer; - z-index: 9999; + z-index: 99; } \ No newline at end of file diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx index 379fc1e..2c7c1fb 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx @@ -98,12 +98,14 @@ function AddModal(props) { } //提交按钮 function submit() { + console.log(effectiveDateList) + return form .validateFields() .then((res) => { const params = { ...res, - property: effectiveDateList,// effectiveDateList[0] + property: effectiveDateList,// property: {rules:effectiveDateList}, }; fetch(params); }) diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx index 2765ae5..e01f533 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx @@ -103,6 +103,7 @@ function EffectiveDate(props) { return false; } function submit() { + console.log(106,form.getFieldsValue()) form .validateFields() .then((values) => { @@ -119,12 +120,12 @@ function EffectiveDate(props) { } return ( -
+
@@ -132,7 +133,7 @@ function EffectiveDate(props) { @@ -202,10 +203,10 @@ function EffectiveDate(props) { }); const obj = { ...form.getFieldsValue(), - time_part_arr: _timePartList, + details: _timePartList, }; - if (obj.effective_date !== void 0) { - obj.effective_date = obj.effective_date.format("YYYY-MM-DD"); + if (obj.date !== void 0) { + obj.date = obj.date.format("YYYY-MM-DD"); } onChange(obj, itemKey); setTimePartList(_timePartList); diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx index 00516e3..3f14c36 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx @@ -23,7 +23,7 @@ function TimePart(props) { } = props; const record1 = { "start": "00:00:00", - "end": "00:00:00", + "end": "13:00:00", "limit": 0, "items": [ { @@ -40,12 +40,97 @@ function TimePart(props) { console.log(disable); const valueChange = (value, all) => { all.key = itemKey; + if (all.time_part) { + all.start = moment(all.time_part[0]).format('HH:mm:ss') + all.end = moment(all.time_part[1]).format('HH:mm:ss') + delete all.time_part + } + if (all.type == 0) { + all.items = [ + { + "type": all.type, + "threshold": 0, + "period": all.time_before_minute, + "unit": all.time_before_money, + "segment": all.time_before, + }, + { + "type": 2, + "threshold": 0, + "period": all.time_after_minute, + "unit": all.time_after_money, + "segment": all.time_before, + }, + ] + delete all.type + delete all.time_before_minute + delete all.time_before_money + delete all.time_before + delete all.time_after_minute + delete all.time_after_money + } else if (all.type == 1) { + all.items = [ + { + "type": all.type, + "threshold": 0, + "unit": all.unit, + }, + ] + delete all.type + delete all.unit + } else { + all.items = [ + { + "type": all.type, + "threshold": 0, + "period": all.period, + "unit": all.unit, + "segment": all.segment + }, + ] + delete all.type + delete all.period + delete all.unit + delete all.segment + } + console.log(66, all) onChange(all); }; - + useEffect(() => { + if (!record.items) return + if (record.items[0]?.type == 0) { + form.setFieldsValue({ + ...record, + type: record.items[0].type, + "time_before": record.items[0].segment, + "time_before_money": record.items[0].unit, + "time_before_minute": record.items[0].period, + "time_after_money": record.items[1].unit, + "time_after_minute": record.items[1].period, + "limit": record.limit, + time_part: [ + moment(record.start, "HH:mm:ss"), + moment(record.end, "HH:mm:ss"), + ], + }) + } else { + form.setFieldsValue({ + ...record, + type: record.items[0]?.type, + "unit": record.items[0]?.unit, + "period": record.items[0]?.period, + //segment:record.items[0].segment, + "limit": record.limit, + time_part: [ + moment(record.start, "HH:mm:ss"), + moment(record.end, "HH:mm:ss"), + ], + }) + } + }, []) console.log(30, record) return ( -
+
- + @@ -77,13 +162,13 @@ function TimePart(props) { - +
/
- + ); - case 3: + case 1: return ( - + ); @@ -170,16 +255,16 @@ function TimePart(props) { prev.interval !== next.interval} + shouldUpdate={(prev, next) => prev.type !== next.type} > {({ getFieldValue }) => { return ( - (getFieldValue("interval") === 1 || - getFieldValue("interval") === 2) && ( + (getFieldValue("type") === 0 || + getFieldValue("type") === 2) && ( diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/index.scss b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/index.scss index 0a56be8..8349e7f 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/index.scss +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/index.scss @@ -88,4 +88,9 @@ $color-primary: var(--color-primary); .wenzi { margin: -5px 13px 0 5px !important; font-size: 25px; +} +.effectivedate-box { + border: 1px solid #8d8d8d; + padding: 12px; + margin-bottom: 24px; } \ No newline at end of file diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx index 1340a3c..2b25945 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx @@ -71,61 +71,77 @@ function ChargeRulesMgm() { { ajax.getChargeRuleInfo({ id: record.id }).then((res) => { - // res = { - // "status": 20000, - // "message": "success", - // "data": { - // "feeName": "凤凰山公园停车场旺季中型车", - // "creatorName": "耿亮", - // "createdTime": "2022-12-13 11:51:23", - // "feeCode": "202212131150", - // "operationId": "1777347430730653926", - // "operationName": "公用事业集团", - // "description": "免费15分钟4月20日-10月10日， \n小型车5元/小时，中型车8元/小时，大型车10元/小时\n", - // "limit24hour": 0, - // "freeTime": 15, - // "freeTimeAbleF": [ - // 1 - // ], - // "freeTimeAbleFName": "是", - // "typeF": 0, - // "typeFName": "否", - // "evFreeTime": 0, - // "evFreeTimeAble": 0, - // "evFreeTimeAbleName": "否", - // "property": { - // "id": 120, - // "freeTime": 15, - // "freeTimeAble": 1, - // "evFreeTime": 0, - // "evFreeTimeAble": 0, - // "limit24hour": "", - // "rules": [ - // { - // "unitDelay": 1, - // "unitUp": 1, - // "date": "2022-12-13", - // "details": [ - // { - // "start": "00:00:00", - // "end": "00:00:00", - // "limit": 0, - // "items": [ - // { - // "type": 2, - // "threshold": 0, - // "period": 60, - // "unit": 8, - // "segment": 1440 - // } - // ] - // } - // ] - // } - // ] - // } - // } - // } + res = { + "status": 20000, + "message": "success", + "data": { + "feeName": "凤凰山公园停车场旺季中型车", + "creatorName": "耿亮", + "createdTime": "2022-12-13 11:51:23", + "feeCode": "202212131150", + "operationId": "1777347430730653926", + "operationName": "公用事业集团", + "description": "免费15分钟4月20日-10月10日， \n小型车5元/小时，中型车8元/小时，大型车10元/小时\n", + "limit24hour": 0, + "freeTime": 15, + "freeTimeAbleF": [ + 1 + ], + "freeTimeAbleFName": "是", + "typeF": 0, + "typeFName": "否", + "evFreeTime": 0, + "evFreeTimeAble": 0, + "evFreeTimeAbleName": "否", + "property": { + "id": 120, + "freeTime": 15, + "freeTimeAble": 1, + "evFreeTime": 0, + "evFreeTimeAble": 0, + "limit24hour": "", + "rules": [ + { + "unitDelay": 1, + "unitUp": 1, + "date": "2022-12-13", + "details": [ + { + "start": "07:00:00", + "end": "13:00:00", + "limit": 0, + // "items": [ + // { + // "type": 1, + // "threshold": 0, + // "period": 60, + // "unit": 8, + // "segment": 1440 + // }, + // { + // "type": 1, + // "threshold": 0, + // "period": 60, + // "unit": 8, + // "segment": 1440 + // } + // ] + "items": [ + { + "type": 1, + "threshold": 0, + "period": 60, + "unit": 2, + "segment": 120 + }, + ] + } + ] + } + ] + } + } + } if (res.status === 20000) { console.log(res.data); setAddModal({ diff --git a/src/pages/SystemMgm/AdminMgm/loadable.jsx b/src/pages/SystemMgm/AdminMgm/loadable.jsx index 01c6ea6..df320c1 100644 --- a/src/pages/SystemMgm/AdminMgm/loadable.jsx +++ b/src/pages/SystemMgm/AdminMgm/loadable.jsx @@ -566,6 +566,8 @@ function AdminMgm(props) { getData(formData) setGetRoleStatus(true) setGetAreaStatus(false) + } else { + message.error(res.message) } }) } diff --git a/src/pages/SystemMgm/AreaManage/loadable.jsx b/src/pages/SystemMgm/AreaManage/loadable.jsx index 6b504ba..ffcee74 100644 --- a/src/pages/SystemMgm/AreaManage/loadable.jsx +++ b/src/pages/SystemMgm/AreaManage/loadable.jsx @@ -226,9 +226,11 @@ function AreaManage() { areaTree.length ? ( { + onClick: ({key, domEvent}, _) => { if (key == 'add') { - handleOrgAdd(undefined, { level, pid, isTop: false, id, name }) + handleOrgAdd(domEvent, { level, pid, isTop: false, id, name }) } else if (key == 'edit') { - handleOrgEdit(undefined, { level, pid, isTop: true, id, name }) + handleOrgEdit(domEvent, { level, pid, isTop: true, id, name }) } else if (key == 'del') { - handleOrgDel(undefined, { name, id }) + handleOrgDel(domEvent, { name, id }) } } }} @@ -583,7 +583,8 @@ function OrgnizationMgm() { { return ajax({ - url: "/api/ana/overview/rateRank", + url: "/api/ana/overview/roadTurnoverRate", type: "get", data: params, }); @@ -130,10 +130,10 @@ export default { data: params, }); }, - //概览-车场收入排行榜 + //区大屏-路段周转次数排行榜 GetParkparkIncomeRank: (params) => { return ajax({ - url: "/api/ana/overview/parkIncomeRank", + url: "/api/ana/overview/parkTurnoverRank", type: "get", data: params, }); @@ -146,4 +146,12 @@ export default { data: params, }); }, + //泊车公司-概览-路段收费率排行榜 + GetParkoverview: (params) => { + return ajax({ + url: "/api/ana/overview/roadChargeRateRank", + type: "get", + data: params, + }); + }, };