Skip to content

G
gassafety-progress
Commit a54dc3ed authored by lizhichao's avatar lizhichao
Browse files
Options

大屏弹出框样式调整

parent 0580795f
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 7 deletions
gassafetyprogress-web/src/components/bigWindow/Cz.vue
View file @ a54dc3ed
...@@ -76,11 +76,11 @@ ...@@ -76,11 +76,11 @@
> >
{{ deviceData.stationAddr || "-" }} {{ deviceData.stationAddr || "-" }}
</div> </div>
<div v-else>-</div> <div v-else class="right last zzz">-</div>
</div> </div>
</div> </div>
<div class="top-right"> <div class="top-right">
<el-image <el-image
v-if="deviceData.pictureAddress" v-if="deviceData.pictureAddress"
style="width: 100px; height: 100px" style="width: 100px; height: 100px"
...@@ -237,7 +237,7 @@ export default { ...@@ -237,7 +237,7 @@ export default {
background-color: rgba(9, 18, 32, 0.6); background-color: rgba(9, 18, 32, 0.6);
padding: 10px; padding: 10px;
position: relative; position: relative;
width: 600px; width: 500px;
.title { .title {
// padding-top: 10px; // padding-top: 10px;
// padding-left: 10px; // padding-left: 10px;
...@@ -258,7 +258,7 @@ export default { ...@@ -258,7 +258,7 @@ export default {
border: 1px solid #cccccc; border: 1px solid #cccccc;
box-sizing: border-box; box-sizing: border-box;
.top-left { .top-left {
flex: 1; flex: 1.8;
.group { .group {
height: 40px; height: 40px;
flex: 1; flex: 1;
...@@ -283,6 +283,9 @@ export default { ...@@ -283,6 +283,9 @@ export default {
text-align: right; text-align: right;
background-color: rgba(255, 255, 255, 0.1); background-color: rgba(255, 255, 255, 0.1);
} }
.right {
flex:2;
}
} }
} }
.top-right { .top-right {
......
gassafetyprogress-web/src/components/bigWindow/Device.vue
View file @ a54dc3ed
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</div> </div>
</div> </div>
<div class="top-right"> <div class="top-right">
<el-image <el-image
v-if="deviceData.iconUrl" v-if="deviceData.iconUrl"
style="width: 100px; height: 100px" style="width: 100px; height: 100px"
...@@ -220,7 +220,7 @@ export default { ...@@ -220,7 +220,7 @@ export default {
background-color: rgba(9, 18, 32, 0.6); background-color: rgba(9, 18, 32, 0.6);
padding: 10px; padding: 10px;
position: relative; position: relative;
width: 600px; width: 500px;
.title { .title {
// padding-top: 10px; // padding-top: 10px;
// padding-left: 10px; // padding-left: 10px;
...@@ -241,7 +241,7 @@ export default { ...@@ -241,7 +241,7 @@ export default {
border: 1px solid #cccccc; border: 1px solid #cccccc;
box-sizing: border-box; box-sizing: border-box;
.top-left { .top-left {
flex: 1; flex: 1.8;
.group { .group {
height: 40px; height: 40px;
flex: 1; flex: 1;
...@@ -266,6 +266,9 @@ export default { ...@@ -266,6 +266,9 @@ export default {
text-align: right; text-align: right;
background-color: rgba(255, 255, 255, 0.1); background-color: rgba(255, 255, 255, 0.1);
} }
.right {
flex:2;
}
} }
} }
.top-right { .top-right {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment