|
@@ -136,8 +136,13 @@
|
|
|
zhxx() {
|
|
|
let that = this
|
|
|
getZhxx().then(resp => {
|
|
|
- console.log("hhh",resp)
|
|
|
- that.regionNum = resp.data.data
|
|
|
+ that.regionNum = [];
|
|
|
+ that.regionNum.push(...resp.data.event)
|
|
|
+ that.regionNum.push(...resp.data.data)
|
|
|
+ for(let i in resp.data.device){
|
|
|
+ that.regionNum.push({value: resp.data.device[i].deviceCount,name: resp.data.device[i].deviceName})
|
|
|
+ }
|
|
|
+
|
|
|
})
|
|
|
},
|
|
|
|