diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx index 64f9d62..5ec92d6 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx @@ -1041,7 +1041,7 @@ function ParkingAlyDuration() { onChange={(key) => { setTabCarKey(key); setPageInfo({ ...pageInfo, ...{ pn: 1 } }); - getListData({}, { pn: 1 }) + getListData({ sort: 1 }, { pn: 1 }) }} items={[ { diff --git a/src/pages/OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx b/src/pages/OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx index b85d4be..545180d 100644 --- a/src/pages/OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx +++ b/src/pages/OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx @@ -38,7 +38,7 @@ function OutDevice() { page_size: defaultParams ? defaultParams?.page_size : 15, }); // 表单数据 - const [formData, setFormData] = useState({...defaultData,...defaultParams}); + const [formData, setFormData] = useState({ ...defaultData, ...defaultParams }); // 搜索提交数据-存储 const [holdData, setHoldData] = useState(formData); // 访问接口，isAjax改变时执行 @@ -346,8 +346,8 @@ function OutDevice() { //allowClear //placeholder="全部" //showSearch - // optionFilterProp="label" - // options={roadData || []} + // optionFilterProp="label" + // options={roadData || []} value={formData?.road_id || undefined} onChange={(e) => setFormData({ ...formData, road_id: e.target.value })} /> @@ -360,20 +360,20 @@ function OutDevice() { //placeholder="全部" options={[ { - label:'全部', - value:'0', + label: '全部', + value: '0', }, { - label:'地上', - value:'1', + label: '地上', + value: '1', }, { - label:'地下', - value:'2', + label: '地下', + value: '2', }, { - label:'地上+地下', - value:'3', + label: '地上+地下', + value: '3', }, ]} value={formData?.physics_type || undefined} @@ -429,7 +429,7 @@ function OutDevice() { columns={columns} pagination={false} loading={tabLoading} - scroll={{y:620}} + scroll={{ y: "calc(100% - 50px)" }} /> diff --git a/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx b/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx index 0b64591..8c6a20e 100644 --- a/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx +++ b/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx @@ -637,6 +637,7 @@ function OutNvrMgm(props) { columns={tableColumns} pagination={false} loading={tabLoading} + scroll={{ y: "calc(100% - 50px)" }} /> diff --git a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx index 8f9c9ad..f6b4cec 100644 --- a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx +++ b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx @@ -32,6 +32,24 @@ const OutRoadOverview = () => { const [recordData, setRecordData] = useState({}); // 显示配置 根据系统管理 停车概览页面配置 进行显示与隐藏设置 const [displayMapping, setDisplayMapping] = useState({}) + const numberFormat = (num) => { + if (!num) { + return "0" + } + let str = JSON.stringify(num); + let len = str.length; + if (len > 8) { + let str1 = str.substring(0, len - 8); + let str2 = str.substring(str1.length, str1.length + 1); + str = str1 + "." + str2 + "亿"; + } + else if (len > 4 && len <= 8) { + let str1 = str.substring(0, len - 4); + let str2 = str.substring(str1.length, str1.length + 1); + str = str1 + "." + str2 + '万'; + } + return str; + } //停车场收入概览 const getRevenueOption = (data) => { // 获取所有地区名称 @@ -56,7 +74,7 @@ const OutRoadOverview = () => { data: dates.map((item) => { for (const { pay_date, income } of areaData) { console.log(pay_date, income); - if (pay_date === item) return income; + if (pay_date === item) return numberFormat(income); } return 0; }), @@ -79,7 +97,7 @@ const OutRoadOverview = () => { setRevenueData({ title: { - text: "停车场收入概览", + text: "", textStyle: { color: "#fff", }, @@ -428,7 +446,9 @@ const OutRoadOverview = () => {
-
+ {/*
*/} +
+
停车场收入概览
{ + //return current && current < moment().subtract(1, "days"); //当天之前的不可选，不包括当天 + return current && current < moment().endOf("day");//当天之前的不可选，包括当天 + } + const [form] = Form.useForm(); const [effTimePart, setEffTimePart] = useState() const [timePartList, setTimePartList] = useState(() => { @@ -55,7 +61,7 @@ function EffectiveDate(props) { } const addTimePart = () => { if (flatten(effTimePart).some(ele => ele === false)) { - message.error("请先把当前时段填写完整") + message.error("请先把当前时段填写正确") return } const randomNum = Math.floor(Math.random() * 1000); @@ -142,7 +148,7 @@ function EffectiveDate(props) { initialValues={{ unit_fee_type_group: [], ...record, - date: moment(record.date), + date: moment(new Date()).add(1, 'days'), }} disabled={disable} > @@ -153,7 +159,7 @@ function EffectiveDate(props) { name="date" rules={[{ required: true }]} > - + e.parentNode}/> diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx index c6aae39..14b4219 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx @@ -61,6 +61,10 @@ function TimePart(props) { //timePart(false) effTimePart(timearr) } else { + if (all.start != "00:00:00" && countDown(all.end) - countDown(all.start) < 0) { + message.error('结束时间需大于开始时间，设置00:00:00除外') + return + } console.log('完整了', all, countDown(all.end) - countDown(all.start), all.items[0].segment * 60) if (all.end != '00:00:00' && countDown(all.end) - countDown(all.start) < all.items[0].segment * 60) { message.error("输入的'前...分钟'数据要小于时间段时间") @@ -202,7 +206,7 @@ function TimePart(props) { - + e.parentNode}/>
*时段结束时间设置00:00:00相当于23:59:59
@@ -221,6 +225,7 @@ function TimePart(props) { +