diff --git a/src/api/device/device.js b/src/api/device/device.js
index 1563b32..a876f09 100644
--- a/src/api/device/device.js
+++ b/src/api/device/device.js
@@ -72,6 +72,11 @@ export function getStatusCount(data) {
return request({ url: '/device/getStatusCount', method: 'GET', params: data })
}
+// 获取仓库统计数量
+export function getWareHouseCount(data) {
+ return request({ url: '/wareHouse/getWareHouseCount', method: 'GET', params: data })
+}
+
// 获取初始化参数
export function getDataInfoRes(data) {
return request({ url: '/device/getDataInfoRes', method: 'GET', params: data })
diff --git a/src/views/index.vue b/src/views/index.vue
index b8833ed..7759025 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -6,7 +6,7 @@
-
河北仓库11家
+
河北仓库{{ this.wareHouseMap.hebeis }}家
停车场19个
@@ -30,7 +30,7 @@
-
辽宁仓库0家
+
辽宁仓库{{ this.wareHouseMap.liaonings }}家
停车场12个
@@ -45,7 +45,6 @@
-
@@ -184,7 +183,7 @@ import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuan'
import HomeMap from '@/views/dashboard/components/HomeMap'
import { getCallPolicePage } from '@/api/callPolice/callPolice'
import { getInfoPage, getUnread, ws } from '@/api/yInfo/yInfo'
-import { getStatusCount } from '@/api/device/device'
+import { getStatusCount, getWareHouseCount } from '@/api/device/device'
import { init } from 'events';
// 1.1入侵报警饼图
const ruqinbaojing_Chart = {
@@ -311,6 +310,7 @@ export default {
},
data() {
return {
+ wareHouseMap: {},
ruqinbaojing_Chart: ruqinbaojing_Chart, // 1.1
shipinjiankong_Chart: shipinjiankong_Chart,
menjinguanli_Chart: menjinguanli_Chart,
@@ -398,16 +398,19 @@ export default {
this.toDoMessagge()
this.timer = setInterval(this.toDoMessagge, 60000)
this.connectSrv()
- getStatusCount({ deviceType: 1 }).then(res => {
- this.statusDataSp = res.data
- this.shipinjiankong_Chart.Data.seriesData = []
- var offline = this.statusDataSp.offline == null ? 0 : this.statusDataSp.offline
- var online = this.statusDataSp.online == null ? 0 : this.statusDataSp.online
- var obj = { name: '正常', value: online }
- var obj1 = { name: '离线', value: offline }
- this.shipinjiankong_Chart.Data.seriesData.push(obj)
- this.shipinjiankong_Chart.Data.seriesData.push(obj1)
- })
+ getWareHouseCount().then(res => {
+ this.wareHouseMap = res.data
+ }),
+ getStatusCount({ deviceType: 1 }).then(res => {
+ this.statusDataSp = res.data
+ this.shipinjiankong_Chart.Data.seriesData = []
+ var offline = this.statusDataSp.offline == null ? 0 : this.statusDataSp.offline
+ var online = this.statusDataSp.online == null ? 0 : this.statusDataSp.online
+ var obj = { name: '正常', value: online }
+ var obj1 = { name: '离线', value: offline }
+ this.shipinjiankong_Chart.Data.seriesData.push(obj)
+ this.shipinjiankong_Chart.Data.seriesData.push(obj1)
+ })
getStatusCount({ deviceType: 2 }).then(res => {
this.statusDataWl = res.data
this.dianziweilan_Chart.Data.seriesData = []
@@ -837,4 +840,5 @@ export default {
font-weight: bold;
display: inline-block;
color: #fc6f04;
-}
+}
+