diff --git a/src/components/boxes/HistoryTemp.vue b/src/components/boxes/HistoryTemp.vue index 15b2059..25e5462 100644 --- a/src/components/boxes/HistoryTemp.vue +++ b/src/components/boxes/HistoryTemp.vue @@ -1,17 +1,22 @@ @@ -48,85 +52,85 @@ export default { @import "../../assets/styles/functions"; .pic { - background: url(../../assets/in-water.png) no-repeat; - background-size: 100% 100%; - background-position: center; - position: absolute; - top: adjust(24px); - right: 0; - width:adjust(w(386px)); - height: adjust(h(364px)); + background: url(../../assets/in-water.png) no-repeat; + background-size: 100% 100%; + background-position: center; + position: absolute; + top: adjust(24px); + right: 0; + width: adjust(w(386px)); + height: adjust(h(364px)); } .content { - height: 100%; + height: 100%; } .wave { - transform: translateX(adjust(-16px)); - width: adjust(w(793px)); - height: adjust(h(72px)); - background: url(../../assets/inwater.png) no-repeat; - background-size: 100% 100%; + transform: translateX(adjust(-16px)); + width: adjust(w(793px)); + height: adjust(h(72px)); + background: url(../../assets/inwater.png) no-repeat; + background-size: 100% 100%; } .graph { - // background: #ccc3; + // background: #ccc3; } .flex-1 { - flex: 1; - // background: #eee; + flex: 1; + // background: #eee; } .time { - // background: #eee; - margin: adjust(12px) 0; - padding-left: adjust(14px); + // background: #eee; + margin: adjust(12px) 0; + padding-left: adjust(14px); } .time--item:not(:last-child) { - margin-right: adjust(5px); + margin-right: adjust(5px); } .unit { - font-family: Ubuntu, monospace, sans-serif !important; - font-size: adjust(20px); - letter-spacing: adjust(1px); - align-self: flex-end; + font-family: Ubuntu, monospace, sans-serif !important; + font-size: adjust(20px); + letter-spacing: adjust(1px); + align-self: flex-end; } .text { - display: inline-block; - margin-left: adjust(24px); - margin-bottom: adjust(10px); - padding: adjust(12px) 0; - text-align: center; - font-size: adjust(22px); - letter-spacing: adjust(1px); - position: relative; - z-index: 10; - user-select: none; + display: inline-block; + margin-left: adjust(24px); + margin-bottom: adjust(10px); + padding: adjust(12px) 0; + text-align: center; + font-size: adjust(22px); + letter-spacing: adjust(1px); + position: relative; + z-index: 10; + user-select: none; } .text::after { - content: ""; - display: block; - position: absolute; - z-index: 0; - left: 0; - bottom: adjust(10px); - height: adjust(4px); - width: 100%; - /* 渐变色 */ - background: radial-gradient( - ellipse at center, - #6fe2ff, - #6fe2ffc0, - #52cbef80, - #52cbef30, - #52cbef00, - transparent - ); + content: ""; + display: block; + position: absolute; + z-index: 0; + left: 0; + bottom: adjust(10px); + height: adjust(4px); + width: 100%; + /* 渐变色 */ + background: radial-gradient( + ellipse at center, + #6fe2ff, + #6fe2ffc0, + #52cbef80, + #52cbef30, + #52cbef00, + transparent + ); } diff --git a/src/components/boxes/OutWater.vue b/src/components/boxes/OutWater.vue index b30a2b7..31d2dfe 100644 --- a/src/components/boxes/OutWater.vue +++ b/src/components/boxes/OutWater.vue @@ -1,28 +1,28 @@ @@ -48,85 +52,85 @@ export default { @import "../../assets/styles/functions"; .pic { - background: url(../../assets/out-water.png) no-repeat; - background-size: 100% 100%; - background-position: center; - position: absolute; - top: adjust(24px); - right: 0; - width: adjust(w(386px)); - height: adjust(h(364px)); + background: url(../../assets/out-water.png) no-repeat; + background-size: 100% 100%; + background-position: center; + position: absolute; + top: adjust(24px); + right: 0; + width: adjust(w(386px)); + height: adjust(h(364px)); } .content { - height: 100%; + height: 100%; } .wave { - transform: translateX(adjust(-16px)); - width: adjust(w(793px)); - height: adjust(h(72px)); - background: url(../../assets/inwater.png) no-repeat; - background-size: 100% 100%; + transform: translateX(adjust(-16px)); + width: adjust(w(793px)); + height: adjust(h(72px)); + background: url(../../assets/inwater.png) no-repeat; + background-size: 100% 100%; } .graph { - // background: #ccc3; + // background: #ccc3; } .flex-1 { - flex: 1; - // background: #eee; + flex: 1; + // background: #eee; } .time { - // background: #eee; - margin: adjust(12px) 0; - padding-left: adjust(14px); + // background: #eee; + margin: adjust(12px) 0; + padding-left: adjust(14px); } .time--item:not(:last-child) { - margin-right: adjust(5px); + margin-right: adjust(5px); } .unit { - font-family: Ubuntu, monospace, sans-serif !important; - font-size: adjust(20px); - letter-spacing: adjust(1px); - align-self: flex-end; + font-family: Ubuntu, monospace, sans-serif !important; + font-size: adjust(20px); + letter-spacing: adjust(1px); + align-self: flex-end; } .text { - display: inline-block; - margin-left: adjust(24px); - margin-bottom: adjust(10px); - padding: adjust(12px) 0; - text-align: center; - font-size: adjust(22px); - letter-spacing: adjust(1px); - position: relative; - z-index: 10; - user-select: none; + display: inline-block; + margin-left: adjust(24px); + margin-bottom: adjust(10px); + padding: adjust(12px) 0; + text-align: center; + font-size: adjust(22px); + letter-spacing: adjust(1px); + position: relative; + z-index: 10; + user-select: none; } .text::after { - content: ""; - display: block; - position: absolute; - z-index: 0; - left: 0; - bottom: adjust(10px); - height: adjust(4px); - width: 100%; - /* 渐变色 */ - background: radial-gradient( - ellipse at center, - #6fe2ff, - #6fe2ffc0, - #52cbef80, - #52cbef30, - #52cbef00, - transparent - ); + content: ""; + display: block; + position: absolute; + z-index: 0; + left: 0; + bottom: adjust(10px); + height: adjust(4px); + width: 100%; + /* 渐变色 */ + background: radial-gradient( + ellipse at center, + #6fe2ff, + #6fe2ffc0, + #52cbef80, + #52cbef30, + #52cbef00, + transparent + ); } diff --git a/src/components/charts/BarChart.vue b/src/components/charts/BarChart.vue index 312d5ba..635d24e 100644 --- a/src/components/charts/BarChart.vue +++ b/src/components/charts/BarChart.vue @@ -1,6 +1,6 @@ diff --git a/src/components/charts/LineChart.vue b/src/components/charts/LineChart.vue index 11a3a09..87d19b0 100644 --- a/src/components/charts/LineChart.vue +++ b/src/components/charts/LineChart.vue @@ -105,6 +105,7 @@ export default { series: { deep: true, handler: function () { + console.log('LineChart: series changed!') this.init(); }, },