From a8d25750bc86fcf3f51098167469701a89839338 Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Sat, 16 Apr 2022 18:14:25 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=89=8D=E7=AB=AF=E5=BC=95=E5=85=A5a?= =?UTF-8?q?t-ui=20=E6=A1=86=E6=9E=B6=202=E3=80=81=E5=89=8D=E7=AB=AFv-for?= =?UTF-8?q?=E8=AD=A6=E5=91=8A=E4=BF=AE=E5=A4=8D=203=E3=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=96=87=E6=A1=A3=E7=94=9F=E6=88=90=E5=BF=BD?= =?UTF-8?q?=E7=95=A5=E8=A1=A8=E5=89=8D=E7=BC=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/package.json | 2 ++ ruoyi-ui/src/main.js | 23 +++++++++++++++---- .../views/business/english/article/index.vue | 2 +- .../views/business/tools/apitools/index.vue | 4 ++-- .../webmagic/_36wallpaper/show/index.vue | 2 +- .../com/xjs/dbmonitor/DbDocController.java | 2 +- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 41671e2d..8d3cd089 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -38,6 +38,8 @@ "dependencies": { "@riophae/vue-treeselect": "0.4.0", "@vue/composition-api": "^1.3.0", + "at-ui": "^1.3.3", + "at-ui-style": "^1.5.1", "axios": "0.24.0", "clipboard": "2.0.8", "codemirror": "^5.65.2", diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index 0f08d54b..070b1c82 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -2,11 +2,13 @@ import Vue from 'vue' import Cookies from 'js-cookie' +//element ui 组件库 import Element from 'element-ui' import './assets/styles/element-variables.scss' import '@/assets/styles/index.scss' // global css import '@/assets/styles/ruoyi.scss' // ruoyi css + import App from './App' import store from './store' import router from './router' @@ -19,6 +21,7 @@ import './permission' // permission control import { getDicts } from "@/api/system/dict/data"; import { getConfigKey } from "@/api/system/config"; import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"; + // 分页组件 import Pagination from "@/components/Pagination"; // 自定义表格工具组件 @@ -37,10 +40,19 @@ import DictTag from '@/components/DictTag' import VueMeta from 'vue-meta' // 字典数据组件 import DictData from '@/components/DictData' + +//------------------------xjs加的---------------------------- + // 消息发布订阅组件 import PubSub from 'pubsub-js' +// json格式化显示 +import JsonViewer from 'vue-json-viewer' +//At ui库 +import AtUI from 'at-ui' +import 'at-ui-style' // 引入组件样式 + -// 全局方法挂载 +// --------------------------全局方法挂载------------------------------------- Vue.prototype.getDicts = getDicts Vue.prototype.getConfigKey = getConfigKey Vue.prototype.parseTime = parseTime @@ -52,7 +64,7 @@ Vue.prototype.download = download Vue.prototype.handleTree = handleTree Vue.prototype.PubSub = PubSub //组件发布订阅消息 -// 全局组件挂载 +// --------------------------全局组件挂载------------------------------------ Vue.component('DictTag', DictTag) Vue.component('Pagination', Pagination) Vue.component('RightToolbar', RightToolbar) @@ -64,11 +76,12 @@ Vue.component('ImagePreview', ImagePreview) Vue.use(directive) Vue.use(plugins) Vue.use(VueMeta) -DictData.install() -// json格式化显示 -import JsonViewer from 'vue-json-viewer' Vue.use(JsonViewer) +Vue.use(AtUI) + +DictData.install() + /** * If you don't want to use mock-server diff --git a/ruoyi-ui/src/views/business/english/article/index.vue b/ruoyi-ui/src/views/business/english/article/index.vue index 49d987df..a1314322 100644 --- a/ruoyi-ui/src/views/business/english/article/index.vue +++ b/ruoyi-ui/src/views/business/english/article/index.vue @@ -44,7 +44,7 @@
- + - @@ -303,7 +303,7 @@ 类型：{{ aim.goodsType }} 推荐 - + 名称：{{ data.goodsName }} 类型：{{ data.goodsType }} diff --git a/ruoyi-ui/src/views/business/webmagic/_36wallpaper/show/index.vue b/ruoyi-ui/src/views/business/webmagic/_36wallpaper/show/index.vue index a910d93b..95946573 100644 --- a/ruoyi-ui/src/views/business/webmagic/_36wallpaper/show/index.vue +++ b/ruoyi-ui/src/views/business/webmagic/_36wallpaper/show/index.vue @@ -24,7 +24,7 @@
- +
diff --git a/xjs-business/xjs-business-monitor/src/main/java/com/xjs/dbmonitor/DbDocController.java b/xjs-business/xjs-business-monitor/src/main/java/com/xjs/dbmonitor/DbDocController.java index ef1d0226..6ecd3e18 100644 --- a/xjs-business/xjs-business-monitor/src/main/java/com/xjs/dbmonitor/DbDocController.java +++ b/xjs-business/xjs-business-monitor/src/main/java/com/xjs/dbmonitor/DbDocController.java @@ -176,7 +176,7 @@ public class DbDocController { */ private static ProcessConfig buildProcessConfig() { return ProcessConfig.builder() - .ignoreTablePrefix(Arrays.asList("QRTZ_", "ACT_")) // 忽略表前缀 + .ignoreTablePrefix(Arrays.asList("QRTZ_","qrtz_", "ACT_","act_")) // 忽略表前缀 .build(); } }