KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改】统一间距 按钮修改 增加权限

Browse Source
This commit is contained in:
zhoulingpo
2023-08-03 17:28:37 +08:00
parent b90805cb6b
commit 6e69b77c13
35 changed files with 188 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/assets/less/common.less
+9 -3
View File
@@ -1,7 +1,7 @@
/*列表上方操作按钮区域*/ /*列表上方操作按钮区域*/
.ant-card-body .table-operator { .ant-card-body .table-operator {
margin-bottom: 8px; //margin-bottom: 8px;
} }
/** Button按钮间距 */ /** Button按钮间距 */
.table-operator .ant-btn { .table-operator .ant-btn {
@@ -12,7 +12,7 @@
} }
.table-operator .ant-btn-group .ant-btn:last-child { .table-operator .ant-btn-group .ant-btn:last-child {
margin: 0 8px 8px 0; margin: 0 8px 0px 0;
} }
/*列表td的padding设置 可以控制列表大小*/ /*列表td的padding设置 可以控制列表大小*/
.ant-table-tbody .ant-table-row td { .ant-table-tbody .ant-table-row td {
@@ -66,5 +66,11 @@
} }
.table-page-search-wrapper .ant-form-inline .ant-form-item{ .table-page-search-wrapper .ant-form-inline .ant-form-item{
margin-bottom: 12px; margin-bottom: 4px;
} }
.ant-card-body .table-operator{
margin-bottom: 4px !important;
}
.ant-tabs-bar {
margin-bottom: 0px;
}
jero-web/src/components/jero/modal/JPopupOnlReport.vue
+3 -3
View File
@@ -43,9 +43,9 @@
</div> </div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i>-->
已选择&nbsp;<a style="font-weight: 600">{{ table.selectedRowKeys.length }}</a>项&nbsp;&nbsp; <!-- 已选择&nbsp;<a style="font-weight: 600">{{ table.selectedRowKeys.length }}</a>项&nbsp;&nbsp;-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
<a v-if="!showSearchFlag" style="margin-left: 24px" @click="onlyReload">刷新</a> <a v-if="!showSearchFlag" style="margin-left: 24px" @click="onlyReload">刷新</a>
</div> </div>
jero-web/src/components/page/GlobalLayout.vue
+3 -3
View File
@@ -198,7 +198,7 @@ export default {
} }
} }
.ant-card-body { .ant-card-body {
padding: 24px 24px 0 !important; padding: 16px 16px 0 !important;
} }
.layout { .layout {
min-height: 100vh !important; min-height: 100vh !important;
@@ -688,7 +688,7 @@ export default {
.ant-form-item { .ant-form-item {
display: flex; display: flex;
margin-bottom: 24px; margin-bottom: 12px;
margin-right: 0; margin-right: 0;
.ant-form-item-control-wrapper { .ant-form-item-control-wrapper {
@@ -711,7 +711,7 @@ export default {
.table-page-search-submitButtons { .table-page-search-submitButtons {
display: block; display: block;
margin-bottom: 24px; margin-bottom: 12px;
white-space: nowrap; white-space: nowrap;
} }
jero-web/src/views/demo/JeroDemoList.vue
+3 -3
View File
@@ -79,9 +79,9 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{-->
selectedRowKeys.length }}</a>项 <!-- selectedRowKeys.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
<span style="float:right;"> <span style="float:right;">
<a @click="loadData()"><a-icon type="sync" />刷新</a> <a @click="loadData()"><a-icon type="sync" />刷新</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
jero-web/src/views/demo/JeroOrderMainList.vue
+5 -5
View File
@@ -49,10 +49,10 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
@@ -177,7 +177,7 @@ export default {
margin-left: 3px margin-left: 3px
} }
.ant-card-body .table-operator{ .ant-card-body .table-operator{
margin-bottom: 18px; margin-bottom: 4px;
} }
.ant-table-tbody .ant-table-row td{ .ant-table-tbody .ant-table-row td{
padding-top:15px; padding-top:15px;
jero-web/src/views/demo/JeroOrderMainListForJEditableTable.vue
+10 -10
View File
@@ -50,15 +50,15 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i>-->
<span>已选择</span> <!-- <span>已选择</span>-->
<a style="font-weight: 600"> <!-- <a style="font-weight: 600">-->
{{ selectedRowKeys.length }} <!-- {{ selectedRowKeys.length }}-->
</a> <!-- </a>-->
<span>项</span> <!-- <span>项</span>-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
@@ -184,7 +184,7 @@ export default {
<style scoped> <style scoped>
.ant-card-body .table-operator { .ant-card-body .table-operator {
margin-bottom: 18px; margin-bottom: 4px;
} }
.ant-table-tbody .ant-table-row td { .ant-table-tbody .ant-table-row td {
jero-web/src/views/demo/RowspanTable.vue
+1 -1
View File
@@ -267,7 +267,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
.ant-card-body .table-operator{ .ant-card-body .table-operator{
margin-bottom: 18px; margin-bottom: 4px;
} }
.ant-table-tbody .ant-table-row td{ .ant-table-tbody .ant-table-row td{
padding-top:15px; padding-top:15px;
jero-web/src/views/demo/SelectDemo.vue
+1 -1
View File
@@ -646,7 +646,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.ant-card-body .table-operator { .ant-card-body .table-operator {
margin-bottom: 18px; margin-bottom: 4px;
} }
.ant-table-tbody .ant-table-row td { .ant-table-tbody .ant-table-row td {
jero-web/src/views/demo/TableExpandeSub.vue
+5 -5
View File
@@ -50,10 +50,10 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
@@ -233,7 +233,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
.ant-card-body .table-operator { .ant-card-body .table-operator {
margin-bottom: 18px; margin-bottom: 4px;
} }
.ant-table-tbody .ant-table-row td { .ant-table-tbody .ant-table-row td {
jero-web/src/views/demo/tablist/JeroOrderCustomerList.vue
+4 -4
View File
@@ -20,10 +20,10 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
jero-web/src/views/demo/tablist/JeroOrderDMainList.vue
+5 -5
View File
@@ -50,10 +50,10 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
@@ -247,7 +247,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
.ant-card-body .table-operator { .ant-card-body .table-operator {
margin-bottom: 18px; margin-bottom: 4px;
} }
.ant-table-tbody .ant-table-row td { .ant-table-tbody .ant-table-row td {
jero-web/src/views/demo/tablist/JeroOrderTicketList.vue
+4 -4
View File
@@ -20,10 +20,10 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
jero-web/src/views/modules/message/SysMessageList.vue
+6 -6
View File
@@ -60,11 +60,11 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{-->
selectedRowKeys.length }}</a>项 <!-- selectedRowKeys.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
@@ -206,7 +206,7 @@ export default {
} }
.ant-card-body .table-operator { .ant-card-body .table-operator {
margin-bottom: 18px; margin-bottom: 4px;
} }
.ant-table-tbody .ant-table-row td { .ant-table-tbody .ant-table-row td {
jero-web/src/views/modules/message/SysMessageTemplateList.vue
+10 -10
View File
@@ -40,11 +40,11 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="default" icon="plus" v-has="'message:template:add'">新增</a-button> <a-button @click="handleAdd" type="default" icon="plus" >新增</a-button>
<a-button type="default" icon="download" @click="handleExportXls('消息模板')" v-has="'message:template:export'">导出</a-button> <a-button type="default" icon="download" @click="handleExportXls('消息模板')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel" :before-upload='beforeUpload'> @change="handleImportExcel" :before-upload='beforeUpload'>
<a-button type="default" icon="import" v-has="'message:template:import'">导入</a-button> <a-button type="default" icon="import" >导入</a-button>
</a-upload> </a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay"> <a-menu slot="overlay">
@@ -53,7 +53,7 @@
删除 删除
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
<a-button style="margin-left: 8px" v-has="'message:template:batchdel'"> 批量操作 <a-button style="margin-left: 8px"> 批量操作
<a-icon type="down"/> <a-icon type="down"/>
</a-button> </a-button>
</a-dropdown> </a-dropdown>
@@ -61,11 +61,11 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{-->
selectedRowKeys.length }}</a>项 <!-- selectedRowKeys.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
@@ -215,7 +215,7 @@ export default {
} }
.ant-card-body .table-operator { .ant-card-body .table-operator {
margin-bottom: 18px; margin-bottom: 4px;
} }
.ant-table-tbody .ant-table-row td { .ant-table-tbody .ant-table-row td {
jero-web/src/views/modules/oss/OSSFileList.vue
+6 -6
View File
@@ -44,12 +44,12 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a-->
style="font-weight: 600">{{ <!-- style="font-weight: 600">{{-->
selectedRowKeys.length }}</a>项 <!-- selectedRowKeys.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
jero-web/src/views/system/DataLogList.vue
+5 -5
View File
@@ -27,16 +27,16 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleCompare()" type="primary" icon="plus">数据比较</a-button> <a-button @click="handleCompare()" type="default" icon="plus">数据比较</a-button>
</div> </div>
<!--table区 --> <!--table区 -->
<div> <div>
<!--已选择的清空 --> <!--已选择的清空 -->
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp; <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
size="middle" size="middle"
jero-web/src/views/system/DepartList.vue
+7 -7
View File
@@ -15,12 +15,12 @@
<!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>--> <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
</a-row> </a-row>
<div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px"> <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
<a-alert type="info" :showIcon="true"> <!-- <a-alert type="info" :showIcon="true">-->
<div slot="message"> <!-- <div slot="message">-->
当前选择：<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span> <!-- 当前选择：<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>-->
<a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">取消选择</a> <!-- <a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">取消选择</a>-->
</div> <!-- </div>-->
</a-alert> <!-- </a-alert>-->
<a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/> <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
<!-- 树--> <!-- 树-->
<a-col :md="10" :sm="24"> <a-col :md="10" :sm="24">
@@ -551,7 +551,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
.ant-card-body .table-operator { .ant-card-body .table-operator {
margin: 15px; margin-bottom: 4px;
} }
.anty-form-btn { .anty-form-btn {
jero-web/src/views/system/DepartListSync.vue
+1 -1
View File
@@ -616,7 +616,7 @@ export default {
</style> </style>
<style scoped> <style scoped>
.ant-card-body .table-operator { .ant-card-body .table-operator {
margin: 15px; margin-bottom: 4px;
} }
.anty-form-btn { .anty-form-btn {
jero-web/src/views/system/NewPermissionList.vue
+5 -5
View File
@@ -16,11 +16,11 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{-->
selectedRowKeys.length }}</a>项&nbsp;&nbsp; <!-- selectedRowKeys.length }}</a>项&nbsp;&nbsp;-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
:columns="columns" :columns="columns"
jero-web/src/views/system/PermissionList.vue
+6 -6
View File
@@ -7,7 +7,7 @@
<a-button <a-button
@click="batchDel" @click="batchDel"
v-if="selectedRowKeys.length > 0" v-if="selectedRowKeys.length > 0"
type="default" type="default"
icon="delete">批量删除 icon="delete">批量删除
</a-button> </a-button>
@@ -16,11 +16,11 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{-->
selectedRowKeys.length }}</a>项&nbsp;&nbsp; <!-- selectedRowKeys.length }}</a>项&nbsp;&nbsp;-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
:columns="columns" :columns="columns"
jero-web/src/views/system/QuartzJobList.vue
+4 -4
View File
@@ -49,10 +49,10 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
jero-web/src/views/system/RoleUserList.vue
+12 -12
View File
@@ -31,7 +31,7 @@
</a-form> </a-form>
</div> </div>
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator" style="margin: 5px 0 10px 2px"> <div class="table-operator" style="margin: 0 0 4px 2px">
<a-button @click="handleAdd" type="default" icon="plus">新建角色</a-button> <a-button @click="handleAdd" type="default" icon="plus">新建角色</a-button>
<!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>--> <!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>-->
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
@@ -40,13 +40,13 @@
<!-- <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>--> <!-- <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>-->
</div> </div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"> <!-- <i class="anticon anticon-info-circle ant-alert-icon">-->
</i> 已选择 <a><b>{{ selectedRowKeys1.length }}</b></a>项 <!-- </i> 已选择 <a><b>{{ selectedRowKeys1.length }}</b></a>项-->
<a style="margin-left: 24px" @click="onClearSelected1">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected1">清空</a>-->
</div> <!-- </div>-->
<div style="margin-top: 15px"> <div >
<a-table <a-table
style="height:500px" style="height:500px"
ref="table" ref="table"
@@ -134,11 +134,11 @@
</div> </div>
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{-->
selectedRowKeys2.length }}</a>项 <!-- selectedRowKeys2.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected2">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected2">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
style="height:500px" style="height:500px"
ref="table2" ref="table2"
jero-web/src/views/system/SysAnnouncementList.vue
+4 -4
View File
@@ -40,10 +40,10 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
jero-web/src/views/system/SysCategoryList.vue
+4 -4
View File
@@ -18,10 +18,10 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
jero-web/src/views/system/SysCheckRuleList.vue
+11 -11
View File
@@ -54,17 +54,17 @@
</div> </div>
<!-- table区域-begin --> <!-- table区域-begin -->
<a-alert type="info" showIcon style="margin-bottom: 16px;"> <!-- <a-alert type="info" showIcon style="margin-bottom: 16px;">-->
<template slot="message"> <!-- <template slot="message">-->
<span>已选择</span> <!-- <span>已选择</span>-->
<a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a> <!-- <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>-->
<span>项</span> <!-- <span>项</span>-->
<template v-if="selectedRowKeys.length>0"> <!-- <template v-if="selectedRowKeys.length>0">-->
<a-divider type="vertical"/> <!-- <a-divider type="vertical"/>-->
<a @click="onClearSelected">清空</a> <!-- <a @click="onClearSelected">清空</a>-->
</template> <!-- </template>-->
</template> <!-- </template>-->
</a-alert> <!-- </a-alert>-->
<a-table <a-table
ref="table" ref="table"
jero-web/src/views/system/SysDataSourceList.vue
+8 -8
View File
@@ -52,14 +52,14 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<a-alert type="info" showIcon style="margin-bottom: 16px;"> <!-- <a-alert type="info" showIcon style="margin-bottom: 16px;">-->
<template slot="message"> <!-- <template slot="message">-->
<span>已选择</span> <!-- <span>已选择</span>-->
<a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a> <!-- <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>-->
<span>项</span> <!-- <span>项</span>-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</template> <!-- </template>-->
</a-alert> <!-- </a-alert>-->
<a-table <a-table
ref="table" ref="table"
jero-web/src/views/system/SysFillRuleList.vue
+11 -11
View File
@@ -46,17 +46,17 @@
</div> </div>
<!-- table区域-begin --> <!-- table区域-begin -->
<a-alert type="info" showIcon style="margin-bottom: 16px;"> <!-- <a-alert type="info" showIcon style="margin-bottom: 16px;">-->
<template slot="message"> <!-- <template slot="message">-->
<span>已选择</span> <!-- <span>已选择</span>-->
<a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a> <!-- <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>-->
<span>项</span> <!-- <span>项</span>-->
<template v-if="selectedRowKeys.length>0"> <!-- <template v-if="selectedRowKeys.length>0">-->
<a-divider type="vertical"/> <!-- <a-divider type="vertical"/>-->
<a @click="onClearSelected">清空</a> <!-- <a @click="onClearSelected">清空</a>-->
</template> <!-- </template>-->
</template> <!-- </template>-->
</a-alert> <!-- </a-alert>-->
<a-table <a-table
ref="table" ref="table"
jero-web/src/views/system/SysUserOnlineList.vue
+4 -4
View File
@@ -22,10 +22,10 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
jero-web/src/views/system/TenantList.vue
+4 -4
View File
@@ -22,10 +22,10 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
jero-web/src/views/system/UserAnnouncementList.vue
+1 -1
View File
@@ -181,7 +181,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
.ant-card-body .table-operator{ .ant-card-body .table-operator{
margin-bottom: 18px; margin-bottom: 4px;
} }
.anty-row-operator button{margin: 0 5px} .anty-row-operator button{margin: 0 5px}
.ant-btn-danger{background-color: #ffffff} .ant-btn-danger{background-color: #ffffff}
jero-web/src/views/system/UserList.vue
+4 -4
View File
@@ -121,10 +121,10 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp; <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
jero-web/src/views/system/modules/DeptUserInfo.vue
+5 -5
View File
@@ -40,11 +40,11 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{-->
selectedRowKeys.length }}</a>项 <!-- selectedRowKeys.length }}</a>项-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
jero-web/src/views/system/modules/SelectUserListModal.vue
+1 -1
View File
@@ -271,7 +271,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
.ant-card-body .table-operator{ .ant-card-body .table-operator{
margin-bottom: 18px; margin-bottom: 4px;
} }
.ant-table-tbody .ant-table-row td{ .ant-table-tbody .ant-table-row td{
jero-web/src/views/system/modules/SelectUserModal.vue
+1 -1
View File
@@ -253,7 +253,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.ant-card-body .table-operator { .ant-card-body .table-operator {
margin-bottom: 18px; margin-bottom: 4px;
} }
.ant-table-tbody .ant-table-row td { .ant-table-tbody .ant-table-row td {
jero-web/src/views/system/modules/UserRecycleBinModal.vue
+15 -15
View File
@@ -7,21 +7,21 @@
cancelText="关闭" cancelText="关闭"
:okButtonProps="{style:{display:'none'}}" :okButtonProps="{style:{display:'none'}}"
> >
<a-alert type="info" showIcon style="margin-bottom: 16px;"> <!-- <a-alert type="info" showIcon style="margin-bottom: 16px;">-->
<template slot="message"> <!-- <template slot="message">-->
<span>已选择</span> <!-- <span>已选择</span>-->
<a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a> <!-- <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>-->
<span>项</span> <!-- <span>项</span>-->
<template v-if="selectedRowKeys.length>0"> <!-- <template v-if="selectedRowKeys.length>0">-->
<a-divider type="vertical"/> <!-- <a-divider type="vertical"/>-->
<a @click="handleClearSelection">清空选择</a> <!-- <a @click="handleClearSelection">清空选择</a>-->
<a-divider type="vertical"/> <!-- <a-divider type="vertical"/>-->
<a @click="handleRevertBatch">批量还原</a> <!-- <a @click="handleRevertBatch">批量还原</a>-->
<a-divider type="vertical"/> <!-- <a-divider type="vertical"/>-->
<a @click="handleDeleteBatch">批量删除</a> <!-- <a @click="handleDeleteBatch">批量删除</a>-->
</template> <!-- </template>-->
</template> <!-- </template>-->
</a-alert> <!-- </a-alert>-->
<a-table <a-table
ref="table" ref="table"