From 5d2106137232b0559a14a28165094f0e1b28d14f Mon Sep 17 00:00:00 2001 From: TreeWish <1131093754@qq.com> Date: 星期一, 20 二月 2023 18:11:14 +0800 Subject: [PATCH] Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW --- src/views/datamanage/SpatialData.vue | 64 +++++++++++++++----------------- 1 files changed, 30 insertions(+), 34 deletions(-) diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue index 5855eb5..ebf3c52 100644 --- a/src/views/datamanage/SpatialData.vue +++ b/src/views/datamanage/SpatialData.vue @@ -50,6 +50,15 @@ $t('synthesis.rangequery') }}</el-button> </el-form-item> + <el-form-item style="float: right"> + <el-button + @click="resetForm" + type="info" + size="small" + icon="el-icon-refresh" + >{{$t('common.reset')}}</el-button> + + </el-form-item> <el-form-item style="float: right"> <el-button @click="submitForm" @@ -69,12 +78,12 @@ </el-form-item> </el-form> </div> - <div class="contenttable"> + <div class="table_box" style="height:calc(100% - 89px)"> <el-table ref="filterTable" :data="tableData" style="width: 100%" - height="100%" + height="calc(100% - 57px)" > <el-table-column type="selection" @@ -95,7 +104,7 @@ align="center" ></el-table-column> <el-table-column - min-width="120" + :label="$t('common.operate')" > <template slot-scope="scope"> @@ -112,7 +121,6 @@ </el-table-column> </el-table> <div - style="margin-top: 20px; " class="pagination_box" > <el-pagination @@ -1107,48 +1115,36 @@ padding: 1%; .spatialContent { width: 100%; - height: 92%; + height: calc(100% - 75px); display: flex; justify-content: space-between; .spatial_leftTree { - width: calc(15% - 0px); + width: calc(23% - 0px); height: 100%; - + padding: 10px; border-radius: 5px; - padding: 1%; - max-height: 670px; + box-sizing: border-box; overflow-y: auto; } - .spatial_rightContent { - // width: 80%; - // height: 91%; - + .contentshuju { + width: 75%; + height: 100%; border-radius: 5px; - padding: 1%; - overflow-y: auto; + padding: 10px; + box-sizing: border-box; + border: 1px solid #dcdfe6; } } } -.contentshuju{ - width: 80%; - height: 91%; - border-radius: 5px; - padding: 1%; - max-height: 670px; - border: 1px solid #dcdfe6; -} -.contentshujutou{ - height: 50px; - padding: 1%; + +.contentshujutou { + padding: 8px; + // margin-top: 10px; border-radius: 5px; border: 1px solid #dcdfe6; -} -.contenttable{ - min-height: 520px; - height: 530px; - margin-top: 10px; -} -/deep/ .el-table__body{ - min-height: 525px; + margin-bottom: 20px; + .el-form-item { + margin: 5px; + } } </style> -- Gitblit v1.9.3