diff --git a/src/components/boxes/HistoryTemp.vue b/src/components/boxes/HistoryTemp.vue new file mode 100644 index 0000000..8c17be1 --- /dev/null +++ b/src/components/boxes/HistoryTemp.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/src/components/boxes/InWater.vue b/src/components/boxes/InWater.vue index 29806ed..e1f9abc 100644 --- a/src/components/boxes/InWater.vue +++ b/src/components/boxes/InWater.vue @@ -3,7 +3,7 @@
-
+
进口实时水温
-
+
+ +
@@ -28,11 +30,12 @@ import LineChart from "../charts/LineChart.vue"; import Container from "../layout/Container.vue"; import SubContainer from "../layout/SubContainer.vue"; import DigitalBox from "../common/DigitalBox.vue"; +import HistoryTrend from './HistoryTemp.vue' export default { name: "XicaoTemp", props: {}, - components: { Container, SubContainer, LineChart, DigitalBox }, + components: { Container, SubContainer, LineChart, DigitalBox, HistoryTrend }, data() { return { chartConfig: {}, @@ -55,6 +58,10 @@ export default { height: h(364px); } +.content { + height: 100%; +} + .wave { transform: translateX(-16px); width: w(793px); @@ -64,7 +71,7 @@ export default { } .graph { - background: #ccc3; + // background: #ccc3; } .flex-1 { diff --git a/src/components/charts/BarChart.vue b/src/components/charts/BarChart.vue index 0579d73..bbeae48 100644 --- a/src/components/charts/BarChart.vue +++ b/src/components/charts/BarChart.vue @@ -1,19 +1,132 @@ - +