diff --git a/src/assets/ty/bf8231e42be621a362407655f4da8af.png b/src/assets/ty/bf8231e42be621a362407655f4da8af.png new file mode 100644 index 0000000..3c9cac1 Binary files /dev/null and b/src/assets/ty/bf8231e42be621a362407655f4da8af.png differ diff --git a/src/assets/ty/f01e9db82fd27cf0062761bb2f96e8a.png b/src/assets/ty/f01e9db82fd27cf0062761bb2f96e8a.png new file mode 100644 index 0000000..1a3a14c Binary files /dev/null and b/src/assets/ty/f01e9db82fd27cf0062761bb2f96e8a.png differ diff --git a/src/views/cultrue/index.vue b/src/views/cultrue/index.vue index f3f0944..bbee9a6 100644 --- a/src/views/cultrue/index.vue +++ b/src/views/cultrue/index.vue @@ -121,9 +121,9 @@ export default { // data: ['厂用电量'] // }, grid: { - left: '3%', - right: '3%', - bottom: '3%', + left: 0, + right: 0, + bottom: 0, top: '10%', containLabel: true }, @@ -326,11 +326,15 @@ export default { // backgroundColor: "#141f56", legend: { top: 0, - itemGap: 15, - itemWidth: 15, + left:0, + itemGap: 25, + itemWidth: 0, + itemHeight:18, + textStyle: { color: '#fff', - fontSize: '14' + fontSize: '14', + padding: [1, 12] }, data: name }, @@ -362,8 +366,10 @@ export default { }, grid: { borderWidth: 0, - top: 240, - bottom: 240, + top: 250, + bottom: 250, + right:15, + left:30, textStyle: { color: "#fff" } @@ -506,7 +512,7 @@ export default { grid: { top: '2%', bottom: -15, - right: 30, + right: -48, left: 30, containLabel: true }, @@ -786,7 +792,7 @@ export default { margin-top: 4vh; width: 50%; float: left; - height: 78vh; + height: 74vh; padding-top: 2vh; background-image: url('../../assets/wh/center_bg.png'); background-repeat: no-repeat; @@ -862,7 +868,7 @@ export default { /* 中间底部 */ .center .cbuttom { margin-top: 12vh; - padding-top: 6vh; + padding-top: 3.5vh; height: 6vh; line-height: 6vh; text-align: center; @@ -939,4 +945,9 @@ export default { clear: both; background-image: url("../../assets/wh/whbg.jpg") !important; } + + +.screen-box { + background: none !important; +} \ No newline at end of file diff --git a/src/views/index.vue b/src/views/index.vue index 0ae1701..96686dc 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -12,7 +12,7 @@ -
+
@@ -174,9 +174,9 @@ export default { // 折线图 this.line_zone(); - this.addNumber(0,345235,'jgval1'); - this.addNumber(0,345235,'jgval2'); - this.addNumber(0,345235,'jgval3'); + this.addNumber(0, 345235, 'jgval1'); + this.addNumber(0, 345235, 'jgval2'); + this.addNumber(0, 345235, 'jgval3'); }, methods: { //选择年月日中的某个 @@ -316,10 +316,10 @@ export default { ], grid: { containLabel: true, - left: 20, - right: 20, - bottom: 10, - top: 40, + left: 30, + right: 0, + bottom: 0, + top: 60, }, xAxis: { axisLabel: { @@ -590,16 +590,16 @@ export default { var myChart = echarts.init(chartDom); var option; - var xData = ['09:00', '10:00', '11:00','12:00', '13:00', '14:00','15:00', '16:00', '17:00','18:00', '20:00', '21:00']; + var xData = ['09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '20:00', '21:00']; var color = ['#FF99CC', '#6666FF', '#FF6600', '#7049f0', '#fa704d', '#01babc',] var name = [] var data = [ - [137, 34, 135, 161, 74, 152, 110, 100, 150,137, 34, 135, 161], - [174, 137, 135, 34, 152, 135, 140, 160, 100,174, 137, 135, 34], - [134, 74, 137, 135, 161, 137, 300, 220, 250,134, 74, 137, 135], - [147, 134, 155, 131, 174, 122, 140, 160, 150,127, 134, 175, 161], - [124, 147, 175, 134, 122, 175, 180, 110, 130,154, 187, 125, 134], - [154, 174, 157, 175, 121, 157, 200, 250, 280,134, 174, 157, 175], + [137, 34, 135, 161, 74, 152, 110, 100, 150, 137, 34, 135, 161], + [174, 137, 135, 34, 152, 135, 140, 160, 100, 174, 137, 135, 34], + [134, 74, 137, 135, 161, 137, 300, 220, 250, 134, 74, 137, 135], + [147, 134, 155, 131, 174, 122, 140, 160, 150, 127, 134, 175, 161], + [124, 147, 175, 134, 122, 175, 180, 110, 130, 154, 187, 125, 134], + [154, 174, 157, 175, 121, 157, 200, 250, 280, 134, 174, 157, 175], // [3.5, 15.2, 16.1, 17.4, 13.4, 6.1], // [16.1, 13.5, 3.7, 17.4, 15.2, 18.9], // [17.4, 6.1, 13.4, 15.2, 13.7, 5.2], @@ -652,6 +652,8 @@ export default { // backgroundColor: "#141f56", legend: { top: 0, + right: 0, + bottom: 0, itemGap: 15, itemWidth: 15, textStyle: { @@ -690,6 +692,8 @@ export default { borderWidth: 0, top: 160, bottom: 160, + right: 15, + left: 50, textStyle: { color: "#fff" } @@ -926,11 +930,12 @@ export default { background-image: url('../assets/index/mid_bg.png'); background-position: 0 0; background-size: 100% 100%; - width: 29%; + width: 30%; float: left; margin-left: 3%; - padding: 1%; - margin-top: 4%; + padding: 2%; + margin-top: 5%; + position: relative; } .centerbox .jgrs { @@ -945,8 +950,8 @@ export default { color: white; font-size: 26px; position: absolute; - bottom: 38px; - left: 44px; + bottom: 54px; + left: 48px; } .centerbox .jgdesc { @@ -954,28 +959,28 @@ export default { color: gray; font-size: 16px; position: absolute; - bottom: 10px; - left: 44px; + bottom: 14px; + left: 50px; } .centerbox .jgval1 { - bottom: 38px; - left: 76px; + bottom: 54px; + left: 70px; } .centerbox .jgdesc1 { - bottom: 10px; - left: 76px; + bottom: 16px; + left: 70px; } .centerbox .jgval3 { - bottom: 38px; - left: 14px; + bottom: 54px; + left: 25px; } .centerbox .jgdesc3 { - bottom: 10px; - left: 14px; + bottom: 14px; + left: 26px; } .centerbox .tygpic { @@ -988,6 +993,25 @@ export default { margin: 12% auto; } +.ndjgrs { + color: white; + text-align: center; + position: absolute; + bottom: 8%; + left: 41%; +} + +.ndjgrs .nddesc { + font-size: 18px; + display: block; + margin-bottom: 19px; +} + +.ndjgrs .ndval { + display: block; + font-size: 24px; +} + /* 右边 */ .rbox { width: 30%; @@ -1018,7 +1042,7 @@ export default { background-image: url('../assets/index/rb_data_bg.png'); background-repeat: no-repeat; background-size: 100% 100%; - height: 2.2rem; + height: 2.4rem; width: 46%; margin-left: 0.28rem; float: left; @@ -1051,7 +1075,8 @@ export default { width: 60%; height: 118px; text-align: center; - line-height: 118px; + /* line-height: 118px; */ + line-height: 160px; } .rbox .rbox_con .rbitem .rbrate { @@ -1061,15 +1086,32 @@ export default { text-align: center; line-height: 118px; position: absolute; - bottom: -14px; + bottom: -12px; right: 16px; color: #00D8FF; } /* 页面背景 */ -.page_bg { +/* .page_bg { clear: both; background-image: url("../assets/index/bg.jpg") !important; + width: 100%; + height: 100%; + background-image: url('../assets/index/bg.jpg') !important; + background-size: 100% 100%; + background-position: 100% 100%; + background-repeat: no-repeat; +} */ +.btgym { + width: 100%; + height: 100%; + background-image: url('../assets/index/bg.jpg') !important; + background-size: 100% 100%; + background-position: 100% 100%; + background-repeat: no-repeat; +} +.screen-box { + background: none !important; } \ No newline at end of file diff --git a/src/views/ty/index.vue b/src/views/ty/index.vue index 7924ef3..a141374 100644 --- a/src/views/ty/index.vue +++ b/src/views/ty/index.vue @@ -1,45 +1,73 @@ \ No newline at end of file