diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
new file mode 100644
index 0000000..25df63f
--- /dev/null
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -0,0 +1,53 @@
+/**
+ * 大屏接口
+ */
+import request from '@/api/index'
+
+// 总体报警情况
+export function alarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/alarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 各分公司报警统计
+export function deptAlarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deptAlarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 设备运行态势
+export function deviceTrendStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTrendStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 监测设备统计
+export function deviceTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 管网类型统计
+export function pipeTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/pipeTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 基本概括
+export function overall(data: any) {
+ return request({
+ url: '/cockpit/apis/overall',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
new file mode 100644
index 0000000..25df63f
--- /dev/null
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -0,0 +1,53 @@
+/**
+ * 大屏接口
+ */
+import request from '@/api/index'
+
+// 总体报警情况
+export function alarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/alarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 各分公司报警统计
+export function deptAlarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deptAlarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 设备运行态势
+export function deviceTrendStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTrendStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 监测设备统计
+export function deviceTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 管网类型统计
+export function pipeTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/pipeTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 基本概括
+export function overall(data: any) {
+ return request({
+ url: '/cockpit/apis/overall',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 366e064..ff88935 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -272,7 +272,7 @@
// },
// },
valueFormatter: (value: string | number) => {
- return value ? value + props.unit : ''
+ return value ? value + props.unit : value === 0 ? '0' : ''
},
}, // 提示框
xAxis: [
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
new file mode 100644
index 0000000..25df63f
--- /dev/null
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -0,0 +1,53 @@
+/**
+ * 大屏接口
+ */
+import request from '@/api/index'
+
+// 总体报警情况
+export function alarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/alarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 各分公司报警统计
+export function deptAlarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deptAlarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 设备运行态势
+export function deviceTrendStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTrendStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 监测设备统计
+export function deviceTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 管网类型统计
+export function pipeTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/pipeTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 基本概括
+export function overall(data: any) {
+ return request({
+ url: '/cockpit/apis/overall',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 366e064..ff88935 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -272,7 +272,7 @@
// },
// },
valueFormatter: (value: string | number) => {
- return value ? value + props.unit : ''
+ return value ? value + props.unit : value === 0 ? '0' : ''
},
}, // 提示框
xAxis: [
diff --git a/src/components/Echart/PieChart3D.vue b/src/components/Echart/PieChart3D.vue
index 681ff96..4010cb6 100644
--- a/src/components/Echart/PieChart3D.vue
+++ b/src/components/Echart/PieChart3D.vue
@@ -602,7 +602,7 @@
},
grid3D: {
show: false,
- boxHeight: 26,
+ boxHeight: 5,
left: '5%',
top: '0%',
width: '50%',
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
new file mode 100644
index 0000000..25df63f
--- /dev/null
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -0,0 +1,53 @@
+/**
+ * 大屏接口
+ */
+import request from '@/api/index'
+
+// 总体报警情况
+export function alarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/alarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 各分公司报警统计
+export function deptAlarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deptAlarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 设备运行态势
+export function deviceTrendStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTrendStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 监测设备统计
+export function deviceTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 管网类型统计
+export function pipeTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/pipeTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 基本概括
+export function overall(data: any) {
+ return request({
+ url: '/cockpit/apis/overall',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 366e064..ff88935 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -272,7 +272,7 @@
// },
// },
valueFormatter: (value: string | number) => {
- return value ? value + props.unit : ''
+ return value ? value + props.unit : value === 0 ? '0' : ''
},
}, // 提示框
xAxis: [
diff --git a/src/components/Echart/PieChart3D.vue b/src/components/Echart/PieChart3D.vue
index 681ff96..4010cb6 100644
--- a/src/components/Echart/PieChart3D.vue
+++ b/src/components/Echart/PieChart3D.vue
@@ -602,7 +602,7 @@
},
grid3D: {
show: false,
- boxHeight: 26,
+ boxHeight: 5,
left: '5%',
top: '0%',
width: '50%',
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 388cec5..255c078 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -1484,20 +1484,20 @@
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
new file mode 100644
index 0000000..25df63f
--- /dev/null
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -0,0 +1,53 @@
+/**
+ * 大屏接口
+ */
+import request from '@/api/index'
+
+// 总体报警情况
+export function alarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/alarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 各分公司报警统计
+export function deptAlarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deptAlarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 设备运行态势
+export function deviceTrendStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTrendStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 监测设备统计
+export function deviceTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 管网类型统计
+export function pipeTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/pipeTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 基本概括
+export function overall(data: any) {
+ return request({
+ url: '/cockpit/apis/overall',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 366e064..ff88935 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -272,7 +272,7 @@
// },
// },
valueFormatter: (value: string | number) => {
- return value ? value + props.unit : ''
+ return value ? value + props.unit : value === 0 ? '0' : ''
},
}, // 提示框
xAxis: [
diff --git a/src/components/Echart/PieChart3D.vue b/src/components/Echart/PieChart3D.vue
index 681ff96..4010cb6 100644
--- a/src/components/Echart/PieChart3D.vue
+++ b/src/components/Echart/PieChart3D.vue
@@ -602,7 +602,7 @@
},
grid3D: {
show: false,
- boxHeight: 26,
+ boxHeight: 5,
left: '5%',
top: '0%',
width: '50%',
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 388cec5..255c078 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -1484,20 +1484,20 @@
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index 525f10f..40a18a8 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -185,9 +185,9 @@
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
new file mode 100644
index 0000000..25df63f
--- /dev/null
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -0,0 +1,53 @@
+/**
+ * 大屏接口
+ */
+import request from '@/api/index'
+
+// 总体报警情况
+export function alarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/alarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 各分公司报警统计
+export function deptAlarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deptAlarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 设备运行态势
+export function deviceTrendStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTrendStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 监测设备统计
+export function deviceTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 管网类型统计
+export function pipeTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/pipeTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 基本概括
+export function overall(data: any) {
+ return request({
+ url: '/cockpit/apis/overall',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 366e064..ff88935 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -272,7 +272,7 @@
// },
// },
valueFormatter: (value: string | number) => {
- return value ? value + props.unit : ''
+ return value ? value + props.unit : value === 0 ? '0' : ''
},
}, // 提示框
xAxis: [
diff --git a/src/components/Echart/PieChart3D.vue b/src/components/Echart/PieChart3D.vue
index 681ff96..4010cb6 100644
--- a/src/components/Echart/PieChart3D.vue
+++ b/src/components/Echart/PieChart3D.vue
@@ -602,7 +602,7 @@
},
grid3D: {
show: false,
- boxHeight: 26,
+ boxHeight: 5,
left: '5%',
top: '0%',
width: '50%',
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 388cec5..255c078 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -1484,20 +1484,20 @@
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index 525f10f..40a18a8 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -185,9 +185,9 @@
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f723273..29057f2 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -5,6 +5,13 @@
-->
-
+
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
new file mode 100644
index 0000000..25df63f
--- /dev/null
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -0,0 +1,53 @@
+/**
+ * 大屏接口
+ */
+import request from '@/api/index'
+
+// 总体报警情况
+export function alarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/alarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 各分公司报警统计
+export function deptAlarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deptAlarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 设备运行态势
+export function deviceTrendStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTrendStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 监测设备统计
+export function deviceTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 管网类型统计
+export function pipeTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/pipeTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 基本概括
+export function overall(data: any) {
+ return request({
+ url: '/cockpit/apis/overall',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 366e064..ff88935 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -272,7 +272,7 @@
// },
// },
valueFormatter: (value: string | number) => {
- return value ? value + props.unit : ''
+ return value ? value + props.unit : value === 0 ? '0' : ''
},
}, // 提示框
xAxis: [
diff --git a/src/components/Echart/PieChart3D.vue b/src/components/Echart/PieChart3D.vue
index 681ff96..4010cb6 100644
--- a/src/components/Echart/PieChart3D.vue
+++ b/src/components/Echart/PieChart3D.vue
@@ -602,7 +602,7 @@
},
grid3D: {
show: false,
- boxHeight: 26,
+ boxHeight: 5,
left: '5%',
top: '0%',
width: '50%',
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 388cec5..255c078 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -1484,20 +1484,20 @@
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index 525f10f..40a18a8 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -185,9 +185,9 @@
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f723273..29057f2 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -5,6 +5,13 @@
-->
-
+
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index 38c92cf..18ebbce 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -4,28 +4,53 @@
Date: 2024-09-18
-->
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
new file mode 100644
index 0000000..25df63f
--- /dev/null
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -0,0 +1,53 @@
+/**
+ * 大屏接口
+ */
+import request from '@/api/index'
+
+// 总体报警情况
+export function alarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/alarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 各分公司报警统计
+export function deptAlarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deptAlarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 设备运行态势
+export function deviceTrendStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTrendStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 监测设备统计
+export function deviceTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 管网类型统计
+export function pipeTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/pipeTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 基本概括
+export function overall(data: any) {
+ return request({
+ url: '/cockpit/apis/overall',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 366e064..ff88935 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -272,7 +272,7 @@
// },
// },
valueFormatter: (value: string | number) => {
- return value ? value + props.unit : ''
+ return value ? value + props.unit : value === 0 ? '0' : ''
},
}, // 提示框
xAxis: [
diff --git a/src/components/Echart/PieChart3D.vue b/src/components/Echart/PieChart3D.vue
index 681ff96..4010cb6 100644
--- a/src/components/Echart/PieChart3D.vue
+++ b/src/components/Echart/PieChart3D.vue
@@ -602,7 +602,7 @@
},
grid3D: {
show: false,
- boxHeight: 26,
+ boxHeight: 5,
left: '5%',
top: '0%',
width: '50%',
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 388cec5..255c078 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -1484,20 +1484,20 @@
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index 525f10f..40a18a8 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -185,9 +185,9 @@
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f723273..29057f2 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -5,6 +5,13 @@
-->
-
+
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index 38c92cf..18ebbce 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -4,28 +4,53 @@
Date: 2024-09-18
-->
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index bd3a653..69fba17 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -5,6 +5,13 @@
-->
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
new file mode 100644
index 0000000..25df63f
--- /dev/null
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -0,0 +1,53 @@
+/**
+ * 大屏接口
+ */
+import request from '@/api/index'
+
+// 总体报警情况
+export function alarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/alarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 各分公司报警统计
+export function deptAlarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deptAlarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 设备运行态势
+export function deviceTrendStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTrendStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 监测设备统计
+export function deviceTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 管网类型统计
+export function pipeTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/pipeTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 基本概括
+export function overall(data: any) {
+ return request({
+ url: '/cockpit/apis/overall',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 366e064..ff88935 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -272,7 +272,7 @@
// },
// },
valueFormatter: (value: string | number) => {
- return value ? value + props.unit : ''
+ return value ? value + props.unit : value === 0 ? '0' : ''
},
}, // 提示框
xAxis: [
diff --git a/src/components/Echart/PieChart3D.vue b/src/components/Echart/PieChart3D.vue
index 681ff96..4010cb6 100644
--- a/src/components/Echart/PieChart3D.vue
+++ b/src/components/Echart/PieChart3D.vue
@@ -602,7 +602,7 @@
},
grid3D: {
show: false,
- boxHeight: 26,
+ boxHeight: 5,
left: '5%',
top: '0%',
width: '50%',
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 388cec5..255c078 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -1484,20 +1484,20 @@
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index 525f10f..40a18a8 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -185,9 +185,9 @@
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f723273..29057f2 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -5,6 +5,13 @@
-->
-
+
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index 38c92cf..18ebbce 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -4,28 +4,53 @@
Date: 2024-09-18
-->
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index bd3a653..69fba17 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -5,6 +5,13 @@
-->
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index eb2c2fd..a5db67a 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -5,7 +5,14 @@
-->
-
+
{
- return value ? value + props.unit : ''
+ return value ? value + props.unit : value === 0 ? '0' : ''
},
}, // 提示框
xAxis: [
diff --git a/src/components/Echart/PieChart3D.vue b/src/components/Echart/PieChart3D.vue
index 681ff96..4010cb6 100644
--- a/src/components/Echart/PieChart3D.vue
+++ b/src/components/Echart/PieChart3D.vue
@@ -602,7 +602,7 @@
},
grid3D: {
show: false,
- boxHeight: 26,
+ boxHeight: 5,
left: '5%',
top: '0%',
width: '50%',
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 388cec5..255c078 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -1484,20 +1484,20 @@
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index 525f10f..40a18a8 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -185,9 +185,9 @@
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f723273..29057f2 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -5,6 +5,13 @@
-->
-
+
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index 38c92cf..18ebbce 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -4,28 +4,53 @@
Date: 2024-09-18
-->
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index bd3a653..69fba17 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -5,6 +5,13 @@
-->
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index eb2c2fd..a5db67a 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -5,7 +5,14 @@
-->
-
+
-
+
-
+
-
+
-
+
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index 525f10f..40a18a8 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -185,9 +185,9 @@
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f723273..29057f2 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -5,6 +5,13 @@
-->
-
+
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index 38c92cf..18ebbce 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -4,28 +4,53 @@
Date: 2024-09-18
-->
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index bd3a653..69fba17 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -5,6 +5,13 @@
-->
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index eb2c2fd..a5db67a 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -5,7 +5,14 @@
-->
-
+
-
+
import layout from './layout.vue'
+import { deviceTypeStatistics } from '@/api/home/dashboard/fullScreen'
import PieChart3D from '@/components/Echart/PieChart3D.vue'
+const $props = defineProps({
+ type: {
+ type: String,
+ required: true,
+ },
+})
// 宽高
const height = ref((window.innerHeight - 100 - 50) / 3)
const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,35 +22,58 @@
})
const data = ref([])
onMounted(() => {
- setTimeout(() => {
- data.value = [
- {
- name: '管网哨兵',
- value: '12',
- },
- {
- name: '燃气智能监测终端',
- value: '18',
- },
- {
- name: '场站监测云台',
- value: '6',
- },
- {
- name: '井盖状态监测仪',
- value: '10',
- },
- {
- name: '智能警示桩',
- value: '14',
- },
- ]
- }, 2000)
+ // setTimeout(() => {
+ // data.value = [
+ // {
+ // name: '管网哨兵',
+ // value: '12',
+ // },
+ // {
+ // name: '燃气智能监测终端',
+ // value: '18',
+ // },
+ // {
+ // name: '场站监测云台',
+ // value: '6',
+ // },
+ // {
+ // name: '井盖状态监测仪',
+ // value: '10',
+ // },
+ // {
+ // name: '智能警示桩',
+ // value: '14',
+ // },
+ // ]
+ // }, 100)
+})
+// 获取数据
+const loading = ref(true)
+const fetchData = () => {
+ loading.value = true
+ deviceTypeStatistics({ type: $props.type }).then((res) => {
+ // console.log(res.data, '监测设备统计')
+ data.value = res.data
+ loading.value = false
+ }).catch(() => {
+ loading.value = false
+ })
+}
+watch(() => $props.type, (newVal) => {
+ if (newVal) {
+ fetchData()
+ }
+ else {
+ loading.value = false
+ }
+}, {
+ deep: true,
+ immediate: true,
})
-
+
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
new file mode 100644
index 0000000..25df63f
--- /dev/null
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -0,0 +1,53 @@
+/**
+ * 大屏接口
+ */
+import request from '@/api/index'
+
+// 总体报警情况
+export function alarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/alarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 各分公司报警统计
+export function deptAlarmStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deptAlarmStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 设备运行态势
+export function deviceTrendStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTrendStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 监测设备统计
+export function deviceTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/deviceTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 管网类型统计
+export function pipeTypeStatistics(data: any) {
+ return request({
+ url: '/cockpit/apis/pipeTypeStatistics',
+ method: 'post',
+ data,
+ })
+}
+// 基本概括
+export function overall(data: any) {
+ return request({
+ url: '/cockpit/apis/overall',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 366e064..ff88935 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -272,7 +272,7 @@
// },
// },
valueFormatter: (value: string | number) => {
- return value ? value + props.unit : ''
+ return value ? value + props.unit : value === 0 ? '0' : ''
},
}, // 提示框
xAxis: [
diff --git a/src/components/Echart/PieChart3D.vue b/src/components/Echart/PieChart3D.vue
index 681ff96..4010cb6 100644
--- a/src/components/Echart/PieChart3D.vue
+++ b/src/components/Echart/PieChart3D.vue
@@ -602,7 +602,7 @@
},
grid3D: {
show: false,
- boxHeight: 26,
+ boxHeight: 5,
left: '5%',
top: '0%',
width: '50%',
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 388cec5..255c078 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -1484,20 +1484,20 @@
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index 525f10f..40a18a8 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -185,9 +185,9 @@
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index f723273..29057f2 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -5,6 +5,13 @@
-->
-
+
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index 38c92cf..18ebbce 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -4,28 +4,53 @@
Date: 2024-09-18
-->
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index bd3a653..69fba17 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -5,6 +5,13 @@
-->
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index eb2c2fd..a5db67a 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -5,7 +5,14 @@
-->
-
+
-
+
import layout from './layout.vue'
+import { deviceTypeStatistics } from '@/api/home/dashboard/fullScreen'
import PieChart3D from '@/components/Echart/PieChart3D.vue'
+const $props = defineProps({
+ type: {
+ type: String,
+ required: true,
+ },
+})
// 宽高
const height = ref((window.innerHeight - 100 - 50) / 3)
const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,35 +22,58 @@
})
const data = ref([])
onMounted(() => {
- setTimeout(() => {
- data.value = [
- {
- name: '管网哨兵',
- value: '12',
- },
- {
- name: '燃气智能监测终端',
- value: '18',
- },
- {
- name: '场站监测云台',
- value: '6',
- },
- {
- name: '井盖状态监测仪',
- value: '10',
- },
- {
- name: '智能警示桩',
- value: '14',
- },
- ]
- }, 2000)
+ // setTimeout(() => {
+ // data.value = [
+ // {
+ // name: '管网哨兵',
+ // value: '12',
+ // },
+ // {
+ // name: '燃气智能监测终端',
+ // value: '18',
+ // },
+ // {
+ // name: '场站监测云台',
+ // value: '6',
+ // },
+ // {
+ // name: '井盖状态监测仪',
+ // value: '10',
+ // },
+ // {
+ // name: '智能警示桩',
+ // value: '14',
+ // },
+ // ]
+ // }, 100)
+})
+// 获取数据
+const loading = ref(true)
+const fetchData = () => {
+ loading.value = true
+ deviceTypeStatistics({ type: $props.type }).then((res) => {
+ // console.log(res.data, '监测设备统计')
+ data.value = res.data
+ loading.value = false
+ }).catch(() => {
+ loading.value = false
+ })
+}
+watch(() => $props.type, (newVal) => {
+ if (newVal) {
+ fetchData()
+ }
+ else {
+ loading.value = false
+ }
+}, {
+ deep: true,
+ immediate: true,
})
-
+
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 3a7433a..4d7c355 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -5,7 +5,14 @@
-->
-
+