diff --git a/package.json b/package.json index 69b1fd6..2acd9ac 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "echarts": "^5.2.2", "echarts-china-cities-js": "^0.1.1", "echarts-gl": "^2.0.8", + "echarts-liquidfill": "^3.1.0", "vue": "^3.0.5", "vue-echarts": "^6.0.0" }, diff --git a/src/render/App.vue b/src/render/App.vue index b5880fb..62e0a08 100644 --- a/src/render/App.vue +++ b/src/render/App.vue @@ -7,13 +7,17 @@
-
+
-
-
+
+ +
+
+ +
-
+
@@ -26,5 +30,13 @@ import FullScreenContainer from './components/Layout/FullScreenContainer.vue' import TheHeader from './components/Layout/TheHeader.vue' import DigitalFlopContainer from './components/DigitalFlopContainer.vue' // import Clock from './components/Clock.vue' +import Compass from './components/Compass.vue' +import WaterLevel from './components/WaterLevel.vue' import Map from './components/Map.vue' + + \ No newline at end of file diff --git a/src/render/components/Compass.vue b/src/render/components/Compass.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/render/components/Map.vue b/src/render/components/Map.vue index 0815d51..36fbaac 100644 --- a/src/render/components/Map.vue +++ b/src/render/components/Map.vue @@ -16,7 +16,6 @@ use([ CanvasRenderer, Map3DChart ]); registerMap('tmsk', tmskMap); const option = reactive({ - backgroundColor: 'rgba(6,30,93,.5)', series: { type: 'map3D', map: 'tmsk', diff --git a/src/render/components/WaterLevel.vue b/src/render/components/WaterLevel.vue new file mode 100644 index 0000000..c0d17d4 --- /dev/null +++ b/src/render/components/WaterLevel.vue @@ -0,0 +1,41 @@ + + + \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 4266680..f04d479 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1035,6 +1035,11 @@ echarts-gl@^2.0.8: claygl "^1.2.1" zrender "^5.1.1" +echarts-liquidfill@^3.1.0: + version "3.1.0" + resolved "https://registry.nlark.com/echarts-liquidfill/download/echarts-liquidfill-3.1.0.tgz#4ec70f3697382d0404c95fff9f3e8dd85c8377da" + integrity sha1-TscPNpc4LQQEyV//nz6N2FyDd9o= + echarts@^5.2.2: version "5.2.2" resolved "https://registry.npmmirror.com/echarts/download/echarts-5.2.2.tgz#ec3c8b2a151cbba71ba3c2c7cf9b2f2047ce4370"