-
+
@@ -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 @@
-
+
删除
@@ -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;
+ }
+}
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;
+ }
+}
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;
+ }
+}
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;
+ }
}
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;
+ }
}
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;
+ }
}
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;
+ }
}
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) {
+
}