admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

湖里大屏(数字工地)：完成塔吊弹框驾驶员信息联调

Browse Source
This commit is contained in:
Jack 2022-08-19 14:45:36 +08:00
parent ca1e34f924
commit 5e9863d2cf
2 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/projectAdmin/dataBoard/digitalSite/index.vue
View File

@ -426,8 +426,7 @@
{{ company == 'longguang' ? $t('message.dataBoard.towerPlayer') : $t('message.dataBoard.driverInfo') }}
</div>
<!-- 驾驶员信息 -->
<vue-scroll v-if="towerBasicInfoDriverList.length > 0" style="height: 130px; margin-bottom: 10px">
<!-- driverIdCard，idCard-->
<vue-scroll v-if="towerBasicInfo.driverList.length" style="height: 130px; margin-bottom: 10px">
<div class="driverInfo" v-for="(item, index) in towerBasicInfo.driverList" :key="index">
<img
@click="openImg(fileUrl + item.fieldAcquisitionUrl)"
@ -686,8 +685,7 @@
{{ $t('message.dataBoard.towerRunInfo') }}
<span class="tower-time">
<!-- 当前上传时间： -->
{{ $t('message.dataBoard.nowUpdateTime') + ':'
}}{{ towerBasicInfo.tower && towerBasicInfo.tower.realTime ? towerBasicInfo.tower.realTime : '--' }}
{{ $t('message.dataBoard.nowUpdateTime') + ':' }}{{ ((towerBasicInfo || {}).tower || {}).realTime || '--' }}
</span>
</div>
<div class="realTimeInfo towerCrane" v-if="company == 'longguang'">
@ -845,8 +843,7 @@
{{ $t('message.dataBoard.towerRunInfo') }}
<span class="tower-time">
<!-- 当前上传时间： -->
{{ $t('message.dataBoard.nowUpdateTime') + ':'
}}{{ towerBasicInfo.tower && towerBasicInfo.tower.realTime ? towerBasicInfo.tower.realTime : '--' }}
{{ $t('message.dataBoard.nowUpdateTime') + ':' }}{{ ((towerBasicInfo || {}).tower || {}).realTime || '--' }}
</span>
</div>
<div class="realTimeInfo towerCrane" v-if="company != 'longguang'">
@ -1055,7 +1052,7 @@
{{ $t('message.dataBoard.alarmInfo') }}
</div>
<div class="deviceInfo" style="background: #061125" v-if="company == 'longguang'">
<vue-scroll v-if="TowerAlarmList.length " style="height: 300px; margin-bottom: 10px">
<vue-scroll v-if="TowerAlarmList.length" style="height: 300px; margin-bottom: 10px">
<div class="driverInfo" v-for="(item, index) in TowerAlarmList" :key="index">
<div class="TowerAlarm_item">
<p v-if="item.windSpeedAlarm" class="p1" style="width: 100%; font-size: 15px">
@ -2131,7 +2128,6 @@ export default {
showCarDialog: false,
showCarDialog2: false,
towerBasicInfo: {}, //塔吊基本信息,
towerBasicInfoDriverList: [],
nutHostId: '', //螺母主机id
towerCurrentInfo: {}, //塔吊实时信息
coordData: {
@ -2506,8 +2502,6 @@ export default {
this.$message.error(res.message)
}
})
console.log(this.towerBasicInfo.tower.nutHostId)
console.log(this.towerBasicInfo.tower.nodeCount)
},
closeMap() {
this.showTowerDialog = false
@ -3109,19 +3103,17 @@ export default {
},
//获取单个塔吊设备信息
getTowerDriverInfo(devSn) {
getTowerAlarmListApi({ devSn, projectSn: this.projectSn }).then(res => {
getTowerAlarmListApi({ devSn, projectSn: this.projectSn }).then(res => {
console.log(res.result)
this.TowerAlarmList = res.result.records
})
this.getTowerWarningList(devSn)
getSelectTowerBySnApi({ devSn }).then(res => {
getSelectTowerBySnApi({ devSn }).then(res => {
console.log(1)
if (res.code == 200) {
console.log(res.result)
this.towerBasicInfo = res.result
this.weightSet = res.result.tower.weightSet
this.towerBasicInfoDriverList = res.result.driverList
console.log('驾驶员信息', this.towerBasicInfoDriverList)
this.nutHostId = res.result.tower.nutHostId
realWidth = this.towerBasicInfo.tower.forearmLength
realHeight = this.towerBasicInfo.tower.towerHeight

47
src/views/projectAdmin/jlw/digitalSite/components/TowerDialog.vue
View File

@ -14,13 +14,18 @@
<div class="card">
<div class="card-title">驾驶员信息</div>
<div class="driver content">
<img src="" />
<div class="infos">
<div class="info-item">姓名：</div>
<div class="info-item">年龄：</div>
<div class="info-item">特种证书编号：</div>
<div class="info-item">证件：</div>
</div>
<vue-scroll>
<div class="driver-item" v-for="(driver, index) in drivers" :key="index">
<img v-if="driver.fieldAcquisitionUrl" :src="fileUrl + driver.fieldAcquisitionUrl" />
<img v-else src="@/assets/images/profile_photo.png" />
<div class="infos">
<div class="info-item">姓名：{{ driver.workerName }}</div>
<div class="info-item">年龄：{{ driver.age }}</div>
<div class="info-item">特种证书编号：{{ driver.certificateNumber }}</div>
<div class="info-item">证件：{{ driver.idCard }}</div>
</div>
</div>
</vue-scroll>
</div>
</div>
<div class="card">
@ -56,8 +61,8 @@
<script>
import AreaTree from '@/components/areaTree'
import VideoModule from '@/components/videoModule/videoModule'
import { getLifterCurrentDataApi, getSelectLifterBySnApi, getLifterAlarmApi } from '@/assets/js/api/lifter'
import { getTowerAlarmListApi } from '@/assets/js/api/towerCrane'
import { getLifterCurrentDataApi, getSelectLifterBySnApi } from '@/assets/js/api/lifter'
import { getTowerAlarmListApi, getSelectTowerBySnApi } from '@/assets/js/api/towerCrane'
import moment from 'moment'
export default {
components: { AreaTree, VideoModule },
@ -70,16 +75,19 @@ export default {
mounted() {
this.getEnvironmentInfo()
this.getDeviceInfo()
this.getDrivers()
this.getAlertInfo()
},
data() {
return {
projectSn: this.$store.state.projectSn,
fileUrl: this.$store.state.FILEURL,
videoList: [],
playList: [],
activeLiveData: { devSn: '' },
environmentInfo: {},
deviceInfo: {},
drivers: [],
alerts: []
}
},
@ -106,6 +114,13 @@ export default {
}
})
},
getDrivers() {
getSelectTowerBySnApi({ devSn: '555' }).then(res => {
if (res.code == 200) {
this.drivers = res.result.driverList
}
})
},
getAlertInfo() {
getTowerAlarmListApi({ devSn: 'A5FBF4B23B234DDF9553480DE4D26674', projectSn: this.projectSn }).then(res => {
this.alerts = res.result.records
@ -161,11 +176,15 @@ export default {
height: 100px;
}
&.driver {
display: flex;
img {
margin-right: 10px;
width: 100px;
height: 100px;
height: 120px;
.driver-item {
margin-bottom: 20px;
display: flex;
img {
margin-right: 10px;
width: 100px;
height: 100px;
}
}
}
&.alert {