diff --git a/public/static/css/antd.dark.min.css b/public/static/css/antd.dark.min.css
index 0abfb85..e4c1c10 100644
--- a/public/static/css/antd.dark.min.css
+++ b/public/static/css/antd.dark.min.css
@@ -16511,7 +16511,8 @@ textarea.ant-input-number {
.ant-input-number-disabled {
color: hsla(0,0%,100%,.3);
background-color: hsla(0,0%,100%,.08);
- border-color: #434343;
+ /* border-color: #434343; */
+ border-color: #666d7d;
box-shadow: none;
cursor: not-allowed;
opacity: 1
@@ -17149,7 +17150,8 @@ textarea.ant-input-affix-wrapper {
.ant-input-disabled {
color: hsla(0,0%,100%,.3);
background-color: hsla(0,0%,100%,.08);
- border-color: #434343;
+ /* border-color: #434343; */
+ border-color: #666d7d;
box-shadow: none;
cursor: not-allowed;
opacity: 1
@@ -17163,7 +17165,8 @@ textarea.ant-input-affix-wrapper {
.ant-input[disabled] {
color: hsla(0,0%,100%,.3);
background-color: hsla(0,0%,100%,.08);
- border-color: #434343;
+ /* border-color: #434343; */
+ border-color: #666d7d;
box-shadow: none;
cursor: not-allowed;
opacity: 1
diff --git a/src/assets/css/base.scss b/src/assets/css/base.scss
index 5a82a96..213cb7a 100644
--- a/src/assets/css/base.scss
+++ b/src/assets/css/base.scss
@@ -742,3 +742,9 @@ color:var(--color-text) !important;
.ant-table-tbody>tr.ant-table-placeholder:hover>td {
background: #3e4557 !important;
}
+
+.searchWrap , .ant-modal-body ,.paid-search{
+ .ant-input-affix-wrapper{
+ background-color: #50586c;
+ }
+}
diff --git a/src/components/layout/SideBar/index.scss b/src/components/layout/SideBar/index.scss
index c9aab77..711254c 100644
--- a/src/components/layout/SideBar/index.scss
+++ b/src/components/layout/SideBar/index.scss
@@ -29,6 +29,12 @@
margin-left: 5px;
}
}
+ .menu-container>.ant-menu>.ant-menu-item{
+ padding-left: 10px !important;
+ .icon-pda{
+ margin-right: 5px;
+ }
+ }
}
.ant-menu-submenu-popup .ant-menu-sub .ant-menu-submenu .ant-menu-title-content{
diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss b/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss
index d6ac85c..6e47301 100644
--- a/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss
@@ -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%;
diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx
index 8faf02d..5b00585 100644
--- a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx
@@ -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) {
) : (
diff --git a/src/pages/OperationCenter/AppMgm/WechatMenuMgm/loadable.jsx b/src/pages/OperationCenter/AppMgm/WechatMenuMgm/loadable.jsx
index 16143c2..bdc31a1 100644
--- a/src/pages/OperationCenter/AppMgm/WechatMenuMgm/loadable.jsx
+++ b/src/pages/OperationCenter/AppMgm/WechatMenuMgm/loadable.jsx
@@ -120,7 +120,7 @@ function WechatMenuMgm() {
// 添加子菜单
const addOneMenu = (index)=>{
if(activeSubmenuIndex > -1){
- if(!/^[\u4e00-\u9fa5]{1,4}$/.test(rightData.name) && !/^[a-zA-Z]{1,8}$/.test(rightData.name) ){
+ if(!/^[\u4e00-\u9fa5]{1,8}$/.test(rightData.name) && !/^[a-zA-Z]{1,16}$/.test(rightData.name) ){
message.error('名称不符合规范, 请重新输入')
return
}
@@ -153,7 +153,7 @@ function WechatMenuMgm() {
const addFirstMenu = ()=>{
if(activeSubmenuIndex > -1){
- if(!/^[\u4e00-\u9fa5]{1,4}$/.test(rightData.name) && !/^[a-zA-Z]{1,8}$/.test(rightData.name) ){
+ if(!/^[\u4e00-\u9fa5]{1,8}$/.test(rightData.name) && !/^[a-zA-Z]{1,16}$/.test(rightData.name) ){
message.error('子菜单名称不符合规范, 请重新输入')
return
}
diff --git a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx
index 2999a17..6487038 100644
--- a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx
+++ b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx
@@ -309,7 +309,9 @@ function GeoSignalIgnoreAudit(props) {
const getCascaderList = () => {
ajax.cascaderList().then(res => {
if (res.status === 20000) {
- setGetCanCaDer(res.data)
+ let arr = res.data
+ let newArr = arr.slice(1)
+ setGetCanCaDer(newArr)
}else{
message.error(res.message)
}
diff --git a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx
index 9d57b1c..891273e 100644
--- a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx
+++ b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx
@@ -197,9 +197,9 @@ function GeoSignalIgnoreInquiry(props) {
//切换分页
const changePn = (pn, length) => {
if (formData.page_size === length) {
- setFormData(Object.assign({}, formData, { pn: pn, page_size: length}))
+ setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
- getData(Object.assign({}, formData, { pn: pn , page_size: length}))
+ getData(Object.assign({}, formData, { pn: pn, page_size: length }))
}
}
//切换每页条数
@@ -217,7 +217,7 @@ function GeoSignalIgnoreInquiry(props) {
setFormData({
...parameter
})
- getData({...parameter,pn: 1} )
+ getData({ ...parameter, pn: 1 })
}
const [getAssetsModel, setGetAssetsModel] = useState([])
const assetsModelName = () => {
@@ -231,8 +231,11 @@ function GeoSignalIgnoreInquiry(props) {
const [getCanCaDer, setGetCanCaDer] = useState([])
const getCascaderList = () => {
ajax.cascaderList().then(res => {
+
if (res.status === 20000) {
- setGetCanCaDer(res.data)
+ let arr = res.data
+ let newArr = arr.slice(1)
+ setGetCanCaDer(newArr)
}
})
}
diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/ActivitySpecificTopic/TemplateConfig.jsx b/src/pages/OperationCenter/OperationSales/CouponMgm/ActivitySpecificTopic/TemplateConfig.jsx
index 31df5c1..6b08859 100644
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/ActivitySpecificTopic/TemplateConfig.jsx
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/ActivitySpecificTopic/TemplateConfig.jsx
@@ -167,7 +167,7 @@ function TemplateConfig(props) {
beforeUpload={(file)=>{
const isPNG = file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/jpeg';
if (!isPNG) {
- message.error(`仅支持上传图片`);
+ message.error(`仅支持上传png、jpg、jpeg图片,`);
}
return isPNG || Upload.LIST_IGNORE;
}}
diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/ActivitySpecificTopic/index.scss b/src/pages/OperationCenter/OperationSales/CouponMgm/ActivitySpecificTopic/index.scss
index 2d38264..00b22c3 100644
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/ActivitySpecificTopic/index.scss
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/ActivitySpecificTopic/index.scss
@@ -141,6 +141,8 @@ $color-primary: var(--color-primary);
height: 120px;
margin-top:20px;
border-radius: 5px;
+ display: flex;
+ flex-direction: column;
}
.desc-title{
color: #9f2b13;
@@ -152,9 +154,12 @@ $color-primary: var(--color-primary);
background-color: #ffffba;
}
.desc-content{
+ flex:1;
color: #6a4c3a;
padding: 0 10px;
font-size: 12px;
+ overflow: auto;
+
}
}
}
diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/index.scss b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/index.scss
index e32f1dd..fa0f1b5 100644
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/index.scss
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/index.scss
@@ -156,7 +156,7 @@ $color-primary : var(--color-primary);
}
.detail-container{
- height: 100%;
+ height: calc(100% - 100px);
.detail-row{
margin-bottom: 8px;
display: flex;
diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/loadable.jsx b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/loadable.jsx
index 38ae2da..5105eb8 100644
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/loadable.jsx
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/loadable.jsx
@@ -211,10 +211,12 @@ function CouponRules() {
if (res.status == 20000) {
let temparr = [];
res.data.map(item=>{
- temparr.push({
- key: item.value + '',
- title: item.label
- })
+ if(item.label != '全部'){
+ temparr.push({
+ key: item.value + '',
+ title: item.label
+ })
+ }
})
setOperatorAllData(temparr)
} else {
@@ -535,7 +537,7 @@ function CouponRules() {
yisaLabel="优惠券名称"
placeholder="输入优惠券名称"
value={formData.name}
- showClose={true}
+ showClose={false}
onChange={e => { setFormData({ name: e.target.value }) } }
/>
@@ -545,7 +547,7 @@ function CouponRules() {
defaultValue={ formData.coupon_type }
placeholder=""
hasUnlimited={ false }
- showClose={true}
+ showClose={false}
onChange={ e=>{setFormData({coupon_type:e})} }
/>
自领取后
- {setCustomDay(e)}}>
+ {setCustomDay(e)}}>
天
- {setCustomHour(e)}}>
+ {setCustomHour(e)}}>
时
- {setCustomMinute(e)}}>
+ {setCustomMinute(e)}}>
分内有效
: null
@@ -926,8 +928,8 @@ function CouponRules() {
disabled={justCheck}
yisaData={[{label: '全部', value: 0},{label: '按车场', value: 1},{label: '按商户', value: 2}]}
// defaultValue={ currentCouponInfo.use_scope || null }
- defaultValue={ 0 }
- placeholder=""
+ defaultValue={currentCouponInfo.use_scope ? currentCouponInfo.use_scope : 0}
+ placeholder="请选择使用范围"
hasUnlimited={ false }
showClose={true}
onChange={ e=>{ setCurrentCouponInfo({...currentCouponInfo,use_scope:e}) } }
@@ -974,6 +976,8 @@ function CouponRules() {
placeholder=""
value={currentCouponInfo.illustrate}
showClose={true}
+ showCount={true}
+ maxLength={200}
onChange={e => { setCurrentCouponInfo({ ...currentCouponInfo,illustrate: e.target.value }) } }
/>
diff --git a/src/pages/SystemMgm/AreaManage/loadable.jsx b/src/pages/SystemMgm/AreaManage/loadable.jsx
index 6e7dec3..6b504ba 100644
--- a/src/pages/SystemMgm/AreaManage/loadable.jsx
+++ b/src/pages/SystemMgm/AreaManage/loadable.jsx
@@ -191,7 +191,7 @@ function AreaManage() {
placement="bottom"
overlayClassName="dropdown-wrapper"
>
-
+
{/* {
diff --git a/src/pages/SystemMgm/BusinessConfig/VacationConf/loadable.jsx b/src/pages/SystemMgm/BusinessConfig/VacationConf/loadable.jsx
index f25dafa..11f032b 100644
--- a/src/pages/SystemMgm/BusinessConfig/VacationConf/loadable.jsx
+++ b/src/pages/SystemMgm/BusinessConfig/VacationConf/loadable.jsx
@@ -52,6 +52,7 @@ function VacationConf() {
if(res.status == 20000){
message.success('删除成功')
getVacationData()
+ setRightDetailData({})
}
}).catch(err=>{
diff --git a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
index 9d88a44..41b37c5 100644
--- a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
+++ b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx
@@ -556,7 +556,7 @@ function OrgnizationMgm() {
placement="bottom"
overlayClassName="dropdown-wrapper"
>
-
+
{/* {