From 5e9863d2cf2c74c40c77e42e1a937ddb25bb298a Mon Sep 17 00:00:00 2001
From: Jack <1638169491@qq.com>
Date: Fri, 19 Aug 2022 14:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E5=B7=A5=E5=9C=B0)=EF=BC=9A=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=A1=94=E5=90=8A=E5=BC=B9=E6=A1=86=E9=A9=BE=E9=A9=B6=E5=91=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataBoard/digitalSite/index.vue           | 20 +++-----
 .../digitalSite/components/TowerDialog.vue    | 47 +++++++++++++------
 2 files changed, 39 insertions(+), 28 deletions(-)

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') }}
                   </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
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 @@
         <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 {