Skip to content

D
digital-construction
Commit 8843ba60 authored by 张牧越's avatar 张牧越
Browse files
Options

styleFix

parent ee222cfd
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 16 deletions
public/index.html
View file @ 8843ba60
...@@ -27,11 +27,12 @@ ...@@ -27,11 +27,12 @@
.el-loading-mask { .el-loading-mask {
z-index: 99999 !important; z-index: 99999 !important;
position: fixed !important;
} }
</style> </style>
</head> </head>
<body style="min-width: 1300px;"> <body style="min-width: 1300px;height:100%">
<noscript> <noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
Please enable it to continue.</strong> Please enable it to continue.</strong>
......
src/App.vue
View file @ 8843ba60
...@@ -42,11 +42,18 @@ export default { ...@@ -42,11 +42,18 @@ export default {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
#app { body {
margin: 0px; margin: 0px;
background: url(assets/background.png) no-repeat; background: url(assets/background.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
background-attachment: fixed; background-attachment: fixed;
min-height: 100vh; min-height: 100vh;
} }
#app {
height: 100%;
}
*::-webkit-scrollbar {
display: none;
}
</style> </style>
src/components/Index.vue
View file @ 8843ba60
...@@ -140,13 +140,19 @@ export default { ...@@ -140,13 +140,19 @@ export default {
this.weekDay = str; this.weekDay = str;
}, },
bodyScale() { bodyScale() {
var devicewidth = document.documentElement.clientWidth; //获取当前分辨率下的可是区域宽度 var deviceHeight = window.screen.height; //获取当前分辨率下的可是区域宽度
var scale = devicewidth / 1920; // 分母——设计稿的尺寸 var scale = deviceHeight / 1080; // 分母——设计稿的尺寸
this.zoom = scale; //放大缩小相应倍数 document.body.style.zoom = scale; //放大缩小相应倍数
let charts = document.getElementsByClassName("chart-container");
for (let i = 0; i < charts.length; i++) { document.styleSheets[document.styleSheets.length - 1].insertRule(
charts[i].style.zoom = 1; "canvas {zoom: " + 1 / scale + "}"
} );
document.styleSheets[document.styleSheets.length - 1].insertRule(
"canvas {transform: scale(" + scale + ")}"
);
document.styleSheets[document.styleSheets.length - 1].insertRule(
"canvas {transform-origin: 0 0}"
);
}, },
jumpBack() { jumpBack() {
window.location.href = window.location.origin + "/pweb/m/"; window.location.href = window.location.origin + "/pweb/m/";
...@@ -169,9 +175,7 @@ export default { ...@@ -169,9 +175,7 @@ export default {
this.leftNav = [...res.data.menu]; this.leftNav = [...res.data.menu];
} }
}); });
this.$nextTick(() => {
this.bodyScale(); this.bodyScale();
});
this.getTime(); this.getTime();
setInterval(() => { setInterval(() => {
......
src/components/construction/Index.vue
View file @ 8843ba60
...@@ -507,6 +507,7 @@ export default { ...@@ -507,6 +507,7 @@ export default {
padding: 12px 20px; padding: 12px 20px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
height: 100%;
} }
.side-area { .side-area {
width: 25%; width: 25%;
......
src/components/fallprotection/Index.vue
View file @ 8843ba60
...@@ -23,9 +23,10 @@ ...@@ -23,9 +23,10 @@
> >
<img src="@/assets/fallprotection/device.png" alt="" /> <img src="@/assets/fallprotection/device.png" alt="" />
{{ device.device_no }} {{ device.device_no }}
<span :style="{ color: device.status == 1 ? '#26D591' : '' }">{{ <span
device.status_name :style="{ color: device.is_online == 1 ? '#26D591' : '' }"
}}</span> >{{ device.is_online_text }}</span
>
</div> </div>
</div> </div>
</div> </div>
......
src/components/projectcheck/Index.vue
View file @ 8843ba60
...@@ -500,6 +500,7 @@ export default { ...@@ -500,6 +500,7 @@ export default {
color: "rgba(95, 120, 144, 0.4)", color: "rgba(95, 120, 144, 0.4)",
}, },
}, },
minInterval: 1,
}, },
series: series, series: series,
}; };
......
src/components/unloadingplatform/Index.vue
View file @ 8843ba60
...@@ -13,7 +13,10 @@ ...@@ -13,7 +13,10 @@
<div class="platform-title"> <div class="platform-title">
<img src="@/assets/unloadingplatform/platform.png" alt="" /> <img src="@/assets/unloadingplatform/platform.png" alt="" />
{{ platform.device_no }} {{ platform.device_no }}
<span>{{ platform.status_name }}</span> <span
:style="{ color: platform.is_online == 1 ? '#66cab9' : '' }"
>{{ platform.is_online_text }}</span
>
</div> </div>
</div> </div>
</div> </div>
......
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