gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/page/dashboard/chartBox.vue
This commit is contained in:
zhangyu
2021-07-05 15:13:51 +08:00
parent c977d6978d edc963d031
commit 7e4c4a4463
30 changed files with 160 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/page/dashboard/chartBox.vue
View File

@@ -499,7 +499,7 @@ import nezhaColor from '../../common/nezhaColor'
import i18n from '../../common/i18n'
import { fromRoute } from '@/components/common/js/constants'
import diagram from '@/components/common/ChartDiagram/diagram'
import rightBoxMain from '@/components/common/mixin/rightBox'
import editRigthBox from '../../common/mixin/editRigthBox'
const rz = {
methods: {
rz (e) {
@@ -520,7 +520,7 @@ export default {
default: false
}
},
mixins: [rz, rightBoxMain],
mixins: [rz,editRigthBox],
data () {
return {
fromRoute,