pc-master #262

Merged
xiaomeng merged 3 commits from pc-master into portal 2025-07-08 07:29:51 +00:00
3 changed files with 30 additions and 3 deletions
Showing only changes of commit 841e82a87d - Show all commits

View File

@ -4098,7 +4098,7 @@ textarea {
max-height: 500px; max-height: 500px;
} }
.model-sel > div { .model-sel.largeScreen4 > div {
width: 25%; width: 25%;
margin-bottom: 20px; margin-bottom: 20px;
white-space: nowrap; white-space: nowrap;
@ -4107,6 +4107,19 @@ textarea {
align-items: center; align-items: center;
} }
.model-sel.largeScreen4 > div .label {
margin-bottom: 5px;
}
.model-sel > div {
width: 25%;
margin-bottom: 20px;
white-space: nowrap;
flex-shrink: 0;
display: flex;
align-items: center;
}
.model-sel > div .label { .model-sel > div .label {
margin-bottom: 5px; margin-bottom: 5px;
} }

View File

@ -4348,7 +4348,6 @@ textarea {
} }
&.largeScreen4{ &.largeScreen4{
max-height: 500px; max-height: 500px;
}
>div { >div {
width: 25%; width: 25%;
margin-bottom: 20px; margin-bottom: 20px;
@ -4360,6 +4359,18 @@ textarea {
margin-bottom: 5px; margin-bottom: 5px;
} }
} }
}
>div {
width: 25%;
margin-bottom: 20px;
white-space: nowrap;
flex-shrink: 0;
display: flex;
align-items: center;
.label{
margin-bottom: 5px;
}
}
} }

View File

@ -1662,7 +1662,10 @@ export default {
}, },
//status //status
getStatePermissionStatus() { getStatePermissionStatus() {
this.api.getStatePermissionStatus().then(res => { var data={
enName:getLanguage()
}
this.api.getStatePermissionStatus(data).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.allDevicestatus = res.data.data this.allDevicestatus = res.data.data
this.getPermissionStatus() this.getPermissionStatus()