diff --git a/src/components/Export/ExportBtnNew/index.jsx b/src/components/Export/ExportBtnNew/index.jsx index 7dfe426..c3de3af 100644 --- a/src/components/Export/ExportBtnNew/index.jsx +++ b/src/components/Export/ExportBtnNew/index.jsx @@ -234,7 +234,7 @@ const ExportBtn = forwardRef((props, ref) => { // } else { // } message.info(res.message) - downloadFile(res.data.url || res.data.export_url) + // downloadFile(res.data.url || res.data.export_url) handleCancel() // setInProcess("2"); // setProcess(res.data?.task_url) diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx index 2a09968..f36c3cf 100644 --- a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx @@ -677,6 +677,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { : null; seriesItem.itemStyle = itemStyle; } + // pieData[i].value && series.push(seriesItem); } @@ -739,9 +740,6 @@ const ParkingOverview = connect(function mapStateToProps(state) { legend: { selectedMode: false, data: legendData, - // formatter: function (name) { - // return `${name}:\n{|1000}}`; - // }, y: "bottom", textStyle: { color: "#fff", @@ -834,9 +832,6 @@ const ParkingOverview = connect(function mapStateToProps(state) { if ((height * 25) / series[0].pieData.value > 30) { return 30; } - // if (!(height * 25) / series[0].pieData.value > 30) { - // return 20; - // } return (height * 25) / series[0].pieData.value; }; @@ -1051,20 +1046,6 @@ const ParkingOverview = connect(function mapStateToProps(state) { // 是否需要label指引线，如果要就添加一个透明的2d饼状图并调整角度使得labelLine和3d的饼状图对齐，并再次setOption option.series.push({ - // name: "pie2d", - // type: "pie", - // labelLine: { - // length: 10, - // length2: 10, - // }, - // startAngle: -25, //起始角度，支持范围[0, 360]。 - // clockwise: false, //饼图的扇区是否是顺时针排布。上述这两项配置主要是为了对齐3d的样式 - // radius: ["65%", "65%"], - // center: ["55%", "48%"], //指示线的位置 - // data: data, - // itemStyle: { - // opacity: 0, - // }, name: "mouseoutSeries", type: "surface", parametric: true, diff --git a/src/pages/FinancialMgm/Invoice/CreateInvoice/index.scss b/src/pages/FinancialMgm/Invoice/CreateInvoice/index.scss index a686873..b10b7b1 100644 --- a/src/pages/FinancialMgm/Invoice/CreateInvoice/index.scss +++ b/src/pages/FinancialMgm/Invoice/CreateInvoice/index.scss @@ -149,18 +149,20 @@ $color-primary : var(--color-primary); } } -.modal-invoicerepeat { +.modal-criarinvoicerepeat { .ant-form-item { height: 54px; margin-bottom: 0; } - .ant-form-item-label>label { + .ant-form-horizontal .ant-form-item-label label { position: relative; display: inline-flex; align-items: center; max-width: 100%; height: 32px; + white-space: inherit; + flex-wrap: nowrap; color: hsla(0, 0%, 100%, .85); font-size: 14px; } diff --git a/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx b/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx index 8df9eb4..6cbaa01 100644 --- a/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx +++ b/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx @@ -796,7 +796,7 @@ function CreateInvoice() { setOpen(false); }} width={800} - className="modal-invoicerepeat" + className="modal-criarinvoicerepeat" title={"开具电子发票"} > {lo == 2 ? FormTable(pushreds, []) : FormTable(pushred, [])} diff --git a/src/pages/OffPeak/OffPeakShareRecords/StallCount/loadable.jsx b/src/pages/OffPeak/OffPeakShareRecords/StallCount/loadable.jsx index 1f0c1a9..9210cc5 100644 --- a/src/pages/OffPeak/OffPeakShareRecords/StallCount/loadable.jsx +++ b/src/pages/OffPeak/OffPeakShareRecords/StallCount/loadable.jsx @@ -60,14 +60,14 @@ function StallCount() { type: "SearchSelect", label: "车场名称", placeholder: "请输入车场名称", - name: "parkName", + name: "parkId", options: [{label: '全部', value: ""}, ...parkList] }, ]; //搜索参数初始化 const initFormData = { time: moment().startOf("day"), - parkName: "" + parkId: "" }; //搜索的结果 const [tableData, setTableData] = useState([]); diff --git a/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx b/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx index 30c5889..c336994 100644 --- a/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx +++ b/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx @@ -431,7 +431,7 @@ function OutNvrMgm(props) { let pattern = /^([0-9]{1,3}\.){3}[0-9]{1,3}$/; let duankou = /^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$/; let shiping_duan_kou = /^\+?[1-9][0-9]*$/ - if(values.nvr_type == 1){ + if (values.nvr_type == 1) { if (!pattern.test(values.ip_address)) { message.warning("请输入合理格式的ip地址") return false @@ -444,8 +444,8 @@ function OutNvrMgm(props) { return false } } - let reg=/^[1-9]\d*$/ - if(!reg.test(values.standard_code)&&values.standard_code){ + let reg = /^[1-9]\d*$/ + if (!reg.test(values.standard_code) && values.standard_code) { message.warning("国标编号为纯数字") return false } @@ -471,7 +471,21 @@ function OutNvrMgm(props) { // 添加按钮 const handleAdd = () => { setRowData(defRowData); - form.setFieldsValue({ nvr_type: "", standard_code: '' }); + form.setFieldsValue({ + nvr_type: "", + standard_code: '', + name: "", + operator_id: "", + road_id: "", + ip_address: "", + port: "", + video_port: "", + network_mode: "", + user_name: "", + password: "", + lng_lat: "", + address: "", + }); // form.resetFields(); setVisible(true); }; @@ -629,7 +643,7 @@ function OutNvrMgm(props) { className="form-con" placeholder="请选择" allowClear={false} - options={[{label: '全部',value: 0},{label: '非国标',value: 1},{label: '国标',value: 2}]} + options={[{ label: '全部', value: 0 }, { label: '非国标', value: 1 }, { label: '国标', value: 2 }]} value={formData?.nvr_type || 0} onChange={(v) => { setFormData({ ...formData, nvr_type: v }); @@ -764,7 +778,7 @@ function OutNvrMgm(props) { > + - + ) : null; }} @@ -796,59 +810,59 @@ function OutNvrMgm(props) { } > {({ getFieldValue }) => { - return getFieldValue("nvr_type") == 1 ? ( + return getFieldValue("nvr_type") == 1 ? ( <> -
- - - - - - +
+ + + + + + -
-
+
+
- - - - - - -
-
- + + + + + + +
+
- - - -
+ + + + +
- + ) : null; }} - +