parent
7f9e0e1159
commit
a8d25750bc
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
Vue.use(JsonViewer)
|
||||
Vue.use(AtUI)
|
||||
|
||||
DictData.install()
|
||||
|
||||
// json格式化显示
|
||||
import JsonViewer from 'vue-json-viewer'
|
||||
Vue.use(JsonViewer)
|
||||
|
||||
/**
|
||||
* If you don't want to use mock-server
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
|
||||
|
||||
<div v-loading="loading">
|
||||
<el-timeline v-for="(article,index) in articleList">
|
||||
<el-timeline v-for="(article,index) in articleList" :key="index">
|
||||
<el-timeline-item :timestamp=article.createTime placement="top">
|
||||
|
||||
<el-button type="text"
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
width="988"
|
||||
trigger="manual"
|
||||
v-model="beautyPictureVisible">
|
||||
<el-image v-for="data in BeautyPictureData" v-loading="loading2"
|
||||
<el-image v-for="(data,index) in BeautyPictureData" v-loading="loading2" :key="index"
|
||||
style="width: 192px; height: 108px"
|
||||
:src="data.imageUrl"
|
||||
:preview-src-list="pictureList">
|
||||
|
|
@ -303,7 +303,7 @@
|
|||
<span>类型:{{ aim.goodsType }}</span>
|
||||
</el-card>
|
||||
<el-divider content-position="center">推荐</el-divider>
|
||||
<el-card shadow="hover" v-for="data in recommendList">
|
||||
<el-card shadow="hover" v-for="(data,index) in recommendList" :key="index">
|
||||
<span>名称:{{ data.goodsName }}</span>
|
||||
<el-divider direction="vertical"></el-divider>
|
||||
<span>类型:{{ data.goodsType }}</span>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
<div class="bigDiv">
|
||||
<el-row :gutter="20" class="el-row">
|
||||
<el-col :span="4" v-for="data in wallpaperList">
|
||||
<el-col :span="4" v-for="(data,index) in wallpaperList" :key="index">
|
||||
<div class="grid-content bg-purple">
|
||||
|
||||
<div style="height: 7px;background-color: #ffba00"></div>
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue