chenglb
/
PMS_Frontend_v1.0.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0.git into develop

master
chenglb 1 year ago
parent
8edf974cf4 75894510cc
commit
61ce736bb3
9 changed files with 107 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      src/pages/DataAnalysisPrediction/ParkingOverview/index.scss
  2. 33
      src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx
  3. 31
      src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx
  4. 2
      src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarManagement.jsx
  5. 28
      src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/LEDConfiguration.jsx
  6. 2
      src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/index.jsx
  7. 2
      src/pages/SystemMgm/AreaManage/loadable.jsx
  8. 2
      src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
  9. 9
      src/services/OutRoadMgm/OutSegment.js

22
src/pages/DataAnalysisPrediction/ParkingOverview/index.scss
View File

@ -47,13 +47,13 @@ $color-primary : var(--color-primary);
justify-content: center;
align-items: flex-start;
color: #ffffff;
z-index: 1000;
z-index: 900;
background: url("../../../assets/images/equip/home/pvhome_header.png") no-repeat;
cursor: pointer;
}
.input_h {
z-index: 1000;
z-index: 900;
position: absolute;
top: 90px;
left: 380px;
@ -83,7 +83,7 @@ $color-primary : var(--color-primary);
}
.select_modals {
z-index: 1000;
z-index: 900;
position: absolute;
top: 133px;
left: 380px;
@ -149,7 +149,7 @@ $color-primary : var(--color-primary);
}
.show_c {
z-index: 1000;
z-index: 900;
position: absolute;
top: 70px;
left: 749px;
@ -204,7 +204,7 @@ $color-primary : var(--color-primary);
}
.left_content {
z-index: 1000;
z-index: 900;
position: absolute;
top: 44px;
left: 100px;
@ -254,7 +254,7 @@ $color-primary : var(--color-primary);
}
.left_home {
z-index: 1000;
z-index: 900;
position: absolute;
top: 90px;
left: 50px;
@ -322,7 +322,7 @@ $color-primary : var(--color-primary);
.right_ssdf {
width: 168px;
height: 270px;
z-index: 1000;
z-index: 900;
position: absolute;
bottom: 38px;
@ -408,7 +408,7 @@ $color-primary : var(--color-primary);
}
.r_xd {
z-index: 1000;
z-index: 900;
width: max-content;
height: 30px;
position: absolute;
@ -419,7 +419,7 @@ $color-primary : var(--color-primary);
}
.r_xld {
z-index: 1000;
z-index: 900;
width: 30px;
height: 30px;
position: absolute;
@ -451,7 +451,7 @@ $color-primary : var(--color-primary);
}
.right_home {
z-index: 1001;
z-index: 901;
position: absolute;
top: 90px;
right: 50px;
@ -654,7 +654,7 @@ $color-primary : var(--color-primary);
}
.pk_footer {
z-index: 1000;
z-index: 900;
position: absolute;
bottom: 0%;
width: 100%;

33
src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx
View File

@ -60,7 +60,6 @@ const ParkingOverview = connect(function mapStateToProps(state) {
};
})((props) => {
const navigate = useNavigate();
let selectedIndex = "";
let hoveredIndex = "";
//地图数据展示is
const MapS = [
@ -877,6 +876,7 @@ const ParkingOverview = connect(function mapStateToProps(state) {
// 从 option.series 中读取重新渲染扇形所需的参数，将是否选中取反。
// 准备重新渲染扇形所需的参数
let option = RightTwo;
console.log(option);
let isSelected;
let isHovered;
let startRatio;
@ -943,6 +943,35 @@ const ParkingOverview = connect(function mapStateToProps(state) {
setRightTwo(option);
}
},
globalout: (params) => {
// 从 option.series 中读取重新渲染扇形所需的参数，将是否选中取反。
// 准备重新渲染扇形所需的参数
let option = RightTwo;
if (hoveredIndex !== "") {
// 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 true。
let isSelected = option.series[hoveredIndex].pieStatus.selected;
let isHovered = false;
let k = option.series[hoveredIndex].pieStatus.k;
let startRatio = option.series[hoveredIndex].pieData.startRatio;
let endRatio = option.series[hoveredIndex].pieData.endRatio;
// 对当前点击的扇形，执行取消高亮操作（对 option 更新）
option.series[hoveredIndex].parametricEquation = getParametricEquation(
startRatio,
endRatio,
isSelected,
isHovered,
k,
option.series[hoveredIndex].pieData.value
);
option.series[hoveredIndex].pieStatus.hovered = isHovered;
// 将此前记录的上次选中的扇形对应的系列号 seriesIndex 清空
hoveredIndex = "";
}
// 使用更新后的 option，渲染图表
setRightTwo(option);
},
// 其他事件处理程序也可以在这里添加
};
const getRingOption = (
@ -2025,7 +2054,7 @@ const ParkingOverview = connect(function mapStateToProps(state) {
</div>
) : (
<ReactEcharts
onEvents={onEvents}
// onEvents={onEvents}
option={RightTwo}
style={{ height: "200px", width: "100%" }}
/>

31
src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx
View File

@ -26,61 +26,88 @@ function ArrearsCar() {
title: "车牌号",
dataIndex: "plate_info",
key: "plate_info",
align: "center",
fixed: "right",
render: (text) => {
return <div style={{ width: 90 }}> {text}</div>;
},
},
{
title: "车辆归属地",
dataIndex: "area",
key: "area",
align: "center",
fixed: "right",
},
{
title: "欠费总金额（元）",
dataIndex: "amount",
key: "amount",
align: "center",
fixed: "right",
},
{
title: "追缴金额（元）",
dataIndex: "currentRefund",
key: "currentRefund",
align: "center",
fixed: "right",
},
{
title: "欠费总订单数",
dataIndex: "amount_count",
key: "amount_count",
align: "center",
fixed: "right",
},
{
title: "追缴单数",
dataIndex: "refund_count",
key: "refund_count",
align: "center",
fixed: "right",
},
{
title: "电话追缴次数",
dataIndex: "mobile_count",
key: "mobile_count",
align: "center",
fixed: "right",
},
{
title: "会员电话",
dataIndex: "user_mobile",
key: "user_mobile",
align: "center",
fixed: "right",
},
{
title: "公安接口电话",
dataIndex: "police_mobile",
key: "police_mobile",
align: "center",
fixed: "right",
},
{
title: "三方导入电话",
dataIndex: "third_mobile",
key: "third_mobile",
align: "center",
fixed: "right",
},
{
title: "近日自主停车",
dataIndex: "parking_mobile",
key: "parking_mobile",
align: "center",
fixed: "right",
},
{
title: "可触达性",
dataIndex: "if_call",
key: "if_call",
align: "center",
fixed: "right",
},
{
title: "操作",
@ -159,7 +186,7 @@ function ArrearsCar() {
key: "in_veh_pic",
render: (text, record, index) => {
return <div className="veh-item-img ">
<img src={text || require("../../../../../src/assets/images/error-img.png")} onClick={() => { setBigPic(baseData.authImg2); setBigpicVisible(true) }}/>
<img src={text || require("../../../../../src/assets/images/error-img.png")} onClick={() => { setBigPic(text); setBigpicVisible(true) }}/>
</div>
},
},
@ -169,7 +196,7 @@ function ArrearsCar() {
key: "out_veh_pic",
render: (text, record, index) => {
return <div className="veh-item-img ">
<img src={text || require("../../../../../src/assets/images/error-img.png")} onClick={() => { setBigPic(baseData.authImg2); setBigpicVisible(true) }}/>
<img src={text || require("../../../../../src/assets/images/error-img.png")} onClick={() => { setBigPic(text); setBigpicVisible(true) }}/>
</div>
},
},

2
src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarManagement.jsx
View File

@ -130,9 +130,11 @@ function CarManagement({ id }) {
onClick={() => {
if (record.status === 1) {
disableVehicle(record.id);
submit(form.getFieldValue());
return;
}
enableVehicle(record.id);
submit(form.getFieldValue());
}}
>
{record.status === 1 ? "禁用" : "启用"}

28
src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/LEDConfiguration.jsx
View File

@ -13,7 +13,7 @@ import {
} from "antd";
const { TextArea } = Input;
import ajax from "@/services";
function GateControlManagement({ id: road_id }) {
function LEDConfiguration({ id }) {
const columns = [
{
title: "业务场景",
@ -94,6 +94,7 @@ function GateControlManagement({ id: road_id }) {
visible: false,
id: null,
});
const [businessList, setBusinessList] = useState([]); // 下拉数据
const [dataSource, setDataSource] = useState([]); // 表格数据
const [total, setTotal] = useState(0);
const addLEDText = () => {
@ -104,7 +105,7 @@ function GateControlManagement({ id: road_id }) {
page_size: 10,
});
const search = () => {
const params = { ...form.getFieldsValue(), ...pageData, road_id };
const params = { ...form.getFieldsValue(), ...pageData, id };
ajax.getLEDList(params).then((res) => {
if (res.status === 20000) {
setDataSource(res.data.list);
@ -144,10 +145,10 @@ function GateControlManagement({ id: road_id }) {
.validateFields()
.then((res) => {
if (modalData.status === "add") {
res.road_id = road_id;
res.road_id = id;
addLED(res);
} else {
res.road_id = road_id;
res.road_id = id;
editLED(res);
}
})
@ -164,6 +165,19 @@ function GateControlManagement({ id: road_id }) {
});
setDelModal({ visible: false, id: null });
}
function getLEDBusiness() {
ajax.getLEDBusiness({ road_id: id }).then((res) => {
if (res.status == 20000) {
setBusinessList(res.data)
} else {
message.error(res.message);
}
});
setDelModal({ visible: false, id: null });
}
useEffect(() => {
getLEDBusiness();
}, []);
useEffect(() => {
search();
}, [pageData]);
@ -174,7 +188,7 @@ function GateControlManagement({ id: road_id }) {
<Row>
<Col span="4_8" style={{ width: "30%" }}>
<Form.Item label="业务场景" name="business_type">
<Select />
<Select options={businessList || []}/>
</Form.Item>
</Col>
<Form.Item>
@ -212,7 +226,7 @@ function GateControlManagement({ id: road_id }) {
rules={[{ required: true }]}
name="business_type"
>
<Select disabled={modalData.status === "edit"} />
<Select options={businessList || []} disabled={modalData.status === "edit"} />
</Form.Item>
<Form.Item
label="LED显示文案"
@ -240,4 +254,4 @@ function GateControlManagement({ id: road_id }) {
);
}
export default GateControlManagement;
export default LEDConfiguration;

2
src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/index.jsx
View File

@ -36,7 +36,7 @@ function ConfigParking(props) {
{
label: "开闸方式管理",
key: "5",
children: <GateControlManagement />,
children: <GateControlManagement id={itemData.id}/>,
},
{
label: "LED配置",

2
src/pages/SystemMgm/AreaManage/loadable.jsx
View File

@ -191,7 +191,7 @@ function AreaManage() {
placement="bottom"
overlayClassName="dropdown-wrapper"
>
<EllipsisOutlined style={{fontSize: 20, color: '#3AA9FF', fontWeight: 700}}/>
<EllipsisOutlined style={{fontSize: 20, color: '#fff', fontWeight: 700}}/>
</Dropdown>
</div>
{/* {

2
src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
View File

@ -556,7 +556,7 @@ function OrgnizationMgm() {
placement="bottom"
overlayClassName="dropdown-wrapper"
>
<EllipsisOutlined style={{fontSize: 20, color: '#3AA9FF', fontWeight: 700}}/>
<EllipsisOutlined style={{fontSize: 20, color: '#fff', fontWeight: 700}}/>
</Dropdown>
</div>
{/* {

9
src/services/OutRoadMgm/OutSegment.js
View File

@ -279,6 +279,14 @@ const deleteWhiteVehicle = (params) => {
data: params,
});
};
///api/orp/road/can_add_business_type 能够新增的业务场景
const getLEDBusiness = (params) => {
return ajax({
url: "/api/orp/road/can_add_business_type",
type: "post",
data: params,
});
};
///api/orp/road/led_list led配置列表
const getLEDList = (params) => {
return ajax({
@ -489,6 +497,7 @@ export default {
enableWhiteVehicle,
disableWhiteVehicle,
deleteWhiteVehicle,
getLEDBusiness,
getLEDList,
editLED,
addLED,

Write Preview
Loading…
Cancel
Save