update 系统管理样式调整

This commit is contained in:
danshihao
2023-11-10 11:10:00 +08:00
parent 4f4e950e07
commit ee378f1f8c
8 changed files with 48 additions and 36 deletions
+1 -1
View File
@@ -7,7 +7,7 @@
<a-row style="margin-left: 14px"> <a-row style="margin-left: 14px">
<a-button @click="handleAdd(1)" type="primary">{{ $t('depart.addDepartment') }}</a-button> <a-button @click="handleAdd(1)" type="primary">{{ $t('depart.addDepartment') }}</a-button>
<a-button @click="handleAdd(2)" type="primary">{{ $t('depart.addSubordinate') }}</a-button> <a-button @click="handleAdd(2)" type="primary">{{ $t('depart.addSubordinate') }}</a-button>
<a-button type="primary" icon="download" @click="handleExportXls($t('depart.departmentInformation'), '.xls')">{{ $t('export') }}</a-button> <a-button type="primary" ghost icon="download" @click="handleExportXls($t('depart.departmentInformation'), '.xls')">{{ $t('export') }}</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">-->
<!-- <a-button type="primary" icon="import">{{ $t('import') }}</a-button>--> <!-- <a-button type="primary" icon="import">{{ $t('import') }}</a-button>-->
<!--</a-upload>--> <!--</a-upload>-->
+3 -3
View File
@@ -23,7 +23,7 @@
--> -->
<div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons"> <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">{{ $t('query') }}</a-button> <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">{{ $t('query') }}</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button> <a-button type="primary" @click="searchReset" icon="reload" ghost style="margin-left: 8px">{{ $t('reset') }}</a-button>
</div> </div>
</a-row> </a-row>
</a-form> </a-form>
@@ -59,7 +59,7 @@
<a-dropdown> <a-dropdown>
<a class="ant-dropdown-link"> <a class="ant-dropdown-link">
{{ $t('more') }} <a-icon type="down"/> <a-icon type="more" class="operate-icon-btn operate-icon-more" />
</a> </a>
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item> <a-menu-item>
@@ -147,7 +147,7 @@
<a-divider type="vertical"/> <a-divider type="vertical"/>
<a-dropdown> <a-dropdown>
<a class="ant-dropdown-link"> <a class="ant-dropdown-link">
{{ $t('more') }} <a-icon type="down"/> <a-icon type="more" class="operate-icon-btn operate-icon-more" />
</a> </a>
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item> <a-menu-item>
+18 -7
View File
@@ -4,9 +4,9 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('分类字典')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('分类字典')" ghost>导出</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">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import" ghost>导入</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">
@@ -35,11 +35,22 @@
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a> <a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record)"> <a-dropdown>
<a>删除</a> <a class="ant-dropdown-link">
</a-popconfirm> <a-icon type="more" class="operate-icon-btn operate-icon-more" />
<a-divider type="vertical" /> </a>
<a @click="handleAddSub(record)">添加下级</a> <a-menu slot="overlay">
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
<a-menu-item>
<a @click="handleAddSub(record)">添加下级</a>
</a-menu-item>
</a-menu>
</a-dropdown>
</span> </span>
</a-table> </a-table>
+5 -5
View File
@@ -77,7 +77,7 @@
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a> </a>
<a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button> <a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button> <a-button type="primary" @click="searchReset" icon="reload" ghost style="margin-left: 8px">{{ $t('reset') }}</a-button>
</div> </div>
</a-row> </a-row>
</a-form> </a-form>
@@ -86,9 +86,9 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator" style="border-top: 5px"> <div class="table-operator" style="border-top: 5px">
<a-button @click="handleAdd" type="primary" icon="plus" >{{ $t('user.addUser') }}</a-button> <a-button @click="handleAdd" type="primary" icon="plus" >{{ $t('user.addUser') }}</a-button>
<a-button type="primary" icon="download" @click="handleExportXls($t('user.userInformation'), '.xls')">{{ $t('export') }}</a-button> <a-button type="primary" ghost icon="download" @click="handleExportXls($t('user.userInformation'), '.xls')">{{ $t('export') }}</a-button>
<a-button type="primary" icon="hdd" @click="recycleBinVisible=true">{{ $t('recycleBin') }}</a-button> <a-button type="primary" ghost icon="hdd" @click="recycleBinVisible=true">{{ $t('recycleBin') }}</a-button>
<a-button type="primary" icon="hdd" @click="roleAssignment">{{ $t('user.roleAllocation') }}</a-button> <a-button type="primary" ghost icon="hdd" @click="roleAssignment">{{ $t('user.roleAllocation') }}</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" @click="handleMenuClick"> <a-menu slot="overlay" @click="handleMenuClick">
<a-menu-item key="1"> <a-menu-item key="1">
@@ -140,7 +140,7 @@
<a-dropdown> <a-dropdown>
<a class="ant-dropdown-link"> <a class="ant-dropdown-link">
{{ $t('more') }} <a-icon type="down"/> <a-icon type="more" class="operate-icon-btn operate-icon-more" />
</a> </a>
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item> <a-menu-item>
@@ -111,6 +111,7 @@ export default {
title: this.$t('system.friendshipLink.isShelf'), title: this.$t('system.friendshipLink.isShelf'),
align: 'center', align: 'center',
width: 180, width: 180,
dataIndex: 'isShelf',
scopedSlots: { customRender: 'isShelf' } scopedSlots: { customRender: 'isShelf' }
}, },
{ {
+8 -8
View File
@@ -11,10 +11,9 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="10"> <a-col :md="6" :sm="8">
<a-form-item :label="$t('createTime')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="$t('createTime')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-range-picker <a-range-picker
style="width: 210px"
v-model="queryParam.createTimeRange" v-model="queryParam.createTimeRange"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:placeholder="[$t('startTime'), $t('endTime')]" :placeholder="[$t('startTime'), $t('endTime')]"
@@ -24,12 +23,10 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <div style="float: right;overflow: hidden;margin-right: 12px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24" > <a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button>
<a-button type="primary" style="left: 10px" @click="searchQuery" icon="search">{{ $t('query') }}</a-button> <a-button type="primary" @click="searchReset" ghost icon="reload" style="margin-left: 8px;">{{ $t('reset') }}</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px;left: 10px">{{ $t('reset') }}</a-button> </div>
</a-col>
</span>
</a-row> </a-row>
</a-form> </a-form>
@@ -172,4 +169,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
/deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
min-width: 80px;
}
</style> </style>
+10 -10
View File
@@ -11,10 +11,9 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="10"> <a-col :md="6" :sm="8">
<a-form-item :label="$t('createTime')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item :label="$t('createTime')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-range-picker <a-range-picker
style="width: 210px"
v-model="queryParam.createTimeRange" v-model="queryParam.createTimeRange"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:placeholder="[$t('startTime'), $t('endTime')]" :placeholder="[$t('startTime'), $t('endTime')]"
@@ -23,18 +22,16 @@
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="5" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item :label="$t('log.operationType')" style="left: 10px"> <a-form-item :label="$t('log.operationType')">
<j-dict-select-tag v-model="queryParam.operateType" :placeholder="$t('pleaseSelect') + $t('log.operationType')" dictCode="operate_type"/> <j-dict-select-tag v-model="queryParam.operateType" :placeholder="$t('pleaseSelect') + $t('log.operationType')" dictCode="operate_type"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <div style="float: right;overflow: hidden;margin-right: 12px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24" > <a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button>
<a-button type="primary" style="left: 10px" @click="searchQuery" icon="search">{{ $t('query') }}</a-button> <a-button type="primary" @click="searchReset" ghost icon="reload" style="margin-left: 8px;">{{ $t('reset') }}</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px;left: 10px">{{ $t('reset') }}</a-button> </div>
</a-col>
</span>
</a-row> </a-row>
</a-form> </a-form>
@@ -193,4 +190,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
/deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
min-width: 80px;
}
</style> </style>
+2 -2
View File
@@ -12,7 +12,7 @@
</a-col> </a-col>
<div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons"> <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload" ghost style="margin-left: 8px">重置</a-button>
</div> </div>
</a-row> </a-row>
</a-form> </a-form>
@@ -59,7 +59,7 @@
<a-dropdown> <a-dropdown>
<a class="ant-dropdown-link"> <a class="ant-dropdown-link">
更多 <a-icon type="down"/> <a-icon type="more" class="operate-icon-btn operate-icon-more" />
</a> </a>
<a-menu slot="overlay"> <a-menu slot="overlay">