From 14f57d24893ad431fa20b382aa445dec59577b54 Mon Sep 17 00:00:00 2001 From: xingjx Date: Fri, 12 Jan 2024 22:01:55 +0800 Subject: [PATCH] =?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 --- .../OperationCenter/CarMgm/CarAuth/loadable.jsx | 19 +- .../OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx | 20 +- .../OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx | 2 +- .../OutExceptionMgm/PlateChangeMgm/index.jsx | 168 +++++++++ .../OutExceptionMgm/PlateChangeMgm/index.scss | 389 +++++++++++++++++++++ .../OutExceptionMgm/SpecialReleaseMgm/index.jsx | 168 +++++++++ .../OutExceptionMgm/SpecialReleaseMgm/index.scss | 389 +++++++++++++++++++++ src/pages/OutRoadMgm/OutExceptionMgm/index.jsx | 6 +- src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx | 12 +- .../OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx | 6 +- .../OutSegmentMgm/OutSegment/loadable.jsx | 42 ++- src/router/router.config.js | 12 + 12 files changed, 1199 insertions(+), 34 deletions(-) create mode 100644 src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx create mode 100644 src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.scss create mode 100644 src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.jsx create mode 100644 src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.scss diff --git a/src/pages/OperationCenter/CarMgm/CarAuth/loadable.jsx b/src/pages/OperationCenter/CarMgm/CarAuth/loadable.jsx index 00c363d..85e0600 100644 --- a/src/pages/OperationCenter/CarMgm/CarAuth/loadable.jsx +++ b/src/pages/OperationCenter/CarMgm/CarAuth/loadable.jsx @@ -216,11 +216,11 @@ function CarAuth() { } {resultData[indexby].auditState == '已作废' || resultData[indexby].auditState == '残疾车已作废' ? -
-
拒审理由
-
{resultData[indexby].text || "--"}
-
- :null +
+
拒审理由
+
{resultData[indexby].text || "--"}
+
+ : null } @@ -240,14 +240,17 @@ function CarAuth() {
-
+
{ setBigPic(resultData[indexby].vehicle_travel_license_img1); setBigpicVisible(true) }} /> {/* { setBigPic(resultData[indexby].vehicle_travel_license_img1); setBigpicVisible(true) }} /> */}
-
+
{ setBigPic(resultData[indexby].vehicle_travel_license_img2); setBigpicVisible(true) }} /> {/* { setBigPic(resultData[indexby].vehicle_travel_license_img2); setBigpicVisible(true) }} /> */}
+
+ { setBigPic(resultData[indexby].car_img); setBigpicVisible(true) }} /> +
@@ -386,7 +389,7 @@ function CarAuth() { >
- +
diff --git a/src/pages/OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx b/src/pages/OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx index ccc8d76..b38e513 100644 --- a/src/pages/OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx +++ b/src/pages/OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx @@ -216,7 +216,7 @@ function OutDevice() { setDefaultParams({ ...postData, ...pageInfo }); // console.log(postData); setTabLoading(true); - ajax.getDeviceMgnList({ ...postData, ...v, ...pageInfo, area_id: formData.area, }).then( + ajax.getDeviceMgnList({ ...postData, ...v, ...pageInfo, area_id: sessionTabList?.area, }).then( (res) => { if (parseInt(res?.status) === 20000) { setResultData(res?.data || {}); @@ -297,19 +297,23 @@ function OutDevice() { }; function cascaderChange(value, options) { - console.log(options) - let last = options[options.length - 1]; let res = []; - if (last.children) { - addChild(last, res); + if (options) { + let last = options[options.length - 1]; + if (last.children) { + addChild(last, res); + } else { + res = [last.id] + } } - res.push(last.id); + console.log(300, res) setAreaId(res); - setFormData({ ...formData, area: res, area_id: value }) + setFormData({ ...formData, area_id: value, area: res }); } const addChild = (child, res) => { if (child.children) { + res.push(child.id) child.children.forEach((item) => { addChild(item, res); }); @@ -471,7 +475,7 @@ function OutDevice() { columns={columns} pagination={false} loading={tabLoading} - scroll={{ y: "calc(100% - 50px)" }} + scroll={{ y: "620px" }} /> diff --git a/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx b/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx index 8c6a20e..d47ece4 100644 --- a/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx +++ b/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx @@ -637,7 +637,7 @@ function OutNvrMgm(props) { columns={tableColumns} pagination={false} loading={tabLoading} - scroll={{ y: "calc(100% - 50px)" }} + scroll={{ y: "620px" }} /> diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx new file mode 100644 index 0000000..7722223 --- /dev/null +++ b/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx @@ -0,0 +1,168 @@ +import React, { useState, useRef, useEffect } from "react"; +import { + message, + Pagination, + Table, + Input, + Space, + Modal, + Button, + Select, + Tabs, + Descriptions, + Timeline +} from "antd"; +import moment from "moment"; +import ajax from '@/services' +import { TableModule } from "@/components"; +import { dictionary } from "@/config/common.js"; +import "./index.scss"; +//plateChangeMgm +function PlateChangeMgm() { + const [resultData, setResultData] = useState([]) + const [total, setTotal] = useState(0); + const [searchSelectList, setSearchSelectList] = useState([]); //搜索下拉数据 + const columns = [ + { + title: "停车场名称", + dataIndex: "road_name", + key: "road_name", + align: "center", + fixed: "right", + }, + { + title: "泊位总数", + dataIndex: "total_berths", + key: "total_berths", + align: "center", + fixed: "right", + }, + { + title: "停车记录数（次）", + dataIndex: "record_count", + key: "record_count", + align: "center", + fixed: "right", + }, + { + title: "订单应收金额（元）", + dataIndex: "receivable_amount", + key: "receivable_amount", + align: "center", + fixed: "right", + }, + { + title: "日均泊位周转次数（次）", + dataIndex: "average_turn_times", + key: "average_turn_times", + align: "center", + fixed: "right", + }, + { + title: "平均泊位利用率", + dataIndex: "average_use_rate", + key: "average_use_rate", + align: "center", + fixed: "right", + }, + { + title: "平均停车时长", + dataIndex: "average_park_time", + key: "average_park_time", + align: "center", + fixed: "right", + }, + ]; + + //检索条件 + const formSearch = [ + { + name: "operator_id", + type: "Select", + label: "修正类型", + options: [], + }, + { + name: "car_parking_type", + type: "Select", + label: "车场类型", + options: [ + { + label: '全部', + value: '3', + }, + { + label: '路内车场', + value: '1', + }, + { + label: '路外车场', + value: '2', + }, + ], + }, + { + name: "road_name", + type: "Input", + label: "停车场", + placeholder: "请输入停车场名称", + }, + { + name: "timePeriod", + type: "RangePicker", + label: "时间段", + defaultValue: [moment().startOf("day"), moment()], + }, + ]; + + //列表数据 + function search(e) { + ajax.getParkingAlyReportList(e).then((res) => { + let { status, data, total } = res + if (status == 20000) { + if (data.list) { + setResultData(data.list) + setTotal(data.total_records) + } else { + setResultData(data) + setTotal(total) + } + } else { + setResultData([]) + message.error(res.message) + } + }) + } + + // 获取下拉数据 + const getSelectList = () => { + ajax.getOperator().then((e) => { + setSearchSelectList([ + ...searchSelectList, + ...e.data + ]) + }) + }; + + useEffect(() => { + getSelectList(); + }, []); + + return ( + <> + + + ); +} + +export default PlateChangeMgm; \ No newline at end of file diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.scss b/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.scss new file mode 100644 index 0000000..14723e7 --- /dev/null +++ b/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.scss @@ -0,0 +1,389 @@ +@import "@/assets/css/mixin.scss"; + +$color-container-bg : var(--color-container-bg); +$color-user-list-bg : var(--color-user-list-bg); +$color-text : var(--color-text); +$color-primary : var(--color-primary); + +.edit-order-inquiry { + display: flex; + padding-top: 10px; + width: 100%; + height: 100%; + overflow-y: auto; + @include scrollBar(var(--color-user-list-bg), #3B97FF); + + .paid-search { + display: block; + width: 375px; + padding: 10px 10px 20px 20px; + + .title { + width: 100%; + font-size: 16px; + font-family: Microsoft YaHei, Microsoft YaHei-Bold; + font-weight: 700; + text-align: left; + color: var(--color-text); + margin-bottom: 20px; + } + + .form-Wrap { + height: calc(100% - 45px); + overflow-y: auto; + scrollbar-width: none; + -ms-overflow-style: none; + + &::-webkit-scrollbar { + display: none; + } + } + + .ant-select-selector, + .ant-picker, + .ant-input { + background-color: var(--color-search-list-item-bg) !important; + box-shadow: none !important; + color: var(--color-search-list-item-value); + border-color: var(--color-search-list-item-bd) !important; + } + + .yisa-search { + width: 100%; + display: flex; + align-items: center; + margin-bottom: 24px; + + label { + color: var(--color-search-list-item-text); + flex: 0 0 27%; + max-width: 27%; + text-align: right; + padding-right: 8px; + + .daf { + display: inline-block; + } + } + + .form-con { + flex: 1; + width: 220px; + } + } + + .form-btn { + display: flex; + flex-flow: row nowrap; + justify-content: space-between; + margin: 40px 0px 0px; + padding: 0 3px; + + .ant-btn+.ant-btn { + margin-left: 10px; + } + + .ant-btn span { + font-size: 16px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + text-align: center; + color: #ffffff; + } + + .reset { + width: 90px; + height: 36px; + background: var(--button-default-bg); + } + + .submit { + width: calc(100% - 100px); + height: 36px; + } + } + } + + .ant-btn+.ant-btn { + margin-left: 10px; + } + + .green { + background-color: #67c23a; + border-color: #67c23a; + } + + .soll-result { + overflow: auto; + + .result { + display: block !important; + } + } + + .paid-result { + width: calc(100% - 375px); + padding-bottom: 15px; + padding: 20px; + background: var(--color-user-list-bg); + border-top-left-radius: 20px; + box-shadow: 0px 3px 8px 0px rgba(0, 0, 0, 0.08); + + .result-hd-overview { + color: #ffffff; + //background: #3e4557; + border-radius: 4px; + margin-bottom: 20px; + display: flex; + + .result-header { + height: 108px; + width: 33%; + margin: 0 10px; + display: flex; + align-items: center; + + .result-content { + margin: auto; + + .title { + height: 19px; + font-size: 14px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + text-align: center; + color: #DBE5FF; + display: inline-block; + } + + i { + border: 1px solid; + border-radius: 22px; + display: inline-block; + text-align: center; + font-size: 10px; + width: 15px; + cursor: pointer; + } + + .num { + height: 27px; + font-size: 20px; + font-family: Alibaba PuHuiTi, Alibaba PuHuiTi-Bold; + font-weight: 700; + text-align: left; + color: #ffffff; + text-align: center; + } + } + } + + .rea { + background: url("../../../../assets/images/red.png"); + background-size: 100% 100%; + } + + .reb { + background: url("../../../../assets/images/blue.png"); + background-size: 100% 100%; + } + + .rec { + background: url("../../../../assets/images/green.png"); + background-size: 100% 100%; + } + + .red { + background: url("../../../../assets/images/yellow.png"); + background-size: 100% 100%; + } + } + + .result { + @include flex-columns; + + .result-box { + color: #ffffff; + background: #3e4557; + border-radius: 4px; + margin-bottom: 20px; + + .result-box-title { + height: 21px; + font-size: 16px; + font-family: Microsoft YaHei, Microsoft YaHei-Bold; + font-weight: 700; + text-align: left; + margin: 18px 0 18px 18px; + display: inline-block; + + } + + i { + border: 1px solid; + border-radius: 22px; + display: inline-block; + text-align: center; + font-size: 12px; + width: 22px; + cursor: pointer; + } + + .ant-table .ant-table-thead tr th { + background: #3e4557; + } + } + .result-title { + display: inline-block; + p { + display: inline; + margin: 0 5px; + color: #3aa9ff; + font-size: 18px; + } + } + .export-btn { + display: inline-block; + text-align: center; + float: right; + width: 68px; + height: 34px; + line-height: 34px; + background: linear-gradient(180deg, #3aa9ff, #59b7ff); + border-radius: 4px; + margin-right: 15px; + margin-bottom: 10px; + cursor: pointer; + } + .root_gfkk { + float: right; + } + .row-head { + height: 32px; + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 13px; + + .number-wrapper { + display: inline-flex; + align-items: center; + font-size: 14px; + + .letter { + color: var(--color-text); + font-size: 14px; + } + + .total-number { + color: var(--color-primary); + font-weight: bold; + margin: 0 4px; + font-size: 14px; + } + } + } + + .cc-result-flow { + width: 100%; + height: calc(100% - 34px - 13px); + + .yisa-table { + width: 100%; + height: calc(100% - 32px - 15px); + overflow-y: auto !important; + @include scrollBar(var(--color-user-list-bg), #3B97FF); + + .ant-table-thead { + th { + background: #616b83 !important; + } + } + + .ant-table-tbody { + td { + background: #3E4557 !important; + border-bottom-color: var(--color-table-border-bottom-color); + } + + tr:nth-child(even) { + td { + background: #3E4557 !important; + } + } + } + } + } + } + + } + +} + +.modal-pay-configuration { + + .submitBtn { + text-align: center; + margin: 20px 0 0; + + .ant-btn { + width: 80px; + height: 35px; + border: none; + border-radius: 4px; + + span { + color: #ffffff; + } + } + + .submit { + background: #409eff; + } + + .cancel { + background: var(--button-default-bg); + margin-left: 20px; + } + } +} + +.tab-title { + display: flex; + + .title { + height: 30px; + line-height: 30px; + margin-right: 10px; + } + + .btn { + font-size: 10px; + } +} + +.edit-order-inquiry { + /*定义滚动条高宽及背景 + 高宽分别对应横竖滚动条的尺寸*/ + ::-webkit-scrollbar { + width: 6px; + height: 16px; + background-color: #5c5c5c; +} + +/*定义滚动条轨道 + 内阴影+圆角*/ +::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); + border-radius: 10px; + background-color: #9da2ab; +} + +/*定义滑块 + 内阴影+圆角*/ +::-webkit-scrollbar-thumb { + border-radius: 10px; + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3); + background-color: #3b97ff; +} +} \ No newline at end of file diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.jsx new file mode 100644 index 0000000..8ba89d3 --- /dev/null +++ b/src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.jsx @@ -0,0 +1,168 @@ +import React, { useState, useRef, useEffect } from "react"; +import { + message, + Pagination, + Table, + Input, + Space, + Modal, + Button, + Select, + Tabs, + Descriptions, + Timeline +} from "antd"; +import moment from "moment"; +import ajax from '@/services' +import { TableModule } from "@/components"; +import { dictionary } from "@/config/common.js"; +import "./index.scss"; +//specialReleaseMgm +function SpecialReleaseMgm() { + const [resultData, setResultData] = useState([]) + const [total, setTotal] = useState(0); + const [searchSelectList, setSearchSelectList] = useState([]); //搜索下拉数据 + const columns = [ + { + title: "停车场名称", + dataIndex: "road_name", + key: "road_name", + align: "center", + fixed: "right", + }, + { + title: "泊位总数", + dataIndex: "total_berths", + key: "total_berths", + align: "center", + fixed: "right", + }, + { + title: "停车记录数（次）", + dataIndex: "record_count", + key: "record_count", + align: "center", + fixed: "right", + }, + { + title: "订单应收金额（元）", + dataIndex: "receivable_amount", + key: "receivable_amount", + align: "center", + fixed: "right", + }, + { + title: "日均泊位周转次数（次）", + dataIndex: "average_turn_times", + key: "average_turn_times", + align: "center", + fixed: "right", + }, + { + title: "平均泊位利用率", + dataIndex: "average_use_rate", + key: "average_use_rate", + align: "center", + fixed: "right", + }, + { + title: "平均停车时长", + dataIndex: "average_park_time", + key: "average_park_time", + align: "center", + fixed: "right", + }, + ]; + + //检索条件 + const formSearch = [ + { + name: "operator_id", + type: "Select", + label: "修正类型", + options: [], + }, + { + name: "car_parking_type", + type: "Select", + label: "车场类型", + options: [ + { + label: '全部', + value: '3', + }, + { + label: '路内车场', + value: '1', + }, + { + label: '路外车场', + value: '2', + }, + ], + }, + { + name: "road_name", + type: "Input", + label: "停车场", + placeholder: "请输入停车场名称", + }, + { + name: "timePeriod", + type: "RangePicker", + label: "时间段", + defaultValue: [moment().startOf("day"), moment()], + }, + ]; + + //列表数据 + function search(e) { + ajax.getParkingAlyReportList(e).then((res) => { + let { status, data, total } = res + if (status == 20000) { + if (data.list) { + setResultData(data.list) + setTotal(data.total_records) + } else { + setResultData(data) + setTotal(total) + } + } else { + setResultData([]) + message.error(res.message) + } + }) + } + + // 获取下拉数据 + const getSelectList = () => { + ajax.getOperator().then((e) => { + setSearchSelectList([ + ...searchSelectList, + ...e.data + ]) + }) + }; + + useEffect(() => { + getSelectList(); + }, []); + + return ( + <> + + + ); +} + +export default SpecialReleaseMgm; \ No newline at end of file diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.scss b/src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.scss new file mode 100644 index 0000000..14723e7 --- /dev/null +++ b/src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.scss @@ -0,0 +1,389 @@ +@import "@/assets/css/mixin.scss"; + +$color-container-bg : var(--color-container-bg); +$color-user-list-bg : var(--color-user-list-bg); +$color-text : var(--color-text); +$color-primary : var(--color-primary); + +.edit-order-inquiry { + display: flex; + padding-top: 10px; + width: 100%; + height: 100%; + overflow-y: auto; + @include scrollBar(var(--color-user-list-bg), #3B97FF); + + .paid-search { + display: block; + width: 375px; + padding: 10px 10px 20px 20px; + + .title { + width: 100%; + font-size: 16px; + font-family: Microsoft YaHei, Microsoft YaHei-Bold; + font-weight: 700; + text-align: left; + color: var(--color-text); + margin-bottom: 20px; + } + + .form-Wrap { + height: calc(100% - 45px); + overflow-y: auto; + scrollbar-width: none; + -ms-overflow-style: none; + + &::-webkit-scrollbar { + display: none; + } + } + + .ant-select-selector, + .ant-picker, + .ant-input { + background-color: var(--color-search-list-item-bg) !important; + box-shadow: none !important; + color: var(--color-search-list-item-value); + border-color: var(--color-search-list-item-bd) !important; + } + + .yisa-search { + width: 100%; + display: flex; + align-items: center; + margin-bottom: 24px; + + label { + color: var(--color-search-list-item-text); + flex: 0 0 27%; + max-width: 27%; + text-align: right; + padding-right: 8px; + + .daf { + display: inline-block; + } + } + + .form-con { + flex: 1; + width: 220px; + } + } + + .form-btn { + display: flex; + flex-flow: row nowrap; + justify-content: space-between; + margin: 40px 0px 0px; + padding: 0 3px; + + .ant-btn+.ant-btn { + margin-left: 10px; + } + + .ant-btn span { + font-size: 16px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + text-align: center; + color: #ffffff; + } + + .reset { + width: 90px; + height: 36px; + background: var(--button-default-bg); + } + + .submit { + width: calc(100% - 100px); + height: 36px; + } + } + } + + .ant-btn+.ant-btn { + margin-left: 10px; + } + + .green { + background-color: #67c23a; + border-color: #67c23a; + } + + .soll-result { + overflow: auto; + + .result { + display: block !important; + } + } + + .paid-result { + width: calc(100% - 375px); + padding-bottom: 15px; + padding: 20px; + background: var(--color-user-list-bg); + border-top-left-radius: 20px; + box-shadow: 0px 3px 8px 0px rgba(0, 0, 0, 0.08); + + .result-hd-overview { + color: #ffffff; + //background: #3e4557; + border-radius: 4px; + margin-bottom: 20px; + display: flex; + + .result-header { + height: 108px; + width: 33%; + margin: 0 10px; + display: flex; + align-items: center; + + .result-content { + margin: auto; + + .title { + height: 19px; + font-size: 14px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + text-align: center; + color: #DBE5FF; + display: inline-block; + } + + i { + border: 1px solid; + border-radius: 22px; + display: inline-block; + text-align: center; + font-size: 10px; + width: 15px; + cursor: pointer; + } + + .num { + height: 27px; + font-size: 20px; + font-family: Alibaba PuHuiTi, Alibaba PuHuiTi-Bold; + font-weight: 700; + text-align: left; + color: #ffffff; + text-align: center; + } + } + } + + .rea { + background: url("../../../../assets/images/red.png"); + background-size: 100% 100%; + } + + .reb { + background: url("../../../../assets/images/blue.png"); + background-size: 100% 100%; + } + + .rec { + background: url("../../../../assets/images/green.png"); + background-size: 100% 100%; + } + + .red { + background: url("../../../../assets/images/yellow.png"); + background-size: 100% 100%; + } + } + + .result { + @include flex-columns; + + .result-box { + color: #ffffff; + background: #3e4557; + border-radius: 4px; + margin-bottom: 20px; + + .result-box-title { + height: 21px; + font-size: 16px; + font-family: Microsoft YaHei, Microsoft YaHei-Bold; + font-weight: 700; + text-align: left; + margin: 18px 0 18px 18px; + display: inline-block; + + } + + i { + border: 1px solid; + border-radius: 22px; + display: inline-block; + text-align: center; + font-size: 12px; + width: 22px; + cursor: pointer; + } + + .ant-table .ant-table-thead tr th { + background: #3e4557; + } + } + .result-title { + display: inline-block; + p { + display: inline; + margin: 0 5px; + color: #3aa9ff; + font-size: 18px; + } + } + .export-btn { + display: inline-block; + text-align: center; + float: right; + width: 68px; + height: 34px; + line-height: 34px; + background: linear-gradient(180deg, #3aa9ff, #59b7ff); + border-radius: 4px; + margin-right: 15px; + margin-bottom: 10px; + cursor: pointer; + } + .root_gfkk { + float: right; + } + .row-head { + height: 32px; + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 13px; + + .number-wrapper { + display: inline-flex; + align-items: center; + font-size: 14px; + + .letter { + color: var(--color-text); + font-size: 14px; + } + + .total-number { + color: var(--color-primary); + font-weight: bold; + margin: 0 4px; + font-size: 14px; + } + } + } + + .cc-result-flow { + width: 100%; + height: calc(100% - 34px - 13px); + + .yisa-table { + width: 100%; + height: calc(100% - 32px - 15px); + overflow-y: auto !important; + @include scrollBar(var(--color-user-list-bg), #3B97FF); + + .ant-table-thead { + th { + background: #616b83 !important; + } + } + + .ant-table-tbody { + td { + background: #3E4557 !important; + border-bottom-color: var(--color-table-border-bottom-color); + } + + tr:nth-child(even) { + td { + background: #3E4557 !important; + } + } + } + } + } + } + + } + +} + +.modal-pay-configuration { + + .submitBtn { + text-align: center; + margin: 20px 0 0; + + .ant-btn { + width: 80px; + height: 35px; + border: none; + border-radius: 4px; + + span { + color: #ffffff; + } + } + + .submit { + background: #409eff; + } + + .cancel { + background: var(--button-default-bg); + margin-left: 20px; + } + } +} + +.tab-title { + display: flex; + + .title { + height: 30px; + line-height: 30px; + margin-right: 10px; + } + + .btn { + font-size: 10px; + } +} + +.edit-order-inquiry { + /*定义滚动条高宽及背景 + 高宽分别对应横竖滚动条的尺寸*/ + ::-webkit-scrollbar { + width: 6px; + height: 16px; + background-color: #5c5c5c; +} + +/*定义滚动条轨道 + 内阴影+圆角*/ +::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); + border-radius: 10px; + background-color: #9da2ab; +} + +/*定义滑块 + 内阴影+圆角*/ +::-webkit-scrollbar-thumb { + border-radius: 10px; + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3); + background-color: #3b97ff; +} +} \ No newline at end of file diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/index.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/index.jsx index 26a4c77..12d78cb 100644 --- a/src/pages/OutRoadMgm/OutExceptionMgm/index.jsx +++ b/src/pages/OutRoadMgm/OutExceptionMgm/index.jsx @@ -1,7 +1,11 @@ import LiftUpPoleRecord from "./LiftUpPoleRecord" +import PlateChangeMgm from "./PlateChangeMgm" +import SpecialReleaseMgm from "./SpecialReleaseMgm" import ZombieCarCleanRecord from "./ZombieCarCleanRecord" export default { LiftUpPoleRecord, - ZombieCarCleanRecord + ZombieCarCleanRecord, + PlateChangeMgm, + SpecialReleaseMgm, } \ No newline at end of file diff --git a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx index 7dbf201..5bb374b 100644 --- a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx +++ b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx @@ -94,7 +94,7 @@ const OutRoadOverview = () => { itemWidth: 18, itemHeight: 12, textStyle: { - fontSize: 14, + fontSize: 12, color: textColor, }, }, @@ -205,7 +205,7 @@ const OutRoadOverview = () => { itemWidth: 18, itemHeight: 12, textStyle: { - fontSize: 14, + fontSize: 12, color: textColor, }, }, @@ -449,22 +449,22 @@ const OutRoadOverview = () => {
- {/*
*/} + {/*
*/}
停车场收入概览
- {/*
*/} + {/*
*/}
停车场记录概览
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx index 71e36cb..784ccf5 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx @@ -28,8 +28,8 @@ function EffectiveDate(props) { } = props; // 限制当天之前的日期不可选 const disabledDate = (current) => { - //return current && current < moment().subtract(1, "days"); //当天之前的不可选，不包括当天 - return current && current < moment().endOf("day");//当天之前的不可选，包括当天 + return current && current < moment().subtract(1, "days"); //当天之前的不可选，不包括当天 + // return current && current < moment().endOf("day");//当天之前的不可选，包括当天 } const [form] = Form.useForm(); @@ -149,7 +149,7 @@ function EffectiveDate(props) { unit_fee_type_group: [], ...record, //date: moment(new Date()).add(1, 'days'), - date: record.date ? moment(record.date) : moment(new Date()).add(1, 'days'), + date: record.date ? moment(record.date) : moment(new Date()), }} disabled={disable} > diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx index e5bb7ce..4d3ed83 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx @@ -290,18 +290,46 @@ function OutSegment() { }); } + // function cascaderChange(value, options) { + // let res = []; + // if (options) { + // let last = options[options.length - 1]; + // if (last.children) { + // addChild(last, res); + // } + // res.push(last.id); + // } + // console.log(300,res) + // setAreaId(res); + // } + + // const addChild = (child, res) => { + // if (child.children) { + // child.children.forEach((item) => { + // addChild(item, res); + // }); + // } else { + // res.push(child.id); + // } + // }; function cascaderChange(value, options) { - let last = options[options.length - 1]; let res = []; - if (last.children) { - addChild(last, res); + if (options) { + let last = options[options.length - 1]; + if (last.children) { + addChild(last, res); + } else { + res = [last.id] + } } - res.push(last.id); + console.log(300, res) setAreaId(res); + setFormData({ ...formData, area_id: value, area: res }); } const addChild = (child, res) => { if (child.children) { + res.push(child.id) child.children.forEach((item) => { addChild(item, res); }); @@ -369,7 +397,7 @@ function OutSegment() { let params = { ...values, //area_id: values.area?.length > 0 ? end : areaId, - area_id:areaId, + area_id: sessionTabList?.area, }; ajax.getOrpRoadExp({ ...pageData, @@ -398,7 +426,7 @@ function OutSegment() { let params = { ...values, //area_id: values.area?.length > 0 ? end : areaId, - area_id: areaId, + area_id: sessionTabList?.area, }; ajax .getOrpRoadList({ @@ -492,7 +520,7 @@ function OutSegment() { > - +