From 5b04f388e931ee2af173e63d15eb3d91d02b7848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B9=B3=E5=87=A1?= Date: Sun, 9 Aug 2020 11:07:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=86=99=E8=A1=A8=E6=A0=BC=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E5=8F=B3=E4=BE=A7=E6=B7=BB=E5=8A=A0=E5=88=B7?= =?UTF-8?q?=E6=96=B0&=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 | 9 +- .../src/main/resources/vm/vue/index.vue.vm | 9 +- ruoyi-ui/src/assets/styles/ruoyi.scss | 1 + .../src/components/TableToolsExt/index.vue | 38 ++ ruoyi-ui/src/main.js | 3 + ruoyi-ui/src/views/monitor/job/index.vue | 9 +- ruoyi-ui/src/views/monitor/job/log.vue | 9 +- .../src/views/monitor/logininfor/index.vue | 9 +- ruoyi-ui/src/views/monitor/online/index.vue | 4 +- ruoyi-ui/src/views/monitor/operlog/index.vue | 9 +- ruoyi-ui/src/views/system/config/index.vue | 9 +- ruoyi-ui/src/views/system/dept/index.vue | 9 +- ruoyi-ui/src/views/system/dict/data.vue | 11 +- ruoyi-ui/src/views/system/dict/index.vue | 9 +- ruoyi-ui/src/views/system/menu/index.vue | 9 +- ruoyi-ui/src/views/system/notice/index.vue | 9 +- ruoyi-ui/src/views/system/post/index.vue | 9 +- ruoyi-ui/src/views/system/role/index.vue | 9 +- ruoyi-ui/src/views/system/user/index.vue | 337 ++++++------------ ruoyi-ui/src/views/tool/gen/index.vue | 9 +- 20 files changed, 166 insertions(+), 354 deletions(-) create mode 100644 ruoyi-ui/src/components/TableToolsExt/index.vue 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 a6ae2026f..21f513852 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 @@ -66,14 +66,7 @@ v-hasPermi="['${moduleName}:${businessName}:add']" >新增 -
- - - - - - -
+ 导出 -
- - - - - - -
+ diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index ffb04a33d..968040e38 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -222,5 +222,6 @@ } .top-right-btn { + position: relative; float: right; } \ No newline at end of file diff --git a/ruoyi-ui/src/components/TableToolsExt/index.vue b/ruoyi-ui/src/components/TableToolsExt/index.vue new file mode 100644 index 000000000..534dd23af --- /dev/null +++ b/ruoyi-ui/src/components/TableToolsExt/index.vue @@ -0,0 +1,38 @@ + + + \ No newline at end of file diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index 7a28b51f8..037ecf9d8 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -20,6 +20,8 @@ import { getDicts } from "@/api/system/dict/data"; import { getConfigKey } from "@/api/system/config"; import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi"; import Pagination from "@/components/Pagination"; +//自定义表格工具扩展 +import TableToolsExt from "@/components/TableToolsExt" // 全局方法挂载 Vue.prototype.getDicts = getDicts @@ -46,6 +48,7 @@ Vue.prototype.msgInfo = function (msg) { // 全局组件挂载 Vue.component('Pagination', Pagination) +Vue.component('TableToolsExt', TableToolsExt) Vue.use(permission) diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue index bd39c16df..5f0cc21a5 100644 --- a/ruoyi-ui/src/views/monitor/job/index.vue +++ b/ruoyi-ui/src/views/monitor/job/index.vue @@ -84,14 +84,7 @@ v-hasPermi="['monitor:job:query']" >日志 -
- - - - - - -
+ diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue index 0ddbba600..ab1596532 100644 --- a/ruoyi-ui/src/views/monitor/job/log.vue +++ b/ruoyi-ui/src/views/monitor/job/log.vue @@ -90,14 +90,7 @@ v-hasPermi="['monitor:job:export']" >导出 -
- - - - - - -
+ diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/ruoyi-ui/src/views/monitor/logininfor/index.vue index 7c83aab40..9aec14e8c 100644 --- a/ruoyi-ui/src/views/monitor/logininfor/index.vue +++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue @@ -84,14 +84,7 @@ v-hasPermi="['system:logininfor:export']" >导出 -
- - - - - - -
+ diff --git a/ruoyi-ui/src/views/monitor/online/index.vue b/ruoyi-ui/src/views/monitor/online/index.vue index 77d04101e..cdee7ee91 100644 --- a/ruoyi-ui/src/views/monitor/online/index.vue +++ b/ruoyi-ui/src/views/monitor/online/index.vue @@ -1,6 +1,6 @@ - + - + @@ -248,23 +125,14 @@ - + - {{dict.dictLabel}} + {{dict.dictLabel}} @@ -273,26 +141,14 @@ - + - + @@ -313,18 +169,7 @@ - +
将文件拖到此处,或 @@ -345,7 +190,17 @@ \ No newline at end of file diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue index fcbbfe535..fe4d42ed7 100644 --- a/ruoyi-ui/src/views/tool/gen/index.vue +++ b/ruoyi-ui/src/views/tool/gen/index.vue @@ -76,14 +76,7 @@ v-hasPermi="['tool:gen:remove']" >删除 -
- - - - - - -
+