diff --git a/src/views/projectAdmin/dataBoard/digitalSite/index.vue b/src/views/projectAdmin/dataBoard/digitalSite/index.vue index c3c3b71b..28f95426 100644 --- a/src/views/projectAdmin/dataBoard/digitalSite/index.vue +++ b/src/views/projectAdmin/dataBoard/digitalSite/index.vue @@ -142,7 +142,7 @@ -
+
{{ environDevDetail.name }} - {{ $t('message.dataBoard.realData') }} @@ -1136,17 +1136,6 @@ {{ $t('message.dataBoard.alarmTime') + ':' }}{{ transformTimestamp(item.alarmTime) }}

- - - - - - - - - - -
@@ -2178,10 +2167,6 @@ export default { }, showEnvironDialog: false, environDevDetail: { name: '' }, - environBoxPos: { - x: 0, - y: 0 - }, showVideoDialog: false, showVideoDialog2: false, showFaceDevDialog: false, @@ -2940,16 +2925,6 @@ export default { break case 6: this.environDevDetail = item - if (parseFloat(item.mapY) > 500) { - this.environBoxPos.y = parseFloat(item.mapY) - 200 + 'px' - } else { - this.environBoxPos.y = parseFloat(item.mapY) + 0 + 'px' - } - if (parseFloat(item.mapX / this.imgWidthScale) > 510) { - this.environBoxPos.x = parseFloat(item.mapX) / this.imgWidthScale - 350 + 'px' - } else { - this.environBoxPos.x = parseFloat(item.mapX) / this.imgWidthScale + 50 + 'px' - } this.showEnvironDialog = true this.getRealTimeDustNoiseData(item.devSn) break @@ -3130,50 +3105,15 @@ export default { this.environmentTotalAlarm = result.alarmTotal.totalAlarm } }) - // // 获取报警列表数据 - // getAIDangerList(data).then((res) => { - // if (res.code === 200) { - // let { result } = res; - // console.log(result); - // let type = [ - // "烟感", - // "明火", - // "人员倒地", - // "未戴安全帽", - // "区域入侵", - // "越界入侵", - // "人员聚集衣", - // "反光衣", - // "裸土覆盖", - // ]; - // this.AIDangerAlarmList = result.slice(0, 6).map((x) => { - // return { - // createTime: x.createTime, - // hardwareName: x.hardwareName, - // id: x.id, - // imageUrl: x.imageUrl, - // location: x.location, - // projectName: x.projectName, - // alarmType: type[x.alarmType - 1], - // }; - // }); - // } - // this.pieAnalyse() - // }); }, //获取环境设备详情数据 getRealTimeDustNoiseData(deviceId) { - let Id = deviceId - let data = { - deviceId: deviceId, - projectSn: this.projectSn - } - getRealTimeDustNoiseDataApi(data).then(res => { + getRealTimeDustNoiseDataApi({ deviceId, projectSn: this.projectSn }).then(res => { if (res.code == 200) { if (res.result) { this.plantCap = res.result this.plantCapInterval = setTimeout(() => { - this.getRealTimeDustNoiseData(Id) + this.getRealTimeDustNoiseData(deviceId) }, 5000) } else { this.plantCap = { diff --git a/src/views/projectAdmin/jlw/digitalSite/centerTop.vue b/src/views/projectAdmin/jlw/digitalSite/centerTop.vue index 50db7310..354563b2 100644 --- a/src/views/projectAdmin/jlw/digitalSite/centerTop.vue +++ b/src/views/projectAdmin/jlw/digitalSite/centerTop.vue @@ -9,6 +9,7 @@ @click="handlePoint(point)" >
+
@@ -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'