From 1de12ada0992158018ad803ff5eb20dc55902087 Mon Sep 17 00:00:00 2001 From: xingjx Date: Fri, 19 Jan 2024 14:44:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix():=E4=BF=A1=E7=94=A8=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OperationSales/CreditScoreMgm/loadable.jsx | 24 +++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx index 29527c6..ea0677c 100644 --- a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx @@ -414,7 +414,7 @@ function CreditScoreMgm() { if (e.status == 20000) { setPayVisible(true) setPayData(e.data) - }else { + } else { message.error(e.message) } }) @@ -429,16 +429,23 @@ function CreditScoreMgm() { const getRechargeRulesUpdate = (e) => { let flag = [] let arr = [] + let couflag = [] e.list.map((item) => { if (item.recharge == null || item.recharge == '') { flag.push(false) } else { arr.push(item.recharge) + let couponArr = [] item.children.map((res) => { if (res.couponId == null || res.couponId == '' || res.num == null || res.num == '') { flag.push(false) + }else { + couponArr.push(res.couponId) } }) + if (couponArr.length != [...new Set(couponArr)].length) { + couflag.push(false) + } } }) if (flatten(flag).some(ele => ele === false)) { @@ -449,6 +456,10 @@ function CreditScoreMgm() { message.error("每个规则对应的充值金额不能相同，请修改") return } + if (flatten(couflag).some(ele => ele === false)) { + message.error("每个规则添加的消费券不能相同，请修改") + return + } ajax.getRechargeRulesUpdate(e).then((e) => { if (e.status == 20000) { message.success(e.message) @@ -463,7 +474,7 @@ function CreditScoreMgm() { if (e.status == 20000) { message.success(e.message) return 1 - }else { + } else { message.error(e.message) } }) @@ -832,7 +843,9 @@ function CreditScoreMgm() { return
规则{index + 1}
{index > 0 ?
{ - getRechargeRulesDel({ rid: item.rid }); + if (item.rid) { + getRechargeRulesDel({ rid: item.rid }); + } let arr = payData arr.list.splice(index, 1); setFlag(flag + 1) @@ -891,10 +904,11 @@ function CreditScoreMgm() { { index2 > 0 && index2 + 1 == item.children.length ?
{ - getRechargeRulesDel({ cid: res.couponId }) + if (res.cid) { + getRechargeRulesDel({ cid: res.cid }) + } let arr = payData arr.list[index].children.splice(index2, 1); - console.log(847, arr) setFlag(flag + 1) setPayData(arr) } From 2fb47ad7a5a9cf3ef36a227b3dae8d2a17be9749 Mon Sep 17 00:00:00 2001 From: zhugy Date: Fri, 19 Jan 2024 14:47:03 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E5=85=85=E7=94=B5?= =?UTF-8?q?=E7=AB=99=E7=AE=A1=E7=90=86=E8=AF=A6=E6=83=85=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/NewEnergy/ChargeStationMgm/loadable.jsx | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx b/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx index 0620fe3..6400593 100644 --- a/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx +++ b/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx @@ -374,15 +374,6 @@ function Appointment() { />
- { setAddFormData({ address: e.target.value }) }} - /> -
-
{ - console.log(adress); + // console.log(adress); + setAddFormData({ address: adress }) }} close={() => setLngLatVisible(false)} />
+
+ { setAddFormData({ address: e.target.value }) }} + /> +
Date: Fri, 19 Jan 2024 14:48:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix():=20=E5=AE=9E=E6=97=B6=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=20=E5=85=85=E7=94=B5=E7=9B=91=E6=8E=A7=E3=80=81?= =?UTF-8?q?=E7=94=B5=E6=A1=A9=E7=9B=91=E6=8E=A7=E6=8E=A5=E5=8F=A3=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx | 4 ++-- src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx | 4 ++-- src/services/NewEnergy/realtimeMonitor.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx index 9a63ac1..ed0c614 100644 --- a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx +++ b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx @@ -14,7 +14,7 @@ function ChargerMonitor() { station_name: "", // 充电桩 phone: "", // 手机号 plate: "", // 车牌号 - status: sysConfig?.energyChargingStatus[0]?.value ?? 0, // 充电状态 + status: sysConfig?.energyChargingStatus?.[0]?.value ?? 0, // 充电状态 timePeriod: moment().format("YYYY-MM-DD HH:mm:ss"), // start_time: "", // 开始时间 // end_time: "", // 结束时间 @@ -45,7 +45,7 @@ function ChargerMonitor() { type: "Select", placeholder: "请选择充电状态", defaultValue: initFormData.status, - options: sysConfig.energyChargingStatus ?? [], + options: sysConfig?.energyChargingStatus ?? [], }, { name: "timePeriod", diff --git a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx index c5aeccc..928b728 100644 --- a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx +++ b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx @@ -19,8 +19,8 @@ function PileMonitor() { const initFormData = { station_name: "", // 充电桩 muzzle_text: "", // 枪名称 - pile_type: sysConfig?.energyChargingType[0]?.value ?? 0, // 充电类型 - charge_status: sysConfig?.energyChargingGunStatus[0]?.value ?? 0, // 枪状态 + pile_type: sysConfig?.energyChargingType?.[0]?.value ?? 0, // 充电类型 + charge_status: sysConfig?.energyChargingGunStatus?.[0]?.value ?? 0, // 枪状态 }; // 初始数据 const formSearch = [ diff --git a/src/services/NewEnergy/realtimeMonitor.js b/src/services/NewEnergy/realtimeMonitor.js index 1bb12ab..f5b5d89 100644 --- a/src/services/NewEnergy/realtimeMonitor.js +++ b/src/services/NewEnergy/realtimeMonitor.js @@ -31,7 +31,7 @@ const getPileMonitorList = (params) => { const getPileMonitorStatsData = (params) => { return ajax({ url: "/api/nes/piles/count", - type: "post", + type: "get", data: params, }); }; From 6b12f45b39ab3298540dd7d9b3b7a92f97471c8e Mon Sep 17 00:00:00 2001 From: wanghx Date: Fri, 19 Jan 2024 14:55:04 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix():=20=E5=AF=BC=E5=87=BA=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BB=BB=E5=8A=A1=E4=B8=8B=E8=BD=BD=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/layout/Header/downloadModal.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/layout/Header/downloadModal.jsx b/src/components/layout/Header/downloadModal.jsx index 241c1aa..daeaff9 100644 --- a/src/components/layout/Header/downloadModal.jsx +++ b/src/components/layout/Header/downloadModal.jsx @@ -33,7 +33,7 @@ function DownloadModal (props) { width: 200, align: 'center', dataIndex: 'progress', - render: (progress) => ((progress || 0) * 100) + '%' + render: (progress) => ((progress || 0)) + '%' }, { title: '文件大小', @@ -83,7 +83,7 @@ function DownloadModal (props) {
{ record.status == 2 ? ( -
handleDownload(record.url)}>下载
+
handleDownload(record.file_url)}>下载
) : null }
handleDel(record)}>删除
From fa3f6ca665efba651a08ce72077027a56895c2d7 Mon Sep 17 00:00:00 2001 From: chenli Date: Fri, 19 Jan 2024 15:54:26 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix():=20=E7=94=B5=E6=A1=A9=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E3=80=81=E5=85=85=E7=94=B5=E7=9B=91=E6=8E=A7=E6=96=87?= =?UTF-8?q?=E5=AD=97=E9=A2=9C=E8=89=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RealtimeMonitor/ChargerMonitor/loadable.jsx | 10 +++----- .../RealtimeMonitor/PileMonitor/index.scss | 19 ++++++++++++-- .../RealtimeMonitor/PileMonitor/loadable.jsx | 30 ++++++++++------------ 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx index ed0c614..2ecd594 100644 --- a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx +++ b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx @@ -1,5 +1,5 @@ import React, { useState, useRef, useEffect } from "react"; -import { message, Modal, Image } from "antd"; +import { message as Message, Modal, Image, Button } from "antd"; import { dictionary, utils } from "@/config/common"; import ajax from "@/services"; import { TableModule } from "@/components"; @@ -154,11 +154,7 @@ function ChargerMonitor() { fixed: "right", width: 100, render: (val, record) => { - return ( - <> - - - - ); + return ; }, }, ]; // 表头 @@ -172,7 +168,7 @@ function ChargerMonitor() { setTableData(res.data.list); setTotal(res.data.total); } else { - message.error(res.message); + Message.error(res.message); } }) .catch((err) => { diff --git a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.scss b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.scss index 9a7abf9..943eb9d 100644 --- a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.scss +++ b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.scss @@ -70,13 +70,28 @@ .ant-table-wrapper { .custom-table-cell-span { &.online-status { - &__2 { + &__1 { color: #2adc41; } - &__1 { + &__2 { color: #ec5761; } } + + &.gun-status{ + &__1{ + color: #62CFA7; + } + &__2{ + color: #F99B2F; + } + &__3{ + color: #FF6978; + } + &__4{ + color: #A0B0BD; + } + } } } } diff --git a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx index 928b728..557af96 100644 --- a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx +++ b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useMemo } from "react"; -import { message } from "antd"; +import { message as Message, Button } from "antd"; import { utils } from "@/config/common"; import ajax from "@/services"; import { TableModule } from "@/components"; @@ -85,15 +85,15 @@ function PileMonitor() { dataIndex: "charge_status_text", key: "charge_status_text", align: "center", - // render: (val, record) => { - // return ( - // - // {val} - // - // ); - // }, + render: (val, record) => { + return ( + + {val} + + ); + }, }, { title: "地锁状态", @@ -119,8 +119,7 @@ function PileMonitor() { key: "operation", align: "center", render: (_, record) => { - return <>; - // return ; + return ; }, }, ]; // 表头 @@ -135,14 +134,13 @@ function PileMonitor() { setTableData(res?.data?.list ?? []); setTotal(res?.data?.total ?? 0); } else { - message.error(res.message); + Message.error(res.message); } }) .catch((err) => { console.error(err); }) - .finally(() => { - }); + .finally(() => {}); } // 获取统计数据 @@ -153,7 +151,7 @@ function PileMonitor() { if (res.status === 20000) { setStatsData(res.data ?? {}); } else { - message.error(res.message); + Message.error(res.message); } }) .catch((err) => { From 9fad89debe1a92ced41de725064d384645248df7 Mon Sep 17 00:00:00 2001 From: zhugy Date: Fri, 19 Jan 2024 16:03:51 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E5=85=85=E7=94=B5?= =?UTF-8?q?=E7=AB=99=E7=AE=A1=E7=90=86=E7=AB=99=E7=82=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/NewEnergy/ChargeStationMgm/loadable.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx b/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx index 6400593..7155c1e 100644 --- a/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx +++ b/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx @@ -13,6 +13,7 @@ import "./index.scss"; function Appointment() { + // 详情弹窗 const [detailVisible, setDetailVisible] = useState(false); // 列表数据 @@ -139,7 +140,7 @@ function Appointment() { label: "站点状态", options: [ { value: "0", label: "全部" }, - ...sysConfig?.stationType || [] + ...sysConfig?.stationStatus || [] ], defaultValue: "0", placeholder: "请选择站点状态",