diff --git a/demon.json b/demon.json index 4210e4f..9d10b70 100644 --- a/demon.json +++ b/demon.json @@ -4,50 +4,981 @@ "data": { "list": [ { - "road_name": "驿站停车场", - "plate": "鲁K6U676", - "phone": "1777347430", - "order_amount": "0.01元", - "method": "余额支付", - "method_id": "1", - "serial_number": "698817808978697089786", - "status": 1, - "order_time": "2022-03-04 16:14:13" - }, - { - "road_name": "驿站停车场", - "plate": "鲁K6U676", - "phone": "1777347430", - "order_amount": "0.01元", - "method": "余额支付", - "method_id": "1", - "serial_number": "698817808978697089786", - "status": 1, - "order_time": "2022-03-04 16:14:13" - }, - { - "road_name": "驿站停车场", - "plate": "鲁K6U676", - "phone": "1777347430", - "order_amount": "0.01元", - "method": "余额支付", - "method_id": "1", - "serial_number": "698817808978697089786", - "status": 1, - "order_time": "2022-03-04 16:14:13" - }, - { - "road_name": "驿站停车场", - "plate": "鲁K6U676", - "phone": "1777347430", - "order_amount": "0.01元", - "method": "余额支付", - "method_id": "1", - "serial_number": "698817808978697089786", - "status": 1, - "order_time": "2022-03-04 16:14:13" + "order_num": "工单编号", + "source": "来源", + "person": "联系人", + "phone": "联系电话", + "order_type": "工单类型", + "send_time": "派单时间", + "end_time": "截止时间", + "founder": "创建人", + "status": "状态" + }, + { + "order_num": "工单编号", + "source": "来源", + "person": "联系人", + "phone": "联系电话", + "order_type": "工单类型", + "send_time": "派单时间", + "end_time": "截止时间", + "founder": "创建人", + "status": "状态" + }, + { + "order_num": "工单编号", + "source": "来源", + "person": "联系人", + "phone": "联系电话", + "order_type": "工单类型", + "send_time": "派单时间", + "end_time": "截止时间", + "founder": "创建人", + "status": "状态" + }, + { + "order_num": "工单编号", + "source": "来源", + "person": "联系人", + "phone": "联系电话", + "order_type": "工单类型", + "send_time": "派单时间", + "end_time": "截止时间", + "founder": "创建人", + "status": "状态" } ], "total": 1 } +} + + +{ + "status": 20000, + "message": "success", + "data": { + "sysText": "青岛停车场", + "login_url": "http://192.168.5.149:90/#/login", + "logout_url": "http://192.168.5.149:90/#/login", + "webIp": "192.168.5.149:90", + "sys": "PMS", + "apiHost": "http://192.168.5.149:90/PMS/", + "map": { + "center": [ + 35.958312, + 120.201416 + ], + "zoom": 11, + "scaleZoom": 13, + "zooms": [ + 3, + 18 + ], + "mapTileType": "tumeng", + "mapCRS": "3857", + "mapTileTile": "tumeng", + "mapTileHost": "http://114.215.146.210:25003", + "slName": "", // 矢量地图名称 + "wxName": "", // 卫星地图名称 + }, + "coupon": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "折扣券" + }, + { + "value": 2, + "label": "满减券" + }, + { + "value": 3, + "label": "全免券" + } + ], + "ment": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "有效" + }, + { + "value": 2, + "label": "无效" + } + ], + "discountType": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "进行中" + }, + { + "value": 2, + "label": "未开始" + }, + { + "value": 3, + "label": "已下架" + }, + { + "value": 4, + "label": "已结束" + } + ], + "payment": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "余额" + }, + { + "value": 2, + "label": "现金" + }, + { + "value": 3, + "label": "微信" + }, + { + "value": 4, + "label": "支付宝" + }, + { + "value": 5, + "label": "系统录入" + }, + { + "value": 6, + "label": "招商银行" + }, + { + "value": 7, + "label": "数字人民币" + }, + { + "value": 8, + "label": "车场自收" + }, + { + "value": 9, + "label": "ETC" + } + ], + "roadType": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "路侧平行" + }, + { + "value": 2, + "label": "路侧垂直" + }, + { + "value": 3, + "label": "封闭车场" + }, + { + "value": 4, + "label": "半封闭车场" + } + ], + "roadDeviceType": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "非自研设备" + }, + { + "value": 2, + "label": "自研设备" + }, + { + "value": 3, + "label": "混合设备" + }, + { + "value": 4, + "label": "PDA" + }, + { + "value": 5, + "label": "视频桩" + }, + { + "value": 6, + "label": "路牙机" + }, + { + "value": 7, + "label": "巡检车" + } + ], + "berthType": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "PDA泊位" + }, + { + "value": 2, + "label": "视频泊位" + }, + { + "value": 3, + "label": "地磁泊位" + }, + { + "value": 4, + "label": "视频桩泊位" + }, + { + "value": 5, + "label": "路牙机泊位" + }, + { + "value": 6, + "label": "巡检车泊位" + } + ], + "chargeType": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "一类区" + }, + { + "value": 2, + "label": "二类区" + }, + { + "value": 3, + "label": "三类区" + } + ], + "vehicleType": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "小型车" + }, + { + "value": 2, + "label": "中型车" + }, + { + "value": 3, + "label": "大型车" + } + ], + "AliPay": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "开通" + }, + { + "value": 2, + "label": "未开通" + } + ], + "payType": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "电子支付" + }, + { + "value": 2, + "label": "现金支付" + } + ], + "accessType": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "平台接入" + }, + { + "value": 2, + "label": "三方接入" + } + ], + "roadLevel": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "独立车场" + }, + { + "value": 2, + "label": "父车场" + }, + { + "value": 3, + "label": "子车场" + } + ], + "roadStatus": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "施工" + }, + { + "value": 2, + "label": "断网" + }, + { + "value": 3, + "label": "断电" + }, + { + "value": 4, + "label": "运营中" + } + ], + "operatorStatus": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "待上线" + }, + { + "value": 2, + "label": "商用" + }, + { + "value": 3, + "label": "试运行" + }, + { + "value": 4, + "label": "下线" + } + ], + "businessRoad": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "商业" + }, + { + "value": 2, + "label": "政府" + } + ], + "cooperationModel": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "自营" + }, + { + "value": 2, + "label": "合作" + } + ], + "berthAllocation": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "单侧" + }, + { + "value": 2, + "label": "双侧" + } + ], + "Equipment": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "系统自动扣款" + }, + { + "value": 2, + "label": "App" + }, + { + "value": 3, + "label": "微信公众号" + }, + { + "value": 4, + "label": "MS" + }, + { + "value": 5, + "label": "PDA" + }, + { + "value": 6, + "label": "开放平台支付" + }, + { + "value": 7, + "label": "扫码枪" + }, + { + "value": 8, + "label": "微信小程序" + }, + { + "value": 9, + "label": "支付宝生活号" + }, + { + "value": 10, + "label": "支付宝小程序" + }, + { + "value": 11, + "label": "缴费大屏" + }, + { + "value": 12, + "label": "自助缴费机" + }, + { + "value": 13, + "label": "后台录入" + }, + { + "value": 14, + "label": "H5" + }, + { + "value": 15, + "label": "ETC" + } + ], + "BPM_ROLE": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "稽查员" + }, + { + "value": 2, + "label": "收费员" + } + ], + "jobStatus": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "在职" + }, + { + "value": 2, + "label": "离职" + } + ], + "jurisdictionMethod": [ + { + "value": 2, + "label": "在职" + }, + { + "value": 3, + "label": "离职" + } + ], + "tenantName": [ + { + "value": 1, + "label": "商户编码" + }, + { + "value": 2, + "label": "公司名称" + }, + ], + "tenantType": [ + { + "value": 1, + "label": "平台" + }, + { + "value": 2, + "label": "普通" + } + ], + "businessType": [ + { + "value": 1, + "label": "停车业务" + }, + { + "value": 2, + "label": "加油业务" + }, + { + "value": 3, + "label": "充电业务" + }, + { + "value": 4, + "label": "车务业务" + } + ], + "tenantStatus": [ + { + "value": 1, + "label": "已启用" + }, + { + "value": 2, + "label": "已停用" + } + ], + "feedbackType": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "待回复" + }, + { + "value": 2, + "label": "已回复" + } + ], + "feedbackState": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "停车服务" + }, + { + "value": 2, + "label": "订单服务" + }, + { + "value": 3, + "label": "车辆管理" + }, + { + "value": 4, + "label": "功能异常" + }, + { + "value": 5, + "label": "商务合作" + }, + { + "value": 6, + "label": "产品建议" + }, + { + "value": 7, + "label": "其他" + } + ], + "plateColor": [ + { + "value": 1, + "label": "蓝" + }, + { + "value": 2, + "label": "黄" + }, + { + "value": 3, + "label": "绿" + }, + { + "value": 4, + "label": "黄绿" + }, + { + "value": 5, + "label": "黑" + }, + { + "value": 6, + "label": "白" + } + ], + "roadErrorType": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "车场未开放" + }, + { + "value": 2, + "label": "车场名称错误" + }, + { + "value": 3, + "label": "导航位置不准" + }, + { + "value": 4, + "label": "支付遇到问题" + }, + { + "value": 5, + "label": "车位状态不准" + }, + { + "value": 6, + "label": "收费标准错误" + }, + { + "value": 7, + "label": "营业时长错误" + }, + { + "value": 8, + "label": "其他" + } + ], + "representationState": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "待审核" + }, + { + "value": 2, + "label": "已通过" + }, + { + "value": 3, + "label": "已拒绝" + } + ], + "messageConst": { + "wssUrl": "1.1.1.1:9502", + "getNewsList": "http://1.1.1.1:9502/api/im/get_news_list", + "getNewsHistoryList": "http://1.1.1.1:9502/api/im/get_news_history_list", + "getContactList": "http://1.1.1.1:9502/api/user/get_address_list", + "createGroupUrl": "http://1.1.1.1:9502/api/im/add_group", + "checkFileUrl": "http://1.1.1.1:9505/api/im/check_file", + "uploadChunkUrl": "http://1.1.1.1:9505/api/im/upload_file", + "getGroupList": "http://1.1.1.1:9502/api/im/get_group_list", + "getDepartmentInfo": "http://1.1.1.1:9502/api/im/get_user_info", + "editGroupUrl": "http://1.1.1.1:9502/api/im/edit_group_person", + "exitGroupUrl": "http://1.1.1.1:9502/api/im/exit_group", + "changeNotifySwitch": "http://1.1.1.1:9502/api/im/change_notify_switch" + }, + "orpRoadType": [ + { + "value": 0, + "label": "独立车场" + }, + { + "value": 1, + "label": "一级车场" + }, + { + "value": 2, + "label": "二级车场" + }, + { + "value": 3, + "label": "三级车场" + }, + { + "value": 4, + "label": "四级车场" + } + ], + "orpSystemType": [ + { + "value": 0, + "label": "AI值守" + }, + { + "value": 1, + "label": "有人值守" + }, + { + "value": 2, + "label": "无人值守" + }, + { + "value": 3, + "label": "远程值守" + } + ], + "orpRoadStatus": [ + { + "value": 1, + "label": "施工" + }, + { + "value": 2, + "label": "断网" + }, + { + "value": 3, + "label": "通电" + }, + { + "value": 4, + "label": "运营中" + } + ], + "saleChannel": [ + { + "value": 1, + "label": "施工" + }, + { + "value": 2, + "label": "断网" + }, + { + "value": 3, + "label": "通电" + } + ], + "saleType": [ + { + "value": 0, + "label": "施工" + }, + { + "value": 2, + "label": "断网" + }, + { + "value": 3, + "label": "通电" + } + ], + "StaggeredPay": [ + { + "value": 0, + "label": "全部" + }, + { + "value": 1, + "label": "ETC支付" + }, + { + "value": 2, + "label": "微信支付分停车服务支付" + }, + { + "value": 3, + "label": "支付宝信用停车服务支付" + }, + { + "value": 4, + "label": "数字人民币子钱包支付" + }, + { + "value": 5, + "label": "数字人民币付款码支付" + }, + { + "value": 6, + "label": "数字人民币H5支付" + }, + { + "value": 7, + "label": "后台录入" + }, + { + "value": 8, + "label": "余额支付" + }, + { + "value": 9, + "label": "招商银行-支付宝小程序支付" + }, + { + "value": 10, + "label": "支付宝原生-支付宝小程序支付" + }, + { + "value": 11, + "label": "招商银行-支付宝生活号\/服务窗支付" + }, + { + "value": 12, + "label": "支付宝原生-支付宝生活号\/服务窗支付" + }, + { + "value": 13, + "label": "招商银行-支付宝H5支付" + }, + { + "value": 14, + "label": "支付宝原生-支付宝H5支付" + }, + { + "value": 15, + "label": "招商银行-支付宝用户主扫支付" + }, + { + "value": 16, + "label": "支付宝原生-支付宝用户主扫支付" + }, + { + "value": 17, + "label": "招商银行-支付宝用户被扫\/付款码支付" + }, + { + "value": 18, + "label": "支付宝原生-支付宝用户被扫\/付款码支付" + }, + { + "value": 19, + "label": "招商银行-支付宝APP支付" + }, + { + "value": 20, + "label": "支付宝原生-支付宝APP支付" + }, + { + "value": 21, + "label": "微信原生-微信信用分支付" + }, + { + "value": 22, + "label": "招商银行-微信小程序支付" + }, + { + "value": 23, + "label": "微信原生-微信小程序支付" + }, + { + "value": 24, + "label": "招商银行-微信H5支付" + }, + { + "value": 25, + "label": "微信原生-微信H5支付" + }, + { + "value": 26, + "label": "招商银行-微信用户主扫支付" + }, + { + "value": 27, + "label": "微信原生-微信用户主扫支付" + }, + { + "value": 28, + "label": "招商银行-微信用户被扫\/付款码支付" + }, + { + "value": 29, + "label": "微信原生-微信用户被扫\/付款码支付" + }, + { + "value": 30, + "label": "招商银行-微信APP支付" + }, + { + "value": 31, + "label": "微信原生-微信APP支付" + }, + { + "value": 32, + "label": "招商银行-微信公众号支付" + }, + { + "value": 33, + "label": "微信原生-微信公众号支付" + } + ], + //来源 + "souceType": [ + { + "value": 1, + "label": "12328" + }, + { + "value": 2, + "label": "12345" + }, + { + "value": 3, + "label": "咨询热线" + } + ], + } } \ No newline at end of file diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx index bc255bc..14ce280 100644 --- a/src/components/TableModule/index.jsx +++ b/src/components/TableModule/index.jsx @@ -60,6 +60,7 @@ const TableModule = forwardRef((props, ref) => { const [formData, setFormData] = useState() const [inputSelectGroup, setInputSelectGroup] = useState([]) const [deftime, setDeftime] = useState([]) + const [reftime, setReftime] = useState([]) const [searchForm] = Form.useForm(); const [tipForm] = Form.useForm(); const timeFlag = @@ -172,7 +173,7 @@ const TableModule = forwardRef((props, ref) => { } if (moment(form.end_time) - moment(form.start_time) > 180 * 3600 * 24000) { //console.log(2222,form.plate,form.berth_id,form.plate==undefined||form.berth_id==undefined||form.plate==''||form.berth_id=='') - if (!(form.plate||form.berth_id)) { + if (!(form.plate || form.berth_id)) { message.error('查询时间范围大于半年,需填写车牌号或泊位号!') return } @@ -237,6 +238,7 @@ const TableModule = forwardRef((props, ref) => { setValue(newValue); }; useEffect(() => { + console.log(deftime.startDateTime); if (deftime.startDateTime) { searchForm.setFieldsValue({ start_time: moment(deftime.startDateTime), @@ -465,22 +467,25 @@ const TableModule = forwardRef((props, ref) => { break; case "FormSliderPicker": children = ( - { - console.log(range, type) - setTimeGroup({ timeType: type, timeRanges: range }); - }} - getValue={(v) => { - setInputSelectGroup(v) - // setTimeGroup({ - // timeType: 1, - // timeRanges: { - // start_time: v.startDateTime, - // end_time: v.endDateTime - // } - // }); - }} - /> + <> + { + console.log(range, type) + setTimeGroup({ timeType: type, timeRanges: range }); + }} + getValue={(v) => { + setInputSelectGroup(v) + // setTimeGroup({ + // timeType: 1, + // timeRanges: { + // start_time: v.startDateTime, + // end_time: v.endDateTime + // } + // }); + }} + /> + + ); break; case "stopTime": @@ -704,31 +709,39 @@ const TableModule = forwardRef((props, ref) => { function InputSelectGroup(params) { const { onChange = () => { }, - getValue = () => { } + getValue = () => { }, + pageName = "", } = params; + const [searchForm] = Form.useForm(); + const [sessionTabList, setSessionTabList] = useSessionStorageState(pageName, { + value: '' + }) const [timeType, setTimeType] = useState(1); const [deftime, setDeftime] = useState([]) const [timeGroup, setTimeGroup] = useState({ start_time: moment().subtract(1, "day").format(), end_time: moment().format(), }); - // useEffect(() => { - // if (deftime.startDateTime) { - // searchForm.setFieldsValue({ - // start_time: moment(deftime.startDateTime), - // end_time: moment(deftime.endDateTime) - // }) - // setSessionTabList({ - // ...sessionTabList, start_time: moment(deftime.startDateTime), - // end_time: moment(deftime.endDateTime) - // }) - // } else { - // // searchForm.setFieldsValue({ - // // start_time: moment().subtract(1, "month"), - // // end_time: moment() - // // }) - // } - // }, [deftime]) + console.log(); + useEffect(() => { + if (deftime.startDateTime) { + setTimeGroup({ + start_time: moment(deftime.startDateTime), + end_time: moment(deftime.endDateTime) + }) + console.log(timeGroup); + + setSessionTabList({ + ...sessionTabList, start_time: moment(deftime.startDateTime), + end_time: moment(deftime.endDateTime) + }) + } else { + // searchForm.setFieldsValue({ + // start_time: moment().subtract(1, "month"), + // end_time: moment() + // }) + } + }, [deftime]) useEffect(() => { onChange(timeGroup, timeType); }, [timeGroup, timeType]); @@ -780,7 +793,7 @@ function InputSelectGroup(params) {
- {/* { - setTimeGroup({ ...timeGroup, start_time: v.startDateTime, end_time: v.endDateTime }) + // setTimeGroup({ ...timeGroup, start_time: v.startDateTime, end_time: v.endDateTime }) getValue(v) setDeftime(v); - }} /> */} + }} />
); diff --git a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx index 88b4534..b3ee45e 100644 --- a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx @@ -283,9 +283,13 @@ function ParkRecordTotal() { value: 1, }, { - label: "已完成", + label: "待支付", value: 2, }, + { + label: "已支付", + value: 3, + } ], }, { @@ -317,7 +321,7 @@ function ParkRecordTotal() { type: 1, park_id: "", order_type: 0, - plate_color:0, + plate_color:-1, in_person: "", out_person: "", }; diff --git a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx index 4db330a..9342c3d 100644 --- a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx +++ b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx @@ -19,6 +19,8 @@ function GeoSignalIgnoreInquiry(props) { const parameter = { areId: [], //区域 parkName: '', //路段 + name: '', //姓名 + phone: '', //手机号 signalType: 0, //消息类型 auditType: 0,//忽略型号 pn: 1, @@ -36,6 +38,14 @@ function GeoSignalIgnoreInquiry(props) { const handleParkName = (v) => { setFormData({ ...formData, parkName: v.target.value }) } + //姓名 + const handleName = (v) => { + setFormData({ ...formData, name: v.target.value }) + } + //手机号 + const handlePhone = (v) => { + setFormData({ ...formData, phone: v.target.value }) + } //消息类型 const handleSignalType = (v) => { setFormData({ ...formData, signalType: v }) @@ -83,6 +93,16 @@ function GeoSignalIgnoreInquiry(props) { key: 'areaName', }, { + title: '区域', + dataIndex: 'name', + key: 'name', + }, + { + title: '区域', + dataIndex: 'phone', + key: 'phone', + }, + { title: '所属路段', dataIndex: 'parkName', key: 'parkName', @@ -257,6 +277,24 @@ function GeoSignalIgnoreInquiry(props) { />
+ + +
+
+ + +
+