diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx
index 7722223..7577824 100644
--- a/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx
+++ b/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.jsx
@@ -13,111 +13,137 @@ import {
Timeline
} from "antd";
import moment from "moment";
-import ajax from '@/services'
+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 [detailData, setDetailData] = useState({})
+ const [visible, setVisible] = useState(false)
const [total, setTotal] = useState(0);
- const [searchSelectList, setSearchSelectList] = useState([]); //搜索下拉数据
const columns = [
{
- title: "停车场名称",
+ title: "序号",
+ dataIndex: "index",
+ key: "index",
+ align: "center",
+ fixed: "right",
+ render: (text, record, index) => index + 1,
+ },
+ {
+ title: "车场名称",
dataIndex: "road_name",
key: "road_name",
align: "center",
fixed: "right",
},
{
- title: "泊位总数",
- dataIndex: "total_berths",
- key: "total_berths",
+ title: "修正前车牌",
+ dataIndex: "plate_old",
+ key: "plate_old",
align: "center",
fixed: "right",
},
{
- title: "停车记录数(次)",
- dataIndex: "record_count",
- key: "record_count",
+ title: "修正后车牌",
+ dataIndex: "plate_new",
+ key: "plate_new",
align: "center",
fixed: "right",
},
{
- title: "订单应收金额(元)",
- dataIndex: "receivable_amount",
- key: "receivable_amount",
+ title: "修正时间",
+ dataIndex: "create_time",
+ key: "create_time",
align: "center",
fixed: "right",
},
{
- title: "日均泊位周转次数(次)",
- dataIndex: "average_turn_times",
- key: "average_turn_times",
+ title: "修正类型",
+ dataIndex: "correct_type_name",
+ key: "correct_type_name",
align: "center",
fixed: "right",
},
{
- title: "平均泊位利用率",
- dataIndex: "average_use_rate",
- key: "average_use_rate",
+ title: "操作人",
+ dataIndex: "operatename",
+ key: "operatename",
align: "center",
fixed: "right",
},
{
- title: "平均停车时长",
- dataIndex: "average_park_time",
- key: "average_park_time",
+ title: "操作",
+ dataIndex: "operation",
+ key: "operation",
align: "center",
fixed: "right",
+ render: (_, record) => {
+ return (
+
+ );
+ },
},
];
//检索条件
const formSearch = [
{
- name: "operator_id",
- type: "Select",
- label: "修正类型",
- options: [],
+ name: "road_name",
+ type: "Input",
+ label: "车场名称",
+ placeholder: "请输入车场名称",
},
{
- name: "car_parking_type",
+ name: "plate",
+ type: "Input",
+ label: "车牌号",
+ placeholder: "请输入车牌号",
+ },
+ {
+ name: "correct_type",
type: "Select",
- label: "车场类型",
+ label: "修正类型",
+ defaultValue: "0",
options: [
{
label: '全部',
- value: '3',
+ value: '0',
},
{
- label: '路内车场',
+ label: '入场修正',
value: '1',
},
{
- label: '路外车场',
+ label: '场中修正',
value: '2',
},
+ {
+ label: '出场修改',
+ value: '3',
+ },
],
},
{
- name: "road_name",
- type: "Input",
- label: "停车场",
- placeholder: "请输入停车场名称",
- },
- {
name: "timePeriod",
type: "RangePicker",
label: "时间段",
+ defaultTitle: ["修正时间", "至"],
defaultValue: [moment().startOf("day"), moment()],
},
];
//列表数据
function search(e) {
- ajax.getParkingAlyReportList(e).then((res) => {
+ ajax.getPlateChangeList(e).then((res) => {
let { status, data, total } = res
if (status == 20000) {
if (data.list) {
@@ -134,22 +160,51 @@ function PlateChangeMgm() {
})
}
- // 获取下拉数据
- const getSelectList = () => {
- ajax.getOperator().then((e) => {
- setSearchSelectList([
- ...searchSelectList,
- ...e.data
- ])
+ //详情数据
+ function getDetailData(e) {
+ ajax.getPlateChangeDetail(e).then((res) => {
+ let { status, data, total } = res
+ if (status == 20000) {
+ if (data.list) {
+ setVisible(true)
+ setDetailData(data.list[0])
+ } else {
+ setDetailData(data)
+ }
+ } else {
+ setResultData([])
+ message.error(res.message)
+ }
})
- };
+ }
- useEffect(() => {
- getSelectList();
- }, []);
+ //停车卡订单详情
+ const tkddModal =
+
+
+
+
车场名称
{detailData?.road_name || "--"}
+
+
+
修正前车牌
{detailData.plate_old || "--"}
+
+
+
修正后车牌
{detailData.plate_new || "--"}
+
+
+
操作人
{detailData.operatename || "--"}
+
+
+
操作类型
{detailData.correct_type_name || "--"}
+
+
+
修正时间
{detailData.create_time || "--"}
+
+
+
return (
- <>
+
- >
+
{
+ setVisible(false);
+ }}
+ footer={[<>
+ >]}
+ >
+ {tkddModal}
+
+
);
}
diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.scss b/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.scss
index 14723e7..ac88986 100644
--- a/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.scss
+++ b/src/pages/OutRoadMgm/OutExceptionMgm/PlateChangeMgm/index.scss
@@ -233,8 +233,10 @@ $color-primary : var(--color-primary);
background: #3e4557;
}
}
+
.result-title {
display: inline-block;
+
p {
display: inline;
margin: 0 5px;
@@ -242,6 +244,7 @@ $color-primary : var(--color-primary);
font-size: 18px;
}
}
+
.export-btn {
display: inline-block;
text-align: center;
@@ -255,9 +258,11 @@ $color-primary : var(--color-primary);
margin-bottom: 10px;
cursor: pointer;
}
+
.root_gfkk {
float: right;
}
+
.row-head {
height: 32px;
display: flex;
@@ -320,6 +325,151 @@ $color-primary : var(--color-primary);
}
+.ltc-box {
+ width: 100%;
+
+ .ltc-box-title {
+ font-size: 18px;
+ font-weight: bolder;
+ width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+
+ .text {
+ display: inline-block;
+ }
+
+ .line {
+ display: inline-block;
+ border: 1px dotted #607092;
+ width: inherit;
+ margin-bottom: 6px;
+ }
+
+ .ltc-icon {
+ width: 5px;
+ background: #0080db;
+ height: 19px;
+ display: inline-block;
+ margin-right: 10px;
+ }
+
+ .ltc-btn {
+ display: inline-block;
+ border: 1px solid;
+ border-radius: 5px;
+ margin: 0 10px;
+ width: 60px;
+ height: 35px;
+ line-height: 35px;
+ text-align: center;
+ background: #409eff;
+ color: #fff;
+ font-weight: 100;
+ cursor: pointer;
+ }
+
+ .ltc-cancel {
+ background: #fff;
+ color: #000;
+ }
+ }
+
+ .ltc-box-line {
+ border: 1px solid #e7e7e7;
+ margin: 8px 0;
+ }
+
+ .ltc-box-in {
+ margin-left: 20px;
+
+ .ant-descriptions {
+ margin-left: 20px;
+ }
+ }
+
+ .ltc-title {
+ margin: auto;
+ width: 50%;
+ text-align: center;
+ font-size: 18px;
+ font-weight: 600;
+ }
+
+ .ltc-content {
+ margin: auto;
+ padding: 20px;
+
+ .ltc-item {
+ font-size: 14px;
+ margin: 6px 12px 6px 0;
+ display: inline-flex;
+
+ //width: 470px;
+ .new-item {
+ display: inline-block;
+ width: 120px;
+ height: 32px;
+ line-height: 32px;
+ background: rgba(150, 161, 192, 0.24);
+ text-align: center;
+ }
+
+ .new-value {
+ display: inline-block;
+ width: 320px;
+ height: 32px;
+ line-height: 32px;
+ text-align: center;
+ background: #3E4557;
+ box-shadow: 0px 3px 8px 0px rgba(0, 0, 0, 0.12);
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
+ .ltc-item-input {
+ display: inline-block;
+ width: 200px;
+ }
+
+ div {
+ width: 150px;
+ }
+ }
+ }
+
+ .ltc-liuc {
+ display: flex;
+ margin-left: 200px;
+
+ .ltc-item {
+ display: flex;
+
+ .ltc-item-name {
+ margin: 6px 10px 0 10px;
+ color: #3f94df;
+ }
+ }
+
+ .ltc-work {
+ text-align: center;
+
+ .ltc-tips {
+ border: 3px solid #000;
+ text-align: center;
+ line-height: 27px;
+ height: 35px;
+ width: 35px;
+ border-radius: 28px;
+ margin: auto;
+ }
+ }
+
+ }
+}
+
+
.modal-pay-configuration {
.submitBtn {
@@ -363,27 +513,28 @@ $color-primary : var(--color-primary);
}
.edit-order-inquiry {
+
/*定义滚动条高宽及背景
高宽分别对应横竖滚动条的尺寸*/
- ::-webkit-scrollbar {
- width: 6px;
- height: 16px;
- background-color: #5c5c5c;
-}
+ ::-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-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;
-}
+ ::-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
index 8ba89d3..fca0de6 100644
--- a/src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.jsx
+++ b/src/pages/OutRoadMgm/OutExceptionMgm/SpecialReleaseMgm/index.jsx
@@ -20,104 +20,128 @@ import "./index.scss";
//specialReleaseMgm
function SpecialReleaseMgm() {
const [resultData, setResultData] = useState([])
+ const [detailData, setDetailData] = useState({})
+ const [visible, setVisible] = useState(false)
const [total, setTotal] = useState(0);
- const [searchSelectList, setSearchSelectList] = useState([]); //搜索下拉数据
const columns = [
{
- title: "停车场名称",
+ title: "序号",
+ dataIndex: "index",
+ key: "index",
+ align: "center",
+ fixed: "right",
+ render: (text, record, index) => index + 1,
+ },
+ {
+ title: "车场名称",
dataIndex: "road_name",
key: "road_name",
align: "center",
fixed: "right",
},
{
- title: "泊位总数",
- dataIndex: "total_berths",
- key: "total_berths",
+ title: "车牌号",
+ dataIndex: "plate",
+ key: "plate_old",
+ align: "center",
+ fixed: "right",
+ },
+ {
+ title: "入场时间",
+ dataIndex: "plate",
+ key: "plate_new",
+ align: "center",
+ fixed: "right",
+ },
+ {
+ title: "出场时间",
+ dataIndex: "cr",
+ key: "cr",
+ align: "center",
+ fixed: "right",
+ },
+ {
+ title: "应收金额",
+ dataIndex: "co",
+ key: "co",
align: "center",
fixed: "right",
},
{
- title: "停车记录数(次)",
- dataIndex: "record_count",
- key: "record_count",
+ title: "通道名称",
+ dataIndex: "op",
+ key: "oe",
align: "center",
fixed: "right",
},
{
- title: "订单应收金额(元)",
- dataIndex: "receivable_amount",
- key: "receivable_amount",
+ title: "开闸时间",
+ dataIndex: "o",
+ key: "o",
align: "center",
fixed: "right",
},
{
- title: "日均泊位周转次数(次)",
- dataIndex: "average_turn_times",
- key: "average_turn_times",
+ title: "开闸原因",
+ dataIndex: "",
+ key: "o",
align: "center",
fixed: "right",
},
{
- title: "平均泊位利用率",
- dataIndex: "average_use_rate",
- key: "average_use_rate",
+ title: "操作人",
+ dataIndex: "o",
+ key: "o",
align: "center",
fixed: "right",
},
{
- title: "平均停车时长",
- dataIndex: "average_park_time",
- key: "average_park_time",
+ title: "操作",
+ dataIndex: "operation",
+ key: "operation",
align: "center",
fixed: "right",
+ render: (_, record) => {
+ return (
+
+ );
+ },
},
];
//检索条件
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: "road_name",
+ name: "c",
type: "Input",
- label: "停车场",
- placeholder: "请输入停车场名称",
+ label: "操作人",
+ placeholder: "请输入操作人",
},
{
name: "timePeriod",
type: "RangePicker",
label: "时间段",
+ defaultTitle: ["开闸时间", "至"],
defaultValue: [moment().startOf("day"), moment()],
},
];
//列表数据
function search(e) {
- ajax.getParkingAlyReportList(e).then((res) => {
+ ajax.getPlateChangeList(e).then((res) => {
let { status, data, total } = res
if (status == 20000) {
if (data.list) {
@@ -134,22 +158,51 @@ function SpecialReleaseMgm() {
})
}
- // 获取下拉数据
- const getSelectList = () => {
- ajax.getOperator().then((e) => {
- setSearchSelectList([
- ...searchSelectList,
- ...e.data
- ])
+ //详情数据
+ function getDetailData(e) {
+ ajax.getPlateChangeDetail(e).then((res) => {
+ let { status, data, total } = res
+ if (status == 20000) {
+ if (data.list) {
+ setVisible(true)
+ setDetailData(data.list[0])
+ } else {
+ setDetailData(data)
+ }
+ } else {
+ setResultData([])
+ message.error(res.message)
+ }
})
- };
+ }
- useEffect(() => {
- getSelectList();
- }, []);
+ //停车卡订单详情
+ const tkddModal =
+
+
+
+
车场名称
{detailData?.road_name || "--"}
+
+
+
修正前车牌
{detailData.plate_old || "--"}
+
+
+
修正后车牌
{detailData.plate_new || "--"}
+
+
+
操作人
{detailData.operatename || "--"}
+
+
+
操作类型
{detailData.correct_type_name || "--"}
+
+
+
修正时间
{detailData.create_time || "--"}
+
+
+
return (
- <>
+
- >
+
{
+ setVisible(false);
+ }}
+ footer={[<>
+ >]}
+ >
+ {tkddModal}
+
+
);
}
diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx
index f777a27..51e2f2b 100644
--- a/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx
@@ -143,8 +143,8 @@ function ZombieCarCleanRecord(props) {
//列表
const deployListColumns = [
{
- title: '序号id',
- dataIndex: 'id',
+ title: '序号',
+ dataIndex: 'info_id',
render: (text, record, index) => {text}
},
{
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
index 3af541a..31789e9 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
@@ -588,7 +588,7 @@ function AddParking(props) {