admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

湖里大屏(CIM)：解决冲突

Browse Source
This commit is contained in:
Jack 2022-08-23 16:47:24 +08:00
parent f424d595fb
commit 8a958adc8f
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/projectAdmin/jlw/CIM/index.vue
View File

@ -96,7 +96,6 @@ export default {
.container { .container {
width: 100%; width: 100%;
height: 100%; height: 100%;
<<<<<<< HEAD
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.charts { .charts {
@ -108,26 +107,6 @@ export default {
.chart { .chart {
height: 32%; height: 32%;
} }
=======
background-color: #07162b;
background-image: url('~@/assets/images/projectImg/Bimbgc.png');
}
.topBox {
height: 20%;
}
.leftBox {
position: relative;
width: 25%;
height: 100%;
margin-right: 15px;
.leftTop {
height: 33%;
margin-bottom: 15px;
}
.leftCenter {
height: 33%;
margin-bottom: 15px;
>>>>>>> dev-xiaole
} }
.bim { .bim {
padding: 8px; padding: 8px;