diff --git a/src/components/boxes/InWater.vue b/src/components/boxes/InWater.vue index 35afceb..c232deb 100644 --- a/src/components/boxes/InWater.vue +++ b/src/components/boxes/InWater.vue @@ -8,7 +8,7 @@
@@ -43,7 +43,7 @@ export default { }; }, computed: { - ...mapState(["kilnWaterIn"]), + ...mapState(["kilnWaterIn", "waterInTemp"]), }, }; diff --git a/src/components/boxes/KilnPressure.vue b/src/components/boxes/KilnPressure.vue index a24be26..f356d2b 100644 --- a/src/components/boxes/KilnPressure.vue +++ b/src/components/boxes/KilnPressure.vue @@ -1,36 +1,40 @@ @@ -38,60 +42,60 @@ export default { @import "../../assets/styles/functions"; .pressure { - background: url(../../assets/speed.png) no-repeat; - background-size: 65% 95%; - // background-position: bottom 85% right -8%; - background-position: top -28% right -9%; + background: url(../../assets/speed.png) no-repeat; + background-size: 65% 95%; + // background-position: bottom 85% right -8%; + background-position: top -28% right -9%; } .time { - // background: #eee; - margin: adjust(12px) 0; + // background: #eee; + margin: adjust(12px) 0; } .time--item:not(:last-child) { - margin-right: adjust(4px); + margin-right: adjust(4px); } .unit { - font-family: sans-serif; - font-size: adjust(20px); - letter-spacing: adjust(1px); - align-self: flex-end; + font-family: sans-serif; + font-size: adjust(20px); + letter-spacing: adjust(1px); + align-self: flex-end; } .flex-start { - align-items: flex-start; + align-items: flex-start; } .text { - padding: adjust(12px) 0; - text-align: center; - font-size: adjust(23px); - letter-spacing: adjust(1px); - position: relative; - z-index: 10; - user-select: none; + padding: adjust(12px) 0; + text-align: center; + font-size: adjust(23px); + 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 f47ccf1..4c83332 100644 --- a/src/components/boxes/OutWater.vue +++ b/src/components/boxes/OutWater.vue @@ -8,7 +8,7 @@
@@ -43,7 +43,7 @@ export default { }; }, computed: { - ...mapState(["kilnWaterOut"]), + ...mapState(["kilnWaterOut", "waterOutTemp"]), }, }; diff --git a/src/components/charts/LineChart.vue b/src/components/charts/LineChart.vue index 00eeb27..73ec952 100644 --- a/src/components/charts/LineChart.vue +++ b/src/components/charts/LineChart.vue @@ -1,32 +1,32 @@ @@ -228,14 +228,14 @@ export default { @import "../../assets/styles/functions"; ::-webkit-scrollbar { - // display: none; - height: adjust(2px); + // display: none; + height: adjust(2px); } ::-webkit-scrollbar-thumb { - height: adjust(2px); - border-radius: adjust(2px); - background: #ccc3; + height: adjust(2px); + border-radius: adjust(2px); + background: #ccc3; } // ::-webkit-scrollbar-track { @@ -245,98 +245,98 @@ export default { ul, li { - margin: 0; - padding: 0; - list-style: none; - min-width: adjust(20px); + margin: 0; + padding: 0; + list-style: none; + min-width: adjust(20px); } ul { - margin-left: adjust(8px); - padding-left: adjust(8px); + margin-left: adjust(8px); + padding-left: adjust(8px); } li { - position: relative; + position: relative; } li::before { - content: ""; - position: absolute; - top: adjust(2px); - left: adjust(-6px); - width: adjust(4px); - height: adjust(4px); - border-radius: adjust(1px); - background: #eee6; + content: ""; + position: absolute; + top: adjust(2px); + left: adjust(-6px); + width: adjust(4px); + height: adjust(4px); + border-radius: adjust(1px); + background: #eee6; } li:nth-child(1)::before { - background: #18c7f3; + background: #18c7f3; } li:nth-child(2)::before { - background: #ffd160; + background: #ffd160; } li:nth-child(3)::before { - background: #f31868; + background: #f31868; } li:nth-child(4)::before { - background: #30e89a; + background: #30e89a; } li:nth-child(5)::before { - background: #2760ff; + background: #2760ff; } li:nth-child(6)::before { - background: #723fff; + background: #723fff; } li:nth-child(7)::before { - background: #ee3fff; + background: #ee3fff; } li:nth-child(8)::before { - background: #800f77; + background: #800f77; } li:nth-child(9)::before { - background: #f77; + background: #f77; } li:nth-child(10)::before { - background: #19f; + background: #19f; } li:nth-child(11)::before { - background: #98f; + background: #98f; } ul { - flex: 1; - width: adjust(154px); - display: flex; - overflow-x: auto; - padding-bottom: adjust(2px); + flex: 1; + width: adjust(154px); + display: flex; + overflow-x: auto; + padding-bottom: adjust(2px); } li:not(:last-child) { - margin-right: adjust(8px); + margin-right: adjust(8px); } .line-chart__wrapper { - position: relative; - background: #7771; - border-radius: adjust(3px); - backdrop-filter: blur(adjust(2px)); - box-shadow: inset 0 0 adjust(10px) adjust(2px) rgba($color: #fff, $alpha: 0.1); - height: 100%; - width: adjust(1px); + position: relative; + background: #7771; + border-radius: adjust(3px); + backdrop-filter: blur(adjust(2px)); + box-shadow: inset 0 0 adjust(10px) adjust(2px) rgba($color: #fff, $alpha: 0.1); + height: 100%; + width: adjust(1px); } .line-chart__custom-legend { - position: absolute; - top: adjust(-13px); - right: 0; - font-size: adjust(7px); - font-family: Ubuntu, sans-serif; - // background: #fff2; - padding: 0; - max-width: 100%; - align-items: flex-start; - justify-content: flex-end; + position: absolute; + top: adjust(-13px); + right: 0; + font-size: adjust(7px); + font-family: Ubuntu, sans-serif; + // background: #fff2; + padding: 0; + max-width: 100%; + align-items: flex-start; + justify-content: flex-end; } diff --git a/src/components/isolate-area-1/Area.vue b/src/components/isolate-area-1/Area.vue index 9b98550..99273cb 100644 --- a/src/components/isolate-area-1/Area.vue +++ b/src/components/isolate-area-1/Area.vue @@ -1,32 +1,44 @@ @@ -34,12 +46,12 @@ export default { @import "../../assets/styles/functions"; .isolate-area-1 { - display: flex; + display: flex; - > .small-box-2:not(:last-child) { - margin: { - right: adjust(15px); - } - } + > .small-box-2:not(:last-child) { + margin: { + right: adjust(15px); + } + } } diff --git a/src/components/layout/Main.vue b/src/components/layout/Main.vue index bd2c1e3..0ea1252 100644 --- a/src/components/layout/Main.vue +++ b/src/components/layout/Main.vue @@ -1,6 +1,6 @@