diff --git a/src/assets/css/main.css b/src/assets/css/main.css index da22bbe4..40802646 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -4098,7 +4098,7 @@ textarea { max-height: 500px; } -.model-sel > div { +.model-sel.largeScreen4 > div { width: 25%; margin-bottom: 20px; white-space: nowrap; @@ -4107,6 +4107,19 @@ textarea { 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 { margin-bottom: 5px; } diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 83c26d0f..a6b37904 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -4348,13 +4348,24 @@ textarea { } &.largeScreen4{ max-height: 500px; + >div { + width: 25%; + margin-bottom: 20px; + white-space: nowrap; + flex-shrink: 0; + display: block; + align-items: center; + .label{ + margin-bottom: 5px; + } + } } >div { width: 25%; margin-bottom: 20px; white-space: nowrap; flex-shrink: 0; - display: block; + display: flex; align-items: center; .label{ margin-bottom: 5px; diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index cb47def2..cbe0554b 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -1662,7 +1662,10 @@ export default { }, //获取全部status数据 getStatePermissionStatus() { - this.api.getStatePermissionStatus().then(res => { + var data={ + enName:getLanguage() + } + this.api.getStatePermissionStatus(data).then(res => { if (res.data.code == 200) { this.allDevicestatus = res.data.data this.getPermissionStatus()