diff --git a/src/views/projectAdmin/jlw/digitalSite/index.vue b/src/views/projectAdmin/jlw/digitalSite/index.vue index 13441771..b3a18369 100644 --- a/src/views/projectAdmin/jlw/digitalSite/index.vue +++ b/src/views/projectAdmin/jlw/digitalSite/index.vue @@ -24,7 +24,7 @@
- +
@@ -64,7 +64,8 @@ export default { towerList: [], // 塔吊设备列表 lifterList: [], // 升降机设备列表 videoCountList: {}, // 视频设备列表 - ufaceList: [], // 人脸闸机列表 + ufaceList: {}, // 人脸闸机列表 + uface:[], ufaceInCount: 0, //人脸闸机今日进场人数 environmentDevList: [], //环境设备列表 dangerAlarmTypeList: [], // 预警类型列表 @@ -90,7 +91,7 @@ export default { // 获取塔吊数量 getAllTowerDangerInfo(data).then(res => { if (res.code === 200) { - console.log('获取塔吊数量',res) + // console.log('获取塔吊数量',res) let { result } = res this.totalTowerDev = result.devCount.devNum this.totalDangerTowerDev = result.towerAlarmCount @@ -154,7 +155,7 @@ export default { selectTowerDevAlarmCountList(data).then(res => { if (res.code === 200) { this.towerList = res.result.devList - console.log('获取塔吊设备信息',this.towerList) + // console.log('获取塔吊设备信息',this.towerList) } }) // 获取升降机设备信息 @@ -173,8 +174,10 @@ export default { // 获取人脸闸机设备信息 selectUfaceDevStatisticsList(data).then(res => { if (res.code === 200) { - this.ufaceList = res.result.devList - this.ufaceList.forEach(item => { + console.log('获取人脸闸机设备信息',res) + this.ufaceList = res.result + this.uface = res.result.devList + this.uface.forEach(item => { this.ufaceInCount += item.inTotalNum }) } diff --git a/src/views/projectAdmin/jlw/digitalSite/leftBottom.vue b/src/views/projectAdmin/jlw/digitalSite/leftBottom.vue index 9db34e92..bfa291b3 100644 --- a/src/views/projectAdmin/jlw/digitalSite/leftBottom.vue +++ b/src/views/projectAdmin/jlw/digitalSite/leftBottom.vue @@ -6,10 +6,12 @@ >
设备名称
-
+
+
{{item.videoName}}
{{item.deviceState ==1 ? '在线' :'离线'}}
+
@@ -34,13 +36,18 @@ export default { return {} }, mounted(){ - console.log('--------------',this.videoCountList) + // console.log('--------------',this.videoCountList) } } diff --git a/src/views/projectAdmin/jlw/digitalSite/leftTop.vue b/src/views/projectAdmin/jlw/digitalSite/leftTop.vue index 1faed0a7..5e55589f 100644 --- a/src/views/projectAdmin/jlw/digitalSite/leftTop.vue +++ b/src/views/projectAdmin/jlw/digitalSite/leftTop.vue @@ -59,7 +59,7 @@ export default { }; }, mounted() { - console.log("传过来了吗", this.towerList, this.totalTowerDev); + // console.log("------", this.towerList, this.totalTowerDev); // 备注:此处xy轴数据没有处理 报警数很多为0 无法渲染 //var datax = [],datay =[] //this.towerList.forEach((item)=>{ diff --git a/src/views/projectAdmin/jlw/digitalSite/rightBottom.vue b/src/views/projectAdmin/jlw/digitalSite/rightBottom.vue index acaf61c6..4d638908 100644 --- a/src/views/projectAdmin/jlw/digitalSite/rightBottom.vue +++ b/src/views/projectAdmin/jlw/digitalSite/rightBottom.vue @@ -10,11 +10,13 @@
进场人数
出场人数
-
-
在线
-
1号塔吊
-
66
-
99
+
+
+
{{item.deviceState ==1 ? '在线' :'离线'}}
+
{{item.devName}}
+
{{item.isEnter}}
+
{{item.outTotalNum}}
+
@@ -30,15 +32,26 @@ export default { title: { type: String, default: '' + }, + ufaceList:{ + type: Object, + default: [] } }, data() { return {} + }, + mounted(){ + // console.log('--------------', this.ufaceList) } }