From 00d4bfaa6e75c41837bb70c349500388d18f7de7 Mon Sep 17 00:00:00 2001 From: liupengpeng <276665548@qq.com> Date: 星期三, 15 二月 2023 18:45:56 +0800 Subject: [PATCH] 数据管理 --- src/views/datamanage/dictionaryManage.vue | 104 +++++++++++--- src/views/datamanage/projectManage.vue | 16 + src/views/datamanage/versionManage.vue | 53 +++++- src/views/datamanage/catalogueManage.vue | 11 + src/views/datamanage/domainManage.vue | 8 src/views/datamanage/dataUpdata.vue | 77 +++++++--- src/views/datamanage/styleManage.vue | 22 ++- src/views/datamanage/SpatialData.vue | 129 +++-------------- 8 files changed, 238 insertions(+), 182 deletions(-) diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue index e98f402..72f2f10 100644 --- a/src/views/datamanage/SpatialData.vue +++ b/src/views/datamanage/SpatialData.vue @@ -22,8 +22,8 @@ ></el-tree> </div> </div> - <div style="width: 80%;"> - <div> + <div class="contentshuju"> + <div class="contentshujutou"> <el-form ref="ruleForm" :model="ruleForm" @@ -42,40 +42,6 @@ style="width: 200px;" ></el-input> </el-form-item> - <!-- <el-form-item style="float: right"> - <el-button - v-if="btnStatus.insert" - @click="conditionVisible = true" - size="small" - icon="el-icon-plus" - type="success" - >{{$t('common.append')}}</el-button> - </el-form-item> - <el-form-item style="float: right"> - <el-button - @click="submitForm" - type="primary" - size="small" - icon="el-icon-search" - >{{$t('common.iquery')}}</el-button> - </el-form-item> - <el-form-item style="float: right"> - <el-button - @click="resetForm" - size="small" - icon="el-icon-refresh" - type="info" - >{{$t('common.reset')}}</el-button> - </el-form-item> - <el-form-item style="float: right"> - <el-button - @click="getSpaceMapVisibale" - size="small" - type="primary" - >{{ - $t('synthesis.rangequery') - }}</el-button> - </el-form-item> --> <el-form-item style="float: right"> <el-button @click="getSpaceMapVisibale" @@ -103,76 +69,13 @@ >{{$t('common.append')}}</el-button> </el-form-item> </el-form> - <!-- <el-divider class="eldivider" /> --> - </div> - <!-- <div class="spatial_rightContent subpage_Div"> - <div> - <el-table - ref="filterTable" - :data="tableData" - border - style="width: 100%;max-height: 593px;overflow: auto;" - @selection-change="handleSelectionChange" - > - <el-table-column - type="selection" - width="55" - /> - <el-table-column - width="60" - align="center" - type="index" - :label="$t('common.index')" - /> - <el-table-column - v-for="(item, index) in attributeData" - :key="index" - :label="item.alias" - :prop="item.field" - show-overflow-tooltip - align="center" - ></el-table-column> - <el-table-column - min-width="120" - :label="$t('common.operate')" - > - <template slot-scope="scope"> - <el-link - class="elLink" - @click="showDetail(scope.$index, scope.row)" - >{{$t('common.details')}}</el-link> - <el-link - class="elLink" - @click="getAttachTable(scope.$index, scope.row)" - style="margin-left: 20px; " - >{{$t('common.enclosure')}}</el-link> - </template> - </el-table-column> - </el-table> - <div - style="margin-top: 20px" - class="pagination_box" - > - <el-pagination - v-if="changePag" - @size-change="handleSizeChange" - @current-change="handleCurrentChange" - :current-page="this.listData.pageIndex" - :page-sizes="[10, 20, 50, 100]" - :page-size="this.listData.pageSize" - layout="total, sizes, prev, pager, next, jumper" - :total="count" - > - </el-pagination> - </div> </div> - </div> --> - <div style="height: 73%"> + <div class="contenttable"> <el-table ref="filterTable" :data="tableData" style="width: 100%" - height="99%" + height="100%" > <el-table-column type="selection" @@ -1210,7 +1113,7 @@ justify-content: space-between; .spatial_leftTree { width: calc(15% - 0px); - height: 91%; + height: 100%; border-radius: 5px; padding: 1%; @@ -1227,4 +1130,26 @@ } } } +.contentshuju{ + width: 80%; + height: 91%; + border-radius: 5px; + padding: 1%; + max-height: 670px; + border: 1px solid #dcdfe6; +} +.contentshujutou{ + height: 50px; + padding: 1%; + border-radius: 5px; + border: 1px solid #dcdfe6; +} +.contenttable{ + min-height: 520px; + height: 530px; + margin-top: 10px; +} +/deep/ .el-table__body{ + min-height: 525px; +} </style> diff --git a/src/views/datamanage/catalogueManage.vue b/src/views/datamanage/catalogueManage.vue index ffb3a79..07980fc 100644 --- a/src/views/datamanage/catalogueManage.vue +++ b/src/views/datamanage/catalogueManage.vue @@ -23,7 +23,7 @@ </div> </div> <div class="cataLog_rightContent subpage_Div"> - <div style="display:flex;justify-content:space-between"> + <div style="align-items: center;display:flex;justify-content:space-between"> <el-breadcrumb separator="/"> <el-breadcrumb-item :to="{ path: '/' }">{{ $t('dataManage.dictionaryManageObj.particulars') @@ -864,19 +864,22 @@ padding: 1%; .cataLogContent { width: 100%; - height: 92%; + height: 100%; + max-height: 670px; display: flex; + align-items: center; justify-content: space-between; .cataLog_leftTree { width: 15%; - height: 91%; + height: 100%; border-radius: 5px; padding: 1%; overflow-y: auto; } .cataLog_rightContent { width: 80%; - height: 91%; + height: 100%; + max-height: 670px; border-radius: 5px; padding: 1%; .menuTop { diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue index 3e44b93..36ff6c5 100644 --- a/src/views/datamanage/dataUpdata.vue +++ b/src/views/datamanage/dataUpdata.vue @@ -300,7 +300,7 @@ <!-- 涓婁紶鏁版嵁鍒楄〃 --> <div class="subpage_Content subpage_Div"> <el-table - style="min-height: 450px;" + style="min-height: 470px;" :data="tableData" @selection-change="handleSelectionChange" > @@ -376,6 +376,13 @@ </el-form-item> <el-form-item style="float: right;"> <el-button + v-if="menuStatus.delete" + @click="setWarehouseDel" + icon="el-icon-folder-delete" + type="danger" + size="small" + >{{ $t('common.delete') }}</el-button> + <el-button @click="setWarehouseSearch" icon="el-icon-upload" size="small" @@ -389,13 +396,6 @@ size="small" type="info" >{{ $t('common.reset') }}</el-button> - <el-button - v-if="menuStatus.delete" - @click="setWarehouseDel" - icon="el-icon-folder-delete" - type="danger" - size="small" - >{{ $t('common.delete') }}</el-button> </el-form-item> <el-form-item style="float: right;"> <el-button @@ -409,11 +409,10 @@ </el-form-item> </el-form> </div> - <div - class="subpage_Content subpage_Div" - style="min-height:480px" - > - <div style="height: 450px"> + <!-- 鍏ュ簱 --> + <div class="bottom"> + <div class="rightTable subpage_Div"> + <div class="table_box"> <el-table ref="filterTable" :data="waretableData" @@ -498,20 +497,23 @@ width="100" /> </el-table> - <div class="pagination_box"> - <el-pagination - @size-change="handleSizeChange" - @current-change="handleCurrentChange" - :current-page="listData.pageIndex" - :page-sizes="[10, 20, 50, 100]" - :page-size="listData.pageSize" - layout="total, sizes, prev, pager, next, jumper" - :total="count" + </div> + <div + class="pagination_box" > - </el-pagination> + <el-pagination + @size-change="handleSizeChange" + @current-change="handleCurrentChange" + :current-page="listData.pageIndex" + :page-sizes="[10, 20, 50, 100]" + :page-size="listData.pageSize" + layout="total, sizes, prev, pager, next, jumper" + :total="count" + > + </el-pagination> + </div> </div> </div> - </div> </el-tab-pane> </el-tabs> <!-- 璐ㄦ寮圭獥 --> @@ -2431,4 +2433,29 @@ }, } }; -</script> \ No newline at end of file +</script> +<style lang="less" scoped> + .bottom { + width: 100%; + margin-top: 1%; + // height: 74%; + height: 570px; + display: flex; + justify-content: space-between; + + .rightTable { + width: 98%; + height: 92%; + + border-radius: 5px; + padding: 1%; + .table_box { + width: 100%; + height: 93%; + margin: 0 auto; + overflow: auto; + } + } + } + +</style> \ No newline at end of file diff --git a/src/views/datamanage/dictionaryManage.vue b/src/views/datamanage/dictionaryManage.vue index 4363ecc..1a969c0 100644 --- a/src/views/datamanage/dictionaryManage.vue +++ b/src/views/datamanage/dictionaryManage.vue @@ -5,8 +5,23 @@ `${$t('dataManage.dictionaryManage')}`, ]"></My-bread> <el-divider /> - <div> - <el-form + <div class="mainBox"> + <div class="dictionaryContent"> + <div class="dictionary_leftTree subpage_Div"> + <ul> + <li + @click="getTableDesc(item)" + v-for="item in optionCount" + :class="{ active: activeName == item.tab }" + > + {{ item.tabDesc }} + </li> + </ul> + </div> + </div> + <div class="right subpage_Div"> + <div class="inquire"> + <el-form :inline="true" :model="formInline" class="demo-form-inline" @@ -49,25 +64,13 @@ >{{ $t('common.reset') }}</el-button> </el-form-item> </el-form> - </div> - <div class="dictionaryContent"> - <div class="dictionary_leftTree subpage_Div"> - <ul> - <li - @click="getTableDesc(item)" - v-for="item in optionCount" - :class="{ active: activeName == item.tab }" - > - {{ item.tabDesc }} - </li> - </ul> - </div> - <div class="dictionary_rightContent subpage_Div"> - <el-table + </div> + <div class="table_box"> + <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange" - height="93%" + height="100%" > <el-table-column type="selection" @@ -154,7 +157,7 @@ </el-table> <div class="pagination_box" - style="margin-top: 10px" + style="margin-top: 20px" > <el-pagination @size-change="handleSizeChange" @@ -166,6 +169,7 @@ :total="count" > </el-pagination> + </div> </div> </div> </div> @@ -700,13 +704,14 @@ width: 98%; padding: 1%; .dictionaryContent { - width: 100%; + width: 16.5%; height: 92%; - display: flex; - justify-content: space-between; + // display: flex; + // justify-content: space-between; .dictionary_leftTree { - width: 15%; + width: 100%; height: 80%; + min-height: 700px; border-radius: 5px; padding: 1%; @@ -745,4 +750,57 @@ margin-bottom: 10px; } } +.mainBox { + width: 100%; + height: 92%; + display: flex; + justify-content: space-between; + .leftTree { + width: 15%; + height: 91%; + + border-radius: 5px; + padding: 1%; + max-height: 670px; + overflow-y: auto; + } + .right { + width: 80%; + height: 91%; + + border-radius: 5px; + padding: 1%; + max-height: 670px; + // overflow-y: auto; + .inquire { + // margin-bottom: 10px; + padding: 1%; + + border-radius: 5px; + border: 1px solid #dcdfe6; + .el-form-item { + margin: 5px; + } + } + .table_box { + width: 100%; + height: 80%; + margin: 0 auto; + // overflow: auto; + margin-top: 10px; + + .el-table /deep/ th.el-table__cell > .cell { + padding: 15px !important; + } + + .el-table--border::after, + .el-table--group::after { + width: 0; + } + .el-table::before { + height: 0; + } + } + } + } </style> diff --git a/src/views/datamanage/domainManage.vue b/src/views/datamanage/domainManage.vue index 3cf2d77..8d36517 100644 --- a/src/views/datamanage/domainManage.vue +++ b/src/views/datamanage/domainManage.vue @@ -753,12 +753,13 @@ border-radius: 5px; padding: 1%; max-height: 670px; - overflow-y: auto; + // overflow-y: auto; .inquire { - margin-bottom: 10px; + // margin-bottom: 10px; + padding: 1%; border-radius: 5px; - border: 1px solid rgb(202, 201, 204); + border: 1px solid #dcdfe6; .el-form-item { margin: 5px; } @@ -768,6 +769,7 @@ height: 80%; margin: 0 auto; overflow: auto; + margin-top: 10px; .el-table /deep/ th.el-table__cell > .cell { padding: 15px !important; diff --git a/src/views/datamanage/projectManage.vue b/src/views/datamanage/projectManage.vue index 7fd64db..f493dd3 100644 --- a/src/views/datamanage/projectManage.vue +++ b/src/views/datamanage/projectManage.vue @@ -21,6 +21,12 @@ </div> <div class="verSion_rightContent subpage_Div"> <el-form + style=" height: 44px; + padding: 1%; + display: flex; + flex-direction: row-reverse; + border-radius: 5px; + border: 1px solid #dcdfe6;" :inline="true" class="demo-form-inline" > @@ -35,12 +41,12 @@ >{{ $t('common.append') }}</el-button> </el-form-item> </el-form> - <el-divider class="eldivider" /> - <div style="height: 80%; padding: 1%; overflow: auto"> + <!-- <el-divider class="eldivider" /> --> + <div style="height: 80%; margin-top: 10px;"> <el-table ref="filterTable" :data="dbTableData" - height="90%" + height="100%" border style="width: 100%" > @@ -462,13 +468,13 @@ border-radius: 5px; padding: 1%; - + max-height: 670px; overflow-y: auto; } .verSion_rightContent { width: 80%; height: 91%; - + max-height: 670px; border-radius: 5px; padding: 1%; overflow-y: auto; diff --git a/src/views/datamanage/styleManage.vue b/src/views/datamanage/styleManage.vue index 60426e8..b4c1f9a 100644 --- a/src/views/datamanage/styleManage.vue +++ b/src/views/datamanage/styleManage.vue @@ -5,7 +5,7 @@ `${$t('dataManage.styleManage')}`, ]"></My-bread> <el-divider /> - <div class="searchComp subpage_Div"> + <div class="searchComp subpage_Div" style="padding: 1%;"> <el-form ref="ruleForm" :model="ruleForm" @@ -52,12 +52,12 @@ </el-form> </div> <div class="bottom"> - <div class="rightTable"> + <div class="rightTable subpage_Div"> <div class="table_box"> <el-table :data="tableData" style="width: 100%" - height="100%" + height="95%" @selection-change="handleSelectionChange" > <el-table-column @@ -143,7 +143,6 @@ </el-table> </div> <div - style="margin-top: 20px;" class="pagination_box" > <el-pagination @@ -1662,13 +1661,20 @@ } .bottom { width: 100%; - height: 85%; + margin-top: 1%; + height: 74%; + display: flex; + justify-content: space-between; + .rightTable { - height: 100%; - width: 100%; + width: 98%; + height: 92%; + + border-radius: 5px; + padding: 1%; .table_box { width: 100%; - height: 80%; + height: 93%; margin: 0 auto; overflow: auto; } diff --git a/src/views/datamanage/versionManage.vue b/src/views/datamanage/versionManage.vue index 220d80d..1e63074 100644 --- a/src/views/datamanage/versionManage.vue +++ b/src/views/datamanage/versionManage.vue @@ -5,12 +5,8 @@ `${$t('dataManage.versionManage')}`, ]"></My-bread> <el-divider /> - <div class="verSionContent"> - <!-- <div class="verSion_leftTree"> - <ver-dir-tree></ver-dir-tree> - </div> --> - <div class="verSion_rightContent subpage_Div"> - <el-form + <div class="inquire subpage_Div"> + <el-form ref="ruleForm" :model="ruleForm" :inline="true" @@ -78,12 +74,14 @@ >{{ $t('common.empty') }}</el-button> </el-form-item> </el-form> - <el-divider class="eldivider" /> - <div style="height: 73%"> + </div> + <div class="bottom"> + <div class="rightTable subpage_Div"> + <div class="table_box"> <el-table :data="tableData" style="width: 100%" - height="99%" + height="95%" > <el-table-column align="center" @@ -156,8 +154,8 @@ </template> </el-table-column> </el-table> + </div> <div - style="margin-top: 20px; " class="pagination_box" > <el-pagination @@ -171,9 +169,8 @@ > </el-pagination> </div> - </div> </div> - </div> + </div> <el-dialog :title="$t('dataManage.vmobj.editVersion')" :visible.sync="dialogFormVisible" @@ -750,4 +747,36 @@ } } } +.inquire { + position: relative; + + padding-bottom: 8px; + + border-radius: 5px; + padding: 1%; + .el-form-item { + margin: 5px; + } + } + .bottom { + width: 100%; + margin-top: 1%; + height: 74%; + display: flex; + justify-content: space-between; + + .rightTable { + width: 98%; + height: 92%; + + border-radius: 5px; + padding: 1%; + .table_box { + width: 100%; + height: 93%; + margin: 0 auto; + overflow: auto; + } + } + } </style> -- Gitblit v1.9.3