From 4ec959d7c2ef1d8dd3af287814ca8a27650b99f7 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期三, 11 一月 2023 15:33:42 +0800 Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0 --- src/views/systemSetting/device/point/index.vue | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/views/systemSetting/device/point/index.vue b/src/views/systemSetting/device/point/index.vue index 868c4d3..7bb4603 100644 --- a/src/views/systemSetting/device/point/index.vue +++ b/src/views/systemSetting/device/point/index.vue @@ -4,8 +4,8 @@ <department-aside @selectedDepartment="selectedDepartment" /> </el-aside> - <el-container> - <el-header style="display: flex; flex-direction: column; height: 120px"> + <el-container class="point-container"> + <el-header style="display: flex; flex-direction: column; height: 120px;padding: 0 40px"> <div style="display: flex; justify-content: space-between; height: 80px" > @@ -153,10 +153,15 @@ }; </script> <style lang="scss" scoped> +.point-container{ + margin-left: 5px; + border: 1px solid #ccc; + padding: 10px; +} .button-one { height: 40px; width: 80px; - margin-left: 20px; + //margin-left: 20px; padding: 0; // background-color: #09152f; color: rgb(75, 155, 183); @@ -309,4 +314,4 @@ video::-webkit-media-controls-toggle-closed-captions-button { display: none; } -</style> \ No newline at end of file +</style> -- Gitblit v1.8.0