From e58fa5412d9440ec74b8808126dad0e0c7f72ec2 Mon Sep 17 00:00:00 2001
From: wj <347312259@qq.com>
Date: Fri, 7 Jul 2023 17:56:57 +0800
Subject: [PATCH] 1111
---
psdc-ui/src/views/analyse/nhdb/index.vue | 10 +++
psdc-ui/src/views/analyse/nhfx/index.vue | 5 ++
psdc-ui/src/views/analyse/nhtj/index.vue | 5 ++
psdc-ui/src/views/bigview/index.vue | 52 ++++++++++------
psdc-ui/src/views/control/manual/index.vue | 72 ++++++++++++++++++----
psdc-ui/src/views/control/timer/index.vue | 43 +++++++++++--
psdc-ui/src/views/emonitor/db/index.vue | 38 +++++++++---
psdc-ui/src/views/emonitor/drgl/index.vue | 38 +++++++++---
psdc-ui/src/views/emonitor/frdl/index.vue | 37 ++++++++---
psdc-ui/src/views/emonitor/kqyrb/index.vue | 37 ++++++++---
psdc-ui/src/views/emonitor/wdcgq/index.vue | 21 ++++++-
psdc-ui/src/views/emonitor/xrgl/index.vue | 37 ++++++++---
psdc-ui/src/views/login.vue | 5 +-
13 files changed, 322 insertions(+), 78 deletions(-)
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;
+ }
+}
</style>
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;
+ }
+}
</style>
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;
+ }
+}
</style>
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 @@
<div class="header">
<h2>电能替代分布式控制试验平台</h2>
<div class="timer">{{timer}}</div>
- <screenfull id="screenfull" class="right-menu-item hover-effect" />
+ <screenfull id="screenfull" @click="refresh" class="right-menu-item hover-effect" />
<router-link :to="{path:'/control/manual'}" tag="div" class="back" @click="linkPage"><el-icon><HomeFilled /></el-icon></router-link>
</div>
<div class="main">
@@ -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%;
+ }
+ }
+
+}
</style>
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 @@
<div class="control_header"><span>调控日志</span></div>
<div class="control_table">
<el-table :data="controlLogList" height="90%">
- <el-table-column label="序号" align="center" type="index" :index="indexMethod1"></el-table-column>
+ <el-table-column label="序号" align="center" type="index" width="60" :index="indexMethod1"></el-table-column>
<el-table-column label="设备名称" align="center" prop="deviceName"/>
<el-table-column label="操作内容" align="center" prop="controlValue" :formatter="formatControlKeyValue"/>
<el-table-column label="操作时间" align="center" prop="createTime"/>
@@ -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;
+ }
}
</style>
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 @@
></el-date-picker>
</el-form-item>
<el-form-item class="mr30">
- <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
- <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+ <el-button class="mybtn" type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+ <el-button class="mybtn" icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -37,9 +37,9 @@
</el-row>
<div class="dev_control_table">
<el-table :data="timingList" height="685px">
- <el-table-column label="序号" type="index" :index="indexMethod1" width="60"></el-table-column>
+ <el-table-column label="序号" type="index" width="60" :index="indexMethod1"></el-table-column>
<el-table-column label="设备名称" align="center" prop="deviceName"/>
- <el-table-column label="任务描述" align="center" prop="controlContext" width="500"/>
+ <el-table-column label="任务描述" align="center" prop="controlContext"/>
<!-- <el-table-column label="状态" align="center">-->
<!-- <template v-slot="scope">-->
<!--<!– <el-tag class="ml-2" :type="timerStatus">暂停</el-tag>–>-->
@@ -50,7 +50,7 @@
<el-table-column label="执行时间" align="center" prop="runtime"/>
<el-table-column label="创建者" align="center" prop="createBy"/>
<el-table-column label="创建时间" align="center" prop="createTime"/>
- <el-table-column label="操作" align="center" prop="handle" width="200">
+ <el-table-column label="操作" align="center" prop="handle">
<template v-slot="scope">
<!-- <el-button size="small" :type="scope.row.timerStatus == 0 ? 'success':''" @click="getUpDateStatusFun(scope)">{{ scope.row.timerStatus == 0 ? '开启' : '停止' }}</el-button>-->
<el-button type="danger" size="small" :icon="Delete" @click="getDeleteTimerFun(scope)">删除</el-button>
@@ -538,7 +538,7 @@ const { queryParams } = toRefs(data);
.dev_control_table{
position: relative;
width: 100%;
- min-height: 740px;
+ //min-height: 740px;
background-color: #2F3D8A;
}
.mr30{
@@ -618,5 +618,36 @@ const { queryParams } = toRefs(data);
::v-deep .el-scrollbar__wrap.el-scrollbar__wrap--hidden-default{
background-color: rgba(47,61,138);
}
+
+@media (max-width:960px) {
+ .app-container{
+ padding: 8px;
+ }
+ .dev_control_table{
+ height: 540px !important;
+ }
+ .mb8{
+ margin-bottom: 0px;
+ }
+ .mybtn{
+ margin-bottom: 0px !important;
+ }
+ ::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;
+ }
+ ::v-deep .el-form--inline .el-form-item{
+ margin-right: 20px;
+ }
+}
</style>
diff --git a/psdc-ui/src/views/emonitor/db/index.vue b/psdc-ui/src/views/emonitor/db/index.vue
index 02c82be..c73e23a 100644
--- a/psdc-ui/src/views/emonitor/db/index.vue
+++ b/psdc-ui/src/views/emonitor/db/index.vue
@@ -176,7 +176,8 @@ export default {
// getData
// },
- onMounted(() => {//需要获取到element,所以是onMounted的Hook
+ onMounted(() => {
+ //需要获取到element,所以是onMounted的Hook
getData(13).then((res)=>{
console.log(res)
if(res.data!=null){
@@ -240,7 +241,10 @@ export default {
detail: {
valueAnimation: true,
formatter: '{value} kW',
- color: 'inherit'
+ color: 'inherit',
+ textStyle:{
+ fontSize: 22
+ }
},
data: [
{
@@ -250,9 +254,9 @@ export default {
}
]
});
- window.onresize = function () {//自适应大小
+ window.addEventListener("resize", function () {
myChart1.resize();
- };
+ });
//当前功率折线图
let myChart2 = echarts.getInstanceByDom(document.getElementById("myEcharts2"));
@@ -339,7 +343,7 @@ export default {
])
}
}, //设置折线区域渐变颜色
- symbol: "none", //去掉拐角点
+ symbol: "circle", //去掉拐角点
markPoint: {
itemStyle: {
normal: {
@@ -359,9 +363,9 @@ export default {
},
],
});
- window.onresize = function () {//自适应大小
+ window.addEventListener("resize", function () {
myChart2.resize();
- };
+ });
})
//今日用电量柱状图
@@ -553,5 +557,25 @@ p{
padding-top: 10px;
padding-left: 10px;
}
+
+@media (max-width:960px) {
+ .app-container{
+ padding: 8px;
+ }
+ .card{
+ p{
+ font-size: 14px;
+ }
+ h1{
+ font-size: 18px;
+ }
+ }
+ .mid1-1,.mid2-1,.bottom1-1{
+ font-size: 14px;
+ height: 32px;
+ line-height: 32px;
+ padding-top: 0;
+ }
+}
</style>
diff --git a/psdc-ui/src/views/emonitor/drgl/index.vue b/psdc-ui/src/views/emonitor/drgl/index.vue
index e9430aa..3f6f1fe 100644
--- a/psdc-ui/src/views/emonitor/drgl/index.vue
+++ b/psdc-ui/src/views/emonitor/drgl/index.vue
@@ -301,7 +301,10 @@ export default {
detail: {
valueAnimation: true,
formatter: '{value} kW',
- color: 'inherit'
+ color: 'inherit',
+ textStyle:{
+ fontSize: 22
+ }
},
data: [
{
@@ -311,9 +314,9 @@ export default {
}
]
});
- window.onresize = function () {//自适应大小
+ window.addEventListener("resize", function () {
myChart1.resize();
- };
+ });
}
//渲染电磁锅炉数据
@@ -623,9 +626,9 @@ export default {
},
],
});
- window.onresize = function () {//自适应大小
+ window.addEventListener("resize", function () {
myChart4.resize();
- };
+ });
})
}
function getDrglFun(){
@@ -724,7 +727,7 @@ export default {
itemStyle:{
color:'#2F8EE0'
},
- symbol: "none", //去掉拐角点
+ symbol: "circle", //去掉拐角点
markPoint: {
itemStyle: {
normal: {
@@ -753,9 +756,9 @@ export default {
},
],
});
- window.onresize = function () {//自适应大小
+ window.addEventListener("resize", function () {
myChart3.resize();
- };
+ });
})
}
@@ -852,5 +855,24 @@ p{
::v-deep .el-form-item{
margin-bottom: 12px;
}
+@media (max-width:960px) {
+ .app-container{
+ padding: 8px;
+ }
+ .card{
+ p{
+ font-size: 14px;
+ }
+ h1{
+ font-size: 18px;
+ }
+ }
+ .title{
+ font-size: 14px;
+ height: 32px;
+ line-height: 32px;
+ padding-top: 0;
+ }
+}
</style>
diff --git a/psdc-ui/src/views/emonitor/frdl/index.vue b/psdc-ui/src/views/emonitor/frdl/index.vue
index 1cd1f99..58d354e 100644
--- a/psdc-ui/src/views/emonitor/frdl/index.vue
+++ b/psdc-ui/src/views/emonitor/frdl/index.vue
@@ -296,7 +296,10 @@ export default {
detail: {
valueAnimation: true,
formatter: '{value} kW',
- color: 'inherit'
+ color: 'inherit',
+ textStyle:{
+ fontSize: 22
+ }
},
data: [
{
@@ -306,9 +309,9 @@ export default {
}
]
});
- window.onresize = function () {//自适应大小
+ window.addEventListener("resize", function () {
myChart1.resize();
- };
+ });
}
//渲染发热电缆数据
@@ -607,9 +610,9 @@ export default {
},
],
});
- window.onresize = function () {//自适应大小
+ window.addEventListener("resize", function () {
myChart4.resize();
- };
+ });
})
}
function getFrdlFun(){
@@ -709,7 +712,7 @@ export default {
itemStyle:{
color:'#2F8EE0'
},
- symbol: "none", //去掉拐角点
+ symbol: "circle", //去掉拐角点
markPoint: {
itemStyle: {
normal: {
@@ -738,9 +741,9 @@ export default {
},
],
});
- window.onresize = function () {//自适应大小
+ window.addEventListener("resize", function () {
myChart3.resize();
- };
+ });
})
}
@@ -836,6 +839,24 @@ p{
}
::v-deep .el-form-item{
margin-bottom: 12px;
+}@media (max-width:960px) {
+ .app-container{
+ padding: 8px;
+ }
+ .card{
+ p{
+ font-size: 14px;
+ }
+ h1{
+ font-size: 18px;
+ }
+ }
+ .title{
+ font-size: 14px;
+ height: 32px;
+ line-height: 32px;
+ padding-top: 0;
+ }
}
</style>
diff --git a/psdc-ui/src/views/emonitor/kqyrb/index.vue b/psdc-ui/src/views/emonitor/kqyrb/index.vue
index d785611..849d27c 100644
--- a/psdc-ui/src/views/emonitor/kqyrb/index.vue
+++ b/psdc-ui/src/views/emonitor/kqyrb/index.vue
@@ -300,7 +300,10 @@ export default {
detail: {
valueAnimation: true,
formatter: '{value} kW',
- color: 'inherit'
+ color: 'inherit',
+ textStyle:{
+ fontSize: 22
+ }
},
data: [
{
@@ -310,9 +313,9 @@ export default {
}
]
});
- window.onresize = function () {//自适应大小
+ window.addEventListener("resize", function () {
myChart1.resize();
- };
+ });
}
//渲染空气源热泵数据
@@ -621,9 +624,9 @@ export default {
},
],
});
- window.onresize = function () {//自适应大小
+ window.addEventListener("resize", function () {
myChart4.resize();
- };
+ });
})
}
function getKqrybFun(){
@@ -721,7 +724,7 @@ export default {
itemStyle:{
color:'#2F8EE0'
},
- symbol: "none", //去掉拐角点
+ symbol: "circle", //去掉拐角点
markPoint: {
itemStyle: {
normal: {
@@ -750,9 +753,9 @@ export default {
},
],
});
- window.onresize = function () {//自适应大小
+ window.addEventListener("resize", function () {
myChart3.resize();
- };
+ });
})
}
@@ -848,6 +851,24 @@ p{
}
::v-deep .el-form-item{
margin-bottom: 12px;
+}@media (max-width:960px) {
+ .app-container{
+ padding: 8px;
+ }
+ .card{
+ p{
+ font-size: 14px;
+ }
+ h1{
+ font-size: 18px;
+ }
+ }
+ .title{
+ font-size: 14px;
+ height: 32px;
+ line-height: 32px;
+ padding-top: 0;
+ }
}
</style>
diff --git a/psdc-ui/src/views/emonitor/wdcgq/index.vue b/psdc-ui/src/views/emonitor/wdcgq/index.vue
index 3e513d5..e112ad7 100644
--- a/psdc-ui/src/views/emonitor/wdcgq/index.vue
+++ b/psdc-ui/src/views/emonitor/wdcgq/index.vue
@@ -321,13 +321,14 @@ p{
width: 100%;
display: flex;
flex-wrap: wrap;
- justify-content: space-between;
+ justify-content: flex-start;
}
.card{
width: 19.45%;
height: 110px;
background-color: #2F3D8A;
margin-bottom: 12px;
+ margin-right: 12px;
//margin-right: 10px;
display: flex;
justify-content: space-around;
@@ -349,6 +350,24 @@ p{
background-color: #374590;
padding-top: 10px;
padding-left: 10px;
+}@media (max-width:960px) {
+ .app-container{
+ padding: 8px;
+ }
+ .card{
+ p{
+ font-size: 14px;
+ }
+ h1{
+ font-size: 18px;
+ }
+ }
+ .mid1-1,.mid2-1,.bottom1-1{
+ font-size: 14px;
+ height: 32px;
+ line-height: 32px;
+ padding-top: 0;
+ }
}
</style>
diff --git a/psdc-ui/src/views/emonitor/xrgl/index.vue b/psdc-ui/src/views/emonitor/xrgl/index.vue
index 5ab000a..485172e 100644
--- a/psdc-ui/src/views/emonitor/xrgl/index.vue
+++ b/psdc-ui/src/views/emonitor/xrgl/index.vue
@@ -302,7 +302,10 @@ export default {
detail: {
valueAnimation: true,
formatter: '{value} kW',
- color: 'inherit'
+ color: 'inherit',
+ textStyle:{
+ fontSize: 22
+ }
},
data: [
{
@@ -312,9 +315,9 @@ export default {
}
]
});
- window.onresize = function () {//自适应大小
+ window.addEventListener("resize", function () {
myChart1.resize();
- };
+ });
}
//渲染蓄热锅炉数据
@@ -413,7 +416,7 @@ export default {
itemStyle:{
color:'#2F8EE0'
},
- symbol: "none", //去掉拐角点
+ symbol: "circle", //去掉拐角点
markPoint: {
itemStyle: {
normal: {
@@ -442,9 +445,9 @@ export default {
},
],
});
- window.onresize = function () {//自适应大小
+ window.addEventListener("resize", function () {
myChart3.resize();
- };
+ });
})
}
function getXcglFun(){
@@ -753,9 +756,9 @@ export default {
},
],
});
- window.onresize = function () {//自适应大小
+ window.addEventListener("resize", function () {
myChart4.resize();
- };
+ });
})
}
@@ -850,6 +853,24 @@ p{
}
::v-deep .el-form-item{
margin-bottom: 12px;
+}@media (max-width:960px) {
+ .app-container{
+ padding: 8px;
+ }
+ .card{
+ p{
+ font-size: 14px;
+ }
+ h1{
+ font-size: 18px;
+ }
+ }
+ .title{
+ font-size: 14px;
+ height: 32px;
+ line-height: 32px;
+ padding-top: 0;
+ }
}
</style>
diff --git a/psdc-ui/src/views/login.vue b/psdc-ui/src/views/login.vue
index 80ce0ca..8da037a 100644
--- a/psdc-ui/src/views/login.vue
+++ b/psdc-ui/src/views/login.vue
@@ -165,7 +165,7 @@ getCookie();
padding-top: 50px;
h2{
text-align: center;
- font-size: .36rem;
+ font-size: 36px;
font-weight: bold;
color: #AFEAFF;
margin:0px 0 50px 0;
@@ -256,5 +256,8 @@ getCookie();
.login-code-img {
height: 40px;
padding-left: 12px;
+}
+@media (max-width: 960px) {
+
}
</style>