Commit c982f61b authored by longchaozhong's avatar longchaozhong

feat: 替换为学文内容

parent df500019
@echo off
echo.
echo [信息] 打包Web工程,生成dist文件。
echo [��Ϣ] ���Web���̣�����dist�ļ���
echo.
%~d0
......
const { run } = require('runjs')
const chalk = require('chalk')
const config = require('../vue.config.js')
const rawArgv = process.argv.slice(2)
const args = rawArgv.join(' ')
if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
const report = rawArgv.includes('--report')
run(`vue-cli-service build ${args}`)
const port = 9526
const publicPath = config.publicPath
var connect = require('connect')
var serveStatic = require('serve-static')
const app = connect()
app.use(
publicPath,
serveStatic('./dist', {
index: ['index.html', '/']
})
)
app.listen(port, function () {
console.log(chalk.green(`> Preview at http://localhost:${port}${publicPath}`))
if (report) {
console.log(chalk.green(`> Report at http://localhost:${port}${publicPath}report.html`))
}
})
} else {
run(`vue-cli-service build ${args}`)
}
This source diff could not be displayed because it is too large. You can view the blob instead.
{
"name": "ruoyi",
"version": "3.8.6",
"description": "若依管理系统",
"version": "3.8.5",
"description": "高等学校实验室信息统计系统",
"author": "若依",
"license": "MIT",
"scripts": {
......@@ -41,7 +41,7 @@
"clipboard": "2.0.8",
"core-js": "3.25.3",
"echarts": "5.4.0",
"element-ui": "2.15.13",
"element-ui": "2.15.12",
"file-saver": "2.0.5",
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",
......
......@@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link rel="icon" type="image/png" href="<%= BASE_URL %>favicon.png">
<title><%= webpackConfig.name %></title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<style>
......
import request from '@/utils/request'
// 查询在线用户列表
export function list(query) {
return request({
url: '/monitor/online/list',
method: 'get',
params: query
})
}
// 强退用户
export function forceLogout(tokenId) {
return request({
url: '/monitor/online/' + tokenId,
method: 'delete'
})
}
......@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询字典类型列表
export function listType(query) {
return request({
url: '/system/dict/type/list',
url: '/system/dict/group/list',
method: 'get',
params: query
})
......@@ -12,7 +12,7 @@ export function listType(query) {
// 查询字典类型详细
export function getType(dictId) {
return request({
url: '/system/dict/type/' + dictId,
url: '/system/dict/group/' + dictId,
method: 'get'
})
}
......@@ -20,7 +20,7 @@ export function getType(dictId) {
// 新增字典类型
export function addType(data) {
return request({
url: '/system/dict/type',
url: '/system/dict/group',
method: 'post',
data: data
})
......@@ -29,7 +29,7 @@ export function addType(data) {
// 修改字典类型
export function updateType(data) {
return request({
url: '/system/dict/type',
url: '/system/dict/group',
method: 'put',
data: data
})
......@@ -38,7 +38,7 @@ export function updateType(data) {
// 删除字典类型
export function delType(dictId) {
return request({
url: '/system/dict/type/' + dictId,
url: '/system/dict/group/' + dictId,
method: 'delete'
})
}
......@@ -46,7 +46,7 @@ export function delType(dictId) {
// 刷新字典缓存
export function refreshCache() {
return request({
url: '/system/dict/type/refreshCache',
url: '/system/dict/group/refreshCache',
method: 'delete'
})
}
......@@ -54,7 +54,7 @@ export function refreshCache() {
// 获取字典选择框列表
export function optionselect() {
return request({
url: '/system/dict/type/optionselect',
url: '/system/dict/group/optionselect',
method: 'get'
})
}
......@@ -3,14 +3,17 @@ import request from '@/utils/request'
// 查询生成表数据
export function listTable(query) {
return request({
headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/list',
method: 'get',
params: query
})
}
// 查询db数据库列表
export function listDbTable(query) {
return request({
headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/db/list',
method: 'get',
params: query
......@@ -20,6 +23,7 @@ export function listDbTable(query) {
// 查询表详细信息
export function getGenTable(tableId) {
return request({
headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/' + tableId,
method: 'get'
})
......@@ -28,6 +32,7 @@ export function getGenTable(tableId) {
// 修改代码生成信息
export function updateGenTable(data) {
return request({
headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen',
method: 'put',
data: data
......@@ -37,6 +42,7 @@ export function updateGenTable(data) {
// 导入表
export function importTable(data) {
return request({
headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/importTable',
method: 'post',
params: data
......@@ -46,6 +52,7 @@ export function importTable(data) {
// 预览生成代码
export function previewTable(tableId) {
return request({
headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/preview/' + tableId,
method: 'get'
})
......@@ -54,6 +61,7 @@ export function previewTable(tableId) {
// 删除表数据
export function delTable(tableId) {
return request({
headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/' + tableId,
method: 'delete'
})
......@@ -62,6 +70,7 @@ export function delTable(tableId) {
// 生成代码(自定义路径)
export function genCode(tableName) {
return request({
headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/genCode/' + tableName,
method: 'get'
})
......@@ -70,6 +79,7 @@ export function genCode(tableName) {
// 同步数据库
export function synchDb(tableName) {
return request({
headers: { 'datasource': localStorage.getItem("dataName") },
url: '/tool/gen/synchDb/' + tableName,
method: 'get'
})
......
......@@ -180,3 +180,12 @@ aside {
margin-bottom: 10px;
}
}
//refine vue-multiselect plugin
.multiselect {
line-height: 16px;
}
.multiselect--active {
z-index: 1000 !important;
}
#app {
.main-container {
height: 100%;
min-height: 100%;
transition: margin-left .28s;
margin-left: $base-sidebar-width;
position: relative;
......
......@@ -7,7 +7,7 @@
:key="item.value"
:index="index"
:class="item.raw.cssClass"
>{{ item.label + " " }}</span
>{{ item.label }}</span
>
<el-tag
v-else
......@@ -17,13 +17,10 @@
:type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
:class="item.raw.cssClass"
>
{{ item.label + " " }}
{{ item.label }}
</el-tag>
</template>
</template>
<template v-if="unmatch && showValue">
{{ unmatchArray | handleArray }}
</template>
</div>
</template>
......@@ -36,53 +33,16 @@ export default {
default: null,
},
value: [Number, String, Array],
// 当未找到匹配的数据时,显示value
showValue: {
type: Boolean,
default: true,
}
},
data() {
return {
unmatchArray: [], // 记录未匹配的项
}
},
computed: {
values() {
if (this.value !== null && typeof this.value !== "undefined") {
if (this.value !== null && typeof this.value !== 'undefined') {
return Array.isArray(this.value) ? this.value : [String(this.value)];
} else {
return [];
}
},
unmatch() {
this.unmatchArray = [];
if (this.value !== null && typeof this.value !== "undefined") {
// 传入值为非数组
if (!Array.isArray(this.value)) {
if (this.options.some((v) => v.value == this.value)) return false;
this.unmatchArray.push(this.value);
return true;
}
// 传入值为Array
this.value.forEach((item) => {
if (!this.options.some((v) => v.value == item))
this.unmatchArray.push(item);
});
return true;
}
// 没有value不显示
return false;
},
},
filters: {
handleArray(array) {
if (array.length === 0) return "";
return array.reduce((pre, cur) => {
return pre + " " + cur;
})
}
}
};
</script>
<style scoped>
......
<!-- @author zhengjie -->
<template>
<div class="icon-body">
<el-input v-model="name" class="icon-search" clearable placeholder="请输入图标名称" @clear="filterIcons" @input="filterIcons">
<el-input v-model="name" style="position: relative;" clearable placeholder="请输入图标名称" @clear="filterIcons" @input.native="filterIcons">
<i slot="suffix" class="el-icon-search el-input__icon" />
</el-input>
<div class="icon-list">
<div class="list-container">
<div v-for="(item, index) in iconList" class="icon-item-wrapper" :key="index" @click="selectedIcon(item)">
<div :class="['icon-item', { active: activeIcon === item }]">
<svg-icon :icon-class="item" class-name="icon" style="height: 25px;width: 16px;"/>
<div v-for="(item, index) in iconList" :key="index" @click="selectedIcon(item)">
<svg-icon :icon-class="item" style="height: 30px;width: 16px;" />
<span>{{ item }}</span>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import icons from './requireIcons'
export default {
name: 'IconSelect',
props: {
activeIcon: {
type: String
}
},
data() {
return {
name: '',
......@@ -55,49 +46,22 @@ export default {
.icon-body {
width: 100%;
padding: 10px;
.icon-search {
position: relative;
margin-bottom: 5px;
}
.icon-list {
height: 200px;
overflow: auto;
.list-container {
display: flex;
flex-wrap: wrap;
.icon-item-wrapper {
width: calc(100% / 3);
height: 25px;
line-height: 25px;
overflow-y: scroll;
div {
height: 30px;
line-height: 30px;
margin-bottom: -5px;
cursor: pointer;
display: flex;
.icon-item {
display: flex;
max-width: 100%;
height: 100%;
padding: 0 5px;
&:hover {
background: #ececec;
border-radius: 5px;
}
.icon {
flex-shrink: 0;
width: 33%;
float: left;
}
span {
display: inline-block;
vertical-align: -0.15em;
fill: currentColor;
padding-left: 2px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.icon-item.active {
background: #ececec;
border-radius: 5px;
}
}
}
}
}
......
<template>
<div>
<svg-icon icon-class="question" @click="goto" />
</div>
</template>
<script>
export default {
name: 'RuoYiDoc',
data() {
return {
url: 'http://doc.ruoyi.vip/ruoyi-vue'
}
},
methods: {
goto() {
window.open(this.url)
}
}
}
</script>
\ No newline at end of file
<template>
<div>
<svg-icon icon-class="github" @click="goto" />
</div>
</template>
<script>
export default {
name: 'RuoYiGit',
data() {
return {
url: 'https://gitee.com/y_project/RuoYi-Vue'
}
},
methods: {
goto() {
window.open(this.url)
}
}
}
</script>
\ No newline at end of file
......@@ -127,13 +127,7 @@ export default {
window.open(key, "_blank");
} else if (!route || !route.children) {
// 没有子路由路径内部打开
const routeMenu = this.childrenMenus.find(item => item.path === key);
if (routeMenu && routeMenu.query) {
let query = JSON.parse(routeMenu.query);
this.$router.push({ path: key, query: query });
} else {
this.$router.push({ path: key });
}
this.$store.dispatch('app/toggleSideBarHide', true);
} else {
// 显示左侧联动菜单
......
......@@ -50,26 +50,3 @@ export default {
}
}
</style>
<style lang="scss">
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
.fixed-header {
padding-right: 6px;
}
}
::-webkit-scrollbar {
width: 6px;
height: 6px;
}
::-webkit-scrollbar-track {
background-color: #f1f1f1;
}
::-webkit-scrollbar-thumb {
background-color: #c0c0c0;
border-radius: 3px;
}
</style>
......@@ -9,14 +9,6 @@
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
<el-tooltip content="源码地址" effect="dark" placement="bottom">
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
</el-tooltip>
<el-tooltip content="文档地址" effect="dark" placement="bottom">
<ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
</el-tooltip>
<screenfull id="screenfull" class="right-menu-item hover-effect" />
<el-tooltip content="布局大小" effect="dark" placement="bottom">
......@@ -54,8 +46,6 @@ import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull'
import SizeSelect from '@/components/SizeSelect'
import Search from '@/components/HeaderSearch'
import RuoYiGit from '@/components/RuoYi/Git'
import RuoYiDoc from '@/components/RuoYi/Doc'
export default {
components: {
......@@ -64,9 +54,7 @@ export default {
Hamburger,
Screenfull,
SizeSelect,
Search,
RuoYiGit,
RuoYiDoc
Search
},
computed: {
...mapGetters([
......
......@@ -35,7 +35,7 @@ export default {
},
data() {
return {
title: process.env.VUE_APP_TITLE,
title: '高等学校实验室信息统计系统',
logo: logoImg
}
}
......
......@@ -182,7 +182,7 @@ export default {
})
},
closeOthersTags() {
this.$router.push(this.selectedTag.fullPath).catch(()=>{});
this.$router.push(this.selectedTag).catch(()=>{});
this.$tab.closeOtherPage(this.selectedTag).then(() => {
this.moveToCurrentTag()
})
......
<template>
<div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
<el-scrollbar>
<div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
<sidebar v-if="!sidebar.hide" class="sidebar-container"/>
<div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
......@@ -12,6 +13,7 @@
<settings/>
</right-panel>
</div>
</el-scrollbar>
</div>
</template>
......@@ -72,6 +74,14 @@ export default {
height: 100%;
width: 100%;
.el-scrollbar{
height: 100%;
}
::v-deep .el-scrollbar__wrap {
overflow-x: hidden;
}
&.mobile.openSidebar {
position: fixed;
top: 0;
......
......@@ -15,7 +15,7 @@ import plugins from './plugins' // plugins
import { download } from '@/utils/request'
import './assets/icons' // icon
// import './permission' // permission control
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";
......
......@@ -46,11 +46,6 @@ export const constantRoutes = [
component: () => import('@/views/login'),
hidden: true
},
{
path: '/home',
component: () => import('@/views/home'),
hidden: true
},
{
path: '/register',
component: () => import('@/views/register'),
......@@ -132,7 +127,7 @@ export const dynamicRoutes = [
permissions: ['system:dict:list'],
children: [
{
path: 'index/:dictId(\\d+)',
path: 'index/:dictId(\\w+)',
component: () => import('@/views/system/dict/data'),
name: 'Data',
meta: { title: '字典数据', activeMenu: '/system/dict' }
......@@ -171,15 +166,9 @@ export const dynamicRoutes = [
// 防止连续点击多次路由报错
let routerPush = Router.prototype.push;
let routerReplace = Router.prototype.replace;
// push
Router.prototype.push = function push(location) {
return routerPush.call(this, location).catch(err => err)
}
// replace
Router.prototype.replace = function push(location) {
return routerReplace.call(this, location).catch(err => err)
}
export default new Router({
mode: 'history', // 去掉url中的#
......
import { isArray } from 'util'
import { exportDefault, titleCase } from '@/utils/index'
import { trigger } from './config'
......@@ -132,12 +133,12 @@ function buildRules(conf, ruleList) {
const rules = []
if (trigger[conf.tag]) {
if (conf.required) {
const type = Array.isArray(conf.defaultValue) ? 'type: \'array\',' : ''
let message = Array.isArray(conf.defaultValue) ? `请至少选择一个${conf.vModel}` : conf.placeholder
const type = isArray(conf.defaultValue) ? 'type: \'array\',' : ''
let message = isArray(conf.defaultValue) ? `请至少选择一个${conf.vModel}` : conf.placeholder
if (message === undefined) message = `${conf.label}不能为空`
rules.push(`{ required: true, ${type} message: '${message}', trigger: '${trigger[conf.tag]}' }`)
}
if (conf.regList && Array.isArray(conf.regList)) {
if (conf.regList && isArray(conf.regList)) {
conf.regList.forEach(item => {
if (item.pattern) {
rules.push(`{ pattern: ${eval(item.pattern)}, message: '${item.message}', trigger: '${trigger[conf.tag]}' }`)
......
<template>
<div class="root-contianer">
<div class="content">
<div class="header">
<img class="logo" src="../assets/uliss/logo.png" alt="" />
<div class="title">
<div class="title-cn">高等学校实验室信息统计系统</div>
<div class="title-en">
University laboratory information statistical system
</div>
</div>
</div>
<div class="notic">
<div class="icon-wrapper"><img class="icon" src="../assets/uliss/volume-up.png" alt="" />公告:</div>
<div class="msg">
<span class="scroll-txt">2022-2023学年数据上报站点于2023年9月1日正式启用,上报站点于2023年9月1日正式启用</span>
</div>
<span class="date">今天是2023/6/26 星期一</span>
</div>
<div class="cotent-row">
<div class="entry-area big">
<div class="entry-header">
<img class="icon" src="../assets/uliss/icon-notic.png" alt="" />
<span class="title">通知公告</span>
<span class="more-link">更多>></span>
</div>
<div class="link-list">
<div
v-for="item in [1, 2, 3, 4, 5, 6, 7]"
:key="item"
class="link-item"
>
<span class="txt one-line dot"
>教育部办公厅关于报送2021-2022学年教育部办公厅关于报送2021-2022学年</span
>
<span v-if="item === 1" class="new-flag"
><img src="../assets/uliss/new-txt.png"
/></span>
<span class="date">2023-06-21</span>
</div>
</div>
</div>
<div class="entry-area">
<div class="entry-header">
<img class="icon" src="../assets/uliss/icon-login.png" alt="" />
<span class="title">欢迎登录</span>
</div>
<el-form class="form-body">
<el-form-item prop="username1">
<el-input
class="login-input"
placeholder="用户编号"
type="text"
auto-complete="off"
size="large"
></el-input>
</el-form-item>
<el-form-item prop="password1">
<el-input
class="login-input"
placeholder="用户密码"
type="password"
auto-complete="off"
size="large"
></el-input>
</el-form-item>
<el-form-item>
<div class="auth-code">
<el-input
class="login-input"
auto-complete="off"
placeholder="验证码"
size="large"
></el-input>
<el-image class="code-img" src="" />
</div>
</el-form-item>
<el-form-item prop="code">
<el-button :loading="loading" class="login-btn" type="primary">
<span>登 录</span>
</el-button>
</el-form-item>
</el-form>
<a href="#" class="login-tips">>>上报前注意事项</a>
</div>
</div>
<div class="cotent-row">
<div class="entry-area big">
<div class="entry-header">
<img class="icon" src="../assets/uliss/icon-service.png" alt="" />
<span class="title">服务资讯</span>
<span class="more-link">更多>></span>
</div>
<div class="link-list">
<div
v-for="item in [1, 2, 3, 4, 5, 6, 7]"
:key="item"
class="link-item"
>
<span class="txt one-line full dot"
>最新普通和成人高等学校清单(截至2023年6月15日)</span
>
<span class="date">2023-06-21</span>
</div>
</div>
</div>
<div class="entry-area">
<div class="entry-header">
<img class="icon" src="../assets/uliss/icon-contact.png" alt="" />
<span class="title">联系方式</span>
</div>
<div class="link-list">
<div
v-for="item in [1, 2, 3, 4, 5, 6, 7]"
:key="item"
class="link-item"
>
<span class="txt one-line full blue"
>填报业务咨询:联系方式见省级教育行政部门通知</span
>
<span v-if="item === 1" class="new-flag"
><img src="../assets/uliss/new-txt.png"
/></span>
</div>
</div>
</div>
</div>
<div class="cotent-row">
<div class="entry-area big">
<div class="entry-header">
<img class="icon" src="../assets/uliss/icon-report.png" alt="" />
<span class="title">报表样式</span>
<span class="more-link">更多>></span>
</div>
<div class="link-list">
<div
v-for="item in [1, 2, 3, 4, 5, 6, 7]"
:key="item"
class="link-item"
>
<span class="txt one-line full"
>基表一 教学科研仪器设备表 (SJ1)</span
>
<span class="btn">在线查阅</span>
</div>
</div>
</div>
<div class="entry-area">
<div class="entry-header hot">
<img class="icon" src="../assets/uliss/icon-hot.png" alt="" />
<span class="title"><span class="skew">热门服务</span> <span class="small">////////////////</span></span>
<span class="more-link">更多>></span>
</div>
<div class="link-list">
<div
v-for="(item, index) in [1, 2, 3, 4, 5, 6, 7]"
:key="item"
class="link-item"
>
<span class="txt one-line full"
><span class="index-num" :class="{ top: index < 3 }">{{
index + 1
}}</span
>“这是一个软件标题”</span
>
<span class="btn">下载</span>
</div>
</div>
</div>
</div>
<div class="cotent-row">
<div class="entry-area big">
<div class="entry-header">
<img class="icon" src="../assets/uliss/icon-desc.png" alt="" />
<span class="title">填报说明</span>
<span class="more-link">更多>></span>
</div>
<div class="link-list">
<div
v-for="item in [1, 2, 3, 4, 5, 6, 7]"
:key="item"
class="link-item"
>
<span class="txt one-line full"
>基表一 教学科研仪器设备表 (SJ1)</span
>
<span class="btn">在线查阅</span>
</div>
</div>
</div>
<div class="entry-area">
<div class="entry-header">
<img class="icon" src="../assets/uliss/icon-help.png" alt="" />
<span class="title">使用帮助</span>
</div>
<div class="link-list">
<div
v-for="item in [1, 2, 3, 4, 5, 6, 7]"
:key="item"
class="link-item"
>
<span class="txt one-line full">上报系统操作说明</span>
<span class="btn">在线查阅</span>
</div>
</div>
</div>
</div>
</div>
<div class="footer">
<div>版权所有 (C) 2005-2022 中华人民共和国教育部</div>
<div>
京ICP备10028400号-1 京公网安备11010202007625号 网站标识码:bm05000001
</div>
</div>
</div>
</template>
<script>
export default {
name: "Home",
};
</script>
<style scoped lang="scss">
.one-line {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.root-contianer {
background: url(../assets/uliss/home-bg.png) no-repeat top center;
background-size: contain;
min-height: 100vh;
background-color: #dfe6ee;
.content {
width: 980px;
margin: 0 auto;
}
}
.header {
display: flex;
align-items: center;
padding-top: 60px;
.logo {
width: 64px;
height: 68px;
}
.title {
flex-grow: 1;
padding-left: 10px;
font-size: 0;
}
.title-cn {
margin-bottom: 14px;
font-size: 40px;
font-weight: bold;
color: #d7e1e9;
line-height: 40px;
text-shadow: 0px 2px 0px rgba(19, 38, 69, 0.8);
}
.title-en {
font-size: 16px;
font-weight: 400;
color: #ffffff;
line-height: 17px;
text-shadow: 0px 2px 0px rgba(19, 38, 69, 0.8);
}
}
.notic {
display: flex;
height: 48px;
padding: 0 30px;
margin: 30px 0 20px 0;
line-height: 48px;
background: linear-gradient(0deg, #4fb1fa, #558ce7);
border-radius: 4px;
font-size: 18px;
font-weight: 400;
color: #ffffff;
align-items: center;
.icon-wrapper {
flex-shrink: 0;
}
.icon {
width: 24px;
height: 24px;
margin-right: 10px;
vertical-align: middle;
}
.msg {
flex-grow: 1;
overflow: hidden;
white-space: nowrap;
}
.scroll-txt {
display: inline-block;
white-space: nowrap;
animation: scroll 10s linear infinite;
}
.date {
flex-shrink: 0;
}
}
.cotent-row {
display: flex;
justify-content: space-between;
margin-bottom: 30px;
&:last-child {
margin-bottom: 0;
}
.entry-area {
background: #ffffff;
box-shadow: 4px 4px 10px 0px rgba(19, 39, 79, 0.06);
border-radius: 4px;
padding: 20px;
width: 430px;
box-sizing: border-box;
&.big {
flex-grow: 1;
margin-right: 20px;
}
.entry-header {
position: relative;
border-bottom: 2px solid #dce4f3;
padding-bottom: 8px;
line-height: 24px;
&.hot {
border-bottom: none;
color: #eb6724;
.title {
font-size: 18px;
font-weight: bold;
font-style: italic;
color: #eb6724;
.skew {
display: inline-block;
transform: skew(-20deg, 0);
}
.small {
font-size: 9px;
}
}
.more-link {
color: #eb6724;
}
&::after {
content: "";
position: absolute;
bottom: -12px;
left: 40px;
width: 50px;
height: 22px;
background: url(../assets/uliss/hot-ring.png);
background-size: 100% 100%;
}
}
&::after {
content: "";
position: absolute;
bottom: -2px;
left: 0;
width: 80px;
height: 2px;
background: #5785e7;
}
.icon {
width: 24px;
height: 24px;
margin-right: 7px;
vertical-align: -6px;
}
.title {
font-size: 18px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #5785e7;
}
.more-link {
float: right;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #567fe6;
&:hover {
cursor: pointer;
}
}
}
.link-list {
padding: 30px 0 0 0;
}
.link-item {
position: relative;
display: flex;
justify-content: space-between;
margin-bottom: 30px;
color: #3c3c3c;
align-content: center;
&:hover {
color: #567fe6;
cursor: pointer;
}
.txt {
width: 286px;
font-size: 16px;
font-weight: 400;
&.full {
flex-grow: 1;
}
&.dot::before {
display: inline-block;
content: "";
width: 4px;
height: 4px;
margin-right: 7px;
background: #406ce2;
vertical-align: 4px;
}
&.blue {
color: #567fe6;
&:hover {
text-decoration: underline;
}
}
.index-num {
margin-right: 8px;
color: #747474;
&.top {
color: #eb6724;
}
}
}
.new-flag {
flex-grow: 1;
img {
width: 22px;
}
}
.date {
flex-shrink: 0;
font-size: 16px;
font-weight: 400;
}
.btn {
flex-shrink: 0;
width: 82px;
line-height: 34px;
background: linear-gradient(0deg, #f0f4ff, #ffffff);
border: 1px solid #d1d1d1;
color: #3c3c3c;
text-align: center;
margin-top: -6px;
}
}
}
}
.form-body {
padding-top: 30px;
.auth-code {
display: flex;
}
.code-img {
width: 140px;
height: 40px;
background: #ffffff;
border-radius: 4px;
margin-left: 19px;
cursor: pointer;
}
.login-btn {
display: block;
height: 48px;
width: 100%;
border: none;
background: linear-gradient(0deg, #4fb1fa, #558ce7);
border-radius: 4px;
font-size: 18px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
}
}
.login-tips {
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #ff4e79;
}
.footer {
padding: 74px 0;
background: #497dce;
text-align: center;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
line-height: 36px;
margin-top: 112px;
}
@keyframes scroll {
0% {
transform: translateX(100%);
}
100% {
transform: translateX(-100%);
}
}
</style>
<template>
<div class="app-container home">
<el-row :gutter="20">
<el-col :sm="24" :lg="24">
<blockquote class="text-warning" style="font-size: 14px">
领取阿里云通用云产品1888优惠券
<br />
<el-link
href="https://www.aliyun.com/minisite/goods?userCode=brki8iof"
type="primary"
target="_blank"
>https://www.aliyun.com/minisite/goods?userCode=brki8iof</el-link
>
<br />
领取腾讯云通用云产品2860优惠券
<br />
<el-link
href="https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console"
type="primary"
target="_blank"
>https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console</el-link
>
<br />
阿里云服务器折扣区
<el-link href="http://aly.ruoyi.vip" type="primary" target="_blank"
>>☛☛点我进入☚☚</el-link
>
&nbsp;&nbsp;&nbsp; 腾讯云服务器秒杀区
<el-link href="http://txy.ruoyi.vip" type="primary" target="_blank"
>>☛☛点我进入☚☚</el-link
><br />
<h4 class="text-danger">
云产品通用红包,可叠加官网常规优惠使用。(仅限新用户)
</h4>
</blockquote>
<hr />
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :sm="24" :lg="12" style="padding-left: 20px">
<h2>若依后台管理框架</h2>
<p>
一直想做一款后台管理系统,看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统,她可以用于所有的Web应用程序,如网站管理后台,网站会员中心,CMS,CRM,OA等等,当然,您也可以对她进行深度定制,以做出更强系统。所有前端后台代码封装过后十分精简易上手,出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
</p>
<p>
<b>当前版本:</b> <span>v{{ version }}</span>
</p>
<p>
<el-tag type="danger">&yen;免费开源</el-tag>
</p>
<p>
<el-button
type="primary"
size="mini"
icon="el-icon-cloudy"
plain
@click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
>访问码云</el-button
>
<el-button
size="mini"
icon="el-icon-s-home"
plain
@click="goTarget('http://ruoyi.vip')"
>访问主页</el-button
>
</p>
</el-col>
<el-col :sm="24" :lg="12" style="padding-left: 50px">
<el-row>
<el-col :span="12">
<h2>技术选型</h2>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<h4>后端技术</h4>
<ul>
<li>SpringBoot</li>
<li>Spring Security</li>
<li>JWT</li>
<li>MyBatis</li>
<li>Druid</li>
<li>Fastjson</li>
<li>...</li>
</ul>
</el-col>
<el-col :span="6">
<h4>前端技术</h4>
<ul>
<li>Vue</li>
<li>Vuex</li>
<li>Element-ui</li>
<li>Axios</li>
<li>Sass</li>
<li>Quill</li>
<li>...</li>
</ul>
</el-col>
</el-row>
</el-col>
</el-row>
<el-divider />
<el-row :gutter="20">
<el-col :xs="24" :sm="24" :md="12" :lg="8">
<el-card class="update-log">
<div slot="header" class="clearfix">
<span>联系信息</span>
</div>
<div class="body">
<p>
<i class="el-icon-s-promotion"></i> 官网:<el-link
href="http://www.ruoyi.vip"
target="_blank"
>http://www.ruoyi.vip</el-link
>
</p>
<p>
<i class="el-icon-user-solid"></i> QQ群:<s> 满937441 </s> <s> 满887144332 </s>
<s> 满180251782 </s> <s> 满104180207 </s> <s> 满186866453 </s> <s> 满201396349 </s>
<s> 满101456076 </s> <s> 满101539465 </s> <s> 满264312783 </s> <s> 满167385320 </s>
<s> 满104748341 </s> <s> 满160110482 </s> <s> 满170801498 </s> <s> 满108482800 </s>
<s> 满101046199 </s> <a href="https://jq.qq.com/?_wv=1027&k=tKEt51dz" target="_blank">136919097</a>
</p>
<p>
<i class="el-icon-chat-dot-round"></i> 微信:<a
href="javascript:;"
>/ *若依</a
>
</p>
<p>
<i class="el-icon-money"></i> 支付宝:<a
href="javascript:;"
class="支付宝信息"
>/ *若依</a
>
</p>
</div>
</el-card>
</el-col>
<el-col :xs="24" :sm="24" :md="12" :lg="8">
<el-card class="update-log">
<div slot="header" class="clearfix">
<span>更新日志</span>
</div>
<el-collapse accordion>
<el-collapse-item title="v3.8.6 - 2023-06-30">
<ol>
<li>支持登录IP黑名单限制</li>
<li>新增监控页面图标显示</li>
<li>操作日志新增消耗时间属性</li>
<li>屏蔽定时任务bean违规的字符</li>
<li>日志管理使用索引提升查询性能</li>
<li>日志注解支持排除指定的请求参数</li>
<li>支持自定义隐藏属性列过滤子对象</li>
<li>升级oshi到最新版本6.4.3</li>
<li>升级druid到最新版本1.2.16</li>
<li>升级fastjson到最新版2.0.34</li>
<li>升级spring-boot到最新版本2.5.15</li>
<li>升级element-ui到最新版本2.15.13</li>
<li>移除apache/commons-fileupload依赖</li>
<li>修复页面切换时布局错乱的问题</li>
<li>修复匿名注解Anonymous空指针问题</li>
<li>修复路由跳转被阻止时内部产生报错信息问题</li>
<li>修复isMatchedIp的参数判断产生空指针的问题</li>
<li>修复用户多角色数据权限可能出现权限抬升的情况</li>
<li>修复开启TopNav后一级菜单路由参数设置无效问题</li>
<li>修复DictTag组件value没有匹配的值时则展示value</li>
<li>优化文件下载出现的异常</li>
<li>优化选择图标组件高亮回显</li>
<li>优化弹窗后导航栏偏移的问题</li>
<li>优化修改密码日志存储明文问题</li>
<li>优化页签栏关闭其他出现的异常问题</li>
<li>优化页签关闭左侧选项排除首页选项</li>
<li>优化关闭当前tab页跳转最右侧tab页</li>
<li>优化缓存列表清除操作提示不变的问题</li>
<li>优化字符未使用下划线不进行驼峰式处理</li>
<li>优化用户导入更新时需获取用户编号问题</li>
<li>优化侧边栏的平台标题与VUE_APP_TITLE保持同步</li>
<li>优化导出Excel时设置dictType属性重复查缓存问题</li>
<li>连接池Druid支持新的配置connectTimeout和socketTimeout</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.8.5 - 2023-01-01">
<ol>
<li>定时任务违规的字符</li>
<li>重置时取消部门选中</li>
<li>新增返回警告消息提示</li>
<li>忽略不必要的属性数据返回</li>
<li>修改参数键名时移除前缓存配置</li>
<li>导入更新用户数据前校验数据权限</li>
<li>兼容Excel下拉框内容过多无法显示的问题</li>
<li>升级echarts到最新版本5.4.0</li>
<li>升级core-js到最新版本3.25.3</li>
<li>升级oshi到最新版本6.4.0</li>
<li>升级kaptcha到最新版2.3.3</li>
<li>升级druid到最新版本1.2.15</li>
<li>升级fastjson到最新版2.0.20</li>
<li>升级pagehelper到最新版1.4.6</li>
<li>优化弹窗内容过多展示不全问题</li>
<li>优化swagger-ui静态资源使用缓存</li>
<li>开启TopNav没有子菜单隐藏侧边栏</li>
<li>删除fuse无效选项maxPatternLength</li>
<li>优化导出对象的子列表为空会出现[]问题</li>
<li>优化编辑头像时透明部分会变成黑色问题</li>
<li>优化小屏幕上修改头像界面布局错位的问题</li>
<li>修复代码生成勾选属性无效问题</li>
<li>修复文件上传组件格式验证问题</li>
<li>修复回显数据字典数组异常问题</li>
<li>修复sheet超出最大行数异常问题</li>
<li>修复Log注解GET请求记录不到参数问题</li>
<li>修复调度日志点击多次数据不变化的问题</li>
<li>修复主题颜色在Drawer组件不会加载问题</li>
<li>修复文件名包含特殊字符的文件无法下载问题</li>
<li>修复table中更多按钮切换主题色未生效修复问题</li>
<li>修复某些特性的环境生成代码变乱码TXT文件问题</li>
<li>修复代码生成图片/文件/单选时选择必填无法校验问题</li>
<li>修复某些特性的情况用户编辑对话框中角色和部门无法修改问题</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.8.4 - 2022-09-26">
<ol>
<li>数据逻辑删除不进行唯一验证</li>
<li>Excel注解支持导出对象的子列表方法</li>
<li>Excel注解支持自定义隐藏属性列</li>
<li>Excel注解支持backgroundColor属性设置背景色</li>
<li>支持配置密码最大错误次数/锁定时间</li>
<li>登录日志新增解锁账户功能</li>
<li>通用下载方法新增config配置选项</li>
<li>支持多权限字符匹配角色数据权限</li>
<li>页面内嵌iframe切换tab不刷新数据</li>
<li>操作日志记录支持排除敏感属性字段</li>
<li>修复多文件上传报错出现的异常问题</li>
<li>修复图片预览组件src属性为null值控制台报错问题</li>
<li>升级oshi到最新版本6.2.2</li>
<li>升级fastjson到最新版2.0.14</li>
<li>升级pagehelper到最新版1.4.3</li>
<li>升级core-js到最新版本3.25.2</li>
<li>升级element-ui到最新版本2.15.10</li>
<li>优化任务过期不执行调度</li>
<li>优化字典数据使用store存取</li>
<li>优化修改资料头像被覆盖的问题</li>
<li>优化修改用户登录账号重复验证</li>
<li>优化代码生成同步后值NULL问题</li>
<li>优化定时任务支持执行父类方法</li>
<li>优化用户个人信息接口防止修改部门</li>
<li>优化布局设置使用el-drawer抽屉显示</li>
<li>优化没有权限的用户编辑部门缺少数据</li>
<li>优化日志注解记录限制请求地址的长度</li>
<li>优化excel/scale属性导出单元格数值类型</li>
<li>优化日志操作中重置按钮时重复查询的问题</li>
<li>优化多个相同角色数据导致权限SQL重复问题</li>
<li>优化表格上右侧工具条(搜索按钮显隐&右侧样式凸出)</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.8.3 - 2022-06-27">
<ol>
<li>新增缓存列表菜单功能</li>
<li>代码生成树表新增(展开/折叠)</li>
<li>Excel注解支持color字体颜色</li>
<li>新增Anonymous匿名访问不鉴权注解</li>
<li>用户头像上传限制只能为图片格式</li>
<li>接口使用泛型使其看到响应属性字段</li>
<li>检查定时任务bean所在包名是否为白名单配置</li>
<li>添加页签openPage支持传递参数</li>
<li>用户缓存信息添加部门ancestors祖级列表</li>
<li>升级element-ui到最新版本2.15.8</li>
<li>升级oshi到最新版本6.1.6</li>
<li>升级druid到最新版本1.2.11</li>
<li>升级fastjson到最新版2.0.8</li>
<li>升级spring-boot到最新版本2.5.14</li>
<li>降级jsencrypt版本兼容IE浏览器</li>
<li>删除多余的salt字段</li>
<li>新增获取不带后缀文件名称方法</li>
<li>新增获取配置文件中的属性值方法</li>
<li>新增内容编码/解码方便插件集成使用</li>
<li>字典类型必须以字母开头,且只能为(小写字母,数字,下滑线)</li>
<li>优化设置分页参数默认值</li>
<li>优化对空字符串参数处理的过滤</li>
<li>优化显示顺序orderNum类型为整型</li>
<li>优化表单构建按钮不显示正则校验</li>
<li>优化字典数据回显样式下拉框显示值</li>
<li>优化R响应成功状态码与全局保持一致</li>
<li>优化druid开启wall过滤器出现的异常问题</li>
<li>优化用户管理左侧树型组件增加选中高亮保持</li>
<li>优化新增用户与角色信息&用户与岗位信息逻辑</li>
<li>优化默认不启用压缩文件缓存防止node_modules过大</li>
<li>修复字典数据显示不全问题</li>
<li>修复操作日志查询类型条件为0时会查到所有数据</li>
<li>修复Excel注解prompt/combo同时使用不生效问题</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.8.2 - 2022-04-01">
<ol>
<li>前端支持设置是否需要防止数据重复提交</li>
<li>开启TopNav没有子菜单情况隐藏侧边栏</li>
<li>侧边栏菜单名称过长悬停显示标题</li>
<li>用户访问控制时校验数据权限,防止越权</li>
<li>导出Excel时屏蔽公式,防止CSV注入风险</li>
<li>组件ImagePreview支持多图预览显示</li>
<li>组件ImageUpload支持多图同时选择上传</li>
<li>组件FileUpload支持多文件同时选择上传</li>
<li>服务监控新增运行参数信息显示</li>
<li>定时任务目标字符串过滤特殊字符</li>
<li>定时任务目标字符串验证包名白名单</li>
<li>代码生成列表图片支持预览</li>
<li>代码生成编辑修改打开新页签</li>
<li>代码生成新增Java类型Boolean</li>
<li>代码生成子表支持日期/字典配置</li>
<li>代码生成同步保留必填/类型选项</li>
<li>升级oshi到最新版本6.1.2</li>
<li>升级fastjson到最新版1.2.80</li>
<li>升级pagehelper到最新版1.4.1</li>
<li>升级spring-boot到最新版本2.5.11</li>
<li>升级spring-boot-mybatis到最新版2.2.2</li>
<li>添加遗漏的分页参数合理化属性</li>
<li>修改npm即将过期的注册源地址</li>
<li>修复分页组件请求两次问题</li>
<li>修复通用文件下载接口跨域问题</li>
<li>修复Xss注解字段值为空时的异常问题</li>
<li>修复选项卡点击右键刷新丢失参数问题</li>
<li>修复表单清除元素位置未垂直居中问题</li>
<li>修复服务监控中运行参数显示条件错误</li>
<li>修复导入Excel时字典字段类型为Long转义为空问题</li>
<li>修复登录超时刷新页面跳转登录页面还提示重新登录问题</li>
<li>优化加载字典缓存数据</li>
<li>优化IP地址获取到多个的问题</li>
<li>优化任务队列满时任务拒绝策略</li>
<li>优化文件上传兼容Weblogic环境</li>
<li>优化定时任务默认保存到内存中执行</li>
<li>优化部门修改缩放后出现的错位问题</li>
<li>优化Excel格式化不同类型的日期对象</li>
<li>优化菜单表关键字导致的插件报错问题</li>
<li>优化Oracle用户头像列为空时不显示问题</li>
<li>优化页面若未匹配到字典标签则返回原字典值</li>
<li>优化修复登录失效后多次请求提示多次弹窗问题</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.8.1 - 2022-01-01">
<ol>
<li>新增Vue3前端代码生成模板</li>
<li>新增图片预览组件</li>
<li>新增压缩插件实现打包Gzip</li>
<li>自定义xss校验注解实现</li>
<li>自定义文字复制剪贴指令</li>
<li>代码生成预览支持复制内容</li>
<li>路由支持单独配置菜单或角色权限</li>
<li>用户管理部门查询选择节点后分页参数初始</li>
<li>修复用户分配角色属性错误</li>
<li>修复打包后字体图标偶现的乱码问题</li>
<li>修复菜单管理重置表单出现的错误</li>
<li>修复版本差异导致的懒加载报错问题</li>
<li>修复Cron组件中周回显问题</li>
<li>修复定时任务多参数逗号分隔的问题</li>
<li>修复根据ID查询列表可能出现的主键溢出问题</li>
<li>修复tomcat配置参数已过期问题</li>
<li>升级clipboard到最新版本2.0.8</li>
<li>升级oshi到最新版本v5.8.6</li>
<li>升级fastjson到最新版1.2.79</li>
<li>升级spring-boot到最新版本2.5.8</li>
<li>升级log4j2到2.17.1,防止漏洞风险</li>
<li>优化下载解析blob异常提示</li>
<li>优化代码生成字典组重复问题</li>
<li>优化查询用户的角色组&岗位组代码</li>
<li>优化定时任务cron表达式小时设置24</li>
<li>优化用户导入提示溢出则显示滚动条</li>
<li>优化防重复提交标识组合为(key+url+header)</li>
<li>优化分页方法设置成通用方便灵活调用</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.8.0 - 2021-12-01">
<ol>
<li>新增配套并同步的Vue3前端版本</li>
<li>新增通用方法简化模态/缓存/下载/权限/页签使用</li>
<li>优化导出数据/使用通用下载方法</li>
<li>Excel注解支持自定义数据处理器</li>
<li>Excel注解支持导入导出标题信息</li>
<li>Excel导入支持@Excels注解</li>
<li>新增组件data-dict,简化数据字典使用</li>
<li>新增Jaxb依赖,防止jdk8以上出现的兼容错误</li>
<li>生产环境使用路由懒加载提升页面响应速度</li>
<li>修复五级以上菜单出现的404问题</li>
<li>防重提交注解支持配置间隔时间/提示消息</li>
<li>日志注解新增是否保存响应参数</li>
<li>任务屏蔽违规字符&参数忽略双引号中的逗号</li>
<li>升级SpringBoot到最新版本2.5.6</li>
<li>升级pagehelper到最新版1.4.0</li>
<li>升级spring-boot-mybatis到最新版2.2.0</li>
<li>升级oshi到最新版本v5.8.2</li>
<li>升级druid到最新版1.2.8</li>
<li>升级velocity到最新版本2.3</li>
<li>升级fastjson到最新版1.2.78</li>
<li>升级axios到最新版本0.24.0</li>
<li>升级dart-sass到版本1.32.13</li>
<li>升级core-js到最新版本3.19.1</li>
<li>升级jsencrypt到最新版本3.2.1</li>
<li>升级js-cookie到最新版本3.0.1</li>
<li>升级file-saver到最新版本2.0.5</li>
<li>升级sass-loader到最新版本10.1.1</li>
<li>升级element-ui到最新版本2.15.6</li>
<li>新增sendGet无参请求方法</li>
<li>禁用el-tag组件的渐变动画</li>
<li>代码生成点击预览重置激活tab</li>
<li>AjaxResult重写put方法,以方便链式调用</li>
<li>优化登录/验证码请求headers不设置token</li>
<li>优化用户个人信息接口防止修改用户名</li>
<li>优化Cron表达式生成器关闭时销毁避免缓存</li>
<li>优化注册成功提示消息类型success</li>
<li>优化aop语法,使用spring自动注入注解</li>
<li>优化记录登录信息,移除不必要的修改</li>
<li>优化mybatis全局默认的执行器</li>
<li>优化Excel导入图片可能出现的异常</li>
<li>修复代码生成模板主子表删除缺少事务</li>
<li>修复日志记录可能出现的转换异常</li>
<li>修复代码生成复选框字典遗漏问题</li>
<li>修复关闭xss功能导致可重复读RepeatableFilter失效</li>
<li>修复字符串无法被反转义问题</li>
<li>修复后端主子表代码模板方法名生成错误问题</li>
<li>修复xss过滤后格式出现的异常</li>
<li>修复swagger没有指定dataTypeClass导致启动出现warn日志</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.7.0 - 2021-09-13">
<ol>
<li>参数管理支持配置验证码开关</li>
<li>新增是否开启用户注册功能</li>
<li>定时任务支持在线生成cron表达式</li>
<li>菜单管理支持配置路由参数</li>
<li>支持自定义注解实现接口限流</li>
<li>Excel注解支持Image图片导入</li>
<li>自定义弹层溢出滚动样式</li>
<li>自定义可拖动弹窗宽度指令</li>
<li>自定义可拖动弹窗高度指令</li>
<li>修复任意账户越权问题</li>
<li>修改时检查用户数据权限范围</li>
<li>修复保存配置主题颜色失效问题</li>
<li>新增暗色菜单风格主题</li>
<li>菜单&部门新增展开/折叠功能</li>
<li>页签新增关闭左侧&添加图标</li>
<li>顶部菜单排除隐藏的默认路由</li>
<li>顶部菜单同步系统主题样式</li>
<li>跳转路由高亮相对应的菜单栏</li>
<li>代码生成主子表多选行数据</li>
<li>日期范围支持添加多组</li>
<li>升级element-ui到最新版本2.15.5</li>
<li>升级oshi到最新版本v5.8.0</li>
<li>升级commons.io到最新版本v2.11.0</li>
<li>定时任务屏蔽ldap远程调用</li>
<li>定时任务屏蔽http(s)远程调用</li>
<li>补充定时任务表字段注释</li>
<li>定时任务对检查异常进行事务回滚</li>
<li>启用父部门状态排除顶级节点</li>
<li>富文本新增上传文件大小限制</li>
<li>默认首页使用keep-alive缓存</li>
<li>修改代码生成字典回显样式</li>
<li>自定义分页合理化传入参数</li>
<li>修复字典组件值为整形不显示问题</li>
<li>修复定时任务日志执行状态显示</li>
<li>角色&菜单新增字段属性提示信息</li>
<li>修复角色分配用户页面参数类型错误提醒</li>
<li>优化布局设置动画特效</li>
<li>优化异常处理信息</li>
<li>优化错误token导致的解析异常</li>
<li>密码框新增显示切换密码图标</li>
<li>定时任务新增更多操作</li>
<li>更多操作按钮添加权限控制</li>
<li>导入用户样式优化</li>
<li>提取通用方法到基类控制器</li>
<li>优化使用权限工具获取用户信息</li>
<li>优化用户不能删除自己</li>
<li>优化XSS跨站脚本过滤</li>
<li>优化代码生成模板</li>
<li>验证码默认20s超时</li>
<li>BLOB下载时清除URL对象引用</li>
<li>代码生成导入表按创建时间排序</li>
<li>修复代码生成页面数据编辑保存之后总是跳转第一页的问题</li>
<li>修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题</li>
<li>多图上传组件移除多余的api地址&验证失败导致图片删除问题&无法删除相应图片修复</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.6.0 - 2021-07-12">
<ol>
<li>角色管理新增分配用户功能</li>
<li>用户管理新增分配角色功能</li>
<li>日志列表支持排序操作</li>
<li>优化参数&字典缓存操作</li>
<li>系统布局配置支持动态标题开关</li>
<li>菜单路由配置支持内链访问</li>
<li>默认访问后端首页新增提示语</li>
<li>富文本默认上传返回url类型</li>
<li>新增自定义弹窗拖拽指令</li>
<li>全局注册常用通用组件</li>
<li>全局挂载字典标签组件</li>
<li>ImageUpload组件支持多图片上传</li>
<li>FileUpload组件支持多文件上传</li>
<li>文件上传组件添加数量限制属性</li>
<li>富文本编辑组件添加类型属性</li>
<li>富文本组件工具栏配置视频</li>
<li>封装通用iframe组件</li>
<li>限制超级管理员不允许操作</li>
<li>用户信息长度校验限制</li>
<li>分页组件新增pagerCount属性</li>
<li>添加bat脚本执行应用</li>
<li>升级oshi到最新版本v5.7.4</li>
<li>升级element-ui到最新版本2.15.2</li>
<li>升级pagehelper到最新版1.3.1</li>
<li>升级commons.io到最新版本v2.10.0</li>
<li>升级commons.fileupload到最新版本v1.4</li>
<li>升级swagger到最新版本v3.0.0</li>
<li>修复关闭confirm提示框控制台报错问题</li>
<li>修复存在的SQL注入漏洞问题</li>
<li>定时任务屏蔽rmi远程调用</li>
<li>修复用户搜索分页变量错误</li>
<li>修复导出角色数据范围翻译缺少仅本人</li>
<li>修复表单构建选择下拉选择控制台报错问题</li>
<li>优化图片工具类读取文件</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.5.0 - 2021-05-25">
<ol>
<li>新增菜单导航显示风格TopNav(false为左侧导航菜单,true为顶部导航菜单)</li>
<li>布局设置支持保存&重置配置</li>
<li>修复树表数据显示不全&加载慢问题</li>
<li>新增IE浏览器版本过低提示页面</li>
<li>用户登录后记录最后登录IP&时间</li>
<li>页面导出按钮点击之后添加遮罩</li>
<li>富文本编辑器支持自定义上传地址</li>
<li>富文本编辑组件新增readOnly属性</li>
<li>页签TagsView新增关闭右侧功能</li>
<li>显隐列组件加载初始默认隐藏列</li>
<li>关闭头像上传窗口还原默认图片</li>
<li>个人信息添加手机&邮箱重复验证</li>
<li>代码生成模板导出按钮点击后添加遮罩</li>
<li>代码生成模板树表操作列添加新增按钮</li>
<li>代码生成模板修复主子表字段重名问题</li>
<li>升级fastjson到最新版1.2.76</li>
<li>升级druid到最新版本v1.2.6</li>
<li>升级mybatis到最新版3.5.6 阻止远程代码执行漏洞</li>
<li>升级oshi到最新版本v5.6.0</li>
<li>velocity剔除commons-collections版本,防止3.2.1版本的反序列化漏洞</li>
<li>数据监控页默认账户密码防止越权访问</li>
<li>修复firefox下表单构建拖拽会新打卡一个选项卡</li>
<li>修正后端导入表权限标识</li>
<li>修正前端操作日志&登录日志权限标识</li>
<li>设置Redis配置HashKey序列化</li>
<li>删除操作日志记录信息</li>
<li>上传媒体类型添加视频格式</li>
<li>修复请求形参未传值记录日志异常问题</li>
<li>优化xss校验json请求条件</li>
<li>树级结构更新子节点使用replaceFirst</li>
<li>优化ExcelUtil空值处理</li>
<li>日志记录过滤BindingResult对象,防止异常</li>
<li>修改主题后mini类型按钮无效问题</li>
<li>优化通用下载完成后删除节点</li>
<li>通用Controller添加响应返回消息</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.4.0 - 2021-02-22">
<ol>
<li>代码生成模板支持主子表</li>
<li>表格右侧工具栏组件支持显隐列</li>
<li>图片组件添加预览&移除功能</li>
<li>Excel注解支持Image图片导出</li>
<li>操作按钮组调整为朴素按钮样式</li>
<li>代码生成支持文件上传组件</li>
<li>代码生成日期控件区分范围</li>
<li>代码生成数据库文本类型生成表单文本域</li>
<li>用户手机邮箱&菜单组件修改允许空字符串</li>
<li>升级SpringBoot到最新版本2.2.13 提升启动速度</li>
<li>升级druid到最新版本v1.2.4</li>
<li>升级fastjson到最新版1.2.75</li>
<li>升级element-ui到最新版本2.15.0</li>
<li>修复IE11浏览器报错问题</li>
<li>优化多级菜单之间切换无法缓存的问题</li>
<li>修复四级菜单无法显示问题</li>
<li>修正侧边栏静态路由丢失问题</li>
<li>修复角色管理-编辑角色-功能权限显示异常</li>
<li>配置文件新增redis数据库索引属性</li>
<li>权限工具类增加admin判断</li>
<li>角色非自定义权限范围清空选择值</li>
<li>修复导入数据为负浮点数时丢失精度问题</li>
<li>移除path-to-regexp正则匹配插件</li>
<li>修复生成树表代码异常</li>
<li>修改ip字段长度防止ipv6地址长度不够</li>
<li>防止get请求参数值为false或0等特殊值会导致无法正确的传参</li>
<li>登录后push添加catch防止出现检查错误</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.3.0 - 2020-12-14">
<ol>
<li>新增缓存监控功能</li>
<li>支持主题风格配置</li>
<li>修复多级菜单之间切换无法缓存的问题</li>
<li>多级菜单自动配置组件</li>
<li>代码生成预览支持高亮显示</li>
<li>支持Get请求映射Params参数</li>
<li>删除用户和角色解绑关联</li>
<li>去除用户手机邮箱部门必填验证</li>
<li>Excel支持注解align对齐方式</li>
<li>Excel支持导入Boolean型数据</li>
<li>优化头像样式,鼠标移入悬停遮罩</li>
<li>代码生成预览提供滚动机制</li>
<li>代码生成删除多余的数字float类型</li>
<li>修正转换字符串的目标字符集属性</li>
<li>回显数据字典防止空值报错</li>
<li>日志记录增加过滤多文件场景</li>
<li>修改缓存Set方法可能导致嵌套的问题</li>
<li>移除前端一些多余的依赖</li>
<li>防止安全扫描YUI出现的风险提示</li>
<li>修改node-sass为dart-sass</li>
<li>升级SpringBoot到最新版本2.1.18</li>
<li>升级poi到最新版本4.1.2</li>
<li>升级oshi到最新版本v5.3.6</li>
<li>升级bitwalker到最新版本1.21</li>
<li>升级axios到最新版本0.21.0</li>
<li>升级element-ui到最新版本2.14.1</li>
<li>升级vue到最新版本2.6.12</li>
<li>升级vuex到最新版本3.6.0</li>
<li>升级vue-cli到版本4.5.9</li>
<li>升级vue-router到最新版本3.4.9</li>
<li>升级vue-cli到最新版本4.4.6</li>
<li>升级vue-cropper到最新版本0.5.5</li>
<li>升级clipboard到最新版本2.0.6</li>
<li>升级core-js到最新版本3.8.1</li>
<li>升级echarts到最新版本4.9.0</li>
<li>升级file-saver到最新版本2.0.4</li>
<li>升级fuse.js到最新版本6.4.3</li>
<li>升级js-beautify到最新版本1.13.0</li>
<li>升级js-cookie到最新版本2.2.1</li>
<li>升级path-to-regexp到最新版本6.2.0</li>
<li>升级quill到最新版本1.3.7</li>
<li>升级screenfull到最新版本5.0.2</li>
<li>升级sortablejs到最新版本1.10.2</li>
<li>升级vuedraggable到最新版本2.24.3</li>
<li>升级chalk到最新版本4.1.0</li>
<li>升级eslint到最新版本7.15.0</li>
<li>升级eslint-plugin-vue到最新版本7.2.0</li>
<li>升级lint-staged到最新版本10.5.3</li>
<li>升级runjs到最新版本4.4.2</li>
<li>升级sass-loader到最新版本10.1.0</li>
<li>升级script-ext-html-webpack-plugin到最新版本2.1.5</li>
<li>升级svg-sprite-loader到最新版本5.1.1</li>
<li>升级vue-template-compiler到最新版本2.6.12</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.2.1 - 2020-11-18">
<ol>
<li>阻止任意文件下载漏洞</li>
<li>代码生成支持上传控件</li>
<li>新增图片上传组件</li>
<li>调整默认首页</li>
<li>升级druid到最新版本v1.2.2</li>
<li>mapperLocations配置支持分隔符</li>
<li>权限信息调整</li>
<li>调整sql默认时间</li>
<li>解决代码生成没有bit类型的问题</li>
<li>升级pagehelper到最新版1.3.0</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.2.0 - 2020-10-10">
<ol>
<li>升级springboot版本到2.1.17 提升安全性</li>
<li>升级oshi到最新版本v5.2.5</li>
<li>升级druid到最新版本v1.2.1</li>
<li>升级jjwt到版本0.9.1</li>
<li>升级fastjson到最新版1.2.74</li>
<li>修改sass为node-sass,避免el-icon图标乱码</li>
<li>代码生成支持同步数据库</li>
<li>代码生成支持富文本控件</li>
<li>代码生成页面时不忽略remark属性</li>
<li>代码生成添加select必填选项</li>
<li>Excel导出类型NUMERIC支持精度浮点类型</li>
<li>Excel导出targetAttr优化获取值,防止get方法不规范</li>
<li>Excel注解支持自动统计数据总和</li>
<li>Excel注解支持设置BigDecimal精度&舍入规则</li>
<li>菜单&数据权限新增(展开/折叠 全选/全不选 父子联动)</li>
<li>允许用户分配到部门父节点</li>
<li>菜单新增是否缓存keep-alive</li>
<li>表格操作列间距调整</li>
<li>限制系统内置参数不允许删除</li>
<li>富文本组件优化,支持自定义高度&图片冲突问题</li>
<li>富文本工具栏样式对齐</li>
<li>导入excel整形值校验优化</li>
<li>修复页签关闭所有时固定标签路由不刷新问题</li>
<li>表单构建布局型组件新增按钮</li>
<li>左侧菜单文字过长显示省略号</li>
<li>修正根节点为子部门时,树状结构显示问题</li>
<li>修正调用目标字符串最大长度</li>
<li>修正菜单提示信息错误</li>
<li>修正定时任务执行一次权限标识</li>
<li>修正数据库字符串类型nvarchar</li>
<li>优化递归子节点</li>
<li>优化数据权限判断</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.1.0 - 2020-08-13">
<ol>
<li>表格工具栏右侧添加刷新&显隐查询组件</li>
<li>后端支持CORS跨域请求</li>
<li>代码生成支持选择上级菜单</li>
<li>代码生成支持自定义路径</li>
<li>代码生成支持复选框</li>
<li>Excel导出导入支持dictType字典类型</li>
<li>Excel支持分割字符串组内容</li>
<li>验证码类型支持(数组计算、字符验证)</li>
<li>升级vue-cli版本到4.4.4</li>
<li>修改 node-sass 为 dart-sass</li>
<li>表单类型为Integer/Long设置整形默认值</li>
<li>代码生成器默认mapper路径与默认mapperScan路径不一致</li>
<li>优化防重复提交拦截器</li>
<li>优化上级菜单不能选择自己</li>
<li>修复角色的权限分配后,未实时生效问题</li>
<li>修复在线用户日志记录类型</li>
<li>修复富文本空格和缩进保存后不生效问题</li>
<li>修复在线用户判断逻辑</li>
<li>唯一限制条件只返回单条数据</li>
<li>添加获取当前的环境配置方法</li>
<li>超时登录后页面跳转到首页</li>
<li>全局异常状态汉化拦截处理</li>
<li>HTML过滤器改为将html转义</li>
<li>检查字符支持小数点&降级改成异常提醒</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.0.0 - 2020-07-20">
<ol>
<li>单应用调整为多模块项目</li>
<li>升级element-ui版本到2.13.2</li>
<li>删除babel,提高编译速度。</li>
<li>新增菜单默认主类目</li>
<li>编码文件名修改为uuid方式</li>
<li>定时任务cron表达式验证</li>
<li>角色权限修改时已有权限未自动勾选异常修复</li>
<li>防止切换权限用户后登录出现404</li>
<li>Excel支持sort导出排序</li>
<li>创建用户不允许选择超级管理员角色</li>
<li>修复代码生成导入表结构出现异常页面不提醒问题</li>
<li>修复代码生成点击多次表修改数据不变化的问题</li>
<li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
<li>修复布局为small者mini用户表单显示错位问题</li>
<li>修复热部署导致的强换异常问题</li>
<li>修改用户管理复选框宽度,防止部分浏览器出现省略号</li>
<li>IpUtils工具,清除Xss特殊字符,防止Xff注入攻击</li>
<li>生成domain 如果是浮点型 统一用BigDecimal</li>
<li>定时任务调整label-width,防止部署出现错位</li>
<li>调整表头固定列默认样式</li>
<li>代码生成模板调整,字段为String并且必填则加空串条件</li>
<li>代码生成字典Integer/Long使用parseInt</li>
<li>
修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
</li>
<li>修正岗位导出权限注解</li>
<li>禁止加密密文返回前端</li>
<li>修复代码生成页面中的查询条件创建时间未生效的问题</li>
<li>修复首页搜索菜单外链无法点击跳转问题</li>
<li>修复菜单管理选择图标,backspace删除时不过滤数据</li>
<li>用户管理部门分支节点不可检查&显示计数</li>
<li>数据范围过滤属性调整</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.3.0 - 2020-06-01">
<ol>
<li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
<li>dev启动默认打开浏览器</li>
<li>vue-cli使用默认source-map</li>
<li>slidebar eslint报错优化</li>
<li>当tags-view滚动关闭右键菜单</li>
<li>字典管理添加缓存读取</li>
<li>参数管理支持缓存操作</li>
<li>支持一级菜单(和主页同级)在main区域显示</li>
<li>限制外链地址必须以http(s)开头</li>
<li>tagview & sidebar 主题颜色与element ui(全局)同步</li>
<li>修改数据源类型优先级,先根据方法,再根据类</li>
<li>支持是否需要设置token属性,自定义返回码消息。</li>
<li>swagger请求前缀加入配置。</li>
<li>登录地点设置内容过长则隐藏显示</li>
<li>修复定时任务执行一次按钮后不提示消息问题</li>
<li>修改上级部门(选择项排除本身和下级)</li>
<li>通用http发送方法增加参数 contentType 编码类型</li>
<li>更换IP地址查询接口</li>
<li>修复页签变量undefined</li>
<li>添加校验部门包含未停用的子部门</li>
<li>修改定时任务详情下次执行时间日期显示错误</li>
<li>角色管理查询设置默认排序字段</li>
<li>swagger添加enable参数控制是否启用</li>
<li>只对json类型请求构建可重复读取inputStream的request</li>
<li>修改代码生成字典字段int类型没有自动选中问题</li>
<li>vuex用户名取值修正</li>
<li>表格树模板去掉多余的)</li>
<li>代码生成序号修正</li>
<li>全屏情况下不调整上外边距</li>
<li>代码生成Date字段添加默认格式</li>
<li>用户管理角色选择权限控制</li>
<li>修复路由懒加载报错问题</li>
<li>模板sql.vm添加菜单状态</li>
<li>设置用户名称不能修改</li>
<li>dialog添加append-to-body属性,防止ie遮罩</li>
<li>菜单区分状态和显示隐藏功能</li>
<li>升级fastjson到最新版1.2.68 修复安全加固</li>
<li>修复代码生成如果选择字典类型缺失逗号问题</li>
<li>登录请求params更换为data,防止暴露url</li>
<li>日志返回时间格式处理</li>
<li>添加handle控制允许拖动的元素</li>
<li>布局设置点击扩大范围</li>
<li>代码生成列属性排序查询</li>
<li>代码生成列支持拖动排序</li>
<li>修复时间格式不支持ios问题</li>
<li>表单构建添加父级class,防止冲突</li>
<li>定时任务并发属性修正</li>
<li>角色禁用&菜单隐藏不查询权限</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.2.0 - 2020-03-18">
<ol>
<li>系统监控新增定时任务功能</li>
<li>添加一个打包Web工程bat</li>
<li>修复页签鼠标滚轮按下的时候,可以关闭不可关闭的tag</li>
<li>修复点击退出登录有时会无提示问题</li>
<li>修复防重复提交注解无效问题</li>
<li>修复通知公告批量删除异常问题</li>
<li>添加菜单时路由地址必填限制</li>
<li>代码生成字段描述可编辑</li>
<li>修复用户修改个人信息导致缓存不过期问题</li>
<li>个人信息创建时间获取正确属性值</li>
<li>操作日志详细显示正确类型</li>
<li>导入表单击行数据时选中对应的复选框</li>
<li>批量替换表前缀逻辑调整</li>
<li>固定重定向路径表达式</li>
<li>升级element-ui版本到2.13.0</li>
<li>操作日志排序调整</li>
<li>修复charts切换侧边栏或者缩放窗口显示bug</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.1.0 - 2020-02-24">
<ol>
<li>新增表单构建</li>
<li>代码生成支持树表结构</li>
<li>新增用户导入</li>
<li>修复动态加载路由页面刷新问题</li>
<li>修复地址开关无效问题</li>
<li>汉化错误提示页面</li>
<li>代码生成已知问题修改</li>
<li>修复多数据源下配置关闭出现异常处理</li>
<li>添加HTML过滤器,用于去除XSS漏洞隐患</li>
<li>修复上传头像控制台出现异常</li>
<li>修改用户管理分页不正确的问题</li>
<li>修复验证码记录提示错误</li>
<li>修复request.js缺少Message引用</li>
<li>修复表格时间为空出现的异常</li>
<li>添加Jackson日期反序列化时区配置</li>
<li>调整根据用户权限加载菜单数据树形结构</li>
<li>调整成功登录不恢复按钮,防止多次点击</li>
<li>修改用户个人资料同步缓存信息</li>
<li>修复页面同时出现el-upload和Editor不显示处理</li>
<li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
<li>配置文件新增redis密码属性</li>
<li>设置mybatis全局的配置文件</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v2.0.0 - 2019-12-02">
<ol>
<li>新增代码生成</li>
<li>新增@RepeatSubmit注解,防止重复提交</li>
<li>新增菜单主目录添加/删除操作</li>
<li>日志记录过滤特殊对象,防止转换异常</li>
<li>修改代码生成路由脚本错误</li>
<li>用户上传头像实时同步缓存,无需重新登录</li>
<li>调整切换页签后不重新加载数据</li>
<li>添加jsencrypt实现参数的前端加密</li>
<li>系统退出删除用户缓存记录</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v1.1.0 - 2019-11-11">
<ol>
<li>新增在线用户管理</li>
<li>新增按钮组功能实现(批量删除、导出、清空)</li>
<li>新增查询条件重置按钮</li>
<li>新增Swagger全局Token配置</li>
<li>新增后端参数校验</li>
<li>修复字典管理页面的日期查询异常</li>
<li>修改时间函数命名防止冲突</li>
<li>去除菜单上级校验,默认为顶级</li>
<li>修复用户密码无法修改问题</li>
<li>修复菜单类型为按钮时不显示权限标识</li>
<li>其他细节优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v1.0.0 - 2019-10-08">
<ol>
<li>若依前后端分离系统正式发布</li>
</ol>
</el-collapse-item>
</el-collapse>
</el-card>
</el-col>
<el-col :xs="24" :sm="24" :md="12" :lg="8">
<el-card class="update-log">
<div slot="header" class="clearfix">
<span>捐赠支持</span>
</div>
<div class="body">
<img
src="@/assets/images/pay.png"
alt="donate"
width="100%"
/>
<span style="display: inline-block; height: 30px; line-height: 30px"
>你可以请作者喝杯咖啡表示鼓励</span
>
</div>
</el-card>
</el-col>
</el-row>
</div>
</template>
......@@ -946,7 +10,7 @@ export default {
data() {
return {
// 版本号
version: "3.8.6"
version: "1.0.0"
};
},
methods: {
......
<template>
<div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">若依后台管理系统</h3>
<div class="root-contianer">
<div class="content">
<div class="header">
<img class="logo" src="../assets/shangbao/logo.png" alt="" />
<div class="title">
<div class="title-cn">高等学校实验室信息统计系统</div>
<!-- <div class="title-en">
University laboratory information statistical system
</div> -->
</div>
</div>
<div class="notic">
<img class="icon" src="../assets/shangbao/volume-up.png" alt="" />
<span class="msg one-line"
>公告:2022-2023学年数据上报站点于2023年9月1日正式启用,上报站点于2023年9月1日正式启用</span
>
<span class="date">今天是{{ currentTime }}</span>
</div>
<div class="cotent-row">
<div class="entry-area big">
<div class="entry-header">
<img class="icon" src="../assets/shangbao/icon-notic.png" alt="" />
<span class="title">政策文件</span>
<span class="more-link">更多>></span>
</div>
<!-- 政策文件列表框 -->
<div class="link-list">
<!-- v-for="item in [1, 2, 3, 4, 5, 6, 7]" -->
<div :key="item" class="link-item">
<a
style="width: 600px"
class="txt one-line dot"
href="http://www.moe.gov.cn/srcsite/A08/s7056/202307/t20230706_1067465.html"
>教育部办公厅关于报送2022-2023学年高等学校实验室信息统计数据的通知(教高厅函
[2023] 14号)</a
>
<span v-if="item === 1" class="new-flag"
><img src="../assets/shangbao/new-txt.png"
/></span>
<!-- <span class="date">2023-06-21</span> -->
</div>
<div :key="item" class="link-item">
<a download href="#" style="width: 600px" class="txt one-line dot"
>高等学校实验室信息统计检测系统 (V2023单机版)
免安装版下载(释放到文件夹中执行检测.exe)</a
>
</div>
<div :key="item" class="link-item">
<a
href="http://www.stats.gov.cn/fw/bmdcxmsp/bmzd/202302/t20230215_1907146.html"
style="width: 600px"
class="txt one-line dot"
>高等学校实验室信息统计调查制度(国统制 [2021] 135号)</a
>
</div>
<div :key="item" class="link-item">
<a
href="http://www.stats.gov.cn/fw/tjxzcfgs/lffg/202302/t20230215_1905287.html"
style="width: 600px"
class="txt one-line dot"
>中华人民共和国统计法</a
>
</div>
<div :key="item" class="link-item">
<a
href="http://www.moe.gov.cn/srcsite/A03/s182/202010/t20201019_495640.html"
style="width: 600px"
class="txt one-line dot"
>教育部办公厅印发《关于防范和惩治教育统计造假弄虚作假责任制规定(试行》的通知(教发厅函
[2020] 49号)</a
>
</div>
<div :key="item" class="link-item">
<a
href="http://www.moe.gov.cn/jyb_xxgk/s5743/s5744/A03/202306/t20230619_1064976.html"
style="width: 600px"
class="txt one-line dot"
>最新普通和成人高等学校清单(截至2023年6月15日)</a
>
</div>
<div :key="item" class="link-item">
<a href="zbdm.htm" style="width: 600px" class="txt one-line dot"
>高等学校实验室信息统计代码集(含最新版的《普通高等学校本科专业目录》)</a
>
</div>
<div :key="item" class="link-item">
<a
href="http://www.moe.gov.cn/srcsite/A07/moe_953/202103/t20210319_521135.html"
style="width: 600px"
class="txt one-line dot"
>职业教育专业目录(2021年)</a
>
</div>
</div>
</div>
<!-- 欢迎登录框 -->
<div class="entry-area">
<div class="entry-header">
<img class="icon" src="../assets/shangbao/icon-login.png" alt="" />
<span class="title">进入上报系统</span>
</div>
<el-form
class="form-body"
ref="loginForm"
:model="loginForm"
:rules="loginRules"
>
<div class="loginMsg">
<span class="loginText">用户编码:</span>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
class="login-input"
placeholder="用户编号"
type="text"
auto-complete="off"
placeholder="账号"
>
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
</el-input>
v-model="loginForm.username"
size="large"
></el-input>
</el-form-item>
</div>
<div class="loginMsg">
<span class="loginText">用户编码:</span>
<el-form-item prop="password">
<el-input
v-model="loginForm.password"
class="login-input"
placeholder="用户密码"
type="password"
auto-complete="off"
placeholder="密码"
v-model="loginForm.password"
@keyup.enter.native="handleLogin"
>
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
</el-input>
size="large"
></el-input>
</el-form-item>
</div>
<div class="loginMsg">
<span class="loginText">验证码:</span>
<el-form-item prop="code" v-if="captchaEnabled">
<div class="auth-code">
<el-input
v-model="loginForm.code"
class="login-input"
auto-complete="off"
v-model="loginForm.code"
placeholder="验证码"
style="width: 63%"
size="large"
@keyup.enter.native="handleLogin"
>
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
</el-input>
<div class="login-code">
<img :src="codeUrl" @click="getCode" class="login-code-img"/>
></el-input>
<!-- <img :src="codeUrl" @click="getCode" class="code-img" /> -->
<img
class="code-img"
src="../../src/assets/images/验证码.png"
alt=""
/>
</div>
</el-form-item>
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
<el-form-item style="width:100%;">
</div>
<el-form-item>
<el-button
:loading="loading"
size="medium"
class="login-btn"
type="primary"
style="width:100%;"
@click.native.prevent="handleLogin"
>
<span v-if="!loading">登 录</span>
<span v-if="!loading" @click="closeMsg()"
>高校联系人信息以及数据报送入口</span
>
<span v-else>登 录 中...</span>
</el-button>
<div style="float: right;" v-if="register">
<router-link class="link-type" :to="'/register'">立即注册</router-link>
</div>
</el-form-item>
</el-form>
<!-- 底部 -->
<div class="el-login-footer">
<span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
<a download href="#" class="login-tips"
>下载2023年上报讲稿(首次上报的老师,务必阅读)</a
><br />
<a href="#" class="login-tips">>>上报前注意</a>
<br />
<a href="#" class="login-tips">>>上报常见问题</a>
</div>
</div>
<div class="cotent-row">
<!-- 报表样式信息框 -->
<div class="entry-area big">
<div class="entry-header">
<img
class="icon"
src="../assets/shangbao/icon-service.png"
alt=""
/>
<span class="title">报表样式(最终上报电子文件为TXT格式)</span>
<span class="more-link">更多>></span>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#">基表一 教学科研仪器设备表(SJ1)</a>
</div>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#"
>基表二 教学科研仪器设备增减变动情况表(SJ2)
</a>
</div>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#">基表三 贵重仪器设备表(SJ3) </a>
</div>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#">基表四 教学实验项目表(SJ4) </a>
</div>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#">基表五 专任实验室人员表(SJ5) </a>
</div>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#">基表六 实验室基本情况表(S]6) </a>
</div>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#">基表七实验室经费情况表(SJ7) </a>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#">综表一 高等学校实验室综合信息表(SZ1) </a>
</div>
</div>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#">综表二 高等学校实验室综合信息表(SZ2)</a>
</div>
</div>
</div>
<!-- 使用帮助框 -->
<div>
<div style="height: 300px" class="entry-area">
<div class="entry-header">
<img class="icon" src="../assets/shangbao/icon-help.png" alt="" />
<span class="title">使用帮助</span>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#">上报操作流程</a>
</div>
<div :key="item" class="link-item">
<a download href="#">上报系统操作说明</a>
</div>
<div :key="item" class="link-item">
<a download href="#">检测系统操作说明</a>
</div>
<div :key="item" class="link-item">
<a download href="#"
>高等学校实验室信息统计检测系统(V2023单机版) <br />
免安装版下载(释放到文件夹中执行检测.exe)</a
>
</div>
<div :key="item" class="link-item">
<a download href="#">浏览器设置 </a>
</div>
<!-- <div :key="item" class="link-item">
<a href="#" class="emailStyle"
>上报培训(最新时间: 请发邮件到Lmf@mail.buct.edu.cn
(邮件标题:培训+学校名称) ,近期安排培训)
</a>
</div> -->
<!-- <div :key="item" class="link-item">
<a href="buct.htm">"北化软件" 免费下载</a>
</div> -->
</div>
</div>
<div class="entry-area" style="margin-top: 8px; height: 65px">
<div class="link-list">
<div :key="item" class="link-item">
<a href="buct.htm" class="emailStyle" style="margin-top: -15px">
<img
class="downloadCloud"
src="../assets/images/download-cloud.png"
alt=""
/>
<span style="display: block; margin: -27px 0 0 35px;"> "北化软件" 免费下载 </span>
</a>
</div>
</div>
</div>
<div class="entry-area" style="margin-top: 8px; height: 85px">
<div :key="item" class="link-item">
<a href="#" style="margin-top: -30px" class="emailStyle">
<img
class="training"
src="../assets/images/火热_fire(1).png"
alt=""
/>
<span>
上报培训(最新时间: 请发邮件到Lmf@mail.buct.edu.cn
(邮件标题:培训+学校名称) ,近期安排培训)
</span>
</a>
</div>
</div>
</div>
</div>
<!-- 填报说明下载 -->
<div class="cotent-row">
<div class="entry-area big">
<div class="entry-header">
<img class="icon" src="../assets/shangbao/icon-desc.png" alt="" />
<span class="title">填报说明下载( DOC格式)</span>
<span class="more-link">更多>></span>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download target="_blank" href="../assets/feils/by1.pdf">基表一 教学科研仪器设备表 (SJ1)</a>
</div>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#"
>基表二 教学科研仪器设备增减变动情况表(SJ2)
</a>
</div>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#">基表三 贵重仪器设备表(SJ3)</a>
</div>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#">基表四 教学实验项目表(SJ4)</a>
</div>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#">基表五 专任实验室人员表(SJ5)</a>
</div>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#">基表六 实验室基本情况表(SJ6)</a>
</div>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#">基表七 实验室经费情况表(SJ7)</a>
</div>
</div>
</div>
<!-- 联系方式框 -->
<div class="entry-area">
<div class="entry-header">
<img
class="icon"
src="../assets/shangbao/icon-contact.png"
alt=""
/>
<span class="title">联系方式</span>
</div>
<div class="link-list">
<div :key="item" class="link-item">
<a href="#"
>填报业务咨询: 联系方式见省级教育行政部门通知 <br />
网站技术咨询:加QQ群或电话13611247473(工作时间)陆老师 <br />
宏观政策咨询: 010-66097856(工作时间)
</a>
</div>
<div :key="item" class="link-item">
<a download href="#">学校名+姓名可加入</a>
</div>
<div :key="item" class="link-item">
<a download href="#">QQ交流群:929296134</a>
</div>
<div :key="item" class="link-item">
<a download href="#">QQ交流群:791984845</a>
</div>
<div :key="item" class="link-item">
<a download href="#">QQ交流群:807016638</a>
</div>
</div>
</div>
</div>
<div class="cotent-row">
<div class="entry-area big1">
<!-- <div class="entry-header">
<img class="icon" src="../assets/shangbao/icon-report.png" alt="" />
<span class="title">报表样式</span>
<span class="more-link">更多>></span>
</div> -->
<div class="link-list">
<div :key="item" class="link-item">
<a download href="#"
>省级教育行政部门实验室信息统计工作联系人信息表格下载</a
>
</div>
<div :key="item" class="link-item">
<a download href="#"
>省(区、市)高等学校实验室信息统计数据联系人汇总表下载 <br />
系统更新:登录系统后,点菜单用户信息维护,修改联系人电话和邮箱即可.</a
>
</div>
<div :key="item" class="link-item">
<a href="#"
>各高校在上报过程中,有问题(比如修改密码等)请咨询本省负责上报工作的同志,使用北化软件的用户或需培训,请发mai(自动回复):
<br />
lmf@mail.buct.edu.cn我们会及时回复.</a
>
</div>
</div>
</div>
<!-- <div class="entry-header">
<img class="icon" src="../assets/shangbao/icon-report.png" alt="" />
<span class="title">报表样式</span>
<span class="more-link">更多>></span>
</div> -->
<!-- <div class="entry-area big2">
<div class="link-list">
<div :key="item" class="link-item">
<a href="buct.htm">"北化软件" 免费下载</a>
</div>
</div>
</div> -->
</div>
</div>
<div class="footer">
<div>版权所有 (C) 2005-2023 中华人民共和国教育部</div>
<!-- <div>
京ICP备10028400号-1 京公网安备11010202007625号 网站标识码:bm05000001
</div> -->
</div>
</div>
</template>
<script>
import { getCodeImg } from "@/api/login";
import Cookies from "js-cookie";
import { encrypt, decrypt } from '@/utils/jsencrypt'
import { encrypt, decrypt } from "@/utils/jsencrypt";
export default {
name: "Login",
name: "LoginNew",
data() {
return {
codeUrl: "",
loginForm: {
username: "admin",
password: "admin123",
rememberMe: false,
// rememberMe: false,
code: "",
uuid: ""
uuid: "",
},
currentTime: "",
loginRules: {
username: [
{ required: true, trigger: "blur", message: "请输入您的账号" }
{ required: true, trigger: "blur", message: "请输入用户编号" },
],
password: [
{ required: true, trigger: "blur", message: "请输入您的密码" }
{ required: true, trigger: "blur", message: "请输入用户密码" },
],
code: [{ required: true, trigger: "change", message: "请输入验证码" }]
code: [{ required: true, trigger: "change", message: "请输入验证码" }],
},
loading: false,
// 验证码开关
captchaEnabled: true,
// 注册开关
register: false,
redirect: undefined
redirect: undefined,
};
},
watch: {
$route: {
handler: function(route) {
handler: function (route) {
this.redirect = route.query && route.query.redirect;
},
immediate: true
}
immediate: true,
},
},
created() {
this.getCode();
this.getCookie();
// this.getCookie();
},
mounted() {
this.updateCurrentTime();
setInterval(this.updateCurrentTime, 1000);
},
methods: {
// 获取时间
updateCurrentTime() {
let d = new Date();
let dateStr =
d.getFullYear() +
"-" +
(d.getMonth() > 8 ? d.getMonth() + 1 : "0" + (d.getMonth() + 1)) +
"-" +
(d.getDate() > 9 ? d.getDate() : "0" + d.getDate());
const currentTime = new Date().toLocaleTimeString();
// this.currentTime =dateStr +" "+ currentTime;
this.currentTime = dateStr;
},
// 登录弹窗
closeMsg() {
alert("系统已关闭");
},
getCode() {
getCodeImg().then(res => {
this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
getCodeImg().then((res) => {
this.captchaEnabled =
res.data.captchaEnabled === undefined
? true
: res.data.captchaEnabled;
if (this.captchaEnabled) {
this.codeUrl = "data:image/gif;base64," + res.img;
this.loginForm.uuid = res.uuid;
this.codeUrl = "data:image/gif;base64," + res.data.img;
this.loginForm.uuid = res.data.uuid;
}
});
},
getCookie() {
const username = Cookies.get("username");
const password = Cookies.get("password");
const rememberMe = Cookies.get('rememberMe')
const rememberMe = Cookies.get("rememberMe");
this.loginForm = {
username: username === undefined ? this.loginForm.username : username,
password: password === undefined ? this.loginForm.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
password:
password === undefined ? this.loginForm.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
};
},
handleLogin() {
this.$refs.loginForm.validate(valid => {
this.$refs.loginForm.validate((valid) => {
if (valid) {
this.loading = true;
if (this.loginForm.rememberMe) {
Cookies.set("username", this.loginForm.username, { expires: 30 });
Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
Cookies.set("password", encrypt(this.loginForm.password), {
expires: 30,
});
Cookies.set("rememberMe", this.loginForm.rememberMe, {
expires: 30,
});
} else {
Cookies.remove("username");
Cookies.remove("password");
Cookies.remove('rememberMe');
Cookies.remove("rememberMe");
}
this.$store.dispatch("Login", this.loginForm).then(() => {
this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
}).catch(() => {
this.$store
.dispatch("Login", this.loginForm)
.then(() => {
this.$router.push({ path: this.redirect || "/" }).catch(() => {});
})
.catch(() => {
this.loading = false;
if (this.captchaEnabled) {
this.getCode();
......@@ -150,70 +565,333 @@ export default {
});
}
});
}
}
},
},
};
</script>
<style rel="stylesheet/scss" lang="scss">
.login {
<style scoped lang="scss">
.one-line {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.root-contianer {
background: url(../assets/shangbao/home-bg.png) no-repeat top center;
background-size: contain;
min-height: 100vh;
background-color: #dfe6ee;
.content {
width: 980px;
margin: 0 auto;
}
}
.header {
display: flex;
justify-content: center;
align-items: center;
height: 100%;
background-image: url("../assets/images/login-background.jpg");
background-size: cover;
padding-top: 60px;
.logo {
width: 64px;
height: 68px;
}
.title {
flex-grow: 1;
padding-left: 10px;
font-size: 0;
}
.title-cn {
margin-bottom: 10px;
font-size: 40px;
font-weight: bold;
color: #d7e1e9;
line-height: 40px;
text-shadow: 0px 2px 0px rgba(19, 38, 69, 0.8);
}
.title-en {
font-size: 16px;
font-weight: 400;
color: #ffffff;
line-height: 17px;
text-shadow: 0px 2px 0px rgba(19, 38, 69, 0.8);
}
}
.title {
margin: 0px auto 30px auto;
text-align: center;
color: #707070;
.notic {
display: flex;
height: 48px;
padding: 0 30px;
margin: 30px 0 20px 0;
line-height: 48px;
background: linear-gradient(0deg, #4fb1fa, #558ce7);
border-radius: 4px;
font-size: 18px;
font-weight: 400;
color: #ffffff;
align-items: center;
.icon {
flex-shrink: 0;
width: 24px;
height: 24px;
margin-right: 10px;
}
.msg {
flex-grow: 1;
}
.date {
flex-shrink: 0;
}
}
.login-form {
border-radius: 6px;
.cotent-row {
display: flex;
justify-content: space-between;
margin-bottom: 15px;
&:last-child {
margin-bottom: 0;
}
.entry-area {
background: #ffffff;
width: 400px;
padding: 25px 25px 5px 25px;
.el-input {
height: 38px;
input {
height: 38px;
box-shadow: 4px 4px 10px 0px rgba(19, 39, 79, 0.06);
border-radius: 4px;
padding: 20px;
width: 430px;
box-sizing: border-box;
&.big {
flex-grow: 1;
margin-right: 20px;
}
&.big1 {
flex-grow: 475.5;
margin-right: 0px;
}
.input-icon {
height: 39px;
width: 14px;
margin-left: 2px;
&.big2 {
flex-grow: 1;
margin-left: 20px;
}
}
.login-tip {
font-size: 13px;
text-align: center;
color: #bfbfbf;
}
.login-code {
width: 33%;
height: 38px;
.entry-header {
position: relative;
border-bottom: 2px solid #dce4f3;
padding-bottom: 8px;
line-height: 24px;
&.hot {
border-bottom: none;
color: #eb6724;
.title {
font-size: 18px;
font-weight: bold;
font-style: italic;
color: #eb6724;
.skew {
display: inline-block;
transform: skew(-20deg, 0);
}
.small {
font-size: 9px;
}
}
.more-link {
color: #eb6724;
}
&::after {
content: "";
position: absolute;
bottom: -12px;
left: 40px;
width: 50px;
height: 22px;
background: url(../assets/shangbao/hot-ring.png);
background-size: 100% 100%;
}
}
&::after {
content: "";
position: absolute;
bottom: -2px;
left: 0;
width: 80px;
height: 2px;
background: #5785e7;
}
.icon {
width: 24px;
height: 24px;
margin-right: 7px;
vertical-align: -6px;
}
.title {
font-size: 18px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #5785e7;
}
.more-link {
float: right;
img {
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #567fe6;
&:hover {
cursor: pointer;
}
}
}
.link-list {
padding: 10px 0 -10px 0;
}
.link-item {
position: relative;
display: flex;
justify-content: space-between;
margin: 20px 0;
color: #3c3c3c;
align-content: center;
&:hover {
color: #567fe6;
cursor: pointer;
vertical-align: middle;
}
.txt {
width: 286px;
font-size: 16px;
font-weight: 400;
&.full {
flex-grow: 1;
}
&.dot::before {
display: inline-block;
content: "";
width: 4px;
height: 4px;
margin-right: 7px;
background: #406ce2;
vertical-align: 4px;
}
&.blue {
color: #567fe6;
&:hover {
text-decoration: underline;
}
}
.index-num {
margin-right: 8px;
color: #747474;
&.top {
color: #eb6724;
}
}
}
.new-flag {
flex-grow: 1;
img {
width: 22px;
}
}
.date {
flex-shrink: 0;
font-size: 16px;
font-weight: 400;
}
.btn {
flex-shrink: 0;
width: 82px;
line-height: 34px;
background: linear-gradient(0deg, #f0f4ff, #ffffff);
border: 1px solid #d1d1d1;
color: #3c3c3c;
text-align: center;
margin-top: -6px;
}
}
}
}
.el-login-footer {
.form-body {
padding-top: 30px;
.auth-code {
display: flex;
}
.code-img {
width: 135px;
height: 40px;
line-height: 40px;
position: fixed;
bottom: 0;
background: #ffffff;
border-radius: 4px;
margin-left: 19px;
cursor: pointer;
}
.login-btn {
display: block;
height: 48px;
width: 100%;
border: none;
background: linear-gradient(0deg, #4fb1fa, #558ce7);
border-radius: 4px;
font-size: 18px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
}
}
.login-tips {
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #ff4e79;
}
.footer {
padding: 74px 0;
background: #497dce;
text-align: center;
color: #fff;
font-family: Arial;
font-size: 12px;
letter-spacing: 1px;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
line-height: 36px;
margin-top: 112px;
}
.loginMsg {
display: flex;
}
.loginText {
margin: 8px 0 0 0;
width: 80px;
}
.login-code-img {
height: 38px;
.emailStyle {
color: red;
}
.downloadCloud {
color: skyblue;
width: 24px;
height: 24px;
margin: -5px 10px 0 0;
}
.training {
color: skyblue;
width: 24px;
height: 24px;
margin: 0px 5px -5px 0;
object-fit: cover;
}
</style>
......@@ -187,7 +187,7 @@ export default {
/** 清理指定名称缓存 */
handleClearCacheName(row) {
clearCacheName(row.cacheName).then(response => {
this.$modal.msgSuccess("清理缓存名称[" + row.cacheName + "]成功");
this.$modal.msgSuccess("清理缓存名称[" + this.nowCacheName + "]成功");
this.getCacheKeys();
});
},
......
......@@ -12,7 +12,7 @@
<el-form-item label="任务组名" prop="jobGroup">
<el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable>
<el-option
v-for="dict in dict.type.sys_job_group"
v-for="dict in dict.type.SYS_JOB_GROUP"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -22,7 +22,7 @@
<el-form-item label="任务状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-option
v-for="dict in dict.type.sys_job_status"
v-for="dict in dict.type.SYS_JOB_STATUS"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -97,7 +97,7 @@
<el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
<el-table-column label="任务组名" align="center" prop="jobGroup">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/>
<dict-tag :options="dict.type.SYS_JOB_GROUP" :value="scope.row.jobGroup"/>
</template>
</el-table-column>
<el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
......@@ -164,7 +164,7 @@
<el-form-item label="任务分组" prop="jobGroup">
<el-select v-model="form.jobGroup" placeholder="请选择任务分组">
<el-option
v-for="dict in dict.type.sys_job_group"
v-for="dict in dict.type.SYS_JOB_GROUP"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -221,7 +221,7 @@
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_job_status"
v-for="dict in dict.type.SYS_JOB_STATUS"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
......@@ -297,7 +297,7 @@ import Crontab from '@/components/Crontab'
export default {
components: { Crontab },
name: "Job",
dicts: ['sys_job_group', 'sys_job_status'],
dicts: ['SYS_JOB_GROUP', 'SYS_JOB_STATUS'],
data() {
return {
// 遮罩层
......@@ -363,7 +363,7 @@ export default {
},
// 任务组名字典翻译
jobGroupFormat(row, column) {
return this.selectDictLabel(this.dict.type.sys_job_group, row.jobGroup);
return this.selectDictLabel(this.dict.type.SYS_JOB_GROUP, row.jobGroup);
},
// 取消按钮
cancel() {
......
......@@ -18,7 +18,7 @@
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_job_group"
v-for="dict in dict.type.SYS_JOB_GROUP"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -33,7 +33,7 @@
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_common_status"
v-for="dict in dict.type.SYS_COMMON_STATUS"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -107,14 +107,14 @@
<el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
<el-table-column label="任务组名" align="center" prop="jobGroup" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/>
<dict-tag :options="dict.type.SYS_JOB_GROUP" :value="scope.row.jobGroup"/>
</template>
</el-table-column>
<el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
<el-table-column label="日志信息" align="center" prop="jobMessage" :show-overflow-tooltip="true" />
<el-table-column label="执行状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
<dict-tag :options="dict.type.SYS_COMMON_STATUS" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="执行时间" align="center" prop="createTime" width="180">
......@@ -185,7 +185,7 @@ import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog";
export default {
name: "JobLog",
dicts: ['sys_common_status', 'sys_job_group'],
dicts: ['SYS_COMMON_STATUS', 'SYS_JOB_GROUP'],
data() {
return {
// 遮罩层
......
......@@ -27,7 +27,7 @@
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_common_status"
v-for="dict in dict.type.SYS_COMMON_STATUS"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -108,7 +108,7 @@
<el-table-column label="操作系统" align="center" prop="os" />
<el-table-column label="登录状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
<dict-tag :options="dict.type.SYS_COMMON_STATUS" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="操作信息" align="center" prop="msg" :show-overflow-tooltip="true" />
......@@ -134,7 +134,7 @@ import { list, delLogininfor, cleanLogininfor, unlockLogininfor } from "@/api/mo
export default {
name: "Logininfor",
dicts: ['sys_common_status'],
dicts: ['SYS_COMMON_STATUS'],
data() {
return {
// 遮罩层
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="登录地址" prop="ipaddr">
<el-input
v-model="queryParams.ipaddr"
placeholder="请输入登录地址"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户名称" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" 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-table
v-loading="loading"
:data="list.slice((pageNum-1)*pageSize,pageNum*pageSize)"
style="width: 100%;"
>
<el-table-column label="序号" type="index" align="center">
<template slot-scope="scope">
<span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
<el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="部门名称" align="center" prop="deptName" />
<el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
<el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<el-table-column label="浏览器" align="center" prop="browser" />
<el-table-column label="操作系统" align="center" prop="os" />
<el-table-column label="登录时间" align="center" prop="loginTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.loginTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleForceLogout(scope.row)"
v-hasPermi="['monitor:online:forceLogout']"
>强退</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
</div>
</template>
<script>
import { list, forceLogout } from "@/api/monitor/online";
export default {
name: "Online",
data() {
return {
// 遮罩层
loading: true,
// 总条数
total: 0,
// 表格数据
list: [],
pageNum: 1,
pageSize: 10,
// 查询参数
queryParams: {
ipaddr: undefined,
userName: undefined
}
};
},
created() {
this.getList();
},
methods: {
/** 查询登录日志列表 */
getList() {
this.loading = true;
list(this.queryParams).then(response => {
this.list = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 强退按钮操作 */
handleForceLogout(row) {
this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户?').then(function() {
return forceLogout(row.tokenId);
}).then(() => {
this.getList();
this.$modal.msgSuccess("强退成功");
}).catch(() => {});
}
}
};
</script>
......@@ -27,7 +27,7 @@
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_oper_type"
v-for="dict in dict.type.SYS_OPER_TYPE"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -42,7 +42,7 @@
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_common_status"
v-for="dict in dict.type.SYS_COMMON_STATUS"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -108,7 +108,7 @@
<el-table-column label="系统模块" align="center" prop="title" :show-overflow-tooltip="true" />
<el-table-column label="操作类型" align="center" prop="businessType">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_oper_type" :value="scope.row.businessType"/>
<dict-tag :options="dict.type.SYS_OPER_TYPE" :value="scope.row.businessType"/>
</template>
</el-table-column>
<el-table-column label="操作人员" align="center" prop="operName" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
......@@ -116,7 +116,7 @@
<el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
<el-table-column label="操作状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
<dict-tag :options="dict.type.SYS_COMMON_STATUS" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="操作日期" align="center" prop="operTime" width="160" sortable="custom" :sort-orders="['descending', 'ascending']">
......@@ -202,7 +202,7 @@ import { list, delOperlog, cleanOperlog } from "@/api/monitor/operlog";
export default {
name: "Operlog",
dicts: ['sys_oper_type', 'sys_common_status'],
dicts: ['SYS_OPER_TYPE', 'SYS_COMMON_STATUS'],
data() {
return {
// 遮罩层
......@@ -252,7 +252,7 @@ export default {
},
// 操作日志类型字典翻译
typeFormat(row, column) {
return this.selectDictLabel(this.dict.type.sys_oper_type, row.businessType);
return this.selectDictLabel(this.dict.type.SYS_OPER_TYPE, row.businessType);
},
/** 搜索按钮操作 */
handleQuery() {
......
<template>
<div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">若依后台管理系统</h3>
<h3 class="title">高等学校实验室信息统计系统</h3>
<el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
......@@ -113,10 +113,10 @@ export default {
methods: {
getCode() {
getCodeImg().then(res => {
this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
this.captchaEnabled = res.data.captchaEnabled === undefined ? true : res.data.captchaEnabled;
if (this.captchaEnabled) {
this.codeUrl = "data:image/gif;base64," + res.img;
this.registerForm.uuid = res.uuid;
this.codeUrl = "data:image/gif;base64," + res.data.img;
this.registerForm.uuid = res.data.uuid;
}
});
},
......
......@@ -22,7 +22,7 @@
<el-form-item label="系统内置" prop="configType">
<el-select v-model="queryParams.configType" placeholder="系统内置" clearable>
<el-option
v-for="dict in dict.type.sys_yes_no"
v-for="dict in dict.type.SYS_YES_NO"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -110,7 +110,7 @@
<el-table-column label="参数键值" align="center" prop="configValue" :show-overflow-tooltip="true" />
<el-table-column label="系统内置" align="center" prop="configType">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.configType"/>
<dict-tag :options="dict.type.SYS_YES_NO" :value="scope.row.configType"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
......@@ -162,7 +162,7 @@
<el-form-item label="系统内置" prop="configType">
<el-radio-group v-model="form.configType">
<el-radio
v-for="dict in dict.type.sys_yes_no"
v-for="dict in dict.type.SYS_YES_NO"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
......@@ -185,7 +185,7 @@ import { listConfig, getConfig, delConfig, addConfig, updateConfig, refreshCache
export default {
name: "Config",
dicts: ['sys_yes_no'],
dicts: ['SYS_YES_NO'],
data() {
return {
// 遮罩层
......
......@@ -12,10 +12,10 @@
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="部门状态" clearable>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
v-for="dict in dict.type.SYS_NORMAL_DISABLE"
:key="parseInt(dict.value)"
:label="dict.label"
:value="dict.value"
:value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
......@@ -60,7 +60,7 @@
<el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
<el-table-column prop="status" label="状态" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
<dict-tag :options="dict.type.SYS_NORMAL_DISABLE" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="200">
......@@ -140,9 +140,9 @@
<el-form-item label="部门状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
v-for="dict in dict.type.SYS_NORMAL_DISABLE"
:key="parseInt(dict.value)"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
......@@ -164,7 +164,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "Dept",
dicts: ['sys_normal_disable'],
dicts: ['SYS_NORMAL_DISABLE'],
components: { Treeselect },
data() {
return {
......@@ -257,7 +257,7 @@ export default {
leader: undefined,
phone: undefined,
email: undefined,
status: "0"
status: 1
};
this.resetForm("form");
},
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="字典名称" prop="dictType">
<el-select v-model="queryParams.dictType">
<el-form-item label="字典名称" prop="code">
<el-select v-model="queryParams.code" filterable>
<el-option
v-for="item in typeOptions"
:key="item.dictId"
:label="item.dictName"
:value="item.dictType"
:key="item.id"
:label="item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
<el-form-item label="字典标签" prop="dictLabel">
<el-form-item label="字典标签" prop="name">
<el-input
v-model="queryParams.dictLabel"
v-model="queryParams.name"
placeholder="请输入字典标签"
clearable
@keyup.enter.native="handleQuery"
......@@ -22,7 +22,7 @@
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="数据状态" clearable>
<el-option
v-for="dict in dict.type.sys_normal_disable"
v-for="dict in dict.type.SYS_NORMAL_DISABLE"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -92,26 +92,26 @@
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="字典编码" align="center" prop="dictCode" />
<el-table-column label="字典标签" align="center" prop="dictLabel">
<!-- <el-table-column label="字典编码" align="center" prop="id" />-->
<el-table-column label="字典标签" align="center" prop="name">
<template slot-scope="scope">
<span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.dictLabel}}</span>
<el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.dictLabel}}</el-tag>
<span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.name}}</span>
<el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.name}}</el-tag>
</template>
</el-table-column>
<el-table-column label="字典键值" align="center" prop="dictValue" />
<el-table-column label="字典排序" align="center" prop="dictSort" />
<el-table-column label="状态" align="center" prop="status">
<el-table-column label="字典键值" align="center" prop="value" />
<el-table-column label="字典排序" align="center" prop="sort" />
<el-table-column label="是否默认" align="center" prop="defaultFlag">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
{{ scope.row.defaultFlag === 1 ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
<dict-tag :options="dict.type.SYS_NORMAL_DISABLE" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......@@ -141,22 +141,19 @@
/>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" :close-on-press-escape="false" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典类型">
<el-input v-model="form.dictType" :disabled="true" />
<el-input v-model="form.code" :disabled="true" />
</el-form-item>
<el-form-item label="数据标签" prop="dictLabel">
<el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
<el-form-item label="数据标签" prop="name">
<el-input v-model="form.name" placeholder="请输入数据标签" />
</el-form-item>
<el-form-item label="数据键值" prop="dictValue">
<el-input v-model="form.dictValue" placeholder="请输入数据键值" />
<el-form-item label="数据键值" prop="value">
<el-input v-model="form.value" placeholder="请输入数据键值" />
</el-form-item>
<el-form-item label="样式属性" prop="cssClass">
<el-input v-model="form.cssClass" placeholder="请输入样式属性" />
</el-form-item>
<el-form-item label="显示排序" prop="dictSort">
<el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
<el-form-item label="显示排序" prop="sort">
<el-input-number v-model="form.sort" controls-position="right" :min="0" />
</el-form-item>
<el-form-item label="回显样式" prop="listClass">
<el-select v-model="form.listClass">
......@@ -171,9 +168,9 @@
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
v-for="dict in dict.type.SYS_NORMAL_DISABLE"
:key="parseInt(dict.value)"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
......@@ -191,11 +188,11 @@
<script>
import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/group";
export default {
name: "Data",
dicts: ['sys_normal_disable'],
dicts: ['SYS_NORMAL_DISABLE'],
data() {
return {
// 遮罩层
......@@ -251,37 +248,39 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
dictName: undefined,
dictType: undefined,
name: undefined,
code: undefined,
status: undefined
},
dictGroupId: '',
// 表单参数
form: {},
// 表单校验
rules: {
dictLabel: [
name: [
{ required: true, message: "数据标签不能为空", trigger: "blur" }
],
dictValue: [
value: [
{ required: true, message: "数据键值不能为空", trigger: "blur" }
],
dictSort: [
sort: [
{ required: true, message: "数据顺序不能为空", trigger: "blur" }
]
}
};
},
created() {
const dictId = this.$route.params && this.$route.params.dictId;
this.getType(dictId);
const dictGroupId = this.$route.params && this.$route.params.dictId;
this.dictGroupId = dictGroupId;
this.getType(dictGroupId);
this.getTypeList();
},
methods: {
/** 查询字典类型详细 */
getType(dictId) {
getType(dictId).then(response => {
this.queryParams.dictType = response.data.dictType;
this.defaultDictType = response.data.dictType;
this.queryParams.code = response.data.code;
this.defaultDictType = response.data.code;
this.getList();
});
},
......@@ -308,14 +307,15 @@ export default {
// 表单重置
reset() {
this.form = {
dictCode: undefined,
dictLabel: undefined,
dictValue: undefined,
cssClass: undefined,
code: undefined,
name: undefined,
value: undefined,
listClass: 'default',
dictSort: 0,
status: "0",
remark: undefined
sort: 0,
status: 1,
remark: undefined,
id: undefined,
groupId: undefined,
};
this.resetForm("form");
},
......@@ -332,7 +332,7 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams.dictType = this.defaultDictType;
this.queryParams.code = this.defaultDictType;
this.handleQuery();
},
/** 新增按钮操作 */
......@@ -340,19 +340,19 @@ export default {
this.reset();
this.open = true;
this.title = "添加字典数据";
this.form.dictType = this.queryParams.dictType;
this.form.code = this.queryParams.code;
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.dictCode)
this.ids = selection.map(item => item.id)
this.single = selection.length!=1
this.multiple = !selection.length
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const dictCode = row.dictCode || this.ids
getData(dictCode).then(response => {
const id = row.id || this.ids
getData(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改字典数据";
......@@ -362,16 +362,17 @@ export default {
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.dictCode != undefined) {
this.form.groupId = this.dictGroupId;
if (this.form.id != undefined) {
updateData(this.form).then(response => {
this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
this.$store.dispatch('dict/removeDict', this.queryParams.code);
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addData(this.form).then(response => {
this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
this.$store.dispatch('dict/removeDict', this.queryParams.code);
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
......@@ -382,7 +383,7 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const dictCodes = row.dictCode || this.ids;
const dictCodes = row.id || this.ids;
this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项?').then(function() {
return delData(dictCodes);
}).then(() => {
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="字典名称" prop="dictName">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="75px">
<el-form-item label="字典名称" prop="name">
<el-input
v-model="queryParams.dictName"
v-model="queryParams.name"
placeholder="请输入字典名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="字典类型" prop="dictType">
<el-form-item label="字典编号" prop="code">
<el-input
v-model="queryParams.dictType"
placeholder="请输入字典类型"
v-model="queryParams.code"
placeholder="请输入字典编号"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="字典状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
......@@ -109,20 +94,15 @@
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="字典编号" align="center" prop="dictId" />
<el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
<!-- <el-table-column label="字典编号" align="center" prop="id" />-->
<el-table-column label="字典名称" align="center" prop="name" :show-overflow-tooltip="true" />
<el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
<span>{{ scope.row.dictType }}</span>
<router-link :to="'/system/dict-data/index/' + scope.row.id" class="link-type">
<span>{{ scope.row.code }}</span>
</router-link>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
......@@ -158,22 +138,13 @@
/>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" :close-on-press-escape="false" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典名称" prop="dictName">
<el-input v-model="form.dictName" placeholder="请输入字典名称" />
</el-form-item>
<el-form-item label="字典类型" prop="dictType">
<el-input v-model="form.dictType" placeholder="请输入字典类型" />
<el-form-item label="字典名称" prop="name">
<el-input v-model="form.name" placeholder="请输入字典名称" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
<el-form-item label="字典类型" prop="code">
<el-input v-model="form.code" placeholder="请输入字典类型" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
......@@ -188,11 +159,11 @@
</template>
<script>
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/group";
export default {
name: "Dict",
dicts: ['sys_normal_disable'],
dicts: ['SYS_NORMAL_DISABLE'],
data() {
return {
// 遮罩层
......@@ -258,10 +229,9 @@ export default {
// 表单重置
reset() {
this.form = {
dictId: undefined,
id: undefined,
dictName: undefined,
dictType: undefined,
status: "0",
remark: undefined
};
this.resetForm("form");
......@@ -292,7 +262,7 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const dictId = row.dictId || this.ids
const dictId = row.id || this.ids
getType(dictId).then(response => {
this.form = response.data;
this.open = true;
......@@ -303,7 +273,7 @@ export default {
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.dictId != undefined) {
if (this.form.id != undefined) {
updateType(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
......@@ -331,7 +301,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
this.download('system/dict/group/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
},
......
......@@ -12,10 +12,10 @@
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="菜单状态" clearable>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
v-for="dict in dict.type.SYS_NORMAL_DISABLE"
:key="parseInt(dict.value)"
:label="dict.label"
:value="dict.value"
:value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
......@@ -67,7 +67,7 @@
<el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="status" label="状态" width="80">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
<dict-tag :options="dict.type.SYS_NORMAL_DISABLE" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime">
......@@ -134,13 +134,14 @@
trigger="click"
@show="$refs['iconSelect'].reset()"
>
<IconSelect ref="iconSelect" @selected="selected" :active-icon="form.icon" />
<IconSelect ref="iconSelect" @selected="selected" />
<el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" readonly>
<svg-icon
v-if="form.icon"
slot="prefix"
:icon-class="form.icon"
style="width: 25px;"
class="el-input__icon"
style="height: 32px;width: 16px;"
/>
<i v-else slot="prefix" class="el-icon-search el-input__icon" />
</el-input>
......@@ -239,7 +240,7 @@
</span>
<el-radio-group v-model="form.visible">
<el-radio
v-for="dict in dict.type.sys_show_hide"
v-for="dict in dict.type.SYS_SHOW_HIDE"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
......@@ -256,9 +257,9 @@
</span>
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
v-for="dict in dict.type.SYS_NORMAL_DISABLE"
:key="parseInt(dict.value)"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
......@@ -281,7 +282,7 @@ import IconSelect from "@/components/IconSelect";
export default {
name: "Menu",
dicts: ['sys_show_hide', 'sys_normal_disable'],
dicts: ['SYS_SHOW_HIDE', 'SYS_NORMAL_DISABLE'],
components: { Treeselect, IconSelect },
data() {
return {
......@@ -375,7 +376,7 @@ export default {
isFrame: "1",
isCache: "0",
visible: "0",
status: "0"
status: 1
};
this.resetForm("form");
},
......
......@@ -20,7 +20,7 @@
<el-form-item label="类型" prop="noticeType">
<el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable>
<el-option
v-for="dict in dict.type.sys_notice_type"
v-for="dict in dict.type.SYS_NOTICE_TYPE"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -80,12 +80,12 @@
/>
<el-table-column label="公告类型" align="center" prop="noticeType" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/>
<dict-tag :options="dict.type.SYS_NOTICE_TYPE" :value="scope.row.noticeType"/>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>
<dict-tag :options="dict.type.SYS_NOTICE_STATUS" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="创建者" align="center" prop="createBy" width="100" />
......@@ -135,7 +135,7 @@
<el-form-item label="公告类型" prop="noticeType">
<el-select v-model="form.noticeType" placeholder="请选择公告类型">
<el-option
v-for="dict in dict.type.sys_notice_type"
v-for="dict in dict.type.SYS_NOTICE_TYPE"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -147,7 +147,7 @@
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_notice_status"
v-for="dict in dict.type.SYS_NOTICE_STATUS"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
......@@ -174,7 +174,7 @@ import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api
export default {
name: "Notice",
dicts: ['sys_notice_status', 'sys_notice_type'],
dicts: ['SYS_NOTICE_STATUS', 'SYS_NOTICE_TYPE'],
data() {
return {
// 遮罩层
......
......@@ -20,10 +20,10 @@
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
v-for="dict in dict.type.SYS_NORMAL_DISABLE"
:key="parseInt(dict.value)"
:label="dict.label"
:value="dict.value"
:value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
......@@ -87,7 +87,7 @@
<el-table-column label="岗位排序" align="center" prop="postSort" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
<dict-tag :options="dict.type.SYS_NORMAL_DISABLE" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
......@@ -138,9 +138,9 @@
<el-form-item label="岗位状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
v-for="dict in dict.type.SYS_NORMAL_DISABLE"
:key="parseInt(dict.value)"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
......@@ -161,7 +161,7 @@ import { listPost, getPost, delPost, addPost, updatePost } from "@/api/system/po
export default {
name: "Post",
dicts: ['sys_normal_disable'],
dicts: ['SYS_NORMAL_DISABLE'],
data() {
return {
// 遮罩层
......@@ -231,7 +231,7 @@ export default {
postCode: undefined,
postName: undefined,
postSort: 0,
status: "0",
status: 1,
remark: undefined
};
this.resetForm("form");
......
......@@ -67,7 +67,7 @@
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
<dict-tag :options="dict.type.SYS_NORMAL_DISABLE" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
......@@ -105,7 +105,7 @@ import selectUser from "./selectUser";
export default {
name: "AuthUser",
dicts: ['sys_normal_disable'],
dicts: ['SYS_NORMAL_DISABLE'],
components: { selectUser },
data() {
return {
......
......@@ -27,10 +27,10 @@
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
v-for="dict in dict.type.SYS_NORMAL_DISABLE"
:key="parseInt(dict.value)"
:label="dict.label"
:value="dict.value"
:value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
......@@ -99,7 +99,6 @@
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="角色编号" prop="roleId" width="120" />
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
<el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
<el-table-column label="显示顺序" prop="roleSort" width="100" />
......@@ -107,8 +106,8 @@
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
active-value="0"
inactive-value="1"
active-value="1"
inactive-value="0"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
......@@ -176,9 +175,9 @@
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
v-for="dict in dict.type.SYS_NORMAL_DISABLE"
:key="parseInt(dict.value)"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
......@@ -257,7 +256,7 @@ import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/m
export default {
name: "Role",
dicts: ['sys_normal_disable'],
dicts: ['SYS_NORMAL_DISABLE'],
data() {
return {
// 遮罩层
......@@ -382,20 +381,20 @@ export default {
/** 根据角色ID查询菜单树结构 */
getRoleMenuTreeselect(roleId) {
return roleMenuTreeselect(roleId).then(response => {
this.menuOptions = response.menus;
this.menuOptions = response.data.menus;
return response;
});
},
/** 根据角色ID查询部门树结构 */
getDeptTree(roleId) {
return deptTreeSelect(roleId).then(response => {
this.deptOptions = response.depts;
this.deptOptions = response.data.depts;
return response;
});
},
// 角色状态修改
handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用";
let text = row.status === "1" ? "启用" : "停用";
this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?').then(function() {
return changeRoleStatus(row.roleId, row.status);
}).then(() => {
......@@ -428,7 +427,7 @@ export default {
roleName: undefined,
roleKey: undefined,
roleSort: 0,
status: "0",
status: 1,
menuIds: [],
deptIds: [],
menuCheckStrictly: true,
......@@ -514,7 +513,7 @@ export default {
this.open = true;
this.$nextTick(() => {
roleMenu.then(res => {
let checkedKeys = res.checkedKeys
let checkedKeys = res.data.checkedKeys
checkedKeys.forEach((v) => {
this.$nextTick(()=>{
this.$refs.menu.setChecked(v, true ,false);
......@@ -540,7 +539,7 @@ export default {
this.openDataScope = true;
this.$nextTick(() => {
deptTreeSelect.then(res => {
this.$refs.dept.setCheckedKeys(res.checkedKeys);
this.$refs.dept.setCheckedKeys(res.data.checkedKeys);
});
});
this.title = "分配数据权限";
......
......@@ -32,7 +32,7 @@
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
<dict-tag :options="dict.type.SYS_NORMAL_DISABLE" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
......@@ -59,7 +59,7 @@
<script>
import { unallocatedUserList, authUserSelectAll } from "@/api/system/role";
export default {
dicts: ['sys_normal_disable'],
dicts: ['SYS_NORMAL_DISABLE'],
props: {
// 角色编号
roleId: {
......
......@@ -56,10 +56,10 @@
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
v-for="dict in dict.type.SYS_NORMAL_DISABLE"
:key="parseInt(dict.value)"
:label="dict.label"
:value="dict.value"
:value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
......@@ -147,8 +147,8 @@
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
active-value="0"
inactive-value="1"
active-value="1"
inactive-value="0"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
......@@ -246,7 +246,7 @@
<el-form-item label="用户性别">
<el-select v-model="form.sex" placeholder="请选择性别">
<el-option
v-for="dict in dict.type.sys_user_sex"
v-for="dict in dict.type.SYS_USER_SEX"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -258,9 +258,9 @@
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
v-for="dict in dict.type.SYS_NORMAL_DISABLE"
:key="parseInt(dict.value)"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
......@@ -348,7 +348,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "User",
dicts: ['sys_normal_disable', 'sys_user_sex'],
dicts: ['SYS_NORMAL_DISABLE', 'SYS_USER_SEX'],
components: { Treeselect },
data() {
return {
......@@ -519,7 +519,7 @@ export default {
phonenumber: undefined,
email: undefined,
sex: undefined,
status: "0",
status: 1,
remark: undefined,
postIds: [],
roleIds: []
......
......@@ -84,6 +84,7 @@ export default {
this.user = response.data;
this.roleGroup = response.roleGroup;
this.postGroup = response.postGroup;
console.log(this.user)
});
}
}
......
......@@ -69,9 +69,9 @@
<el-option label="=" value="EQ" />
<el-option label="!=" value="NE" />
<el-option label=">" value="GT" />
<el-option label=">=" value="GTE" />
<el-option label=">=" value="GE" />
<el-option label="<" value="LT" />
<el-option label="<=" value="LTE" />
<el-option label="<=" value="LE" />
<el-option label="LIKE" value="LIKE" />
<el-option label="BETWEEN" value="BETWEEN" />
</el-select>
......@@ -128,7 +128,7 @@
<script>
import { getGenTable, updateGenTable } from "@/api/tool/gen";
import { optionselect as getDictOptionselect } from "@/api/system/dict/type";
import { optionselect as getDictOptionselect } from "@/api/system/dict/group";
import { listMenu as getMenuTreeselect } from "@/api/system/menu";
import basicInfoForm from "./basicInfoForm";
import genInfoForm from "./genInfoForm";
......
......@@ -7,7 +7,7 @@
<el-select v-model="info.tplCategory" @change="tplSelectChange">
<el-option label="单表(增删改查)" value="crud" />
<el-option label="树表(增删改查)" value="tree" />
<el-option label="主子表(增删改查)" value="sub" />
<!-- <el-option label="主子表(增删改查)" value="sub" />-->
</el-select>
</el-form-item>
</el-col>
......@@ -177,7 +177,7 @@
<el-form-item>
<span slot="label">
关联子表的表名
<el-tooltip content="关联子表的表名, 如:sys_user" placement="top">
<el-tooltip content="关联子表的表名, 如:RMS_S_USER" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="数据源" prop="dataName">
<el-input
v-model="queryParams.dataName"
placeholder="请输入数据源名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="表名称" prop="tableName">
<el-input
v-model="queryParams.tableName"
......@@ -217,7 +225,8 @@ export default {
pageNum: 1,
pageSize: 10,
tableName: undefined,
tableComment: undefined
tableComment: undefined,
dataName: "master"
},
// 预览参数
preview: {
......@@ -229,6 +238,7 @@ export default {
};
},
created() {
localStorage.setItem("dataName", this.queryParams.dataName);
this.getList();
},
activated() {
......@@ -252,6 +262,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
localStorage.setItem("dataName", this.queryParams.dataName);
this.queryParams.pageNum = 1;
this.getList();
},
......
<template>
<i-frame :src="url" />
</template>
<script>
import iFrame from "@/components/iFrame/index";
export default {
name: "Swagger",
components: { iFrame },
data() {
return {
url: process.env.VUE_APP_BASE_API + "/swagger-ui/index.html"
};
},
};
</script>
......@@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
const name = process.env.VUE_APP_TITLE || '高等学校实验室信息统计系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口
......@@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8080`,
target: `http://localhost:9998`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
......@@ -90,7 +90,9 @@ module.exports = {
})
.end()
config.when(process.env.NODE_ENV !== 'development', config => {
config
.when(process.env.NODE_ENV !== 'development',
config => {
config
.plugin('ScriptExtHtmlWebpackPlugin')
.after('html')
......@@ -99,8 +101,8 @@ module.exports = {
inline: /runtime\..*\.js$/
}])
.end()
config.optimization.splitChunks({
config
.optimization.splitChunks({
chunks: 'all',
cacheGroups: {
libs: {
......@@ -111,8 +113,8 @@ module.exports = {
},
elementUI: {
name: 'chunk-elementUI', // split elementUI into a single package
test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app
priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
},
commons: {
name: 'chunk-commons',
......@@ -123,12 +125,12 @@ module.exports = {
}
}
})
config.optimization.runtimeChunk('single'),
{
from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
to: './' //到根目录下
}
})
}
)
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment