diff --git a/psdc-ui/src/views/analyse/nhdb/index.vue b/psdc-ui/src/views/analyse/nhdb/index.vue index 9f1d948..ee7ee46 100644 --- a/psdc-ui/src/views/analyse/nhdb/index.vue +++ b/psdc-ui/src/views/analyse/nhdb/index.vue @@ -301,5 +301,15 @@ function getCelueListFun(){ background-color: #2F3D8A; height: 260px; } +@media (max-width:960px) { + .app-container{ + padding: 8px; + } + .box-card{ + width: 100%; + margin-bottom: 8px; + margin-right: 0 !important; + } +} diff --git a/psdc-ui/src/views/analyse/nhfx/index.vue b/psdc-ui/src/views/analyse/nhfx/index.vue index 16b0e70..53e415c 100644 --- a/psdc-ui/src/views/analyse/nhfx/index.vue +++ b/psdc-ui/src/views/analyse/nhfx/index.vue @@ -728,5 +728,10 @@ onBeforeUnmount(() => { //color: #f3ffff; color: #606266 !important; } +@media (max-width:960px) { + .app-container{ + padding: 8px; + } +} diff --git a/psdc-ui/src/views/analyse/nhtj/index.vue b/psdc-ui/src/views/analyse/nhtj/index.vue index 49b2317..84d02de 100644 --- a/psdc-ui/src/views/analyse/nhtj/index.vue +++ b/psdc-ui/src/views/analyse/nhtj/index.vue @@ -543,5 +543,10 @@ const { filterForm } = toRefs(data); //color: #f3ffff; color: #606266 !important; } +@media (max-width:960px) { + .app-container{ + padding: 8px; + } +} diff --git a/psdc-ui/src/views/bigview/index.vue b/psdc-ui/src/views/bigview/index.vue index 7fc17a9..a90b448 100644 --- a/psdc-ui/src/views/bigview/index.vue +++ b/psdc-ui/src/views/bigview/index.vue @@ -3,7 +3,7 @@

电能替代分布式控制试验平台

{{timer}}
- +
@@ -151,7 +151,9 @@ onMounted(()=>{ getZdbFun(); dqglChartFun() }) - +function refresh(){ + // window.location.reload(); +} /** 日期*/ const timer = ref() //格式化日期 @@ -314,9 +316,9 @@ let xrglChart; let kqyrbChart; let frdlChart; function dcglChartFun(){ - const chartDom = document.getElementById('dcglChart') + var chartDom = document.getElementById('dcglChart') dcglChart = echarts.init(chartDom); - const option = { + var option = { legend: { data: ["进水温度","出水温度"], // selectedMode: 'single', @@ -424,9 +426,9 @@ function dcglChartFun(){ ] }; option && dcglChart.setOption(option); - window.onresize = function () {//自适应大小 - chartDom.resize(); - }; + window.addEventListener("resize", function () { + dcglChart.resize(); + }); }; function xrglChartFun(){ const chartDom = document.getElementById('xrglChart') @@ -539,9 +541,9 @@ function xrglChartFun(){ ] }; option && xrglChart.setOption(option); - window.onresize = function () {//自适应大小 - chartDom.resize(); - }; + window.addEventListener("resize", function () { + xrglChart.resize(); + }); }; function kqyrbChartFun(){ const chartDom = document.getElementById('kqyrbChart') @@ -654,9 +656,9 @@ function kqyrbChartFun(){ ] }; option && kqyrbChart.setOption(option); - window.onresize = function () {//自适应大小 - chartDom.resize(); - }; + window.addEventListener("resize", function () { + kqyrbChart.resize(); + }); }; function frdlChartFun(){ const chartDom = document.getElementById('frdlChart') @@ -759,9 +761,9 @@ function frdlChartFun(){ ] }; option && frdlChart.setOption(option); - window.onresize = function () {//自适应大小 - chartDom.resize(); - }; + window.addEventListener("resize", function () { + frdlChart.resize(); + }); }; /**总电表信息*/ @@ -911,9 +913,9 @@ function dqglChartFun(){ ] }; option && dqglChart.setOption(option); - window.onresize = function () {//自适应大小 - chartDom.resize(); - }; + window.addEventListener("resize", function () { + dqglChart.resize(); + }); }; @@ -1237,5 +1239,17 @@ onBeforeUnmount(() => { .screenNumber{ font-family: 'ds-digitalnormal'; } +@media (max-width: 960px) { + .info_box{ + .dev_img{ + width: 40%; + height: 80%; + } + .dev_data{ + width: 55%; + } + } + +} diff --git a/psdc-ui/src/views/control/manual/index.vue b/psdc-ui/src/views/control/manual/index.vue index cc252d1..2314e3f 100644 --- a/psdc-ui/src/views/control/manual/index.vue +++ b/psdc-ui/src/views/control/manual/index.vue @@ -40,7 +40,7 @@
调控日志
- + @@ -580,17 +580,6 @@ function getSetTemperatureFun(item){ .red{ color: red; } - .submit{ - padding: 3px 15px; - border-radius: 2px; - background-color: #2F8EED; - float: right; - margin-top: 8px; - cursor: pointer; - &:hover{ - background-color: #5ba2f3; - } - } } } } @@ -757,10 +746,69 @@ function getSetTemperatureFun(item){ .app-container{ padding: 8px; } + .home{ + height: 800px; + .dev_control_wrapper{ + .dev_control_item{ + width: 32%; + &:nth-child(3n){ + margin-right: 0px; + } + &:nth-child(4n){ + margin-right: 12px; + } + .item_header{ + height: 15%; + span{ + font-size: 14px; + line-height: 30px; + } + .switch{ + line-height: 30px; + height: 30px; + } + } + .item_bottom{ + .item_bottom_img{ + width: 35%; + height: 65%; + padding: 15px; + margin-right: 5px; + } + .item_bottom_form{ + width: 60%; + height: 100%; + padding: 0; + } + } + } + } + .dev_control_table{ + .control_header{ + height: 8%; + span{ + font-size: 14px; + line-height: 32px; + } + } + .control_table{ + height: 80%; + } + } + } ::v-deep .el-button{ margin-bottom: 8px; font-size: 12px; } + ::v-deep .el-form-item--default .el-form-item__label{ + height: 30px; + line-height: 30px; + font-size: 12px; + } + ::v-deep .el-form-item--default .el-form-item__content{ + line-height: 30px; + font-size: 12px; + } } diff --git a/psdc-ui/src/views/control/timer/index.vue b/psdc-ui/src/views/control/timer/index.vue index 95243c5..4fccc0d 100644 --- a/psdc-ui/src/views/control/timer/index.vue +++ b/psdc-ui/src/views/control/timer/index.vue @@ -26,8 +26,8 @@ > - 搜索 - 重置 + 搜索 + 重置 @@ -37,9 +37,9 @@
- + - + @@ -50,7 +50,7 @@ - +