From cc97e6d10ac2490f476bc7848576d853ef63f1c7 Mon Sep 17 00:00:00 2001
From: lisf <lisf@yisa.com>
Date: Fri, 19 Jan 2024 17:34:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix():=20=E5=BC=B9=E6=A1=86=E5=B1=95?=
=?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E4=BF=AE=E5=A4=8D=E4=BB=A5?=
=?UTF-8?q?=E5=8F=8A=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../NewEnergy/ChargingMgm/BillingRule/index.scss | 20 ++++++++++++++++----
.../NewEnergy/ChargingMgm/BillingRule/loadable.jsx | 6 ++----
.../ChargingMgm/IllegalRuleConfigMgm/loadable.jsx | 4 ++--
.../NewEnergy/ChargingMgm/OrderRuleMgm/index.scss | 18 ++++++++++++++++--
.../NewEnergy/ChargingMgm/OrderRuleMgm/loadable.jsx | 4 ++--
5 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/src/pages/NewEnergy/ChargingMgm/BillingRule/index.scss b/src/pages/NewEnergy/ChargingMgm/BillingRule/index.scss
index 23f35ce..247000e 100644
--- a/src/pages/NewEnergy/ChargingMgm/BillingRule/index.scss
+++ b/src/pages/NewEnergy/ChargingMgm/BillingRule/index.scss
@@ -270,14 +270,26 @@ $color-primary: var(--color-primary);
height: 96px;
}
.new-value{
- width: 780px;
- line-height: 96px;
+ width: calc(100% - 120px);
+ // line-height: 96px;
height: 96px;
- word-wrap:break-word
+ word-wrap:break-word;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ span{
+ width: 100%;
+ max-height: 100%;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ text-align: center;
+ -webkit-line-clamp: 3;
+ }
}
}
}
-
}
}
\ No newline at end of file
diff --git a/src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx b/src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx
index a026bc1..d5b054a 100644
--- a/src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx
+++ b/src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx
@@ -243,7 +243,7 @@ function BillingRule() {
<Select
value={modalData.operator_id}
style={{ width: 660, marginLeft: 10 }}
- options={operatorOption}
+ options={operatorOption.filter(item => item.value != "0")}
onChange={(v) => {setModalData({...modalData,operator_id:v})}}
/>
</div>
@@ -270,7 +270,6 @@ function BillingRule() {
/>
</div>
<div className="yisa-search" style={{marginLeft:26}}>
- <em style={{marginRight:'5px',marginLeft:'-13px',color:'red'}}>*</em>
<label>创建人</label>
<Input
placeholder="请输入创建人"
@@ -282,7 +281,6 @@ function BillingRule() {
/>
</div>
<div className="yisa-search" style={{marginLeft:12}}>
- <em style={{marginRight:'5px',marginLeft:'-13px',color:'red'}}>*</em>
<label>创建时间</label>
<Input
placeholder="请输入创建时间"
@@ -354,7 +352,7 @@ function BillingRule() {
<div className="ltc-item rule-description" >
<div className="new-item">规则描述</div>
<div className="new-value">
- {detailsData?.rule_description || "--"}
+ <span>{detailsData?.rule_description || "--"}</span>
</div>
</div>
</div>
diff --git a/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/loadable.jsx b/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/loadable.jsx
index 1e1badc..9d43e99 100644
--- a/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/loadable.jsx
+++ b/src/pages/NewEnergy/ChargingMgm/IllegalRuleConfigMgm/loadable.jsx
@@ -311,7 +311,7 @@ return (
<Select
value={modalData.operator_id}
style={{ width: 660, marginLeft: 10 }}
- options={operatorOption}
+ options={operatorOption.filter(item => item.value != "0")}
onChange={(v) => {setModalData({...modalData,operator_id:v})}}
/>
</div>
@@ -342,7 +342,7 @@ return (
<Select
value={modalData.effective_place}
style={{ width: 660, marginLeft: 10 }}
- options={stationOption}
+ options={stationOption.filter(item => item.value != "0")}
onChange={(v) => {setModalData({...modalData,effective_place:v})}}
/>
</div>
diff --git a/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/index.scss b/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/index.scss
index 9a67b18..6664878 100644
--- a/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/index.scss
+++ b/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/index.scss
@@ -268,9 +268,23 @@ $color-primary: var(--color-primary);
}
.new-value{
width: 780px;
- line-height: 96px;
+ // line-height: 96px;
height: 96px;
- word-wrap:break-word
+ word-wrap:break-word;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 5px;
+ span{
+ width: 100%;
+ max-height: 100%;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ text-align: center;
+ -webkit-line-clamp: 3;
+ }
}
}
diff --git a/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/loadable.jsx b/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/loadable.jsx
index 8b01b55..58381f1 100644
--- a/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/loadable.jsx
+++ b/src/pages/NewEnergy/ChargingMgm/OrderRuleMgm/loadable.jsx
@@ -295,7 +295,7 @@ return (
<Select
value={modalData.operator_id}
style={{ width: 660, marginLeft: 10 }}
- options={operatorOption}
+ options={operatorOption.filter(item => item.value != "0")}
onChange={(v) => {setModalData({...modalData,operator_id:v})}}
/>
</div>
@@ -430,7 +430,7 @@ return (
<div className="ltc-item rule-description" >
<div className="new-item">规则描述</div>
<div className="new-value">
- {detailsData?.rule_description || "--"}
+ <span>{detailsData?.rule_description || "--"}</span>
</div>
</div>
From df4c04d8e523848cd4fdfdf8be46f445b18e1699 Mon Sep 17 00:00:00 2001
From: He Huan <hehuan@yisa.com>
Date: Fri, 19 Jan 2024 17:48:22 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E7=89=A9=E7=90=86?=
=?UTF-8?q?=E6=A1=A9=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ChargeDeviceMgm/GroundLockManagement/loadable.jsx | 8 ++++----
.../ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx | 2 +-
.../OffPeak/OffPeakTimeMgm/ManagementTime/loadable.jsx | 13 ++++++++++++-
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/pages/NewEnergy/ChargeDeviceMgm/GroundLockManagement/loadable.jsx b/src/pages/NewEnergy/ChargeDeviceMgm/GroundLockManagement/loadable.jsx
index 1f5e6f2..01c69e5 100644
--- a/src/pages/NewEnergy/ChargeDeviceMgm/GroundLockManagement/loadable.jsx
+++ b/src/pages/NewEnergy/ChargeDeviceMgm/GroundLockManagement/loadable.jsx
@@ -281,7 +281,7 @@ function GroundLockManagement() {
/>
<FormSelect
yisaLabel="设备类型"
- yisaData={selectData.model}
+ yisaData={selectData.model.filter(item => item.value != "0")}
defaultValue={rowData.model || null}
placeholder="请选择设备类型"
hasUnlimited={false}
@@ -291,7 +291,7 @@ function GroundLockManagement() {
/>
<FormSelect
yisaLabel="设备供应商"
- yisaData={selectData.supplier}
+ yisaData={selectData.supplier.filter(item => item.value != "0")}
defaultValue={rowData.supplier || null}
placeholder="请选择设备供应商"
hasUnlimited={false}
@@ -301,7 +301,7 @@ function GroundLockManagement() {
/>
<FormSelect
yisaLabel="设备状态"
- yisaData={selectData.status}
+ yisaData={selectData.status.filter(item => item.value != "0")}
defaultValue={rowData.status || null}
placeholder="请选择设备状态"
hasUnlimited={false}
@@ -313,7 +313,7 @@ function GroundLockManagement() {
<FormSelect
yisaLabel="所属物理桩"
- yisaData={selectData.pile_id}
+ yisaData={selectData.pile_id.filter(item => item.value != "0")}
defaultValue={rowData.pile_id || null}
placeholder="请选择所属物理桩"
hasUnlimited={false}
diff --git a/src/pages/NewEnergy/ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx b/src/pages/NewEnergy/ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx
index 40e998b..c805769 100644
--- a/src/pages/NewEnergy/ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx
+++ b/src/pages/NewEnergy/ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx
@@ -230,7 +230,7 @@ function PhysicalPileManagement() {
</div>
<FormSelect
yisaLabel="所在充电站"
- yisaData={selectData}
+ yisaData={selectData.filter(item => item.value != "0")}
defaultValue={rowData.charging_station_id || null}
placeholder="请选择所在充电站"
hasUnlimited={false}
diff --git a/src/pages/OffPeak/OffPeakTimeMgm/ManagementTime/loadable.jsx b/src/pages/OffPeak/OffPeakTimeMgm/ManagementTime/loadable.jsx
index 7df1874..9cebb92 100644
--- a/src/pages/OffPeak/OffPeakTimeMgm/ManagementTime/loadable.jsx
+++ b/src/pages/OffPeak/OffPeakTimeMgm/ManagementTime/loadable.jsx
@@ -5,9 +5,11 @@ import { TableModule ,FormInput,FormSelect,FormDatePicker} from "@/components";
import { useSelector, useDispatch } from "react-redux"
import "./index.scss";
// import errorImg from "@/assets/images/layout/error.png"
+import { useNavigate, useLocation } from "react-router-dom"
import { useParams } from "react-router-dom";
const { TextArea } = Input;
function ManagementTime(props) {
+ const navigate = useNavigate()
const id = new URLSearchParams(location.href).get("id");
const columns = [
{
@@ -148,7 +150,16 @@ function ManagementTime(props) {
});
}
function addButton() {
- return ([<Button
+ return ([
+ <Button
+ type="primary"
+ onClick={() => {
+ navigate(`/offPeak/timeRule`)
+ }}
+ >
+ 返回
+ </Button>,
+ <Button
type="primary"
onClick={() => {
setVisible(true);
From a96bce7ce4743a0ae4b501aaca3f69ceda2121b5 Mon Sep 17 00:00:00 2001
From: xingjx <xingjx@yisa.com>
Date: Fri, 19 Jan 2024 18:03:02 +0800
Subject: [PATCH 3/3] =?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
---
.../OperationSales/CreditScoreMgm/index.scss | 7 +++++--
.../OperationSales/CreditScoreMgm/loadable.jsx | 12 +++++++-----
src/pages/OutRoadMgm/OutRoadOverview/index.scss | 6 ++++++
src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx | 20 ++++++++++++++------
4 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/index.scss b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/index.scss
index 0defd80..b77b749 100644
--- a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/index.scss
+++ b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/index.scss
@@ -478,6 +478,7 @@
width: 84px;
text-align: center;
height: 25px;
+ line-height: 25px;
background: linear-gradient(180deg, #3aa9ff, #59b7ff);
border-radius: 4px;
margin-left: 20px;
@@ -497,9 +498,11 @@
width: 84px;
text-align: center;
height: 25px;
+ line-height: 25px;
background: linear-gradient(180deg, #3aa9ff, #59b7ff);
border-radius: 4px;
margin-left: 20px;
+ color: #fff;
cursor: pointer;
}
.content {
@@ -526,8 +529,8 @@
.del-btn {
color: #fff;
- border: 1px solid red;
- background: red;
+ border: 1px solid rgb(245, 67, 67);
+ background: rgb(245, 67, 67);
}
}
diff --git a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx
index ea0677c..2ebd54a 100644
--- a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx
+++ b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx
@@ -439,7 +439,7 @@ function CreditScoreMgm() {
item.children.map((res) => {
if (res.couponId == null || res.couponId == '' || res.num == null || res.num == '') {
flag.push(false)
- }else {
+ } else {
couponArr.push(res.couponId)
}
})
@@ -839,7 +839,7 @@ function CreditScoreMgm() {
><>
{flag > 0 && payData && payData.list?.length != 0 ?
payData.list?.map((item, index) => {
- console.log(778, item)
+ //console.log(778, item)
return <div className="pay-box">
<div className="title">规则{index + 1}</div>
{index > 0 ? <div className="delrule-btn" onClick={() => {
@@ -855,7 +855,8 @@ function CreditScoreMgm() {
<div className="row-title">充值
<InputNumber
className="credit-inputnum"
- min={0}
+ min={1}
+ precision={0}
value={payData.list[index]?.recharge}
onChange={(e) => {
let arr = payData
@@ -890,7 +891,8 @@ function CreditScoreMgm() {
/>
<InputNumber
className="credit-inputnum"
- min={0}
+ min={1}
+ precision={0}
value={payData.list[index]?.children[index2]?.num}
onChange={(e) => {
let arr = payData
@@ -929,7 +931,7 @@ function CreditScoreMgm() {
setFlag(flag + 1)
setPayData(arr)
}
- }>+</div>
+ }>➕</div>
}
</div>
)
diff --git a/src/pages/OutRoadMgm/OutRoadOverview/index.scss b/src/pages/OutRoadMgm/OutRoadOverview/index.scss
index 6c20de5..715ff03 100644
--- a/src/pages/OutRoadMgm/OutRoadOverview/index.scss
+++ b/src/pages/OutRoadMgm/OutRoadOverview/index.scss
@@ -70,6 +70,12 @@ $color-primary: var(--color-primary);
}
.center {
@include Card();
+ .select-box {
+ display: inline-block;
+ width: 200px;
+ margin-right: 10px;
+ margin-bottom: 10px;
+ }
}
.right {
display: grid;
diff --git a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx
index 21326f1..7ca143f 100644
--- a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx
@@ -17,6 +17,7 @@ const OutRoadOverview = () => {
const [videoRoad, setVideoRoad] = useState([])
const [roadId, setRoadId] = useState()
const [videoDevice, setVideoDevice] = useState([])
+ const [todevice, setTodevice] = useState([])
const [videoPlay, setVideoPlay] = useState('')
const [headerNums, setHeaderNums] = useState({
park_num: 0,
@@ -297,7 +298,7 @@ const OutRoadOverview = () => {
.then((res) => {
if (res.status === 20000) {
setVideoDevice(res.data);
- }else {
+ } else {
message.error(res.message)
}
})
@@ -307,14 +308,18 @@ const OutRoadOverview = () => {
}
//查看监控视频
function getOutRoadVideoPlay(e) {
+ if (timer) {
+ clearInterval(timer)
+ timer = null
+ }
ajax
.getOutRoadVideoPlay(e)
.then((res) => {
if (res.status === 20000) {
- setVideoPlay("http://122.9.151.13:81/rtp/Play-37021100131110000028-37021100131310000196.live.mp4");
+ //setVideoPlay("http://122.9.151.13:81/rtp/Play-37021100131110000028-37021100131310000196.live.mp4");
handleFlvPlay(res.data.url);
getOutRoadVideoPlaying(e) //轮询
- }else {
+ } else {
message.error(res.message)
}
})
@@ -411,7 +416,7 @@ const OutRoadOverview = () => {
const handleFlvPlay = (e) => {
videoRef.current.closeVideo()
setVideoType("mp4")
- console.log(e)
+ //console.log(e)
videoRef.current.changeUrl(e)
}
useEffect(() => {
@@ -555,14 +560,17 @@ const OutRoadOverview = () => {
<div>
<Select
placeholder="请选择停车场"
+ className="select-box"
value={roadId}
options={videoRoad}
- onChange={(e) => setRoadId(e)}
+ onChange={(e) => { setRoadId(e); videoRef.current.closeVideo(); setVideoDevice([]); setTodevice('') }}
/>
<Select
placeholder="请选择监控设备"
+ className="select-box"
options={videoDevice}
- onChange={(e) => { getOutRoadVideoPlay({ id: e, type: 1 }) }}
+ value={todevice}
+ onChange={(e) => { getOutRoadVideoPlay({ id: e, type: 1 }); setTodevice(e) }}
/>
<div>
<VideoPlay ref={videoRef} videoType={videoType} />