jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Browse Source 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/package.json
	ruoyi-ui/src/layout/components/AppMain.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
	sql/ry_20201128.sql
This commit is contained in:
疯狂的狮子li
2020-11-30 12:41:39 +08:00
parent 6d900dc654 1147ea5f8a
commit ce438f182a
16 changed files with 159 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/views/monitor/cache/index.vue vendored
View File

@ -117,14 +117,14 @@ export default {
this.usedmemory = echarts.init(this.$refs.usedmemory, "macarons");
this.usedmemory.setOption({
tooltip: {
formatter: "{b} <br/>{a} : {c}M",
formatter: "{b} <br/>{a} : {c}K",
},
series: [
{
name: "峰值",
type: "gauge",
detail: {
formatter: "{value}M",
formatter: "{value}K",
},
data: [
{

3
ruoyi-ui/src/views/system/log/index.vue
View File

@ -1,3 +0,0 @@
<template >
<router-view />
</template>

3
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
View File

@ -144,6 +144,7 @@ export default {
.user-info-head {
position: relative;
display: inline-block;
height: 120px;
}
.user-info-head:hover:after {
@ -163,4 +164,4 @@ export default {
line-height: 110px;
border-radius: 50%;
}
</style>
</style>