diff --git a/psdc-ui/src/assets/images/head_bg2.png b/psdc-ui/src/assets/images/head_bg2.png new file mode 100644 index 0000000..eb9c407 Binary files /dev/null and b/psdc-ui/src/assets/images/head_bg2.png differ diff --git a/psdc-ui/src/assets/images/wrappertitle2.png b/psdc-ui/src/assets/images/wrappertitle2.png new file mode 100644 index 0000000..f651436 Binary files /dev/null and b/psdc-ui/src/assets/images/wrappertitle2.png differ diff --git a/psdc-ui/src/views/analyse/nhdb/index.vue b/psdc-ui/src/views/analyse/nhdb/index.vue index 838ce75..6064f92 100644 --- a/psdc-ui/src/views/analyse/nhdb/index.vue +++ b/psdc-ui/src/views/analyse/nhdb/index.vue @@ -314,7 +314,7 @@ function indoorChartFun(){ }, yAxis: { type: 'value', - // name:'℃', + name:'℃', nameTextStyle: { color: "#b6bee7", fontSize:12, diff --git a/psdc-ui/src/views/bigview/index.vue b/psdc-ui/src/views/bigview/index.vue index c481920..c792829 100644 --- a/psdc-ui/src/views/bigview/index.vue +++ b/psdc-ui/src/views/bigview/index.vue @@ -338,7 +338,7 @@ function dcglChartFun(){ }, grid:{ show: true, - top: '20%', + top: '40%', bottom:'15%', left:'10%', right:'3%', @@ -374,6 +374,8 @@ function dcglChartFun(){ yAxis: { type: 'value', name:'℃', + // scale: true, //自适应 + // minInterval: 5, //分割刻度 nameTextStyle: { color: "#b6bee7", fontSize:fontSize(12), @@ -387,7 +389,7 @@ function dcglChartFun(){ }, splitLine: { show: true, - lineStyle: {color: "#767da1", type: "dashed"} //dashed + lineStyle: {color: "#767da180", type: "dashed"} //dashed } //s是否显示为虚线的条纹背景 }, series: [ @@ -453,7 +455,7 @@ function xrglChartFun(){ }, grid:{ show: true, - top: '20%', + top: '40%', bottom:'15%', left:'10%', right:'3%', @@ -502,7 +504,7 @@ function xrglChartFun(){ }, splitLine: { show: true, - lineStyle: {color: "#767da1", type: "dashed"} //dashed + lineStyle: {color: "#767da180", type: "dashed"} //dashed } //s是否显示为虚线的条纹背景 }, series: [ @@ -568,7 +570,7 @@ function kqyrbChartFun(){ }, grid:{ show: true, - top: '20%', + top: '40%', bottom:'15%', left:'10%', right:'3%', @@ -617,7 +619,7 @@ function kqyrbChartFun(){ }, splitLine: { show: true, - lineStyle: {color: "#767da1", type: "dashed"} //dashed + lineStyle: {color: "#767da180", type: "dashed"} //dashed } //s是否显示为虚线的条纹背景 }, series: [ @@ -683,7 +685,7 @@ function kqyrbChartFun(){ // }, // grid:{ // show: true, -// top: '20%', +// top: '40%', // bottom:'15%', // left:'10%', // right:'3%', @@ -732,7 +734,7 @@ function kqyrbChartFun(){ // }, // splitLine: { // show: true, -// lineStyle: {color: "#767da1", type: "dashed"} //dashed +// lineStyle: {color: "#767da180", type: "dashed"} //dashed // } //s是否显示为虚线的条纹背景 // }, // series: [ @@ -802,8 +804,8 @@ function dqglChartFun(){ }, grid:{ show: true, - top: '20%', - bottom:'15%', + top: '30%', + bottom:'13%', left:'10%', right:'3%', borderWidth: 0, @@ -862,6 +864,9 @@ function dqglChartFun(){ yAxis: { type: 'value', name:'kW', + min: 0, + scale: true, //自适应 + minInterval: 10, //分割刻度 nameTextStyle: { color: "#b6bee7", fontSize:fontSize(12), @@ -875,7 +880,7 @@ function dqglChartFun(){ }, splitLine: { show: true, - lineStyle: {color: "#767da1", type: "dashed"} //dashed + lineStyle: {color: "#767da180", type: "dashed"} //dashed } //是否显示为虚线的条纹 }, series: [ @@ -952,7 +957,7 @@ function indoorChartFun(){ }, grid:{ show: true, - top: '20%', + top: '40%', bottom:'15%', left:'8%', right:'4%', @@ -987,7 +992,10 @@ function indoorChartFun(){ }, yAxis: { type: 'value', - // name:'℃', + name:'℃', + min: 0, + scale: true, //自适应 + minInterval: 10, //分割刻度 nameTextStyle: { color: "#b6bee7", fontSize:fontSize(10), @@ -1052,7 +1060,7 @@ function outdoorChartFun(){ }, grid:{ show: true, - top: '20%', + top: '40%', bottom:'15%', left:'8%', right:'4%', @@ -1087,7 +1095,10 @@ function outdoorChartFun(){ }, yAxis: { type: 'value', - // name:'℃', + name:'℃', + min: 0, + scale: true, //自适应 + minInterval: 10, //分割刻度 nameTextStyle: { color: "#b6bee7", fontSize:fontSize(10), @@ -1162,32 +1173,32 @@ onBeforeUnmount(() => { position: relative; width: 100%; height: .7rem; - background-image: url("../../assets/images/headtitle.png"); + background-image: url("../../assets/images/head_bg2.png"); background-size: 100% 100%; .timer{ position: absolute; - top: .13rem; - left: .3rem; + top: .12rem; + left: 1rem; font-size: .16rem; font-weight: bold; } h2{ - font-size: .36rem; + font-size: .3rem; color: #AFEAFF; font-weight: bold; text-align: center; - line-height: .7rem; + line-height: .5rem; } .right-menu-item { display: inline-block; - color: #97A8BE; + color: #fff; vertical-align: text-bottom; position: absolute; - top: 0px; - right: .8rem; - font-size: .14rem; - padding: 0.09rem .15rem; - border: 1px solid #dddddd00; + top: 0.09rem; + right: 1.5rem; + font-size: 0.14rem; + padding: 0.05rem 0.15rem; + border: 1px solid rgba(221, 221, 221, 0); cursor: pointer; &:hover{ border: 1px solid #dddddd70; @@ -1196,11 +1207,11 @@ onBeforeUnmount(() => { } .back{ position: absolute; - top: 0px; - right: .3rem; + top: 0.09rem; + right: 1rem; font-size: .16rem; color: #fff; - padding: 0.09rem .15rem; + padding: 0.03rem .15rem; border: 1px solid #dddddd00; &:hover{ border: 1px solid #dddddd70; @@ -1261,7 +1272,7 @@ onBeforeUnmount(() => { margin-top: -.1rem; } .txt{ - color: #1AC4F5; + color: #fff; font-size: .15rem; font-weight: bold; line-height: .3rem; @@ -1288,7 +1299,7 @@ onBeforeUnmount(() => { margin-top: -.1rem; } .txt{ - color: #1AC4F5; + color: #fff; font-size: .15rem; font-weight: bold; line-height: .3rem; @@ -1381,15 +1392,15 @@ onBeforeUnmount(() => { } } .title{ - width: 45%; + width: 50%; height: .3rem; line-height: .3rem; margin: 0 auto .2rem auto; - color: #19C3F4; + color: #ffffff; font-size: .18rem; font-weight: bold; text-align: center; - background-image: url("../../assets/images/wrappertitle.png"); + background-image: url("../../assets/images/wrappertitle2.png"); background-size: 100% 100%; } .info_box{ @@ -1410,7 +1421,8 @@ onBeforeUnmount(() => { width: 50%; height: 100%; //border: 1px solid #fff; - margin-left: .1rem; + margin-left: .3rem; + padding-top: .2rem; p{ font-size: .16rem; line-height: .4rem; @@ -1447,21 +1459,66 @@ onBeforeUnmount(() => { } } .bgimg{ - background-image: url("../../assets/images/wrapperbox.png"); - background-size: 100% 100%; - //background-color: rgba(32,237,255,.1); + //background-image: url("../../assets/images/wrapperbox.png"); + //background-size: 100% 100%; + background-color: #1969b640; + border: 1px solid #1969b6; } .screenNumber{ font-family: 'ds-digitalnormal'; } @media (max-width: 960px) { + .header{ + h2{ + font-size: 17px !important; + } + .timer{ + font-size: 12px !important; + transform: scale(0.8); + top: 3px !important; + } + .right-menu-item{ + padding: 0 !important; + font-size: 10px !important; + } + .back{ + padding: 0 !important; + font-size: 13px !important; + top: 3px !important; + } + } + .main{ + .title{ + height: 20px !important; + line-height: 20px !important; + font-size: 12px !important; + width: 70%; + } + .info_box{ + height: 40% !important; + } + .echart_box{ + height: 47% !important; + } + .txt{ + font-size: 12px !important; + line-height: 20px !important; + } + } .info_box{ .dev_img{ + position: relative; width: 40%; height: 80%; + img{ + position: absolute; + top: 0; + left: 0; + } } .dev_data{ width: 55%; + height: 80%; } }