diff --git a/assets/fonts/fonts.less b/assets/fonts/fonts.less index 9d07a1d..2991e22 100644 --- a/assets/fonts/fonts.less +++ b/assets/fonts/fonts.less @@ -17,3 +17,8 @@ font-family: MicrosoftYaHei-Bold; src: url("./Microsoft-YaHei-Bold.ttf") format("truetype"); } + +@font-face { + font-family: 思源黑体; + src: url("./思源黑体1 SourceHanSansCN-ExtraLight.otf") format("truetype"); +} diff --git a/assets/peakCoalMonitoring/left/air-rate-bg.png b/assets/peakCoalMonitoring/left/air-rate-bg.png new file mode 100644 index 0000000..cd30ef4 Binary files /dev/null and b/assets/peakCoalMonitoring/left/air-rate-bg.png differ diff --git a/assets/peakCoalMonitoring/left/pollution-cha.png b/assets/peakCoalMonitoring/left/pollution-cha.png new file mode 100644 index 0000000..c3f23b5 Binary files /dev/null and b/assets/peakCoalMonitoring/left/pollution-cha.png differ diff --git a/assets/peakCoalMonitoring/left/pollution-chi-ping.png b/assets/peakCoalMonitoring/left/pollution-chi-ping.png new file mode 100644 index 0000000..4844ec3 Binary files /dev/null and b/assets/peakCoalMonitoring/left/pollution-chi-ping.png differ diff --git a/assets/peakCoalMonitoring/left/pollution-you.png b/assets/peakCoalMonitoring/left/pollution-you.png new file mode 100644 index 0000000..4170296 Binary files /dev/null and b/assets/peakCoalMonitoring/left/pollution-you.png differ diff --git a/assets/peakCoalMonitoring/right/microsite-icon.png b/assets/peakCoalMonitoring/right/microsite-icon.png new file mode 100644 index 0000000..3a3450c Binary files /dev/null and b/assets/peakCoalMonitoring/right/microsite-icon.png differ diff --git a/assets/peakCoalMonitoring/right/point-icon.png b/assets/peakCoalMonitoring/right/point-icon.png new file mode 100644 index 0000000..333f87f Binary files /dev/null and b/assets/peakCoalMonitoring/right/point-icon.png differ diff --git a/assets/peakCoalMonitoring/right/tester-icon.png b/assets/peakCoalMonitoring/right/tester-icon.png new file mode 100644 index 0000000..30c6c51 Binary files /dev/null and b/assets/peakCoalMonitoring/right/tester-icon.png differ diff --git a/components/charts/AirRateCharts.vue b/components/charts/AirRateCharts.vue new file mode 100644 index 0000000..aad6016 --- /dev/null +++ b/components/charts/AirRateCharts.vue @@ -0,0 +1,166 @@ + + + + + + diff --git a/components/charts/ChangesPollutantsCharts.vue b/components/charts/ChangesPollutantsCharts.vue new file mode 100644 index 0000000..89c5bcf --- /dev/null +++ b/components/charts/ChangesPollutantsCharts.vue @@ -0,0 +1,206 @@ + + + + + + diff --git a/components/charts/PeakAirQualityTrendCharts.vue b/components/charts/PeakAirQualityTrendCharts.vue new file mode 100644 index 0000000..a14a50b --- /dev/null +++ b/components/charts/PeakAirQualityTrendCharts.vue @@ -0,0 +1,205 @@ + + + + + + diff --git a/components/peak-coal-monitoring/AlarmOverview.vue b/components/peak-coal-monitoring/AlarmOverview.vue index 3a72dcb..574cf4e 100644 --- a/components/peak-coal-monitoring/AlarmOverview.vue +++ b/components/peak-coal-monitoring/AlarmOverview.vue @@ -1,6 +1,15 @@ + + diff --git a/components/peak-coal-monitoring/DeviceOverview.vue b/components/peak-coal-monitoring/DeviceOverview.vue index f4c31c1..9113357 100644 --- a/components/peak-coal-monitoring/DeviceOverview.vue +++ b/components/peak-coal-monitoring/DeviceOverview.vue @@ -1,6 +1,43 @@ @@ -22,5 +59,59 @@ export default { .device-overview{ height: 100%; width: 100%; + .flex-column; + .device-total{ + flex: 1; + height: 0; + .flex-row; + justify-content: space-around; + .device-item{ + height: 60%; + width: 140px; + .flex-column; + justify-content: space-between; + align-items: center; + .point-icon{ + width: 61px; + height: 61px; + background: url("~/assets/peakCoalMonitoring/right/point-icon.png") no-repeat; + } + .microsite-icon{ + width: 61px; + height: 61px; + background: url("~/assets/peakCoalMonitoring/right/microsite-icon.png") no-repeat; + } + .tester-icon{ + width: 61px; + height: 61px; + background: url("~/assets/peakCoalMonitoring/right/tester-icon.png") no-repeat; + } + .title-value{ + .flex-row; + ._title{ + font-family: MicrosoftYaHei; + font-size: 14px; + color: #6AC4FF; + letter-spacing: 2.26px; + font-weight: 400; + } + ._value { + padding-left: 10px; + font-family: YouSheBiaoTiHei; + font-size: 18px; + color: #FFFFFF; + letter-spacing: 5.64px; + font-weight: 400; + text-align: right; + .text-ellipsis; + } + } + } + ._line{ + width: 1px; + height: 160px; + background: #1A4157; + } + } } diff --git a/components/peak-coal-monitoring/EnergyProfile.vue b/components/peak-coal-monitoring/EnergyProfile.vue index fca4d0a..5652f40 100644 --- a/components/peak-coal-monitoring/EnergyProfile.vue +++ b/components/peak-coal-monitoring/EnergyProfile.vue @@ -1,6 +1,15 @@