From 85827ea442367c843d1929bdd7e7bdb42f449472 Mon Sep 17 00:00:00 2001 From: chenqiang Date: Thu, 25 Jan 2024 15:33:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix():=20=E8=A7=A3=E5=86=B3=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=97=A0=E5=AE=9E=E9=99=85=E6=95=88=E6=9E=9C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParkingOverview/loadable.jsx | 44 ------------------- .../SettleBill/GeneralBusiness/loadable.jsx | 10 +---- .../FinancialMgm/SettleBill/PayRepeat/loadable.jsx | 50 +--------------------- 3 files changed, 2 insertions(+), 102 deletions(-) diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx index e408dc6..2a09968 100644 --- a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx @@ -680,23 +680,6 @@ const ParkingOverview = connect(function mapStateToProps(state) { series.push(seriesItem); } - // 使用上一次遍历时，计算出的数据和 sumValue，调用 getParametricEquation 函数， - // 向每个 series-surface 传入不同的参数方程 series-surface.parametricEquation，也就是实现每一个扇形。 - - // for (let i = 0; i < series.length; i++) { - // endValue = startValue + series[i].pieData.value; - // series[i].pieData.startRatio = startValue / sumValue; - // series[i].pieData.endRatio = endValue / sumValue; - // series[i].parametricEquation = getParametricEquation( - // series[i].pieData.startRatio, - // series[i].pieData.endRatio, - // false, - // false, - // k, - // series[i].pieData.value - // ); - // startValue = endValue; - // } for (let i = 0; i < series.length; i++) { endValue = startValue + series[i].pieData.value; @@ -753,13 +736,6 @@ const ParkingOverview = connect(function mapStateToProps(state) { // }); let option = { - // backgroundColor: "#203598", - // labelLine: { - // show: true, - // lineStyle: { - // color: "#fff", - // }, - // }, legend: { selectedMode: false, data: legendData, @@ -790,26 +766,6 @@ const ParkingOverview = connect(function mapStateToProps(state) { }, tooltip: { backgroundColor: "#fff", - // formatter: (params) => { - // if ( - // params.seriesName !== "mouseoutSeries" && - // params.seriesName !== "pie2d" - // ) { - // let bfb = ( - // (option.series[params.seriesIndex].pieData.endRatio - - // option.series[params.seriesIndex].pieData.startRatio) * - // 100 - // ).toFixed(2); - // if (bfb == "NaN") { - // bfb = 0; - // } - // return ( - // `${params.seriesName}
` + - // `` + - // `${bfb}%` - // ); - // } - // }, formatter: (params) => { if ( params.seriesName !== "mouseoutSeries" && diff --git a/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx b/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx index 7c40d54..a46f593 100644 --- a/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx +++ b/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx @@ -6,22 +6,14 @@ import { Select, Input, Popover, - Modal, - Row, - Form, - Col, Button, DatePicker, } from "antd"; -import { dictionary, utils } from "@/config/common"; +import { dictionary } from "@/config/common"; import moment from "moment"; -import { DeleteOutlined } from "@ant-design/icons"; import ajax from "@/services"; -// import { useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks'; import { ResultFlow } from "@/components"; import "./index.scss"; -// import errorImg from "@/assets/images/layout/error.png" -// import { useLocation } from "react-router-dom"; const { RangePicker } = DatePicker; const { TextArea } = Input; function GeneralBusiness() { diff --git a/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx b/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx index f509610..a1ddcfa 100644 --- a/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx +++ b/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx @@ -699,42 +699,6 @@ function PayRepeat() { /> - {/*
- 操作人 -
- hangChange(e)} />
diff --git a/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx index 5db7645..71b79e7 100644 --- a/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx +++ b/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx @@ -81,42 +81,49 @@ function PileMonitor() { dataIndex: "device_name", key: "device_name", align: "center", + render: (text, record, index) => text||"-", }, { title: "设备编码", dataIndex: "device_num", key: "device_num", align: "center", + render: (text, record, index) => text||"-", }, { title: "设备类型", dataIndex: "device_type", key: "device_type", align: "center", + render: (text, record, index) => text||"-", }, { title: "设备供应商", dataIndex: "device_vendor", key: "device_vendor", align: "center", + render: (text, record, index) => text||"-", }, { title: "对接平台", dataIndex: "platform", key: "platform", align: "center", + render: (text, record, index) => text||"-", }, { title: "车位锁状态", dataIndex: "lock_state_name", key: "lock_state_name", align: "center", + render: (text, record, index) => text||"-", }, { title: "设备状态", dataIndex: "device_state_name", key: "device_state_name", align: "center", + render: (text, record, index) => text||"-", }, { title: "操作", From 835e588b448d07a144ad6bcaa553983e9e91f53d Mon Sep 17 00:00:00 2001 From: wanghx Date: Thu, 25 Jan 2024 15:54:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix():=20=E5=AF=BC=E5=87=BAtotalRecords?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EquipmentAly/EquipmentRunningStat/loadable.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx b/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx index 16c41fe..2b408c6 100644 --- a/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx @@ -728,7 +728,7 @@ function ExceptionParkReport() { 导出} modalType="noImg" - totalRecords={500} + totalRecords={Data?.total || 0} exportUrl="/api/ana/equipmentRuning/export" postdata={{ formData: { From d13c47645c962d3cd70bc55e3c604ee80cfbf597 Mon Sep 17 00:00:00 2001 From: xingjx Date: Fri, 26 Jan 2024 09:12:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix():bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/VideoPlay/index.jsx | 10 +++++----- src/pages/OperationCenter/CarMgm/CarAuth/loadable.jsx | 4 ++-- .../OperationSales/CreditScoreMgm/loadable.jsx | 8 ++++++++ .../OutDeviceMgm/OutMonitorMgm/loadable.jsx | 16 ++++++++++++---- .../OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx | 19 ++++++++++++------- .../OutExceptionMgm/LiftUpPoleRecord/loadable.jsx | 2 +- src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx | 2 +- .../OutSegment/ConfigParking/CarMgm/CarGroupMgm.jsx | 2 +- .../ConfigParking/GateControlManagement.jsx | 2 +- 9 files changed, 43 insertions(+), 22 deletions(-) diff --git a/src/components/VideoPlay/index.jsx b/src/components/VideoPlay/index.jsx index 4b6c268..fdf4084 100644 --- a/src/components/VideoPlay/index.jsx +++ b/src/components/VideoPlay/index.jsx @@ -8,8 +8,8 @@ let reloadTimes = 0 let flvPlayer = null let lastUrl = null -function VideoPlay (props, ref) { - const {videoType = "flv"} = props +function VideoPlay(props, ref) { + const { videoType = "flv", controlslist } = props const videoElement = useRef() const [videoUrl, setVideoUrl] = useState('') // console.log(videoType) @@ -47,7 +47,7 @@ function VideoPlay (props, ref) { console.log(e) } } - }else{ + } else { console.log("不支持flvjs!!!") } } @@ -84,7 +84,7 @@ function VideoPlay (props, ref) { useImperativeHandle(ref, () => ({ changeUrl: (url) => { - if(lastUrl == url) { + if (lastUrl == url) { flvPlayer.play() return } @@ -99,7 +99,7 @@ function VideoPlay (props, ref) { return (
- +
) } diff --git a/src/pages/OperationCenter/CarMgm/CarAuth/loadable.jsx b/src/pages/OperationCenter/CarMgm/CarAuth/loadable.jsx index 85e0600..ec31f3e 100644 --- a/src/pages/OperationCenter/CarMgm/CarAuth/loadable.jsx +++ b/src/pages/OperationCenter/CarMgm/CarAuth/loadable.jsx @@ -286,10 +286,10 @@ function CarAuth() {
: null}
- { setBigPic(resultData[indexby].disabled_certificate_img1); setBigpicVisible(true) }} /> + { setBigPic(resultData[indexby].disabled_certificate_img1); setBigpicVisible(true) }} />
- { setBigPic(resultData[indexby].disabled_certificate_img2); setBigpicVisible(true) }} /> + { setBigPic(resultData[indexby].disabled_certificate_img2); setBigpicVisible(true) }} />
diff --git a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx index b71c944..94741c4 100644 --- a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx @@ -354,6 +354,10 @@ function CreditScoreMgm() { } //积分兑换配置 编辑保存 function getRedeemEdit(e, type) { + if(!addData?.awardId||!addData?.redeem_points||!addData.total_num){ + message.error('请填写完整!') + return + } ajax.getCreditScoreRedeemEdit({ ...e }).then((res) => { let { status, data, total } = res if (status == 20000) { @@ -375,6 +379,10 @@ function CreditScoreMgm() { } //积分兑换配置 添加 function getRedeemAdd(e, type) { + if(!addData?.awardId||!addData?.redeem_points||!addData.total_num){ + message.error('请填写完整!') + return + } ajax.getCreditScoreRedeemAdd({ ...e }).then((res) => { let { status, data, total } = res if (status == 20000) { diff --git a/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx b/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx index 23e1315..7b788d4 100644 --- a/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx +++ b/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx @@ -71,8 +71,9 @@ function OutMonitorMgm(props) { device_name: "", nvr_id: "", device_code: "", - berth_ids: "", - nvr_type: "" + channel_ids: "", + nvr_type: "", + id: '', }; // 行数据 const [rowData, setRowData] = useState(defRowData); @@ -501,9 +502,15 @@ function OutMonitorMgm(props) { // message.error("请选择泊位"); // return; // } + if (form.getFieldValue("nvr_type") == 1) { + if (!rowData?.channel_ids) { + message.error("请选择通道号"); + return; + } + } ajax[values?.id ? "monitorOutEdit" : "monitorOutAdd"]({ ...values, - berth_ids: rowData?.berth_ids, + channel_ids: rowData?.channel_ids, }).then( (res) => { if (res?.status == 20000) { @@ -794,7 +801,8 @@ function OutMonitorMgm(props) { > + diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx index 35eebf5..94b31cf 100644 --- a/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx +++ b/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx @@ -113,7 +113,7 @@ function LiftUpPoleRecord(props) { key: 'start_time', }, { - title: '关闸时间', + title: '开闸原因', dataIndex: 'end_reason', key: 'end_reason', }, diff --git a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx index 7ca143f..64b5ebb 100644 --- a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx +++ b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx @@ -573,7 +573,7 @@ const OutRoadOverview = () => { onChange={(e) => { getOutRoadVideoPlay({ id: e, type: 1 }); setTodevice(e) }} />
- +
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarGroupMgm.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarGroupMgm.jsx index 9777963..729cc21 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarGroupMgm.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarGroupMgm.jsx @@ -114,7 +114,7 @@ function CarGroupMgm({ id }) { }); const [pageData, setPageData] = useState({ pn: 1, - page_size: 10, + page_size: 15, total: 0, }); const [currentId, setCurrentId] = useState(""); diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/GateControlManagement.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/GateControlManagement.jsx index 26b97e4..b6f2b4c 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/GateControlManagement.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/GateControlManagement.jsx @@ -254,7 +254,6 @@ function GateControlManagement(props) { useEffect(()=>{ - getOptionData() getOpenData(pageData) },[]) @@ -263,6 +262,7 @@ function GateControlManagement(props) {