diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx
index 6fd5069..1ab0ad0 100644
--- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx
@@ -186,7 +186,7 @@ const ModalDetail = (props) => {
})
const [formData, setFormData] = useState({
pn: 1,
- length: 10,
+ length: 15,
plate_number: plate_number,
car_id: car_id
})
@@ -278,7 +278,7 @@ const ModalDetail = (props) => {
if (visible) {
setFormData({
pn: 1,
- length: 10,
+ length: 15,
car_id: car_id,
plate_number: plate_number
})
diff --git a/src/pages/FinancialMgm/ExceptionDeal/DealRecordAudit/index.jsx b/src/pages/FinancialMgm/ExceptionDeal/DealRecordAudit/index.jsx
index b6ecccc..e8691b7 100644
--- a/src/pages/FinancialMgm/ExceptionDeal/DealRecordAudit/index.jsx
+++ b/src/pages/FinancialMgm/ExceptionDeal/DealRecordAudit/index.jsx
@@ -40,7 +40,7 @@ function DealRecordAudit() {
width: 60,
align: "center",
fixed: 'left',
- render: (text, record, index) => index + 1,
+ render: (text, record, index) => index + 1 + formData.page_size * (formData.pn - 1),
},
{
title: "处理记录ID",
@@ -235,7 +235,7 @@ function DealRecordAudit() {
};
ajax.getStartExceptionExamineAbnormal(_data).then((res) => {
setButtonLoad(false);
- if (res.status == 20000 || res.status == 0) {
+ if (res.status == 20000) {
message.success(res?.message || "提交审核成功");
setRecordReviewModal({open: false, data: []});
$getTableList();
diff --git a/src/pages/FinancialMgm/ExceptionDeal/DealRecordList/index.jsx b/src/pages/FinancialMgm/ExceptionDeal/DealRecordList/index.jsx
index 7de498d..4480dbc 100644
--- a/src/pages/FinancialMgm/ExceptionDeal/DealRecordList/index.jsx
+++ b/src/pages/FinancialMgm/ExceptionDeal/DealRecordList/index.jsx
@@ -40,7 +40,7 @@ function DealRecordList() {
width: 60,
align: "center",
fixed: 'left',
- render: (text, record, index) => index + 1,
+ render: (text, record, index) => index + 1 + formData.page_size * (formData.pn - 1),
},
{
title: "处理记录ID",
@@ -198,7 +198,7 @@ function DealRecordList() {
const $dispose = (id, value) => {
if(!id) return message.error("获取业务订单ID失败,请重新选择!");
ajax.getDealRecordListActionView({...id}).then((res) => {
- if (res.status == 20000 || res.status == 0) {
+ if (res.status == 20000) {
setRecordReviewModal({open: true, data: res?.data || []});
$processView(value);
} else {
diff --git a/src/pages/FinancialMgm/ExceptionDeal/StartExceptionDeal/index.jsx b/src/pages/FinancialMgm/ExceptionDeal/StartExceptionDeal/index.jsx
index 181aa3b..03ae098 100644
--- a/src/pages/FinancialMgm/ExceptionDeal/StartExceptionDeal/index.jsx
+++ b/src/pages/FinancialMgm/ExceptionDeal/StartExceptionDeal/index.jsx
@@ -46,7 +46,7 @@ function StartExceptionDeal() {
width: 60,
align: "center",
fixed: 'left',
- render: (text, record, index) => index + 1,
+ render: (text, record, index) => index + 1 + formData.page_size * (formData.pn - 1),
},
{
title: "停车订单ID",
diff --git a/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx
index fc7dc83..29a92c9 100644
--- a/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx
@@ -199,7 +199,7 @@ function EditOrderInquiry(props) {
title: "序号",
width: 60,
align: "center",
- render: (text, record, index) => index + 1,
+ render: (text, record, index) => pageInfo.pn ? index + 1 + (pageInfo.pn - 1) * pageInfo.page_size : index + 1,
},
{
title: "修改原因",
diff --git a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
index 6da15a9..fcd640e 100644
--- a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
@@ -214,6 +214,17 @@ function ParkingOrderInquiry(props) {
dataIndex: 'arrearsAmount',
key: 'arrearsAmount',
align: "center",
+ render: (text, data) => {
+ if (data.arrearsAmount_new) {
+ return
+ {data.arrearsAmount}
+ {data.arrearsAmount_new}
+
+ }
+ else {
+ return
{text}
+ }
+ }
},
{
title: '订单修改时间',
diff --git a/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx
index 4a46af9..770216b 100644
--- a/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx
@@ -651,7 +651,7 @@ function ProductOrderInquiry() {
createCol(['序号', '停车场名称', '手机号', '订单金额', '支付方式', '渠道流水号', '同步MS状态', '订购时间'],
['id', 'parking_name', 'phone', 'pay_amount', 'pay_method', 'channel_serial_number', 'status', 'pay_time'], 2),
cfkash,
- resultData, '错峰卡', "/api/fin/order_search/staggered_parking_order_list"//错峰卡
+ resultData, '错峰卡', "/api/fin/order_search/staggered_parking_order_list_export"//错峰卡
) : null}
{/*
diff --git a/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
index 9b850eb..bd07181 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
@@ -785,8 +785,10 @@ function Fence(props) {
label={"视频端口号"}
name={"video_port"}
rules={[
- { required: true, message: "视频端口号不能为空" },
- { type: 'number', message: '视频端口号格式错误' }
+ { type: 'number', message: '视频端口号格式错误', transform(value) {
+ return Number(value)
+ }},
+ { required: true, message: "视频端口号不能为空" }
]}
>
@@ -811,8 +813,10 @@ function Fence(props) {
label={"端口号"}
name={"port"}
rules={[
- { required: true, message: "端口号不能为空" },
- { type: 'number', message: '端口号格式错误' }
+ { type: 'number', message: '端口号格式错误', transform(value) {
+ return Number(value)
+ }},
+ { required: true, message: "端口号不能为空" }
]}
>
diff --git a/src/pages/InRoadMgm/InRoadOverview/loadable.jsx b/src/pages/InRoadMgm/InRoadOverview/loadable.jsx
index 14d16ca..cf5e926 100644
--- a/src/pages/InRoadMgm/InRoadOverview/loadable.jsx
+++ b/src/pages/InRoadMgm/InRoadOverview/loadable.jsx
@@ -438,7 +438,7 @@ const InRoadOverview = () => {
-
+
@@ -447,7 +447,7 @@ const InRoadOverview = () => {
style={{ height: "100%", width: "100%", overflow: "hidden" }}
/>
-
+
diff --git a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
index 529b1f6..bfa2996 100644
--- a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
@@ -23,7 +23,7 @@ function SalesStat(props) {
})
const parameter = {
name: '',//登录名
- start_time: moment().format('YYYY-MM-DD 00:00:00'),
+ start_time: moment().subtract(1, 'days').startOf('day').format('YYYY-MM-DD 00:00:00'),
end_time: moment().format("YYYY-MM-DD 23:59:59"),
pn: 1,
length: Number(pageSizeOptions[0]), // 每页条数
diff --git a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
index 8f170ad..0bf596d 100644
--- a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
@@ -22,6 +22,7 @@ import ajax from "@/services";
import errorImg from '@/assets/images/error-img-new.png'
import { QuestionCircleOutlined } from '@ant-design/icons';
import { TableModule } from "@/components";
+import { useSessionStorageState } from 'ahooks';
import "./index.scss";
import {
payRecordColumns,
@@ -35,6 +36,23 @@ const { TextArea } = Input;
let array = [];
function ParkRecordTotal() {
+ const [sessionTabList, setSessionTabList] = useSessionStorageState("parkRecordTotal", {
+ value: {}
+ })
+ const sType = sessionTabList.type // 出场类型
+ // 数据来源
+ const [source, setSource] = useState(() => {
+ if (!sType || sType == 1) {
+ return sysConfig?.inSource
+ } else if (sType == 2) {
+ return sysConfig?.outSource
+ }
+ })
+ const valueChange = (v) => {
+ // console.log(v.type);
+ let _source = v.type == 1 ? sysConfig?.inSource : sysConfig?.outSource
+ setSource(_source)
+ }
const roadContent = (
出场时间-入场时间的计算金额
@@ -70,7 +88,7 @@ function ParkRecordTotal() {
render: (text, record, index) => index + 1,
width: 100,
},
-
+
{
title: "路段名称",
dataIndex: "road",
@@ -178,8 +196,8 @@ function ParkRecordTotal() {
{
title:
应收金额
-
- ,
+
+ ,
dataIndex: "receivable_amount",
key: "receivable_amount",
width: 100,
@@ -198,10 +216,10 @@ function ParkRecordTotal() {
align: "center",
},
{
- title:
+ title:
优惠金额
-
- ,
+
+ ,
dataIndex: "preferential_amount",
key: "preferential_amount",
width: 100,
@@ -213,10 +231,10 @@ function ParkRecordTotal() {
//
},
{
- title:
+ title:
折扣金额
-
- ,
+
+ ,
dataIndex: "discount_amount",
key: "discount_amount",
width: 100,
@@ -230,8 +248,8 @@ function ParkRecordTotal() {
{
title:
退款总计
-
- ,
+
+ ,
dataIndex: "refund_total",
key: "refund_total",
width: 100,
@@ -303,7 +321,7 @@ function ParkRecordTotal() {
name: "region",
type: "TreeSelect",
label: "区域",
- areaName:1
+ areaName: 1
},
{
name: "operator",
@@ -311,14 +329,14 @@ function ParkRecordTotal() {
label: "商户名称",
defaultValue: "0",
placeholder: "请选择商户名称",
- operatorName:1
+ operatorName: 1
},
{
name: "road",
type: "SearchSelect",
label: "路段名称",
placeholder: "请输入路段名称",
- roadName:1
+ roadName: 1
},
{
name: "road_type",
@@ -432,12 +450,12 @@ function ParkRecordTotal() {
// ],
},
{
- name: "in_source",
+ name: "source",
type: "Select",
label: "操作来源",
placeholder: "请选择操作来源",
defaultValue: 0,
- options: sysConfig?.inSource || [],
+ options: source,
},
{
name: "in_person",
@@ -699,7 +717,7 @@ function ParkRecordTotal() {
{item.receivable_amount}
-
{item.coupon }
+
{item.coupon}
{item.preferential_amount}
@@ -725,17 +743,17 @@ function ParkRecordTotal() {
-
+
-
+
-
+
@@ -744,7 +762,7 @@ function ParkRecordTotal() {
);
}
//查看历史详情
- const [getHistoryData,setGetHistoryData]=useState({})
+ const [getHistoryData, setGetHistoryData] = useState({})
function checkHistoryDetail(record) {
setGetHistoryData(record);
setHistoryVisible(true);
@@ -794,7 +812,7 @@ function ParkRecordTotal() {
ajax.getHistoryRecord({ park_record_id: park_id }).then((res) => {
if (res.status === 20000) {
// res.data.list.map(res=>{
- setHistoryProgressRecord(res.data.list);
+ setHistoryProgressRecord(res.data.list);
// })
} else {
message.error(res.message)
@@ -809,7 +827,7 @@ function ParkRecordTotal() {
if (res.status === 20000) {
setTableData(res.data.list);
setTotal(res.data.total);
- }else{
+ } else {
message.error(res.message)
}
});
@@ -826,7 +844,8 @@ function ParkRecordTotal() {
tableData={tableData}
formSearch={formSearch}
pagename="停车记录查询"
- mandatory={['plate','berth_id']}
+ valueChange={valueChange}
+ mandatory={['plate', 'berth_id']}
mandatory_name={['车牌号或泊位号']}
pageName={'parkRecordTotal'}
initFormData={initFormData}
@@ -1184,11 +1203,11 @@ function ParkRecordTotal() {
diff --git a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
index 6099e52..19b9d32 100644
--- a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
@@ -660,7 +660,7 @@ const ConfigRoad = (props) => {
},
search: function (params) {
ajax
- .getPoleListData(params)
+ .getPoleListDatas(params)
.then((res) => {
if (res.status === 20000) {
setResultData({
diff --git a/src/pages/MerchantMgm/FunctionMgm/loadable.jsx b/src/pages/MerchantMgm/FunctionMgm/loadable.jsx
index f650553..0e4fcf0 100644
--- a/src/pages/MerchantMgm/FunctionMgm/loadable.jsx
+++ b/src/pages/MerchantMgm/FunctionMgm/loadable.jsx
@@ -36,6 +36,9 @@ function FunctionMgm() {
dataIndex: 'id',
key: 'id',
align: "center",
+ render: (text, record, index) => {
+ return <>{index + 1 + formData.page_size * (formData.pn - 1)}>
+ },
},
{
title: '商户名称',
diff --git a/src/pages/NewEnergy/ChargeDeviceMgm/ElectricModal/loadable.jsx b/src/pages/NewEnergy/ChargeDeviceMgm/ElectricModal/loadable.jsx
index c9b4463..a081a13 100644
--- a/src/pages/NewEnergy/ChargeDeviceMgm/ElectricModal/loadable.jsx
+++ b/src/pages/NewEnergy/ChargeDeviceMgm/ElectricModal/loadable.jsx
@@ -145,10 +145,13 @@ function BillingRule() {
}
const handelOk = () => {
var numberRegex = /^\d+$/;
+ var letterNumber = /^[0-9a-zA-Z]+$/;
if (addFormData.producer_id === '') {
message.error('请选择设备生产商')
} else if (addFormData.model === '') {
message.error('请输入设备型号')
+ } else if (!letterNumber.test(addFormData.model)) {
+ message.error('设备型号只能输入英文和数字')
} else if (addFormData.type === '') {
message.error('请选择设备类型')
} else if (addFormData.power === '') {
diff --git a/src/pages/NewEnergy/ChargeStationMgm/index.scss b/src/pages/NewEnergy/ChargeStationMgm/index.scss
index 7f6d376..0047101 100644
--- a/src/pages/NewEnergy/ChargeStationMgm/index.scss
+++ b/src/pages/NewEnergy/ChargeStationMgm/index.scss
@@ -1,4 +1,7 @@
.add-station-modal {
+ .ant-modal-header {
+ border-radius: 4px 4px 0 0;
+ }
.add-station-body {
display: flex;
justify-content: space-between;
@@ -62,6 +65,7 @@
.ant-modal-footer{
display: flex;
justify-content: center;
+ border-radius: 0 0 4px 4px;
.ant-btn{
width: 88px;
height: 35px;
diff --git a/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx b/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx
index e73c352..c0e8ffa 100644
--- a/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx
+++ b/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx
@@ -6,14 +6,14 @@ import {
Upload,
} from "antd";
import ajax from "@/services";
-import { useSessionStorageState, useSetState } from "ahooks"
+import { useSetState } from "ahooks"
import { LoadingOutlined, PlusOutlined } from '@ant-design/icons';
-import { TableModule, FormInput, FormSelect, FormTreeSelectNew, ImgError, SelectGaodeLngLat } from "@/components";
+import { TableModule, FormInput, FormSelect, FormTreeSelectNew, ImgError, SelectGaodeLngLat2 } from "@/components";
import "./index.scss";
function Appointment() {
- const pattern = /^\d+$/; // 正整数正则
+ const pattern = /^[1-9][0-9]*$/; // 正整数正则
// 详情弹窗
const [detailVisible, setDetailVisible] = useState(false);
// 列表数据
@@ -26,8 +26,7 @@ function Appointment() {
const [areaList, setAreaList] = useState([]);
//商户名称下拉
const [operatorList, setOperatorList] = useState([]);
- // 经纬度选择弹窗
- const [lngLatVisible, setLngLatVisible] = useState(false);
+
// 添加站点
const initAdd = {
name: "",
@@ -41,6 +40,10 @@ function Appointment() {
lng_lat: ""
}
const [addFormData, setAddFormData] = useSetState(initAdd);
+ const [lngLat, setLngLat] = useSetState({
+ lng_lat: "",
+ address: ""
+ });
// 搜索参数
const [formData, setFormData] = useSetState({});
// 图片上传load
@@ -103,7 +106,7 @@ function Appointment() {
key: "count",
align: "center",
render: (val, record) => {
- return <>{val || "-"}>;
+ return <>{val || 0}>;
},
},
{
@@ -200,6 +203,7 @@ function Appointment() {
// 获取商户下拉
const getAllOperator = () => {
ajax.getAllOperator().then((res) => {
+ console.log(res);
const { status, data } = res
if (status === 20000) {
if (data && data.length) {
@@ -236,12 +240,8 @@ function Appointment() {
setLoading(false)
setDetailVisible(true)
}
- const handelClose = () => {
- setLngLatVisible(false)
- setAddFormData({ lng_lat: "", address: "" })
- }
const handelOk = () => {
- // console.log(addFormData);
+ console.log(addFormData);
if (!addFormData.name) {
message.warn("请输入充电站名称")
return
@@ -254,18 +254,10 @@ function Appointment() {
message.warn("请输入车位数量")
return
}
- if (addFormData.count < 1) {
- message.warn("请输入正确的车位数量")
- return
- }
if (!pattern.test(addFormData.count)) {
message.warn("请输入正整数的车位数量")
return
}
- if (!addFormData.address) {
- message.warn("请输入详细地址")
- return
- }
if (!addFormData.site_type) {
message.warn("请选择站点类型")
return
@@ -282,6 +274,10 @@ function Appointment() {
message.warn("请选择经纬度")
return
}
+ if (!addFormData.address) {
+ message.warn("请输入详细地址")
+ return
+ }
if (!addFormData.img) {
message.warn("请上传充电站图片")
return
@@ -468,20 +464,15 @@ function Appointment() {
disabled={true}
/>
- setLngLatVisible(true)}
- lngLatVisible={lngLatVisible}
+ {
setAddFormData({ lng_lat: value })
}}
onChange={(adress) => {
- // console.log(adress);
setAddFormData({ address: adress })
}}
- // close={handelClose}
- close={() => setLngLatVisible(false)}
- hide={() => setLngLatVisible(false)}
/>
diff --git a/src/pages/NewEnergy/ChargingMgm/BillingRule/index.scss b/src/pages/NewEnergy/ChargingMgm/BillingRule/index.scss
index e3c0efc..0cdc83b 100644
--- a/src/pages/NewEnergy/ChargingMgm/BillingRule/index.scss
+++ b/src/pages/NewEnergy/ChargingMgm/BillingRule/index.scss
@@ -179,6 +179,8 @@ $color-primary: var(--color-primary);
}
.ant-modal-content{
width: 796px;
+ overflow: hidden;
+ border-radius: 4px;
}
.modal-form{
margin: 20px 0 0 10px;
@@ -208,6 +210,7 @@ $color-primary: var(--color-primary);
color: #fff;
border: none;
border-radius: 4px;
+ background-color: #636d80;
}
.ant-btn:last-child{
background: #409eff;
@@ -220,6 +223,10 @@ $color-primary: var(--color-primary);
font-weight: 700;
color: #ffffff;
}
+ .ant-modal-content{
+ overflow: hidden;
+ border-radius: 4px;
+ }
.ltc-content {
display: flex;
flex-wrap: wrap;
diff --git a/src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx b/src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx
index 4958fc2..f99d2af 100644
--- a/src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx
+++ b/src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx
@@ -189,6 +189,8 @@ function BillingRule() {
// 处理弹框ok按钮
const handleConfirm = () => {
+ let chineseReg = /^(?:[\u4e00-\u9fa5·]{1,16})$/
+ let reg = /^[0-9a-zA-Z]*$/g;
let data = {
...modalData,
rule_name:modalData?.rule_name.replace(/\s/g,""),
@@ -197,13 +199,19 @@ function BillingRule() {
}
setDetailVisible(true)
if(!data?.operator_id){
- message.warning("运营商名称不能为空")
+ message.error("运营商名称不能为空")
return
}else if(!data?.rule_name){
- message.warning("规则名称不能为空")
+ message.error("规则名称不能为空")
+ return
+ }else if(!chineseReg.test(data?.rule_name)){
+ message.error("规则名称不能为数字或英文")
return
}else if(!data?.rule_code){
- message.warning("规则编码不能为空")
+ message.error("规则编码不能为空")
+ return
+ }else if(!reg.test(data?.rule_code)){
+ message.error("规则编码不能包含汉字")
return
}
// 发保存请求
@@ -283,7 +291,12 @@ function BillingRule() {
value={modalData.rule_name}
style={{ width: 660, marginLeft: 10 }}
maxLength={20}
- onChange={(v) => {setModalData({...modalData,rule_name:v.target.value})}}
+ onChange={(v) => {
+ setModalData({
+ ...modalData,
+ rule_name:v.target.value
+ })}
+ }
/>
@@ -294,7 +307,12 @@ function BillingRule() {
value={modalData.rule_code}
style={{ width: 660, marginLeft: 10 }}
maxLength={20}
- onChange={(v) => {setModalData({...modalData,rule_code:v.target.value})}}
+ onChange={(v) => {
+ setModalData({
+ ...modalData,
+ rule_code:v.target.value
+ })
+ }}
/>
diff --git a/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/index.scss b/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/index.scss
index a6d531e..6231e3c 100644
--- a/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/index.scss
+++ b/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/index.scss
@@ -180,6 +180,8 @@ $color-primary: var(--color-primary);
}
.ant-modal-content{
width: 796px;
+ overflow: hidden;
+ border-radius: 4px;
}
.modal-form{
margin: 20px 0 0 10px;
@@ -209,6 +211,7 @@ $color-primary: var(--color-primary);
color: #fff;
border: none;
border-radius: 4px;
+ background-color: #636d80;
}
.ant-btn:last-child{
background: #409eff;
diff --git a/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/loadable.jsx b/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/loadable.jsx
index 5b7ccc4..71908d5 100644
--- a/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/loadable.jsx
+++ b/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/loadable.jsx
@@ -253,6 +253,8 @@ const handelAdd = () => {
// 处理弹框ok按钮
const handleConfirm = () => {
+ let chineseReg = /^(?:[\u4e00-\u9fa5·]{1,16})$/
+ let reg = /^[0-9a-zA-Z]*$/g;
let data = {
...modalData,
rule_name:modalData?.rule_name.replace(/\s/g,""),
@@ -261,19 +263,25 @@ const handleConfirm = () => {
}
setDetailVisible(true)
if(!modalData?.operator_id){
- message.warning("运营商名称不能为空")
+ message.error("运营商名称不能为空")
return
}else if(!data?.rule_name){
- message.warning("规则名称不能为空")
+ message.error("规则名称不能为空")
+ return
+ }else if(!chineseReg.test(data?.rule_name)){
+ message.error("规则名称不能为数字或英文")
return
}else if(!data?.rule_code){
- message.warning("规则编码不能为空")
+ message.error("规则编码不能为空")
+ return
+ }else if(!reg.test(data?.rule_code)){
+ message.error("规则编码不能包含汉字")
return
}else if(!modalData?.effective_place){
- message.warning("生效场站不能为空")
+ message.error("生效场站不能为空")
return
}else if(modalData?.status === ""){
- message.warning("规则状态不能为空")
+ message.error("规则状态不能为空")
return
}
// 发保存请求
diff --git a/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/index.scss b/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/index.scss
index 6a2c041..3a854f1 100644
--- a/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/index.scss
+++ b/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/index.scss
@@ -180,6 +180,8 @@ $color-primary: var(--color-primary);
}
.ant-modal-content{
width: 796px;
+ overflow: hidden;
+ border-radius: 4px;
}
.modal-form{
margin: 20px 0 0 10px;
@@ -209,6 +211,7 @@ $color-primary: var(--color-primary);
color: #fff;
border: none;
border-radius: 4px;
+ background-color: #636d80;
}
.ant-btn:last-child{
background: #409eff;
@@ -221,6 +224,10 @@ $color-primary: var(--color-primary);
font-weight: 700;
color: #ffffff;
}
+ .ant-modal-content{
+ overflow: hidden;
+ border-radius: 4px;
+ }
.ltc-content {
display: flex;
flex-wrap: wrap;
diff --git a/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/loadable.jsx b/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/loadable.jsx
index b7a3a48..9f0bedc 100644
--- a/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/loadable.jsx
+++ b/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/loadable.jsx
@@ -238,6 +238,8 @@ const handelAdd = () => {
// 处理弹框ok按钮
const handleConfirm = () => {
+ let chineseReg = /^(?:[\u4e00-\u9fa5·]{1,16})$/
+ let reg = /^[0-9a-zA-Z]*$/g;
let data = {
...modalData,
rule_name:modalData?.rule_name.replace(/\s/g,""),
@@ -246,16 +248,22 @@ const handleConfirm = () => {
}
setDetailVisible(true)
if(!modalData?.operator_id){
- message.warning("运营商名称不能为空")
+ message.error("运营商名称不能为空")
return
}else if(!data?.rule_name){
- message.warning("规则名称不能为空")
+ message.error("规则名称不能为空")
+ return
+ }else if(!chineseReg.test(data?.rule_name)){
+ message.error("规则名称不能为数字或英文")
return
}else if(!data?.rule_code){
- message.warning("规则编码不能为空")
+ message.error("规则编码不能为空")
+ return
+ }else if(!reg.test(data?.rule_code)){
+ message.error("规则编码不能包含汉字")
return
}else if(modalData?.status === ""){
- message.warning("规则状态不能为空")
+ message.error("规则状态不能为空")
return
}
// 发保存请求
diff --git a/src/pages/NewEnergy/NewEnergyOverview/Map.jsx b/src/pages/NewEnergy/NewEnergyOverview/Map.jsx
index 590f241..a650cff 100644
--- a/src/pages/NewEnergy/NewEnergyOverview/Map.jsx
+++ b/src/pages/NewEnergy/NewEnergyOverview/Map.jsx
@@ -5,7 +5,8 @@ import Charge50 from "@/assets/images/map/charge50.png"
import Charge20 from "@/assets/images/map/charge20.png"
import Chargelow from "@/assets/images/map/chargelow.png"
import mapLocation from '@/assets/images/map/map-location.png'
-
+import errorImg from '@/assets/images/error-img-new.png'
+import { Icon } from "@/components"
import citys from './data'
import ajax from "@/services";
function BaseMap(props) {
@@ -46,18 +47,23 @@ function BaseMap(props) {
let style = [{
url: Charge50,
- anchor: new AMap.Pixel(22, 22),
- size: new AMap.Size(44, 44)
+ anchor: new AMap.Pixel(16, 24),
+ size: new AMap.Size(32, 48)
}, {
url: Charge20,
- anchor: new AMap.Pixel(22, 22),
- size: new AMap.Size(44, 44)
+ anchor: new AMap.Pixel(16, 24),
+ size: new AMap.Size(32, 48)
}, {
url: Chargelow,
- anchor: new AMap.Pixel(22, 22),
- size: new AMap.Size(44, 44)
+ anchor: new AMap.Pixel(16, 24),
+ size: new AMap.Size(32, 48)
}
];
+ const handleImgError = (e) => {
+ let evn = e || event
+ let img = evn.srcElement ? evn.srcElement : evn.target
+ img.src = errorImg
+}
const initMap = () => {
@@ -120,8 +126,6 @@ function BaseMap(props) {
infoRef.current=true
}
},[childInfo])
- console.log(info);
-
useEffect(() => {
if (map&&data.length!=0) {
var mass = new AMap.MassMarks(data, {
@@ -194,8 +198,8 @@ function BaseMap(props) {
{hasInit ? renderChildren(map) : null}
{ showInfo&&
{info.name}
-

{info.location}
-
+
{info.location}
+

diff --git a/src/pages/NewEnergy/NewEnergyOverview/index.scss b/src/pages/NewEnergy/NewEnergyOverview/index.scss
index 5060a40..4721a6d 100644
--- a/src/pages/NewEnergy/NewEnergyOverview/index.scss
+++ b/src/pages/NewEnergy/NewEnergyOverview/index.scss
@@ -1,4 +1,5 @@
.overview-map{
+ opacity: 0.8;
.search{
.select-map{
position: absolute;
@@ -6,7 +7,8 @@
background-color:#303950 ;
top: 20px;
left: 20px;
- border-radius: 20px;
+ // border-radius: 20px;
+ overflow: hidden;
.ant-select-selector{
height: 40px;
border:0px;
@@ -20,15 +22,15 @@
}
.search-pic{
- background-image: url("../../../assets/images/search.png");
- width: 30px;
- height: 30px;
+ background-image: url("../../../assets/images/search-map.png");
+ width: 25px;
+ height: 25px;
background-repeat: no-repeat;
background-size: 100% 100%;
z-index: 1002;
position: absolute;
left: 310px;
- top: 25px;
+ top: 27px;
}
}
.right-bottom{
@@ -76,7 +78,7 @@
padding: 20px;
width: 340px;
height: 392px;
- background: linear-gradient(180deg,#1e283c, #293144);
+ background: #303950;
border: #1e283c;
top: 62px !important;
left: 20px !important;
@@ -104,8 +106,8 @@
}
.item{
padding:10px 0px;
- border-bottom: 1px solid#EEEFF1;
- opacity: 0.7;
+ border-bottom: 1px solid#3C4558;
+ opacity: 0.88;
display: flex;
justify-content: space-between;
}
diff --git a/src/pages/NewEnergy/NewEnergyOverview/loadable.jsx b/src/pages/NewEnergy/NewEnergyOverview/loadable.jsx
index b4274d7..daaf16f 100644
--- a/src/pages/NewEnergy/NewEnergyOverview/loadable.jsx
+++ b/src/pages/NewEnergy/NewEnergyOverview/loadable.jsx
@@ -36,6 +36,13 @@ function NewEnergyOverview() {
(option?.label ?? '').toLowerCase().includes(input.toLowerCase());
useEffect(()=>{
getPointData()
+ //页面加载时加上样式,页面销毁时隐藏样式
+ document.getElementsByClassName("cc-container")[0].style.paddingLeft="10px"
+ document.getElementsByClassName("cc-container")[0].style.paddingTop="10px"
+ return ()=>{
+ document.getElementsByClassName("cc-container")[0].style.paddingTop="0px"
+ document.getElementsByClassName("cc-container")[0].style.paddingLeft="0px"
+ }
},[])
useEffect(()=>{
if(data.length!=0){
@@ -59,7 +66,8 @@ function NewEnergyOverview() {
className="select-map"
style={{
width: 340,
- height:40
+ height:40,
+ borderRadius:"20px"
}}
options={option}
filterOption={filterOption}
diff --git a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/index.scss b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/index.scss
index 1a35d17..9115f4e 100644
--- a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/index.scss
+++ b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/index.scss
@@ -23,12 +23,12 @@
}
}
- .custom-view-detail{
- &.default{
+ .custom-view-detail {
+ &.default {
cursor: pointer;
}
- &.disabled{
- color: hsla(0,0%,100%,.3);
+ &.disabled {
+ color: hsla(0, 0%, 100%, 0.3);
cursor: not-allowed;
}
}
@@ -39,9 +39,19 @@
}
.custom-modal__charger-monitor {
- .content {
- display: flex;
- align-items: center;
- justify-content: center;
+ .ant-modal-content {
+ border-radius: 4px;
+ overflow: hidden;
+ .content {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ .ant-image {
+ border: 1px solid #626b7e;
+ border-radius: 4px;
+ background-color: #3e4557;
+ overflow: hidden;
+ }
+ }
}
}
diff --git a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx
index a230618..62eb04e 100644
--- a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx
+++ b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx
@@ -3,7 +3,7 @@ import { message as Message, Modal, Image, Button } from "antd";
import { dictionary, utils } from "@/config/common";
import ajax from "@/services";
import { TableModule } from "@/components";
-import errorImg from "@/assets/images/error-img.png";
+import errorImgNew from "@/assets/images/error-img-new.png";
import "./index.scss";
import moment from "moment";
@@ -227,17 +227,19 @@ function ChargerMonitor() {
width={1000}
open={ImgRecordShow}
footer={null}
+ destroyOnClose
onCancel={() => {
closeImgRecordModal();
}}
>
-
+
diff --git a/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx b/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx
index 044090b..9b3d88d 100644
--- a/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx
+++ b/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx
@@ -39,6 +39,12 @@ function InfoModal (props) {
const validateCws = (_, value) => {
const total = baseForm.getFieldValue('total');
+ if (Number.isInteger(value)) {
+ return Promise.reject(new Error('可预约车位数必须为整数'));
+ }
+ if (value < 0) {
+ return Promise.reject(new Error('可预约车位数错误'));
+ }
if (value > total) {
return Promise.reject(new Error('可预约车位数大于总数'));
}
@@ -90,7 +96,7 @@ function InfoModal (props) {
-
+
diff --git a/src/pages/OutRoadMgm/OutPersonMgm/TollCollector/index.jsx b/src/pages/OutRoadMgm/OutPersonMgm/TollCollector/index.jsx
index 2ed7369..0da0590 100644
--- a/src/pages/OutRoadMgm/OutPersonMgm/TollCollector/index.jsx
+++ b/src/pages/OutRoadMgm/OutPersonMgm/TollCollector/index.jsx
@@ -62,7 +62,7 @@ function TollCollector() {
width: 60,
align: "center",
fixed: 'left',
- render: (text, record, index) => index + 1,
+ render: (text, record, index) => index + 1 + formData.page_size * (formData.pn - 1),
},
{
title: "商户名称",
diff --git a/src/pages/OutRoadMgm/OutPersonMgm/TransitionReport/index.jsx b/src/pages/OutRoadMgm/OutPersonMgm/TransitionReport/index.jsx
index 2936432..0d180b7 100644
--- a/src/pages/OutRoadMgm/OutPersonMgm/TransitionReport/index.jsx
+++ b/src/pages/OutRoadMgm/OutPersonMgm/TransitionReport/index.jsx
@@ -57,7 +57,7 @@ function TransitionReport() {
width: 60,
align: "center",
fixed: 'left',
- render: (text, record, index) => index + 1,
+ render: (text, record, index) => index + 1 + formData.page_size * (formData.pn - 1),
},
{
title: "商户名称",
diff --git a/src/pages/OutRoadMgm/OutRemoteDevice/index.jsx b/src/pages/OutRoadMgm/OutRemoteDevice/index.jsx
index b98611f..bd74d12 100644
--- a/src/pages/OutRoadMgm/OutRemoteDevice/index.jsx
+++ b/src/pages/OutRoadMgm/OutRemoteDevice/index.jsx
@@ -43,7 +43,7 @@ function OutRemoteDevice(props) {
width: 60,
align: "center",
fixed: 'left',
- render: (text, record, index) => index + 1,
+ render: (text, record, index) => index + 1 + formData.page_size * (formData.pn - 1),
},
{
title: "版本",
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
index efdbd74..539900c 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
@@ -56,13 +56,18 @@ function OutSegment() {
maxLength: 50,
showCount: true,
};
+ const [pageData, setPageData] = useSetState({
+ // 分页参数
+ pn: 1,
+ page_size: 15,
+ });
const columns = [
{
title: "序号",
dataIndex: "index",
key: "index",
render: (_, record, index) => {
- return index + 1;
+ return pageData.pn ? index + 1 + (pageData.pn - 1) * pageData.page_size : index + 1
},
},
{
@@ -211,11 +216,6 @@ function OutSegment() {
},
];
- const [pageData, setPageData] = useSetState({
- // 分页参数
- pn: 1,
- page_size: 15,
- });
const exportRef = useRef(null);
const tableRef = useRef(null);
const [appraise, setAppraise] = useState({})
diff --git a/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx b/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx
index 5061818..6c04899 100644
--- a/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx
+++ b/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx
@@ -31,8 +31,8 @@ function ModalAreaAdd(props) {
lng: ''
}
if (formData.latlng && formData.latlng.split(',').length) {
- latlngObj['lat'] = formData.latlng.split(',')[0]
- latlngObj['lng'] = formData.latlng.split(',')[1]
+ latlngObj['lat'] = formData.latlng.split(',')[1]
+ latlngObj['lng'] = formData.latlng.split(',')[0]
}
onOk(formData={...formData,id: editForm.id, ...latlngObj}, editStatus, )
form.resetFields()
@@ -60,6 +60,7 @@ function ModalAreaAdd(props) {
...editForm,
latlng: latlng
})
+ setAreaType(editForm.type)
} else {
form.setFieldsValue({
pid: pid,
diff --git a/src/pages/SystemMgm/BusinessConfig/BusinessConf/index.scss b/src/pages/SystemMgm/BusinessConfig/BusinessConf/index.scss
index 2d9f1aa..76f54f4 100644
--- a/src/pages/SystemMgm/BusinessConfig/BusinessConf/index.scss
+++ b/src/pages/SystemMgm/BusinessConfig/BusinessConf/index.scss
@@ -132,6 +132,9 @@ $color-primary: var(--color-primary);
border-top: none !important;
border-left: none !important;
}
+ .yisa-table-scroll .ant-spin-nested-loading .ant-spin-container .ant-table .ant-table-container .ant-table-content > table {
+ height: unset !important;
+ }
.ant-table.ant-table-bordered > .ant-table-container > .ant-table-content {
max-height: 687px;
overflow: auto;
diff --git a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
index cefd121..cd9d3cb 100644
--- a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
+++ b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
@@ -343,7 +343,7 @@ function OrgnizationMgm() {
ajaxOrgDetailSave(Object.assign({}, baseForm.getFieldsValue(), {
id: activeOrg.id,
role: roleCheckedKeys.join(','),
- control_area: baseForm.getFieldValue('control_area')
+ control_area: (baseForm.getFieldValue('control_area') instanceof Array) ? baseForm.getFieldValue('control_area').join(',') : baseForm.getFieldValue('control_area')
})).then((msg) => {
message.success(msg)
setEditStatus(false)
diff --git a/src/pages/SystemMgm/RoleMgm/index.scss b/src/pages/SystemMgm/RoleMgm/index.scss
index 5d8a055..edeb7f7 100644
--- a/src/pages/SystemMgm/RoleMgm/index.scss
+++ b/src/pages/SystemMgm/RoleMgm/index.scss
@@ -8,6 +8,11 @@ $color-primary: var(--color-primary);
display: flex;
padding: 15px;
width: 100%;
+ .role-tree {
+ .ant-tree .ant-tree-node-selected {
+ background: unset !important;
+ }
+ }
.paid-search {
.search {
font-size: 16px;
diff --git a/src/pages/SystemMgm/RoleMgm/loadable.jsx b/src/pages/SystemMgm/RoleMgm/loadable.jsx
index 4e1d2aa..3083e72 100644
--- a/src/pages/SystemMgm/RoleMgm/loadable.jsx
+++ b/src/pages/SystemMgm/RoleMgm/loadable.jsx
@@ -690,9 +690,11 @@ function RoleMgm(props) {
全选
{
setGetAdminId(
Object.assign({}, getAdminId, { auth: checkedKeysValue })
);
setCheckedKeys(checkedKeysValue)
}}
+ height={400}
checkedKeys={checkedKeys}
treeData={getGovernmentArea}
fieldNames={{
diff --git a/src/pages/SystemMgm/SystemLog/loadable.jsx b/src/pages/SystemMgm/SystemLog/loadable.jsx
index f37a693..1aaf025 100644
--- a/src/pages/SystemMgm/SystemLog/loadable.jsx
+++ b/src/pages/SystemMgm/SystemLog/loadable.jsx
@@ -31,7 +31,7 @@ const SystemLog = () => {
align: "center",
width: 80,
render: (text, record, index) => {
- return <>{index + 1}>
+ return <>{index + 1 + formData.page_size * (formData.pn - 1)}>
},
},
{
diff --git a/src/services/InroadMgm/RoadMgm/RoadMgm.js b/src/services/InroadMgm/RoadMgm/RoadMgm.js
index 7a14694..59f911f 100644
--- a/src/services/InroadMgm/RoadMgm/RoadMgm.js
+++ b/src/services/InroadMgm/RoadMgm/RoadMgm.js
@@ -114,7 +114,7 @@ const addToll = (params) => {
///api/bpm/device/road_set_pole_position_list 杆位管理-获取列表
-const getPoleListData = (params) => {
+const getPoleListDatas = (params) => {
return ajax({
url: "/api/bpm/device/road_set_pole_position_list",
type: "post",
@@ -385,7 +385,7 @@ export default {
getRoadInfo,
addToll,
getEtcData,
- getPoleListData,
+ getPoleListDatas,
getRoadRuleList,
delToll,
getEditInRoadData,