解决冲突
BIN
src/assets/images/airInfo/bg.png
Normal file
|
After Width: | Height: | Size: 8.4 KiB |
BIN
src/assets/images/airInfo/dust-icon.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
src/assets/images/airInfo/fan-v-icon.png
Normal file
|
After Width: | Height: | Size: 932 B |
BIN
src/assets/images/airInfo/o2-icon.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
src/assets/images/airInfo/tempture-icon.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
src/assets/images/airInfo/water-icon.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
src/assets/images/badGasInfo/bg.png
Normal file
|
After Width: | Height: | Size: 17 KiB |
BIN
src/assets/images/fanInfo/white-state-icon.png
Normal file
|
After Width: | Height: | Size: 832 B |
BIN
src/assets/images/site/zdgl_bj.png
Normal file
|
After Width: | Height: | Size: 19 KiB |
BIN
src/assets/images/site/zdgl_dbj.png
Normal file
|
After Width: | Height: | Size: 2.0 MiB |
BIN
src/assets/images/site/zdgl_icon_bj.png
Normal file
|
After Width: | Height: | Size: 967 B |
BIN
src/assets/images/site/zdgl_icon_fh.png
Normal file
|
After Width: | Height: | Size: 626 B |
BIN
src/assets/images/site/zdgl_icon_tjz.png
Normal file
|
After Width: | Height: | Size: 4.6 KiB |
BIN
src/assets/images/site/zdgl_zd.png
Normal file
|
After Width: | Height: | Size: 50 KiB |
BIN
src/assets/images/transducer/icon1.png
Normal file
|
After Width: | Height: | Size: 788 B |
BIN
src/assets/images/transducer/sp_icon_dl.png
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
BIN
src/assets/images/transducer/sp_icon_dy.png
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
src/assets/images/transducer/sp_icon_pbq.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
src/assets/images/transducer/sp_icon_yc.png
Normal file
|
After Width: | Height: | Size: 370 B |
BIN
src/assets/images/usedEle/white-ele.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
@@ -16,7 +16,16 @@ a {
|
||||
html, body, #app, .el-container, .el-aside, .el-main {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.tunnel-title {
|
||||
width: 2330px;
|
||||
height: 156px;
|
||||
z-index: 2;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 50%;
|
||||
margin-left: -1165px;
|
||||
background-image: url('../images/topAndDown/sp_tb.png');
|
||||
}
|
||||
.box-top {
|
||||
.manage-btn {
|
||||
display: flex;
|
||||
@@ -49,17 +58,6 @@ html, body, #app, .el-container, .el-aside, .el-main {
|
||||
}
|
||||
}
|
||||
|
||||
.tunnel-title {
|
||||
width: 2330px;
|
||||
height: 156px;
|
||||
z-index: 2;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 50%;
|
||||
margin-left: -1165px;
|
||||
background-image: url('../images/topAndDown/sp_tb.png');
|
||||
}
|
||||
|
||||
.top-right {
|
||||
z-index: 2;
|
||||
position: absolute;
|
||||
@@ -113,6 +111,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
|
||||
.el-drawer {
|
||||
width: 900px !important;
|
||||
background-color: transparent;
|
||||
box-shadow: none;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||