code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-17 16:36:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

!40 大屏与主样式冲突问题

Browse Source 
Merge pull request !40 from 孙阿龙/master
This commit is contained in:
随遇而安
2022-08-11 07:30:16 +00:00
committed by Gitee
parent b2d94772a6 ce7bbf8c46
commit 73e64ed0e0
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vue/src/assets/bigScreen/css/index.scss
View File

@@ -1,7 +1,7 @@
@import "./modules/reset.scss"; @import "./modules/reset.scss";
@import "./modules/variables.scss"; @import "./modules/variables.scss";
@import './theme/index.css'; // @import './theme/index.css';
@import '../iconfont//iconfont.css'; // @import '../iconfont//iconfont.css';
[class*=" blq-icon-"], [class*=" blq-icon-"],
[class^=blq-icon-] { [class^=blq-icon-] {

2
vue/src/main.js
View File

@@ -47,8 +47,6 @@ import Message from './views/bigScreen/components/message/message.vue'
import Reacquire from './views/bigScreen/components/reacquire/reacquire.vue' import Reacquire from './views/bigScreen/components/reacquire/reacquire.vue'
import Echart from './views/bigScreen/components/echart/index.vue' import Echart from './views/bigScreen/components/echart/index.vue'
import '@/assets/bigScreen/css/public.scss'
import "@/assets/bigScreen/css/index.scss"
import {loading,borderBox13,digitalFlop,capsuleChart,borderBox8} from '@jiaminghi/data-view' import {loading,borderBox13,digitalFlop,capsuleChart,borderBox8} from '@jiaminghi/data-view'
import * as filters from '@/directive/filters' import * as filters from '@/directive/filters'

2
vue/src/views/bigScreen/home.vue
View File

@@ -90,4 +90,6 @@ export default {
<style lang="scss" > <style lang="scss" >
@import "./home.scss"; @import "./home.scss";
@import '../../assets/bigScreen/css/theme/index.css';
@import "../../assets/bigScreen/css/index.scss"
</style> </style>