diff --git a/package.json b/package.json index af0ff12..c028022 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ }, "dependencies": { "echarts": "^5.4.3", + "echarts-gl": "^2.0.9", "element-plus": "^2.4.3", "moment": "^2.29.4", "sass": "^1.69.5", diff --git a/src/assets/font/D-DIN-Bold.otf b/src/assets/font/D-DIN-Bold.otf new file mode 100644 index 0000000..95f91b3 Binary files /dev/null and b/src/assets/font/D-DIN-Bold.otf differ diff --git a/src/assets/font/font.css b/src/assets/font/font.css index 3bb3fb4..679aa4a 100644 --- a/src/assets/font/font.css +++ b/src/assets/font/font.css @@ -11,4 +11,11 @@ src: url('./msyhl.ttc'); font-weight: normal; font-style: normal; +} +/* D-DIN-Bold */ +@font-face { + font-family: "D-DIN-Bold"; + src: url('./D-DIN-Bold.otf'); + font-weight: normal; + font-style: normal; } \ No newline at end of file diff --git a/src/assets/images/carbonEmission/carbonEmission StatisticsReport.png b/src/assets/images/carbonEmission/carbonEmission StatisticsReport.png new file mode 100644 index 0000000..e25cca3 Binary files /dev/null and b/src/assets/images/carbonEmission/carbonEmission StatisticsReport.png differ diff --git a/src/assets/images/carbonEmission/carbonEmissionReduction.png b/src/assets/images/carbonEmission/carbonEmissionReduction.png new file mode 100644 index 0000000..a1a29ea Binary files /dev/null and b/src/assets/images/carbonEmission/carbonEmissionReduction.png differ diff --git a/src/assets/images/carbonEmission/carbonNeutralityBg.png b/src/assets/images/carbonEmission/carbonNeutralityBg.png new file mode 100644 index 0000000..0d45c50 Binary files /dev/null and b/src/assets/images/carbonEmission/carbonNeutralityBg.png differ diff --git a/src/assets/images/carbonEmission/carbonOffsettingAmount.png b/src/assets/images/carbonEmission/carbonOffsettingAmount.png new file mode 100644 index 0000000..7b66281 Binary files /dev/null and b/src/assets/images/carbonEmission/carbonOffsettingAmount.png differ diff --git a/src/assets/images/carbonEmission/totalEmissions.png b/src/assets/images/carbonEmission/totalEmissions.png new file mode 100644 index 0000000..f9efa34 Binary files /dev/null and b/src/assets/images/carbonEmission/totalEmissions.png differ diff --git a/src/assets/images/overview/nextYear.png b/src/assets/images/overview/nextYear.png new file mode 100644 index 0000000..0e0f4db Binary files /dev/null and b/src/assets/images/overview/nextYear.png differ diff --git a/src/assets/images/overview/prevYear.png b/src/assets/images/overview/prevYear.png new file mode 100644 index 0000000..cf44d41 Binary files /dev/null and b/src/assets/images/overview/prevYear.png differ diff --git a/src/components/calendar/index.vue b/src/components/calendar/index.vue index e9717f7..3640997 100644 --- a/src/components/calendar/index.vue +++ b/src/components/calendar/index.vue @@ -17,7 +17,7 @@ const selectDate = (val) => {