diff --git a/src/views/projectAdmin/dataBoard/digitalSite/index.vue b/src/views/projectAdmin/dataBoard/digitalSite/index.vue index 676927e0..26109173 100644 --- a/src/views/projectAdmin/dataBoard/digitalSite/index.vue +++ b/src/views/projectAdmin/dataBoard/digitalSite/index.vue @@ -426,8 +426,7 @@ {{ company == 'longguang' ? $t('message.dataBoard.towerPlayer') : $t('message.dataBoard.driverInfo') }} - - +
- {{ $t('message.dataBoard.nowUpdateTime') + ':' - }}{{ towerBasicInfo.tower && towerBasicInfo.tower.realTime ? towerBasicInfo.tower.realTime : '--' }} + {{ $t('message.dataBoard.nowUpdateTime') + ':' }}{{ ((towerBasicInfo || {}).tower || {}).realTime || '--' }}
@@ -845,8 +843,7 @@ {{ $t('message.dataBoard.towerRunInfo') }} - {{ $t('message.dataBoard.nowUpdateTime') + ':' - }}{{ towerBasicInfo.tower && towerBasicInfo.tower.realTime ? towerBasicInfo.tower.realTime : '--' }} + {{ $t('message.dataBoard.nowUpdateTime') + ':' }}{{ ((towerBasicInfo || {}).tower || {}).realTime || '--' }}
@@ -1055,7 +1052,7 @@ {{ $t('message.dataBoard.alarmInfo') }}
- +

@@ -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 diff --git a/src/views/projectAdmin/jlw/digitalSite/components/TowerDialog.vue b/src/views/projectAdmin/jlw/digitalSite/components/TowerDialog.vue index 13e72536..3dfc0420 100644 --- a/src/views/projectAdmin/jlw/digitalSite/components/TowerDialog.vue +++ b/src/views/projectAdmin/jlw/digitalSite/components/TowerDialog.vue @@ -14,13 +14,18 @@

驾驶员信息
- -
-
姓名:
-
年龄:
-
特种证书编号:
-
证件:
-
+ +
+ + +
+
姓名:{{ driver.workerName }}
+
年龄:{{ driver.age }}
+
特种证书编号:{{ driver.certificateNumber }}
+
证件:{{ driver.idCard }}
+
+
+
@@ -56,8 +61,8 @@