mirror of
https://github.com/nsnail/NetAdmin.git
synced 2025-04-24 07:02:51 +08:00
fix: 🐛 修复一些样式问题
This commit is contained in:
parent
f1fd53f72b
commit
442a69f90d
@ -1,11 +1,14 @@
|
||||
import colorTool from '@/utils/color'
|
||||
const style = getComputedStyle(document.documentElement)
|
||||
const el_color_primary = style.getPropertyValue('--el-color-primary')
|
||||
const el_color_info = style.getPropertyValue('--el-color-info')
|
||||
const el_text_color_primary = style.getPropertyValue('--el-text-color-primary')
|
||||
const el_border_color_lighter = style.getPropertyValue('--el-border-color-lighter')
|
||||
|
||||
const T = {
|
||||
export default {
|
||||
build() {
|
||||
const style = getComputedStyle(document.documentElement)
|
||||
const el_color_primary = style.getPropertyValue('--el-color-primary')
|
||||
const el_color_info = style.getPropertyValue('--el-color-info')
|
||||
const el_text_color_primary = style.getPropertyValue('--el-text-color-primary')
|
||||
const el_border_color_lighter = style.getPropertyValue('--el-border-color-lighter')
|
||||
|
||||
return {
|
||||
color: [el_color_primary, colorTool.lighten(el_color_primary, 0.5), ...colorTool.colorSets],
|
||||
grid: {
|
||||
left: '3%',
|
||||
@ -87,6 +90,6 @@ const T = {
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
export default T
|
@ -5,8 +5,6 @@
|
||||
<script>
|
||||
import * as echarts from 'echarts'
|
||||
import T from './echarts-theme-T.js'
|
||||
|
||||
echarts.registerTheme('T', T)
|
||||
const unwarp = (obj) => obj && (obj.__v_raw || obj.valueOf() || obj)
|
||||
|
||||
export default {
|
||||
@ -53,6 +51,7 @@ export default {
|
||||
mounted() {
|
||||
this.isActivat = true
|
||||
this.$nextTick(() => {
|
||||
echarts.registerTheme('T', T.build())
|
||||
this.draw()
|
||||
})
|
||||
},
|
||||
|
@ -14,11 +14,7 @@
|
||||
</el-header>
|
||||
<el-main>
|
||||
<el-scrollbar>
|
||||
<el-menu
|
||||
:active-text-color="DEFAULT_CONFIG.APP_SET_COLOR"
|
||||
:default-active="$route.meta.active || $route.fullPath"
|
||||
@select="select"
|
||||
router>
|
||||
<el-menu :default-active="$route.meta.active || $route.fullPath" @select="select" router>
|
||||
<NavMenu :navMenus="menu"></NavMenu>
|
||||
</el-menu>
|
||||
</el-scrollbar>
|
||||
|
@ -7,10 +7,6 @@
|
||||
--el-menu-horizontal-height: 4rem;
|
||||
}
|
||||
|
||||
.el-menu--inline {
|
||||
--el-menu-active-color: var(--el-color-primary) !important;
|
||||
}
|
||||
|
||||
.el-form-item--default {
|
||||
--font-size: 1rem;
|
||||
}
|
||||
|
@ -1,8 +1,7 @@
|
||||
<template>
|
||||
<div v-if="loading" v-loading="true" style="height: 100%"></div>
|
||||
<el-main v-else :style="{ height: mainHeight }">
|
||||
<widgets v-if="dashboard" @on-customizing="onCustomizing"></widgets>
|
||||
<work v-else></work>
|
||||
<el-main v-loading="loading" :style="{ height: mainHeight, minHeight: '100%' }">
|
||||
<widgets v-if="dashboard" @on-customizing="onCustomizing" @on-mounted="this.loading = false"></widgets>
|
||||
<work v-if="myapp" @on-mounted="this.loading = false"></work>
|
||||
</el-main>
|
||||
|
||||
<el-tour v-model="tour.open" @close="$TOOL.data.set('TOUR_TIP_READ_INDEX', true)">
|
||||
@ -34,13 +33,14 @@ export default {
|
||||
loading: true,
|
||||
mainHeight: 'auto',
|
||||
dashboard: false,
|
||||
myapp: false,
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
//下载配置
|
||||
await this.$TOOL.data.downloadConfig()
|
||||
this.dashboard = this.$GLOBAL.user.roles.findIndex((x) => x.displayDashboard) >= 0
|
||||
this.loading = false
|
||||
this.myapp = !this.dashboard
|
||||
},
|
||||
mounted() {
|
||||
this.$nextTick(() => {
|
||||
|
@ -153,7 +153,7 @@ export default {
|
||||
this.loadGrid()
|
||||
},
|
||||
mounted() {
|
||||
this.$emit('on-mounted')
|
||||
this.$nextTick(() => this.$emit('on-mounted'))
|
||||
},
|
||||
computed: {
|
||||
allCompsList() {
|
||||
|
@ -15,7 +15,7 @@ export default {
|
||||
return {}
|
||||
},
|
||||
mounted() {
|
||||
this.$emit('on-mounted')
|
||||
this.$nextTick(() => this.$emit('on-mounted'))
|
||||
},
|
||||
methods: {},
|
||||
}
|
||||
|
@ -245,7 +245,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { defineAsyncComponent } from 'vue'
|
||||
import { defineAsyncComponent, h } from 'vue'
|
||||
import table from '@/config/table'
|
||||
import naColOperation from '@/config/naColOperation'
|
||||
import naIndicator from '@/components/naIndicator/index.vue'
|
||||
@ -380,7 +380,7 @@ export default {
|
||||
await this.$API.sys_job.execute.post({ id: row.id })
|
||||
this.$notify.success({
|
||||
dangerouslyUseHTMLString: true,
|
||||
message: `<div id="countdown">${this.$t('已发起执行请求,5 秒后弹出执行结果')}</div>`,
|
||||
message: h('div', { id: 'countdown' }, this.$t('已发起执行请求,5 秒后弹出执行结果')),
|
||||
onClose: async () => {
|
||||
clearInterval(this.timer)
|
||||
this.dialog.save = { row, mode: 'view', tabId: 'record' }
|
||||
|
Loading…
x
Reference in New Issue
Block a user