diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
new file mode 100644
index 0000000..e7256e2
--- /dev/null
+++ b/src/api/home/device/count.ts
@@ -0,0 +1,53 @@
+/**
+ * 设备管理--设备统计模块接口
+ */
+import request from '@/api/index'
+
+// 设备运行情况
+export function getDeviceRun() {
+ return request({
+ url: '/device/statics/status',
+ method: 'post',
+ })
+}
+
+// 设备上报情况
+export function getDeviceReport() {
+ return request({
+ url: '/device/statics/dataReport',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getDeviceType() {
+ return request({
+ url: '/device/statics/deviceType',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getOffline() {
+ return request({
+ url: '/device/statics/offLine',
+ method: 'post',
+ })
+}
+
+// 管理单位设备统计
+export function getDeptDevice() {
+ return request({
+ url: '/device/statics/company',
+ method: 'post',
+ })
+}
+
+// 离线设备清单
+export function getOfflineDevice(data: any) {
+ return request({
+ url: '/device/statics/offLineList',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
new file mode 100644
index 0000000..e7256e2
--- /dev/null
+++ b/src/api/home/device/count.ts
@@ -0,0 +1,53 @@
+/**
+ * 设备管理--设备统计模块接口
+ */
+import request from '@/api/index'
+
+// 设备运行情况
+export function getDeviceRun() {
+ return request({
+ url: '/device/statics/status',
+ method: 'post',
+ })
+}
+
+// 设备上报情况
+export function getDeviceReport() {
+ return request({
+ url: '/device/statics/dataReport',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getDeviceType() {
+ return request({
+ url: '/device/statics/deviceType',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getOffline() {
+ return request({
+ url: '/device/statics/offLine',
+ method: 'post',
+ })
+}
+
+// 管理单位设备统计
+export function getDeptDevice() {
+ return request({
+ url: '/device/statics/company',
+ method: 'post',
+ })
+}
+
+// 离线设备清单
+export function getOfflineDevice(data: any) {
+ return request({
+ url: '/device/statics/offLineList',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/index.ts b/src/api/index.ts
index 5bc5f16..2d9ecf2 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
const request = axios.create({
baseURL: window.localStorage.getItem('url-bj-well') as string,
// baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
- timeout: 1000 * 60,
+ timeout: 1000 * 60 * 2,
responseType: 'json',
})
diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
new file mode 100644
index 0000000..e7256e2
--- /dev/null
+++ b/src/api/home/device/count.ts
@@ -0,0 +1,53 @@
+/**
+ * 设备管理--设备统计模块接口
+ */
+import request from '@/api/index'
+
+// 设备运行情况
+export function getDeviceRun() {
+ return request({
+ url: '/device/statics/status',
+ method: 'post',
+ })
+}
+
+// 设备上报情况
+export function getDeviceReport() {
+ return request({
+ url: '/device/statics/dataReport',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getDeviceType() {
+ return request({
+ url: '/device/statics/deviceType',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getOffline() {
+ return request({
+ url: '/device/statics/offLine',
+ method: 'post',
+ })
+}
+
+// 管理单位设备统计
+export function getDeptDevice() {
+ return request({
+ url: '/device/statics/company',
+ method: 'post',
+ })
+}
+
+// 离线设备清单
+export function getOfflineDevice(data: any) {
+ return request({
+ url: '/device/statics/offLineList',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/index.ts b/src/api/index.ts
index 5bc5f16..2d9ecf2 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
const request = axios.create({
baseURL: window.localStorage.getItem('url-bj-well') as string,
// baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
- timeout: 1000 * 60,
+ timeout: 1000 * 60 * 2,
responseType: 'json',
})
diff --git a/src/assets/images/device/1 b/src/assets/images/device/1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/assets/images/device/1
diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
new file mode 100644
index 0000000..e7256e2
--- /dev/null
+++ b/src/api/home/device/count.ts
@@ -0,0 +1,53 @@
+/**
+ * 设备管理--设备统计模块接口
+ */
+import request from '@/api/index'
+
+// 设备运行情况
+export function getDeviceRun() {
+ return request({
+ url: '/device/statics/status',
+ method: 'post',
+ })
+}
+
+// 设备上报情况
+export function getDeviceReport() {
+ return request({
+ url: '/device/statics/dataReport',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getDeviceType() {
+ return request({
+ url: '/device/statics/deviceType',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getOffline() {
+ return request({
+ url: '/device/statics/offLine',
+ method: 'post',
+ })
+}
+
+// 管理单位设备统计
+export function getDeptDevice() {
+ return request({
+ url: '/device/statics/company',
+ method: 'post',
+ })
+}
+
+// 离线设备清单
+export function getOfflineDevice(data: any) {
+ return request({
+ url: '/device/statics/offLineList',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/index.ts b/src/api/index.ts
index 5bc5f16..2d9ecf2 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
const request = axios.create({
baseURL: window.localStorage.getItem('url-bj-well') as string,
// baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
- timeout: 1000 * 60,
+ timeout: 1000 * 60 * 2,
responseType: 'json',
})
diff --git a/src/assets/images/device/1 b/src/assets/images/device/1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/assets/images/device/1
diff --git a/src/assets/images/device/count/offline.png b/src/assets/images/device/count/offline.png
new file mode 100644
index 0000000..9b1f055
--- /dev/null
+++ b/src/assets/images/device/count/offline.png
Binary files differ
diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
new file mode 100644
index 0000000..e7256e2
--- /dev/null
+++ b/src/api/home/device/count.ts
@@ -0,0 +1,53 @@
+/**
+ * 设备管理--设备统计模块接口
+ */
+import request from '@/api/index'
+
+// 设备运行情况
+export function getDeviceRun() {
+ return request({
+ url: '/device/statics/status',
+ method: 'post',
+ })
+}
+
+// 设备上报情况
+export function getDeviceReport() {
+ return request({
+ url: '/device/statics/dataReport',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getDeviceType() {
+ return request({
+ url: '/device/statics/deviceType',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getOffline() {
+ return request({
+ url: '/device/statics/offLine',
+ method: 'post',
+ })
+}
+
+// 管理单位设备统计
+export function getDeptDevice() {
+ return request({
+ url: '/device/statics/company',
+ method: 'post',
+ })
+}
+
+// 离线设备清单
+export function getOfflineDevice(data: any) {
+ return request({
+ url: '/device/statics/offLineList',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/index.ts b/src/api/index.ts
index 5bc5f16..2d9ecf2 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
const request = axios.create({
baseURL: window.localStorage.getItem('url-bj-well') as string,
// baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
- timeout: 1000 * 60,
+ timeout: 1000 * 60 * 2,
responseType: 'json',
})
diff --git a/src/assets/images/device/1 b/src/assets/images/device/1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/assets/images/device/1
diff --git a/src/assets/images/device/count/offline.png b/src/assets/images/device/count/offline.png
new file mode 100644
index 0000000..9b1f055
--- /dev/null
+++ b/src/assets/images/device/count/offline.png
Binary files differ
diff --git a/src/assets/images/device/count/online.png b/src/assets/images/device/count/online.png
new file mode 100644
index 0000000..aa8d5e5
--- /dev/null
+++ b/src/assets/images/device/count/online.png
Binary files differ
diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
new file mode 100644
index 0000000..e7256e2
--- /dev/null
+++ b/src/api/home/device/count.ts
@@ -0,0 +1,53 @@
+/**
+ * 设备管理--设备统计模块接口
+ */
+import request from '@/api/index'
+
+// 设备运行情况
+export function getDeviceRun() {
+ return request({
+ url: '/device/statics/status',
+ method: 'post',
+ })
+}
+
+// 设备上报情况
+export function getDeviceReport() {
+ return request({
+ url: '/device/statics/dataReport',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getDeviceType() {
+ return request({
+ url: '/device/statics/deviceType',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getOffline() {
+ return request({
+ url: '/device/statics/offLine',
+ method: 'post',
+ })
+}
+
+// 管理单位设备统计
+export function getDeptDevice() {
+ return request({
+ url: '/device/statics/company',
+ method: 'post',
+ })
+}
+
+// 离线设备清单
+export function getOfflineDevice(data: any) {
+ return request({
+ url: '/device/statics/offLineList',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/index.ts b/src/api/index.ts
index 5bc5f16..2d9ecf2 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
const request = axios.create({
baseURL: window.localStorage.getItem('url-bj-well') as string,
// baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
- timeout: 1000 * 60,
+ timeout: 1000 * 60 * 2,
responseType: 'json',
})
diff --git a/src/assets/images/device/1 b/src/assets/images/device/1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/assets/images/device/1
diff --git a/src/assets/images/device/count/offline.png b/src/assets/images/device/count/offline.png
new file mode 100644
index 0000000..9b1f055
--- /dev/null
+++ b/src/assets/images/device/count/offline.png
Binary files differ
diff --git a/src/assets/images/device/count/online.png b/src/assets/images/device/count/online.png
new file mode 100644
index 0000000..aa8d5e5
--- /dev/null
+++ b/src/assets/images/device/count/online.png
Binary files differ
diff --git a/src/assets/images/device/count/stop.png b/src/assets/images/device/count/stop.png
new file mode 100644
index 0000000..a9074b9
--- /dev/null
+++ b/src/assets/images/device/count/stop.png
Binary files differ
diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
new file mode 100644
index 0000000..e7256e2
--- /dev/null
+++ b/src/api/home/device/count.ts
@@ -0,0 +1,53 @@
+/**
+ * 设备管理--设备统计模块接口
+ */
+import request from '@/api/index'
+
+// 设备运行情况
+export function getDeviceRun() {
+ return request({
+ url: '/device/statics/status',
+ method: 'post',
+ })
+}
+
+// 设备上报情况
+export function getDeviceReport() {
+ return request({
+ url: '/device/statics/dataReport',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getDeviceType() {
+ return request({
+ url: '/device/statics/deviceType',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getOffline() {
+ return request({
+ url: '/device/statics/offLine',
+ method: 'post',
+ })
+}
+
+// 管理单位设备统计
+export function getDeptDevice() {
+ return request({
+ url: '/device/statics/company',
+ method: 'post',
+ })
+}
+
+// 离线设备清单
+export function getOfflineDevice(data: any) {
+ return request({
+ url: '/device/statics/offLineList',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/index.ts b/src/api/index.ts
index 5bc5f16..2d9ecf2 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
const request = axios.create({
baseURL: window.localStorage.getItem('url-bj-well') as string,
// baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
- timeout: 1000 * 60,
+ timeout: 1000 * 60 * 2,
responseType: 'json',
})
diff --git a/src/assets/images/device/1 b/src/assets/images/device/1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/assets/images/device/1
diff --git a/src/assets/images/device/count/offline.png b/src/assets/images/device/count/offline.png
new file mode 100644
index 0000000..9b1f055
--- /dev/null
+++ b/src/assets/images/device/count/offline.png
Binary files differ
diff --git a/src/assets/images/device/count/online.png b/src/assets/images/device/count/online.png
new file mode 100644
index 0000000..aa8d5e5
--- /dev/null
+++ b/src/assets/images/device/count/online.png
Binary files differ
diff --git a/src/assets/images/device/count/stop.png b/src/assets/images/device/count/stop.png
new file mode 100644
index 0000000..a9074b9
--- /dev/null
+++ b/src/assets/images/device/count/stop.png
Binary files differ
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index 74d506a..ca56b83 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -211,9 +211,9 @@
right: props.right,
label: {
show: props.labelShow,
- position: 'center',
+ position: props.labelPosition,
formatter: props.labelFormatter ? props.labelFormatter : (props.valueType == 'percentage' ? '{style1|{b}}\n{style2|{d}%}' : '{style1|{b}}\n{style2|{c}}'),
- fontSize: 20,
+ fontSize: 16,
fontWeight: 'bold',
rich: {
style1: {
diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
new file mode 100644
index 0000000..e7256e2
--- /dev/null
+++ b/src/api/home/device/count.ts
@@ -0,0 +1,53 @@
+/**
+ * 设备管理--设备统计模块接口
+ */
+import request from '@/api/index'
+
+// 设备运行情况
+export function getDeviceRun() {
+ return request({
+ url: '/device/statics/status',
+ method: 'post',
+ })
+}
+
+// 设备上报情况
+export function getDeviceReport() {
+ return request({
+ url: '/device/statics/dataReport',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getDeviceType() {
+ return request({
+ url: '/device/statics/deviceType',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getOffline() {
+ return request({
+ url: '/device/statics/offLine',
+ method: 'post',
+ })
+}
+
+// 管理单位设备统计
+export function getDeptDevice() {
+ return request({
+ url: '/device/statics/company',
+ method: 'post',
+ })
+}
+
+// 离线设备清单
+export function getOfflineDevice(data: any) {
+ return request({
+ url: '/device/statics/offLineList',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/index.ts b/src/api/index.ts
index 5bc5f16..2d9ecf2 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
const request = axios.create({
baseURL: window.localStorage.getItem('url-bj-well') as string,
// baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
- timeout: 1000 * 60,
+ timeout: 1000 * 60 * 2,
responseType: 'json',
})
diff --git a/src/assets/images/device/1 b/src/assets/images/device/1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/assets/images/device/1
diff --git a/src/assets/images/device/count/offline.png b/src/assets/images/device/count/offline.png
new file mode 100644
index 0000000..9b1f055
--- /dev/null
+++ b/src/assets/images/device/count/offline.png
Binary files differ
diff --git a/src/assets/images/device/count/online.png b/src/assets/images/device/count/online.png
new file mode 100644
index 0000000..aa8d5e5
--- /dev/null
+++ b/src/assets/images/device/count/online.png
Binary files differ
diff --git a/src/assets/images/device/count/stop.png b/src/assets/images/device/count/stop.png
new file mode 100644
index 0000000..a9074b9
--- /dev/null
+++ b/src/assets/images/device/count/stop.png
Binary files differ
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index 74d506a..ca56b83 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -211,9 +211,9 @@
right: props.right,
label: {
show: props.labelShow,
- position: 'center',
+ position: props.labelPosition,
formatter: props.labelFormatter ? props.labelFormatter : (props.valueType == 'percentage' ? '{style1|{b}}\n{style2|{d}%}' : '{style1|{b}}\n{style2|{c}}'),
- fontSize: 20,
+ fontSize: 16,
fontWeight: 'bold',
rich: {
style1: {
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
new file mode 100644
index 0000000..4b16e06
--- /dev/null
+++ b/src/views/home/device/count/components/bottom.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
new file mode 100644
index 0000000..e7256e2
--- /dev/null
+++ b/src/api/home/device/count.ts
@@ -0,0 +1,53 @@
+/**
+ * 设备管理--设备统计模块接口
+ */
+import request from '@/api/index'
+
+// 设备运行情况
+export function getDeviceRun() {
+ return request({
+ url: '/device/statics/status',
+ method: 'post',
+ })
+}
+
+// 设备上报情况
+export function getDeviceReport() {
+ return request({
+ url: '/device/statics/dataReport',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getDeviceType() {
+ return request({
+ url: '/device/statics/deviceType',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getOffline() {
+ return request({
+ url: '/device/statics/offLine',
+ method: 'post',
+ })
+}
+
+// 管理单位设备统计
+export function getDeptDevice() {
+ return request({
+ url: '/device/statics/company',
+ method: 'post',
+ })
+}
+
+// 离线设备清单
+export function getOfflineDevice(data: any) {
+ return request({
+ url: '/device/statics/offLineList',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/index.ts b/src/api/index.ts
index 5bc5f16..2d9ecf2 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
const request = axios.create({
baseURL: window.localStorage.getItem('url-bj-well') as string,
// baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
- timeout: 1000 * 60,
+ timeout: 1000 * 60 * 2,
responseType: 'json',
})
diff --git a/src/assets/images/device/1 b/src/assets/images/device/1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/assets/images/device/1
diff --git a/src/assets/images/device/count/offline.png b/src/assets/images/device/count/offline.png
new file mode 100644
index 0000000..9b1f055
--- /dev/null
+++ b/src/assets/images/device/count/offline.png
Binary files differ
diff --git a/src/assets/images/device/count/online.png b/src/assets/images/device/count/online.png
new file mode 100644
index 0000000..aa8d5e5
--- /dev/null
+++ b/src/assets/images/device/count/online.png
Binary files differ
diff --git a/src/assets/images/device/count/stop.png b/src/assets/images/device/count/stop.png
new file mode 100644
index 0000000..a9074b9
--- /dev/null
+++ b/src/assets/images/device/count/stop.png
Binary files differ
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index 74d506a..ca56b83 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -211,9 +211,9 @@
right: props.right,
label: {
show: props.labelShow,
- position: 'center',
+ position: props.labelPosition,
formatter: props.labelFormatter ? props.labelFormatter : (props.valueType == 'percentage' ? '{style1|{b}}\n{style2|{d}%}' : '{style1|{b}}\n{style2|{c}}'),
- fontSize: 20,
+ fontSize: 16,
fontWeight: 'bold',
rich: {
style1: {
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
new file mode 100644
index 0000000..4b16e06
--- /dev/null
+++ b/src/views/home/device/count/components/bottom.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
new file mode 100644
index 0000000..e732ea6
--- /dev/null
+++ b/src/views/home/device/count/components/header.vue
@@ -0,0 +1,215 @@
+
+
+
+
+
+
+
+
diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
new file mode 100644
index 0000000..e7256e2
--- /dev/null
+++ b/src/api/home/device/count.ts
@@ -0,0 +1,53 @@
+/**
+ * 设备管理--设备统计模块接口
+ */
+import request from '@/api/index'
+
+// 设备运行情况
+export function getDeviceRun() {
+ return request({
+ url: '/device/statics/status',
+ method: 'post',
+ })
+}
+
+// 设备上报情况
+export function getDeviceReport() {
+ return request({
+ url: '/device/statics/dataReport',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getDeviceType() {
+ return request({
+ url: '/device/statics/deviceType',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getOffline() {
+ return request({
+ url: '/device/statics/offLine',
+ method: 'post',
+ })
+}
+
+// 管理单位设备统计
+export function getDeptDevice() {
+ return request({
+ url: '/device/statics/company',
+ method: 'post',
+ })
+}
+
+// 离线设备清单
+export function getOfflineDevice(data: any) {
+ return request({
+ url: '/device/statics/offLineList',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/index.ts b/src/api/index.ts
index 5bc5f16..2d9ecf2 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
const request = axios.create({
baseURL: window.localStorage.getItem('url-bj-well') as string,
// baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
- timeout: 1000 * 60,
+ timeout: 1000 * 60 * 2,
responseType: 'json',
})
diff --git a/src/assets/images/device/1 b/src/assets/images/device/1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/assets/images/device/1
diff --git a/src/assets/images/device/count/offline.png b/src/assets/images/device/count/offline.png
new file mode 100644
index 0000000..9b1f055
--- /dev/null
+++ b/src/assets/images/device/count/offline.png
Binary files differ
diff --git a/src/assets/images/device/count/online.png b/src/assets/images/device/count/online.png
new file mode 100644
index 0000000..aa8d5e5
--- /dev/null
+++ b/src/assets/images/device/count/online.png
Binary files differ
diff --git a/src/assets/images/device/count/stop.png b/src/assets/images/device/count/stop.png
new file mode 100644
index 0000000..a9074b9
--- /dev/null
+++ b/src/assets/images/device/count/stop.png
Binary files differ
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index 74d506a..ca56b83 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -211,9 +211,9 @@
right: props.right,
label: {
show: props.labelShow,
- position: 'center',
+ position: props.labelPosition,
formatter: props.labelFormatter ? props.labelFormatter : (props.valueType == 'percentage' ? '{style1|{b}}\n{style2|{d}%}' : '{style1|{b}}\n{style2|{c}}'),
- fontSize: 20,
+ fontSize: 16,
fontWeight: 'bold',
rich: {
style1: {
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
new file mode 100644
index 0000000..4b16e06
--- /dev/null
+++ b/src/views/home/device/count/components/bottom.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
new file mode 100644
index 0000000..e732ea6
--- /dev/null
+++ b/src/views/home/device/count/components/header.vue
@@ -0,0 +1,215 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
new file mode 100644
index 0000000..2346fd0
--- /dev/null
+++ b/src/views/home/device/count/components/imgData.ts
@@ -0,0 +1,7 @@
+export const img = {
+ online: new URL('@/assets/images/device/count/online.png', import.meta.url),
+ offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
+ stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+ upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+ backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+}
diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
new file mode 100644
index 0000000..e7256e2
--- /dev/null
+++ b/src/api/home/device/count.ts
@@ -0,0 +1,53 @@
+/**
+ * 设备管理--设备统计模块接口
+ */
+import request from '@/api/index'
+
+// 设备运行情况
+export function getDeviceRun() {
+ return request({
+ url: '/device/statics/status',
+ method: 'post',
+ })
+}
+
+// 设备上报情况
+export function getDeviceReport() {
+ return request({
+ url: '/device/statics/dataReport',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getDeviceType() {
+ return request({
+ url: '/device/statics/deviceType',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getOffline() {
+ return request({
+ url: '/device/statics/offLine',
+ method: 'post',
+ })
+}
+
+// 管理单位设备统计
+export function getDeptDevice() {
+ return request({
+ url: '/device/statics/company',
+ method: 'post',
+ })
+}
+
+// 离线设备清单
+export function getOfflineDevice(data: any) {
+ return request({
+ url: '/device/statics/offLineList',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/index.ts b/src/api/index.ts
index 5bc5f16..2d9ecf2 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
const request = axios.create({
baseURL: window.localStorage.getItem('url-bj-well') as string,
// baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
- timeout: 1000 * 60,
+ timeout: 1000 * 60 * 2,
responseType: 'json',
})
diff --git a/src/assets/images/device/1 b/src/assets/images/device/1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/assets/images/device/1
diff --git a/src/assets/images/device/count/offline.png b/src/assets/images/device/count/offline.png
new file mode 100644
index 0000000..9b1f055
--- /dev/null
+++ b/src/assets/images/device/count/offline.png
Binary files differ
diff --git a/src/assets/images/device/count/online.png b/src/assets/images/device/count/online.png
new file mode 100644
index 0000000..aa8d5e5
--- /dev/null
+++ b/src/assets/images/device/count/online.png
Binary files differ
diff --git a/src/assets/images/device/count/stop.png b/src/assets/images/device/count/stop.png
new file mode 100644
index 0000000..a9074b9
--- /dev/null
+++ b/src/assets/images/device/count/stop.png
Binary files differ
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index 74d506a..ca56b83 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -211,9 +211,9 @@
right: props.right,
label: {
show: props.labelShow,
- position: 'center',
+ position: props.labelPosition,
formatter: props.labelFormatter ? props.labelFormatter : (props.valueType == 'percentage' ? '{style1|{b}}\n{style2|{d}%}' : '{style1|{b}}\n{style2|{c}}'),
- fontSize: 20,
+ fontSize: 16,
fontWeight: 'bold',
rich: {
style1: {
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
new file mode 100644
index 0000000..4b16e06
--- /dev/null
+++ b/src/views/home/device/count/components/bottom.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
new file mode 100644
index 0000000..e732ea6
--- /dev/null
+++ b/src/views/home/device/count/components/header.vue
@@ -0,0 +1,215 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
new file mode 100644
index 0000000..2346fd0
--- /dev/null
+++ b/src/views/home/device/count/components/imgData.ts
@@ -0,0 +1,7 @@
+export const img = {
+ online: new URL('@/assets/images/device/count/online.png', import.meta.url),
+ offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
+ stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+ upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+ backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+}
diff --git a/src/views/home/device/count/components/middle.vue b/src/views/home/device/count/components/middle.vue
new file mode 100644
index 0000000..f45a3a3
--- /dev/null
+++ b/src/views/home/device/count/components/middle.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
diff --git a/src/api/home/device/count.ts b/src/api/home/device/count.ts
new file mode 100644
index 0000000..e7256e2
--- /dev/null
+++ b/src/api/home/device/count.ts
@@ -0,0 +1,53 @@
+/**
+ * 设备管理--设备统计模块接口
+ */
+import request from '@/api/index'
+
+// 设备运行情况
+export function getDeviceRun() {
+ return request({
+ url: '/device/statics/status',
+ method: 'post',
+ })
+}
+
+// 设备上报情况
+export function getDeviceReport() {
+ return request({
+ url: '/device/statics/dataReport',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getDeviceType() {
+ return request({
+ url: '/device/statics/deviceType',
+ method: 'post',
+ })
+}
+
+// 设备分类统计
+export function getOffline() {
+ return request({
+ url: '/device/statics/offLine',
+ method: 'post',
+ })
+}
+
+// 管理单位设备统计
+export function getDeptDevice() {
+ return request({
+ url: '/device/statics/company',
+ method: 'post',
+ })
+}
+
+// 离线设备清单
+export function getOfflineDevice(data: any) {
+ return request({
+ url: '/device/statics/offLineList',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/index.ts b/src/api/index.ts
index 5bc5f16..2d9ecf2 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -26,7 +26,7 @@
const request = axios.create({
baseURL: window.localStorage.getItem('url-bj-well') as string,
// baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
- timeout: 1000 * 60,
+ timeout: 1000 * 60 * 2,
responseType: 'json',
})
diff --git a/src/assets/images/device/1 b/src/assets/images/device/1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/assets/images/device/1
diff --git a/src/assets/images/device/count/offline.png b/src/assets/images/device/count/offline.png
new file mode 100644
index 0000000..9b1f055
--- /dev/null
+++ b/src/assets/images/device/count/offline.png
Binary files differ
diff --git a/src/assets/images/device/count/online.png b/src/assets/images/device/count/online.png
new file mode 100644
index 0000000..aa8d5e5
--- /dev/null
+++ b/src/assets/images/device/count/online.png
Binary files differ
diff --git a/src/assets/images/device/count/stop.png b/src/assets/images/device/count/stop.png
new file mode 100644
index 0000000..a9074b9
--- /dev/null
+++ b/src/assets/images/device/count/stop.png
Binary files differ
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index 74d506a..ca56b83 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -211,9 +211,9 @@
right: props.right,
label: {
show: props.labelShow,
- position: 'center',
+ position: props.labelPosition,
formatter: props.labelFormatter ? props.labelFormatter : (props.valueType == 'percentage' ? '{style1|{b}}\n{style2|{d}%}' : '{style1|{b}}\n{style2|{c}}'),
- fontSize: 20,
+ fontSize: 16,
fontWeight: 'bold',
rich: {
style1: {
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
new file mode 100644
index 0000000..4b16e06
--- /dev/null
+++ b/src/views/home/device/count/components/bottom.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
new file mode 100644
index 0000000..e732ea6
--- /dev/null
+++ b/src/views/home/device/count/components/header.vue
@@ -0,0 +1,215 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
new file mode 100644
index 0000000..2346fd0
--- /dev/null
+++ b/src/views/home/device/count/components/imgData.ts
@@ -0,0 +1,7 @@
+export const img = {
+ online: new URL('@/assets/images/device/count/online.png', import.meta.url),
+ offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
+ stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+ upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+ backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+}
diff --git a/src/views/home/device/count/components/middle.vue b/src/views/home/device/count/components/middle.vue
new file mode 100644
index 0000000..f45a3a3
--- /dev/null
+++ b/src/views/home/device/count/components/middle.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/home/device/count/index.vue b/src/views/home/device/count/index.vue
index d7c2022..5d1de06 100644
--- a/src/views/home/device/count/index.vue
+++ b/src/views/home/device/count/index.vue
@@ -1,3 +1,25 @@
+
+
+
- 设备统计
+
+
+
+
+
+
+
+
+
+
+
+