diff --git a/src/components/domain/Three/SceneOne/CustomChartPanel.jsx b/src/components/domain/Three/SceneOne/CustomChartPanel.jsx index 6556635..160b14b 100644 --- a/src/components/domain/Three/SceneOne/CustomChartPanel.jsx +++ b/src/components/domain/Three/SceneOne/CustomChartPanel.jsx @@ -178,21 +178,6 @@ function CustomChartPanel() { width: 4, }, }, - { - name: "青藏高原", - type: "line", - // stack: "Total", - data: TibetanData, - smooth: true, - color: "green", - symbol: "none", - itemStyle: { - color: "green", - }, - lineStyle: { - width: 4, - }, - }, ], }; diff --git a/src/components/domain/Three/SceneTwo/Labels.jsx b/src/components/domain/Three/SceneTwo/Labels.jsx index 78b835d..ca60b9d 100644 --- a/src/components/domain/Three/SceneTwo/Labels.jsx +++ b/src/components/domain/Three/SceneTwo/Labels.jsx @@ -12,21 +12,15 @@ export default function Labels() { eyeOffset={new Cartesian2(0, 1000000)} /> - diff --git a/src/components/domain/Three/SceneTwo/TemperatureLegend.jsx b/src/components/domain/Three/SceneTwo/TemperatureLegend.jsx new file mode 100644 index 0000000..fa9ff63 --- /dev/null +++ b/src/components/domain/Three/SceneTwo/TemperatureLegend.jsx @@ -0,0 +1,55 @@ +import styles from "./index.module.less"; + +const colorBar = [ + "#801FEF", + "#050CFB", + "#3B6EE6", + "#159AFF", + "#36C1F8", + "#AADBF2", + "#FFF479", + "#FFC113", + "#FF7E00", + "#FF7E00", + "#CD0000", + "#FFB1B1", +]; + +function Legend() { + return ( +
+
全球温度异常空间分布
+
+ {colorBar.map((color, index) => { + return ( +
+ ); + })} +
+
+ {["", -1, -0.8, -0.6, -0.4, -0.2, 0, 0.2, 0.4, 0.6, 0.8, 1.0, ""].map( + (item, index) => { + return ( +
+ {item} +
+ ); + } + )} +
+
+ ); +} + +export default Legend; diff --git a/src/components/domain/Three/SceneTwo/index.jsx b/src/components/domain/Three/SceneTwo/index.jsx index bcbc8a8..d0c6937 100644 --- a/src/components/domain/Three/SceneTwo/index.jsx +++ b/src/components/domain/Three/SceneTwo/index.jsx @@ -1,5 +1,7 @@ import MapLayout from "@/components/map/Layout"; +import TextInfoPanel from "@/components/common/TextInfoPanel"; import Legend from "./Legend"; +import TemperatureLegned from "./TemperatureLegend"; import CustomFlyTo from "./CustomFlyTo"; import Point from "./Point"; import Circles from "./Circles"; @@ -15,11 +17,15 @@ function SceneTwo() {
两极协同—连接南极和北极的热带大西洋经向模的媒介作用
+
+ +
+ + ); +} + +export default CustomClock; diff --git a/src/components/domain/Two/CustomFlyTo.jsx b/src/components/domain/Two/CustomFlyTo.jsx index 42e945d..e20f3bd 100644 --- a/src/components/domain/Two/CustomFlyTo.jsx +++ b/src/components/domain/Two/CustomFlyTo.jsx @@ -91,7 +91,7 @@ function CustomFlyTo() { const HadleyCellOptions = { destination: Cartesian3.fromDegrees(94, 1, 5000000), - duration: 2, + duration: 3, orientation: { heading: 6, pitch: -1.2, @@ -107,7 +107,7 @@ function CustomFlyTo() { const QTPlateauOption = { destination: Cartesian3.fromDegrees(92, 8, 5000000), - duration: 2, + duration: 3, orientation: { heading: 6, pitch: -1.2, diff --git a/src/components/domain/Two/HadleyCell.jsx b/src/components/domain/Two/HadleyCell.jsx index f7fd5e3..33c2266 100644 --- a/src/components/domain/Two/HadleyCell.jsx +++ b/src/components/domain/Two/HadleyCell.jsx @@ -18,7 +18,7 @@ export default function HadleyCell() { stopTime.secondsOfDay - currentTime.secondsOfDay ); - if (leftTime < 5) { + if (leftTime < 4) { setShow(true); } else if (show) setShow(false); }, [show]); diff --git a/src/components/domain/Two/Labels/index.jsx b/src/components/domain/Two/Labels/index.jsx index 96b91ea..3c3e53d 100644 --- a/src/components/domain/Two/Labels/index.jsx +++ b/src/components/domain/Two/Labels/index.jsx @@ -21,7 +21,7 @@ export default function Labels() { position={Cartesian3.fromDegrees(73, -7, 0)} /> diff --git a/src/components/domain/Two/index.jsx b/src/components/domain/Two/index.jsx index f5f63eb..92823dd 100644 --- a/src/components/domain/Two/index.jsx +++ b/src/components/domain/Two/index.jsx @@ -1,6 +1,6 @@ import MapLayout from "@/components/map/Layout"; import CustomToolbar from "@/components/common/CustomToolbar"; -import CustomClock from "@/components/common/CustomClock"; +import CustomClock from "./CustomClock"; import TextInfoPanel from "@/components/common/TextInfoPanel"; import CustomFlyTo from "./CustomFlyTo"; import Point from "./Point";