From 4dcf737db03720bff2216ea04aba082be1ebb413 Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: Sat, 1 Aug 2020 15:45:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=B7=A5=E5=85=B7=E6=A0=8F?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E6=B7=BB=E5=8A=A0=E5=88=B7=E6=96=B0&?= =?UTF-8?q?=E6=98=BE=E9=9A=90=E6=9F=A5=E8=AF=A2=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/vm/vue/index-tree.vue.vm | 31 +++++++++----- .../src/main/resources/vm/vue/index.vue.vm | 14 ++++++- ruoyi-ui/src/assets/styles/ruoyi.scss | 27 ++++++++++++- ruoyi-ui/src/views/monitor/job/index.vue | 14 ++++++- ruoyi-ui/src/views/monitor/job/log.vue | 14 ++++++- .../src/views/monitor/logininfor/index.vue | 14 ++++++- ruoyi-ui/src/views/monitor/online/index.vue | 2 +- ruoyi-ui/src/views/monitor/operlog/index.vue | 14 ++++++- ruoyi-ui/src/views/system/config/index.vue | 14 ++++++- ruoyi-ui/src/views/system/dept/index.vue | 40 +++++++++++++------ ruoyi-ui/src/views/system/dict/data.vue | 14 ++++++- ruoyi-ui/src/views/system/dict/index.vue | 14 ++++++- ruoyi-ui/src/views/system/menu/index.vue | 37 ++++++++++++++--- ruoyi-ui/src/views/system/notice/index.vue | 14 ++++++- ruoyi-ui/src/views/system/post/index.vue | 14 ++++++- ruoyi-ui/src/views/system/role/index.vue | 14 ++++++- ruoyi-ui/src/views/system/user/index.vue | 14 ++++++- ruoyi-ui/src/views/tool/gen/index.vue | 14 ++++++- 18 files changed, 262 insertions(+), 57 deletions(-) diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm index 2b26f79..a6ae202 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -1,6 +1,6 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> #foreach($column in $columns) #if($column.query) #set($dictType=$column.dictType) @@ -51,23 +51,30 @@ #end #end <el-form-item> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> + </el-form-item> + </el-form> + + <el-row :gutter="10" class="mb8"> + <el-col :span="1.5"> <el-button - class="filter-item" - type="primary" - icon="el-icon-search" - size="mini" - @click="handleQuery" - >æœç´¢</el-button> - <el-button - class="filter-item" type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['${moduleName}:${businessName}:add']" >新增</el-button> - </el-form-item> - </el-form> + </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> + </el-row> <el-table v-loading="loading" @@ -229,6 +236,8 @@ export default { return { // é®ç½©å±‚ loading: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // ${functionName}è¡¨æ ¼æ•°æ® ${businessName}List: [], // ${functionName}æ ‘é€‰é¡¹ diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index c4d7407..f060f9c 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -1,6 +1,6 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> #foreach($column in $columns) #if($column.query) #set($dictType=$column.dictType) @@ -51,7 +51,7 @@ #end #end <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> </el-form-item> </el-form> @@ -95,6 +95,14 @@ v-hasPermi="['${moduleName}:${businessName}:export']" >导出</el-button> </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> </el-row> <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange"> @@ -260,6 +268,8 @@ export default { single: true, // éžå¤šä¸ªç¦ç”¨ multiple: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // æ€»æ¡æ•° total: 0, // ${functionName}è¡¨æ ¼æ•°æ® diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index 18dff3a..ffb04a3 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -142,7 +142,28 @@ padding-left: 15px; margin-bottom: 10px; } - + +/* button color */ +.el-button--cyan.is-active, +.el-button--cyan:active { + background: #20B2AA; + border-color: #20B2AA; + color: #FFFFFF; +} + +.el-button--cyan:focus, +.el-button--cyan:hover { + background: #48D1CC; + border-color: #48D1CC; + color: #FFFFFF; +} + +.el-button--cyan { + background-color: #20B2AA; + border-color: #20B2AA; + color: #FFFFFF; +} + /* text color */ .text-navy { color: #1ab394; @@ -198,4 +219,8 @@ opacity: .8; color: #fff!important; background: #42b983!important; +} + +.top-right-btn { + float: right; } \ No newline at end of file diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue index 3a35e85..bd39c16 100644 --- a/ruoyi-ui/src/views/monitor/job/index.vue +++ b/ruoyi-ui/src/views/monitor/job/index.vue @@ -1,6 +1,6 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form-item label="任务åç§°" prop="jobName"> <el-input v-model="queryParams.jobName" @@ -31,7 +31,7 @@ </el-select> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> </el-form-item> </el-form> @@ -84,6 +84,14 @@ v-hasPermi="['monitor:job:query']" >日志</el-button> </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> </el-row> <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange"> @@ -274,6 +282,8 @@ export default { single: true, // éžå¤šä¸ªç¦ç”¨ multiple: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // æ€»æ¡æ•° total: 0, // å®šæ—¶ä»»åŠ¡è¡¨æ ¼æ•°æ® diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue index 254f486..0ddbba6 100644 --- a/ruoyi-ui/src/views/monitor/job/log.vue +++ b/ruoyi-ui/src/views/monitor/job/log.vue @@ -1,6 +1,6 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form-item label="任务åç§°" prop="jobName"> <el-input v-model="queryParams.jobName" @@ -56,7 +56,7 @@ ></el-date-picker> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> </el-form-item> </el-form> @@ -90,6 +90,14 @@ v-hasPermi="['monitor:job:export']" >导出</el-button> </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> </el-row> <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange"> @@ -175,6 +183,8 @@ export default { ids: [], // éžå¤šä¸ªç¦ç”¨ multiple: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // æ€»æ¡æ•° total: 0, // è°ƒåº¦æ—¥å¿—è¡¨æ ¼æ•°æ® diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/ruoyi-ui/src/views/monitor/logininfor/index.vue index 0a21005..7c83aab 100644 --- a/ruoyi-ui/src/views/monitor/logininfor/index.vue +++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue @@ -1,6 +1,6 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form-item label="登录地å€" prop="ipaddr"> <el-input v-model="queryParams.ipaddr" @@ -50,7 +50,7 @@ ></el-date-picker> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> </el-form-item> </el-form> @@ -84,6 +84,14 @@ v-hasPermi="['system:logininfor:export']" >导出</el-button> </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> </el-row> <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange"> @@ -126,6 +134,8 @@ export default { ids: [], // éžå¤šä¸ªç¦ç”¨ multiple: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // æ€»æ¡æ•° total: 0, // è¡¨æ ¼æ•°æ® diff --git a/ruoyi-ui/src/views/monitor/online/index.vue b/ruoyi-ui/src/views/monitor/online/index.vue index 1f5a50f..77d0410 100644 --- a/ruoyi-ui/src/views/monitor/online/index.vue +++ b/ruoyi-ui/src/views/monitor/online/index.vue @@ -20,7 +20,7 @@ /> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> </el-form-item> </el-form> diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue index ba84d3c..d8b2ff4 100644 --- a/ruoyi-ui/src/views/monitor/operlog/index.vue +++ b/ruoyi-ui/src/views/monitor/operlog/index.vue @@ -1,6 +1,6 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form-item label="系统模å—" prop="title"> <el-input v-model="queryParams.title" @@ -66,7 +66,7 @@ ></el-date-picker> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> </el-form-item> </el-form> @@ -100,6 +100,14 @@ v-hasPermi="['system:config:export']" >导出</el-button> </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> </el-row> <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange"> @@ -195,6 +203,8 @@ export default { ids: [], // éžå¤šä¸ªç¦ç”¨ multiple: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // æ€»æ¡æ•° total: 0, // è¡¨æ ¼æ•°æ® diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue index 83b77b9..b5b44e0 100644 --- a/ruoyi-ui/src/views/system/config/index.vue +++ b/ruoyi-ui/src/views/system/config/index.vue @@ -1,6 +1,6 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form-item label="傿•°åç§°" prop="configName"> <el-input v-model="queryParams.configName" @@ -44,7 +44,7 @@ ></el-date-picker> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> </el-form-item> </el-form> @@ -97,6 +97,14 @@ v-hasPermi="['system:config:remove']" >清ç†ç¼“å˜</el-button> </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> </el-row> <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange"> @@ -188,6 +196,8 @@ export default { single: true, // éžå¤šä¸ªç¦ç”¨ multiple: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // æ€»æ¡æ•° total: 0, // 傿•°è¡¨æ ¼æ•°æ® diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue index 4d4d978..d2b4418 100644 --- a/ruoyi-ui/src/views/system/dept/index.vue +++ b/ruoyi-ui/src/views/system/dept/index.vue @@ -1,7 +1,7 @@ <template> <div class="app-container"> - <el-form :inline="true"> - <el-form-item label="部门åç§°"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"> + <el-form-item label="部门åç§°" prop="deptName"> <el-input v-model="queryParams.deptName" placeholder="请输入部门åç§°" @@ -10,7 +10,7 @@ @keyup.enter.native="handleQuery" /> </el-form-item> - <el-form-item label="状æ€"> + <el-form-item label="状æ€" prop="status"> <el-select v-model="queryParams.status" placeholder="部门状æ€" clearable size="small"> <el-option v-for="dict in statusOptions" @@ -21,23 +21,30 @@ </el-select> </el-form-item> <el-form-item> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> + </el-form-item> + </el-form> + + <el-row :gutter="10" class="mb8"> + <el-col :span="1.5"> <el-button - class="filter-item" - type="primary" - icon="el-icon-search" - size="mini" - @click="handleQuery" - >æœç´¢</el-button> - <el-button - class="filter-item" type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:dept:add']" >新增</el-button> - </el-form-item> - </el-form> + </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> + </el-row> <el-table v-loading="loading" @@ -149,6 +156,8 @@ export default { return { // é®ç½©å±‚ loading: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // è¡¨æ ¼æ ‘æ•°æ® deptList: [], // éƒ¨é—¨æ ‘é€‰é¡¹ @@ -247,6 +256,11 @@ export default { handleQuery() { this.getList(); }, + /** é‡ç½®æŒ‰é’®æ“作 */ + resetQuery() { + this.resetForm("queryForm"); + this.handleQuery(); + }, /** 新增按钮æ“作 */ handleAdd(row) { this.reset(); diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue index f5eb63e..7a8c50b 100644 --- a/ruoyi-ui/src/views/system/dict/data.vue +++ b/ruoyi-ui/src/views/system/dict/data.vue @@ -1,6 +1,6 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true"> + <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true"> <el-form-item label="å—å…¸åç§°" prop="dictType"> <el-select v-model="queryParams.dictType" size="small"> <el-option @@ -31,7 +31,7 @@ </el-select> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> </el-form-item> </el-form> @@ -75,6 +75,14 @@ v-hasPermi="['system:dict:export']" >导出</el-button> </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> </el-row> <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange"> @@ -170,6 +178,8 @@ export default { single: true, // éžå¤šä¸ªç¦ç”¨ multiple: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // æ€»æ¡æ•° total: 0, // å—å…¸è¡¨æ ¼æ•°æ® diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/ruoyi-ui/src/views/system/dict/index.vue index 779c173..6da26ab 100644 --- a/ruoyi-ui/src/views/system/dict/index.vue +++ b/ruoyi-ui/src/views/system/dict/index.vue @@ -1,6 +1,6 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form-item label="å—å…¸åç§°" prop="dictName"> <el-input v-model="queryParams.dictName" @@ -50,7 +50,7 @@ ></el-date-picker> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> </el-form-item> </el-form> @@ -103,6 +103,14 @@ v-hasPermi="['system:dict:remove']" >清ç†ç¼“å˜</el-button> </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> </el-row> <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange"> @@ -196,6 +204,8 @@ export default { single: true, // éžå¤šä¸ªç¦ç”¨ multiple: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // æ€»æ¡æ•° total: 0, // å—å…¸è¡¨æ ¼æ•°æ® diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue index 2303a52..6cf8d3b 100644 --- a/ruoyi-ui/src/views/system/menu/index.vue +++ b/ruoyi-ui/src/views/system/menu/index.vue @@ -1,7 +1,7 @@ <template> <div class="app-container"> - <el-form :inline="true"> - <el-form-item label="èœå•åç§°"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"> + <el-form-item label="èœå•åç§°" prop="menuName"> <el-input v-model="queryParams.menuName" placeholder="请输入èœå•åç§°" @@ -10,7 +10,7 @@ @keyup.enter.native="handleQuery" /> </el-form-item> - <el-form-item label="状æ€"> + <el-form-item label="状æ€" prop="status"> <el-select v-model="queryParams.status" placeholder="èœå•状æ€" clearable size="small"> <el-option v-for="dict in statusOptions" @@ -21,11 +21,31 @@ </el-select> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> - <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']">新增</el-button> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> </el-form-item> </el-form> + <el-row :gutter="10" class="mb8"> + <el-col :span="1.5"> + <el-button + type="primary" + icon="el-icon-plus" + size="mini" + @click="handleAdd" + v-hasPermi="['system:menu:add']" + >新增</el-button> + </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> + </el-row> + <el-table v-loading="loading" :data="menuList" @@ -197,6 +217,8 @@ export default { return { // é®ç½©å±‚ loading: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // èœå•è¡¨æ ¼æ ‘æ•°æ® menuList: [], // èœå•æ ‘é€‰é¡¹ @@ -310,6 +332,11 @@ export default { handleQuery() { this.getList(); }, + /** é‡ç½®æŒ‰é’®æ“作 */ + resetQuery() { + this.resetForm("queryForm"); + this.handleQuery(); + }, /** 新增按钮æ“作 */ handleAdd(row) { this.reset(); diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue index 828dd3e..384ec2f 100644 --- a/ruoyi-ui/src/views/system/notice/index.vue +++ b/ruoyi-ui/src/views/system/notice/index.vue @@ -1,6 +1,6 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form-item label="å…¬å‘Šæ ‡é¢˜" prop="noticeTitle"> <el-input v-model="queryParams.noticeTitle" @@ -30,7 +30,7 @@ </el-select> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> </el-form-item> </el-form> @@ -65,6 +65,14 @@ v-hasPermi="['system:notice:remove']" >åˆ é™¤</el-button> </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> </el-row> <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange"> @@ -190,6 +198,8 @@ export default { single: true, // éžå¤šä¸ªç¦ç”¨ multiple: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // æ€»æ¡æ•° total: 0, // å…¬å‘Šè¡¨æ ¼æ•°æ® diff --git a/ruoyi-ui/src/views/system/post/index.vue b/ruoyi-ui/src/views/system/post/index.vue index 046ef22..a3d9f4f 100644 --- a/ruoyi-ui/src/views/system/post/index.vue +++ b/ruoyi-ui/src/views/system/post/index.vue @@ -1,6 +1,6 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form-item label="å²—ä½ç¼–ç " prop="postCode"> <el-input v-model="queryParams.postCode" @@ -30,7 +30,7 @@ </el-select> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> </el-form-item> </el-form> @@ -74,6 +74,14 @@ v-hasPermi="['system:post:export']" >导出</el-button> </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> </el-row> <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange"> @@ -164,6 +172,8 @@ export default { single: true, // éžå¤šä¸ªç¦ç”¨ multiple: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // æ€»æ¡æ•° total: 0, // å²—ä½è¡¨æ ¼æ•°æ® diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue index dddc906..ba74174 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/ruoyi-ui/src/views/system/role/index.vue @@ -1,6 +1,6 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true"> + <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true"> <el-form-item label="角色åç§°" prop="roleName"> <el-input v-model="queryParams.roleName" @@ -50,7 +50,7 @@ ></el-date-picker> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> </el-form-item> </el-form> @@ -94,6 +94,14 @@ v-hasPermi="['system:role:export']" >导出</el-button> </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> </el-row> <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange"> @@ -249,6 +257,8 @@ export default { single: true, // éžå¤šä¸ªç¦ç”¨ multiple: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // æ€»æ¡æ•° total: 0, // è§’è‰²è¡¨æ ¼æ•°æ® diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index 51c2627..a1ae706 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -27,7 +27,7 @@ </el-col> <!--用户数æ®--> <el-col :span="20" :xs="24"> - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form-item label="用户åç§°" prop="userName"> <el-input v-model="queryParams.userName" @@ -77,7 +77,7 @@ ></el-date-picker> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> </el-form-item> </el-form> @@ -130,6 +130,14 @@ v-hasPermi="['system:user:export']" >导出</el-button> </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> </el-row> <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"> @@ -356,6 +364,8 @@ export default { single: true, // éžå¤šä¸ªç¦ç”¨ multiple: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // æ€»æ¡æ•° total: 0, // ç”¨æˆ·è¡¨æ ¼æ•°æ® diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue index 06306c2..fcbbfe5 100644 --- a/ruoyi-ui/src/views/tool/gen/index.vue +++ b/ruoyi-ui/src/views/tool/gen/index.vue @@ -1,6 +1,6 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form-item label="表åç§°" prop="tableName"> <el-input v-model="queryParams.tableName" @@ -32,7 +32,7 @@ ></el-date-picker> </el-form-item> <el-form-item> - <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">æœç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é‡ç½®</el-button> </el-form-item> </el-form> @@ -76,6 +76,14 @@ v-hasPermi="['tool:gen:remove']" >åˆ é™¤</el-button> </el-col> + <div class="top-right-btn"> + <el-tooltip class="item" effect="dark" content="刷新" placement="top"> + <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" /> + </el-tooltip> + <el-tooltip class="item" effect="dark" :content="showSearch ? 'éšè—æœç´¢' : '显示æœç´¢'" placement="top"> + <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" /> + </el-tooltip> + </div> </el-row> <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange"> @@ -186,6 +194,8 @@ export default { single: true, // éžå¤šä¸ªç¦ç”¨ multiple: true, + // 显示æœç´¢æ¡ä»¶ + showSearch: true, // æ€»æ¡æ•° total: 0, // è¡¨æ•°æ® -- 2.18.1