diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_sby.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_sby.png
new file mode 100644
index 00000000..7e968d5d
Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_sby.png differ
diff --git a/src/views/projectAdmin/fourEngin/carbon/centerBottom.vue b/src/views/projectAdmin/fourEngin/carbon/centerBottom.vue
index 088eb687..52d6e59d 100644
--- a/src/views/projectAdmin/fourEngin/carbon/centerBottom.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/centerBottom.vue
@@ -49,7 +49,14 @@ export default {
// 默认为直线,可选为:'line' | 'shadow'
}
},
-
+ grid: {
+ // 图表距离边框的距离,可用百分比和数字(px)配置
+ top: '15%',
+ left: '2%',
+ right: '4%',
+ bottom: '17%',
+ containLabel: true
+ },
xAxis: {
boundaryGap: false,
diff --git a/src/views/projectAdmin/fourEngin/carbon/centerTop.vue b/src/views/projectAdmin/fourEngin/carbon/centerTop.vue
index 3b1e0dcc..6c9a69ee 100644
--- a/src/views/projectAdmin/fourEngin/carbon/centerTop.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/centerTop.vue
@@ -1,16 +1,27 @@
- 实时数据
- 零碳展厅
+ 实时数据
+ 零碳展厅
-
+
+
+ 设备一
+
+ 设备二
+ 设备三
+
+
+
+
+
-
-
+
+
+
@@ -18,12 +29,12 @@
@@ -393,8 +399,7 @@ export default {
height: 10%;
display: flex;
margin-left: 35%;
-
-
+
.btn_anniu {
display: inline-block;
// margin-top: 5px;
@@ -410,7 +415,6 @@ export default {
margin: 0 10px 0 0;
color: #fff;
font-size: 24px;
-
}
.newStyle {
@@ -430,32 +434,49 @@ export default {
}
}
.right3 {
- width: 100%;
+ width: 100%;
height: 80%;
margin-top: 25px;
- .centerChart {
- width: 100%;
- height: calc(100% - 22px);
+ .centerChart {
+ width: 100%;
+ height: calc(100% - 22px);
}
-
- #right2{
- width: 100%;
- height: 100%;
-
- }
- .right4{
- width: 100%;
- height: 100%;
- .video{
- margin-bottom: -50px;
- display: inline-block;
- margin-left: 25px;
- width: 850px;
- height: 550px;
- }
- }
- }
-
+ #right2 {
+ width: 100%;
+ height: 100%;
+ }
+ .right4 {
+ width: 100%;
+ height: 100%;
+ .video {
+ margin-bottom: -50px;
+ display: inline-block;
+ margin-left: 25px;
+ width: 850px;
+ height: 550px;
+ }
+ }
+ .dropDown {
+ float: right;
+ text-align: center;
+ margin-right: 40px;
+ margin-top: -20px;
+ width: 100px;
+ height: 30px;
+ line-height: 30px;
+ background-color: #305c6d;
+ background-image: url(../assets/images/common/bg_sby.png);
+ background-repeat: no-repeat;
+ background-size: 100%;
+ font-size: 8px;
+ .el-dropdown-link {
+ color: #Fff;
+ }
+ .el-icon-arrow-down{
+ margin-left: 15px;
+ }
+ }
+ }
}
diff --git a/src/views/projectAdmin/fourEngin/carbon/leftBottom.vue b/src/views/projectAdmin/fourEngin/carbon/leftBottom.vue
index 7a68dc99..f8670a1a 100644
--- a/src/views/projectAdmin/fourEngin/carbon/leftBottom.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/leftBottom.vue
@@ -3,7 +3,9 @@
今日发电
- 10
+
+ 10
+
度
@@ -180,7 +182,7 @@ export default {
span{
color: #6EE4F0 ;
font-size: 24px;
- opacity: 0.7;
+ // opacity: 0.7;
}
.numTop{
display: inline-block;
@@ -193,13 +195,14 @@ export default {
background-size: 80%;
//font-size: 40px;
line-height: 60px;
- color: #fff !important;
+ // color: #fff !important;
margin-bottom: 10px;
margin-right: -15px;
+
}
.numText{
font-size: 40px;
- color: #fff;
+ color: #fff !important;
margin-right: 25px;
}
.text1{
diff --git a/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue b/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue
index bb2d0d78..47d06dfa 100644
--- a/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/leftCenter.vue
@@ -91,10 +91,10 @@ export default {
color:#72bdc9;
border-bottom: 1px solid rgba(31, 68, 86, 0.3);
line-height: 35px;
- opacity: 0.8;
+ //opacity: 0.8;
}
td {
- color: #c5c7cc;
+ color: #FFF;
line-height: 35px;
}
}
diff --git a/src/views/projectAdmin/fourEngin/carbon/leftTop.vue b/src/views/projectAdmin/fourEngin/carbon/leftTop.vue
index 8f8ead08..90c14de6 100644
--- a/src/views/projectAdmin/fourEngin/carbon/leftTop.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/leftTop.vue
@@ -52,11 +52,12 @@ export default {
position: relative;
color: #c5c7cc;
.air {
+ margin-top: 25px;
width: 100%;
height: 80%;
}
.text {
- margin-top: 10px;
+ margin-top: -20px;
width: 100%;
height: 20%;
text-align: center;
diff --git a/src/views/projectAdmin/fourEngin/carbon/rightBottom.vue b/src/views/projectAdmin/fourEngin/carbon/rightBottom.vue
index d224b5f0..d7df33e1 100644
--- a/src/views/projectAdmin/fourEngin/carbon/rightBottom.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/rightBottom.vue
@@ -71,7 +71,7 @@ export default {
grid: {
// 图表距离边框的距离,可用百分比和数字(px)配置
top: '5%',
- left: '0%',
+ left: '4%',
right: '4%',
bottom: '25%',
containLabel: true
diff --git a/src/views/projectAdmin/fourEngin/carbon/rightCenter.vue b/src/views/projectAdmin/fourEngin/carbon/rightCenter.vue
index 253faf90..ea5d4f51 100644
--- a/src/views/projectAdmin/fourEngin/carbon/rightCenter.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/rightCenter.vue
@@ -283,7 +283,7 @@ export default {
}
span {
color: #6ee4f0;
- opacity: 0.8;
+
font-size: 12px;
}
.span1{
diff --git a/src/views/projectAdmin/fourEngin/components/environmentWatchTwo.vue b/src/views/projectAdmin/fourEngin/components/environmentWatchTwo.vue
index 9517cfdc..74d890a2 100644
--- a/src/views/projectAdmin/fourEngin/components/environmentWatchTwo.vue
+++ b/src/views/projectAdmin/fourEngin/components/environmentWatchTwo.vue
@@ -75,7 +75,7 @@ export default {
var dataArr = 80;
var option = {
- // backgroundColor: "#FFFFFF",
+ // backgroundColor: "#162235",
title: {
show: true,
text: '优',
@@ -84,8 +84,8 @@ var option = {
z: 8,
textAlign: 'center',
textStyle: {
- color: '#458efd',
- fontSize: 20,
+ color: '#42A6DD ',
+ fontSize: 15,
fontWeight: 'normal'
},
@@ -94,15 +94,15 @@ var option = {
name: "内部(环形)进度条",
type: "gauge",
// center: ['30%', '40%'],
- radius: '50%',
+ radius: '60%',
splitNumber: 20,
axisLine: {
lineStyle: {
color: [
- [dataArr / 80, '#6acdc9'],
+ [dataArr / 100, '#6acdc9'],
[1]
],
- width: 5
+ width: 3.5
}
},
axisLabel: {
@@ -123,7 +123,7 @@ var option = {
name: '外部刻度',
type: 'gauge',
// center: ['20%', '50%'],
- radius: '62%',
+ radius: '70%',
min: 0, //最小刻度
max: 100, //最大刻度
splitNumber: 10, //刻度数量
@@ -133,7 +133,7 @@ var option = {
show: true,
// 仪表盘刻度线
lineStyle: {
- width: 1,
+ width: 0.5,
color: [
[1]
]
@@ -141,7 +141,7 @@ var option = {
},
//仪表盘文字
axisLabel: {
- show: true,
+ show: false,
color: '#7abec4',
distance: 8,
fontSize:8,
@@ -179,11 +179,11 @@ var option = {
color: '#7abec4', //用颜色渐变函数不起作用
width: 1,
},
- length: -5
+ length: -3
}, //刻度样式
splitLine: {
show: true,
- length: -8,
+ length: -5,
lineStyle: {
color: '#7abec4', //用颜色渐变函数不起作用
width: 1,
@@ -199,7 +199,7 @@ var option = {
/*内部*/
{
type: 'pie',
- radius: ['37%', '33%'],
+ radius: ["35%",'36'],
center: ['50%', '50%'],
z: 8,
hoverAnimation: false,
@@ -223,7 +223,7 @@ var option = {
formatter: function(params) {
return params.value ;
},
- color: '#458efd',
+ color: '#42A6DD ',
fontSize: 30,
fontWeight: "bold",
position: 'center',
@@ -238,7 +238,7 @@ var option = {
/*外一层*/
{
type: "pie",
- radius: ['39%', '35%'],
+ radius: ['43%','36'],
startAngle: 220,
endAngle: -40,
hoverAnimation: false,
@@ -262,7 +262,7 @@ var option = {
//外二层圈
{
type: "pie",
- radius: ['41%', '38%'],
+ radius: ["48%",'36%'],
center: ["50%", "50%"],
avoidLabelOverlap: false,
z: 0,