diff --git a/components/charts/PeakWarningTypeChart.vue b/components/charts/PeakWarningTypeChart.vue index b30e892..fc295bc 100644 --- a/components/charts/PeakWarningTypeChart.vue +++ b/components/charts/PeakWarningTypeChart.vue @@ -147,8 +147,8 @@ export default { name: '', type: 'pie', roundCap: true, - radius: ['26%', '50%'], - center: ['20%', '50%'], + radius: ['40%', '60%'], + center: ['20.2%', '57%'], label: { show: false }, diff --git a/components/peak-coal-monitoring/MonitorData2.vue b/components/peak-coal-monitoring/MonitorData2.vue new file mode 100644 index 0000000..545bf00 --- /dev/null +++ b/components/peak-coal-monitoring/MonitorData2.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/pages/peak-coal-monitoring/PeakCoalMonitoring.vue b/pages/peak-coal-monitoring/PeakCoalMonitoring.vue index 61513f1..6cffd5c 100644 --- a/pages/peak-coal-monitoring/PeakCoalMonitoring.vue +++ b/pages/peak-coal-monitoring/PeakCoalMonitoring.vue @@ -21,12 +21,13 @@
-
- -
+
+
@@ -34,10 +35,10 @@
- +
- +
@@ -50,6 +51,7 @@ import AtmosphericModule from "@/components/peak-coal-monitoring/AtmosphericModule"; import PollutionInformation from "@/components/peak-coal-monitoring/PollutionInformation"; import MonitorData from "@/components/peak-coal-monitoring/MonitorData"; +import MonitorData2 from "@/components/peak-coal-monitoring/MonitorData2"; import EnergyProfile from "@/components/peak-coal-monitoring/EnergyProfile"; import DeviceOverview from "@/components/peak-coal-monitoring/DeviceOverview"; import AlarmOverview from "@/components/peak-coal-monitoring/AlarmOverview"; @@ -60,16 +62,9 @@ import GBZDialog from "@/components/GBZDialog"; import CEMSDialog from "@/components/CEMSDialog"; import pointDialog from '@/components/PointDialog' import {mapState} from "vuex"; -import DeviceOnlineRate from "@/components/peak-coal-monitoring/DeviceOnlineRate"; -import PeakEnergyUse from "@/components/peak-coal-monitoring/PeakEnergyUse"; -import ExcessiveWarning from "@/components/peak-coal-monitoring/ExcessiveWarning"; export default { name: "PeakCoalMonitoring", - components: { - ExcessiveWarning, - PeakEnergyUse, - DeviceOnlineRate, - AlarmOverview, DeviceOverview, EnergyProfile, MonitorData, PollutionInformation, AtmosphericModule}, + components: {AlarmOverview, DeviceOverview, EnergyProfile, MonitorData, PollutionInformation, AtmosphericModule, MonitorData2}, computed: { ...mapState({ title: state => state.system.title, @@ -249,12 +244,9 @@ body, html, #__nuxt, #__layout { padding-right: 0; .atmospheric-module-module{ - height: 230px; + height: 336px; width: 100%; } - .device-online-rate{ - height: 230px; - } .pollution-information-module{ height: 260px;