@@ -22,9 +23,11 @@
import Card from '../components/Card.vue'
import JNestedRingChart from '../jChart/pie/JNestedRingChart.vue'
import FaceGageDialog from './components/FaceGageDialog.vue'
+import EnvironmentDialog from './components/EnvironmentDialog.vue'
import { selectWorkerAttendanceByDevApi } from '@/assets/js/api/dataBoard'
+import { getRealTimeDustNoiseDataApi } from '@/assets/js/api/environmentManage'
export default {
- components: { Card, JNestedRingChart, FaceGageDialog },
+ components: { Card, JNestedRingChart, FaceGageDialog, EnvironmentDialog },
props: {
title: {
type: String,
@@ -32,7 +35,8 @@ export default {
}
},
mounted() {
- this.selectWorkerAttendanceByDev()
+ this.getFaceGateInfo()
+ this.getEnvironmentInfo()
},
data() {
return {
@@ -51,7 +55,9 @@ export default {
list: [],
totalAttendance: { inTotalNum: 0, outTotalNum: 0 },
ufaceDev: { deviceState: 1 }
- }
+ },
+ environmentDialog: false,
+ environmentInfo: {}
}
},
methods: {
@@ -64,17 +70,27 @@ export default {
case 'gate':
this.faceGateDialog = true
break
+ case 'environment':
+ this.environmentDialog = true
+ break
default:
break
}
},
- selectWorkerAttendanceByDev() {
+ getFaceGateInfo() {
selectWorkerAttendanceByDevApi({
projectSn: this.projectSn,
devSn: '2525'
}).then(res => {
this.faceGateData = { ...res.result }
})
+ },
+ getEnvironmentInfo() {
+ getRealTimeDustNoiseDataApi({ deviceId: 'BDDA658E1AB347B783E5FAA283466CA9', projectSn: this.projectSn }).then(res => {
+ if (res.code == 200) {
+ this.environmentInfo = res.result || {}
+ }
+ })
}
},
computed: {
diff --git a/src/views/projectAdmin/jlw/digitalSite/components/EnvironmentDialog.vue b/src/views/projectAdmin/jlw/digitalSite/components/EnvironmentDialog.vue
new file mode 100644
index 00000000..a0a77768
--- /dev/null
+++ b/src/views/projectAdmin/jlw/digitalSite/components/EnvironmentDialog.vue
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
diff --git a/src/views/projectAdmin/jlw/digitalSite/components/FaceGageDialog.vue b/src/views/projectAdmin/jlw/digitalSite/components/FaceGageDialog.vue
index 8c5f7bb1..29ca611b 100644
--- a/src/views/projectAdmin/jlw/digitalSite/components/FaceGageDialog.vue
+++ b/src/views/projectAdmin/jlw/digitalSite/components/FaceGageDialog.vue
@@ -29,12 +29,6 @@ export default {
default: () => ({})
}
},
- mounted() {
- console.log(this.data, '是第三方士大夫')
- setTimeout(() => {
- console.log(this.data, '收待发送发生的方法')
- }, 2000)
- },
computed: {
isOnline() {
return this.data.ufaceDev && this.data.ufaceDev.deviceState === '1'