From a26d6e53e4cf533eb138ac8ca043110022a759cc Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Mon, 26 Jun 2023 18:09:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9All=20Data=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E4=B8=8B=E6=8B=89=E6=A1=86=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=EF=BC=8C=E5=B9=B6=E4=BF=AE=E5=A4=8DSelect=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=99=A8=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/style.less | 19 ++++++++++++++++--- src/views/stationOperation/index.vue | 5 ++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/style.less b/src/style.less index f1b696b..6c60280 100644 --- a/src/style.less +++ b/src/style.less @@ -379,8 +379,8 @@ body { } } -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { +input[type='number']::-webkit-inner-spin-button, +input[type='number']::-webkit-outer-spin-button { -webkit-appearance: none; appearance: none; margin: 0; @@ -448,10 +448,11 @@ input[type="number"]::-webkit-outer-spin-button { &-dropdown { padding-top: 7px; + background-color: transparent; @borderColor: #0da397; &:not(.ant-select-tree-dropdown) { - &-content { + .ant-select-dropdown-content { border: 1px solid @borderColor; overflow: visible !important; &::before { @@ -466,6 +467,18 @@ input[type="number"]::-webkit-outer-spin-button { transform: rotate(45deg) skew(14deg, 14deg); } } + + &.ant-select-dropdown-placement-topLeft { + padding-top: 0; + padding-bottom: 7px; + + .ant-select-dropdown-content { + &::before { + top: auto; + bottom: -6px; + } + } + } } &-menu { diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue index bdc409b..44e6a91 100644 --- a/src/views/stationOperation/index.vue +++ b/src/views/stationOperation/index.vue @@ -253,7 +253,7 @@ export default { // 获取站点类型 async getStationTypeList() { try { - const res = await getAction('/gardsStations/findType') + const res = await getAction('/jeecg-station-operation/stationOperation/findStationType') this.stationTypeList = res.filter(item => item).map(item => ({ label: item, value: item })) } catch (error) { console.error(error) @@ -319,8 +319,7 @@ export default { !this.filter.searchText || -1 !== dataItem.stationName.toLowerCase().indexOf(this.filter.searchText.toLowerCase()) const filterStatus = !this.filter.status || this.filter.status == dataItem.status - const filterType = !this.filter.stationType || this.filter.type == dataItem.stationType - + const filterType = !this.filter.type || this.filter.type == dataItem.stationType return filterSearchText && filterStatus && filterType })