From 4367edeb081c83fd327cd51aeb83614dab68fd27 Mon Sep 17 00:00:00 2001
From: Jack <1638169491@qq.com>
Date: Fri, 19 Aug 2022 11:48:35 +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=E8=AE=BE=E5=A4=87=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataBoard/digitalSite/index.vue           | 111 ++++++------------
 .../digitalSite/components/TowerDialog.vue    |  27 ++++-
 2 files changed, 60 insertions(+), 78 deletions(-)

diff --git a/src/views/projectAdmin/dataBoard/digitalSite/index.vue b/src/views/projectAdmin/dataBoard/digitalSite/index.vue
index ae66e4a0..68acf2b6 100644
--- a/src/views/projectAdmin/dataBoard/digitalSite/index.vue
+++ b/src/views/projectAdmin/dataBoard/digitalSite/index.vue
@@ -391,34 +391,33 @@
                 <div class="dialogBlockContent">
                   <div class="blockTitle blockTitle2" :class="company == 'longguang' ? 'blockTitle3' : ''">
                     <i v-if="company != 'longguang'"></i>
-                    <!-- 设备信息 -->
-                    {{ $t('message.dataBoard.devInfo') }}
+                    <!-- 设备信息 -->{{ $t('message.dataBoard.devInfo') }}
                   </div>
                   <div class="deviceInfo">
                     <!-- 设备名称： -->
                     <p>
                       {{ $t('message.dataBoard.devName2') + ':' }}
-                      {{ towerBasicInfo.tower ? towerBasicInfo.tower.devName : '--' }}
+                      {{ (towerBasicInfo.tower || {}).devName || '--' }}
                     </p>
                     <!-- 设备编号： -->
                     <p>
                       {{ $t('message.dataBoard.devCode') + ':' }}
-                      {{ towerBasicInfo.tower ? towerBasicInfo.tower.devSn : '--' }}
+                      {{ (towerBasicInfo.tower || {}).devSn || '--' }}
                     </p>
                     <!-- 设备备案号： -->
                     <p>
                       {{ $t('message.dataBoard.devAQ') + ':' }}
-                      {{ towerBasicInfo.tower ? towerBasicInfo.tower.registNo : '--' }}
+                      {{ (towerBasicInfo.tower || {}).registNo || '--' }}
                     </p>
                     <!-- 生产厂家： -->
                     <p>
                       {{ $t('message.dataBoard.manufacturer') + ':' }}
-                      {{ towerBasicInfo.tower ? towerBasicInfo.tower.factoryName : '--' }}
+                      {{ (towerBasicInfo.tower || {}).factoryName || '--' }}
                     </p>
                     <p v-if="company == 'longguang'">
                       <!-- 总包单位： -->
                       {{ $t('message.dataBoard.mainContractor') + ':' }}
-                      {{ towerBasicInfo.tower ? towerBasicInfo.tower.generalContractorsName : '--' }}
+                      {{ (towerBasicInfo.tower || {}).generalContractorsName || '--' }}
                     </p>
                   </div>
                   <!-- '塔吊操作人员':'驾驶员信息' -->
@@ -429,12 +428,7 @@
                   <!-- 驾驶员信息 -->
                   <vue-scroll v-if="towerBasicInfoDriverList.length > 0" style="height: 130px; margin-bottom: 10px">
                     <!--                    driverIdCard，idCard-->
-                    <div
-                      class="driverInfo"
-                      v-for="(item, index) in towerBasicInfo.driverList"
-                      v-if="company == 'longguang' || item.idCard == towerCurrentInfo.driverIdCard"
-                      :key="index"
-                    >
+                    <div class="driverInfo" v-for="(item, index) in towerBasicInfo.driverList" :key="index">
                       <img
                         @click="openImg(fileUrl + item.fieldAcquisitionUrl)"
                         v-if="item.fieldAcquisitionUrl"
@@ -551,11 +545,7 @@
                     <div class="boltDetailsRight">
                       <div class="boltDetailsRight_top">
                         <div class="boltDetailsRight_top_item">
-                          <p
-                            :class="{
-                              alarmNumber: afterAnalysisDataInfo.alarmNum > 0
-                            }"
-                          >
+                          <p :class="{ alarmNumber: afterAnalysisDataInfo.alarmNum > 0 }">
                             {{ afterAnalysisDataInfo.alarmNum }}
                           </p>
                           <p class="itemTitle">
@@ -581,12 +571,7 @@
                       <div class="boltDetailsRight_bottom">
                         <vue-scroll style="width: 100%; height: 130px">
                           <div class="bottom_list">
-                            <div
-                              v-for="(item, index) in afterAnalysisDataInfo.list"
-                              v-if="item.alarm == 1 || item.offLine == 1"
-                              :key="index"
-                              class="listItem"
-                            >
+                            <div v-for="(item, index) in afterAnalysisDataInfo.list" :key="index" class="listItem">
                               <!-- 螺栓监测-螺栓 -->
                               <div class="listItemName">
                                 {{ $t('message.dataBoard.boltMonitoring') + '-' + $t('message.dataBoard.bolt') }}{{ item.nutNo }}
@@ -688,7 +673,7 @@
                     <p
                       id="arrow"
                       :style="{
-                        transform: `rotate(${towerCurrentInfo ? towerCurrentInfo.angle : ''}deg)`
+                        transform: `rotate(${(towerCurrentInfo || {}).angle || ''}deg)`
                       }"
                     >
                       <span></span>
@@ -723,7 +708,7 @@
                         {{ $t('message.dataBoard.forearmLong') + ':' + $t('message.dataBoard.forearmInfo') }}
                       </div>
                     </span>
-                    {{ towerBasicInfo.tower ? towerBasicInfo.tower.forearmLength : '--' }}
+                    {{ (towerBasicInfo.tower || {}).forearmLength || '--' }}
                     m
                   </p>
                   <p>
@@ -741,7 +726,7 @@
                         <!-- 塔吊高：塔吊基础表面到吊钩下端的垂直距离。 -->
                       </div>
                     </span>
-                    {{ towerBasicInfo.tower ? towerBasicInfo.tower.towerHeight : '--' }}
+                    {{ (towerBasicInfo.tower || {}).towerHeight || '--' }}
                     m
                   </p>
                   <p v-if="weightSet == 1">
@@ -759,7 +744,7 @@
                         <!-- 载重：塔吊工作实时吊装重量 -->
                       </div>
                     </span>
-                    {{ towerCurrentInfo ? towerCurrentInfo.loading : '--' }} kg
+                    {{ (towerCurrentInfo || {}).loading || '--' }} kg
                   </p>
                   <p
                     :class="{
@@ -780,7 +765,7 @@
                         <!-- 幅度：塔吊的回转中心到吊钩之间的水平距离 -->
                       </div>
                     </span>
-                    {{ towerCurrentInfo ? towerCurrentInfo.ranger : '--' }} m
+                    {{ (towerCurrentInfo || {}).ranger || '--' }} m
                   </p>
                   <p :class="{ red: towerCurrentInfo.heightAlarm != 0 }" style="white-space: nowrap">
                     <!-- '吊钩与大臂的垂直距离' -->
@@ -798,13 +783,9 @@
                         <!-- 高度：吊钩与大臂的垂直距离 -->
                       </div>
                     </span>
-                    {{ towerCurrentInfo ? towerCurrentInfo.height : '--' }} m
+                    {{ (towerCurrentInfo || {}).height || '--' }} m
                   </p>
-                  <p
-                    :class="{
-                      red: towerCurrentInfo.obliguityXAlarm != 0 || towerCurrentInfo.obliguityYAlarm != 0
-                    }"
-                  >
+                  <p :class="{ red: towerCurrentInfo.obliguityXAlarm != 0 || towerCurrentInfo.obliguityYAlarm != 0 }">
                     <span>
                       <i
                         @mouseenter="showTitle6 = true"
@@ -819,7 +800,7 @@
                         <!-- 角度：塔吊大臂正北方的相对于水平夹角 -->
                       </div>
                     </span>
-                    {{ towerCurrentInfo ? towerCurrentInfo.angle : '--' }} °
+                    {{ (towerCurrentInfo || {}).angle || '--' }} °
                   </p>
                   <p v-if="weightSet == 1" :class="{ red: towerCurrentInfo.momentAlarm != 0 }">
                     <span>
@@ -836,8 +817,7 @@
                         <!-- 力矩比：起重机的起重能力。是指起重量载荷与相应工作幅度的乘积 -->
                       </div>
                     </span>
-                    {{ towerCurrentInfo ? towerCurrentInfo.torqueRatio : '--' }}
-                    %
+                    {{ (towerCurrentInfo || {}).torqueRatio || '--' }}%
                   </p>
                   <p v-if="weightSet == 1">
                     <span>
@@ -854,7 +834,7 @@
                         <!-- 载重比：塔吊吊装的物体重量与此时小车幅度对应最大起重量的百分比 -->
                       </div>
                     </span>
-                    {{ towerCurrentInfo ? towerCurrentInfo.loadRatio : '--' }}%
+                    {{ (towerCurrentInfo || {}).loadRatio || '--' }}%
                   </p>
                 </div>
               </div>
@@ -887,7 +867,7 @@
                           {{ $t('message.dataBoard.forearmLong') + ':' + $t('message.dataBoard.forearmInfo') }}
                         </div>
                       </span>
-                      {{ towerBasicInfo.tower ? towerBasicInfo.tower.forearmLength : '--' }}
+                      {{ (towerBasicInfo.tower || {}).forearmLength || '--' }}
                       m
                     </p>
                     <p>
@@ -905,7 +885,7 @@
                           <!-- 塔吊高：塔吊基础表面到吊钩下端的垂直距离。 -->
                         </div>
                       </span>
-                      {{ towerBasicInfo.tower ? towerBasicInfo.tower.towerHeight : '--' }}
+                      {{ (towerBasicInfo.tower || {}).towerHeight || '--' }}
                       m
                     </p>
                     <p v-if="weightSet == 1">
@@ -923,7 +903,7 @@
                           <!-- 载重：塔吊工作实时吊装重量 -->
                         </div>
                       </span>
-                      {{ towerCurrentInfo ? towerCurrentInfo.loading : '--' }}
+                      {{ (towerCurrentInfo || {}).loading || '--' }}
                       kg
                     </p>
                     <p
@@ -945,7 +925,7 @@
                           <!-- 幅度：塔吊的回转中心到吊钩之间的水平距离 -->
                         </div>
                       </span>
-                      {{ towerCurrentInfo ? towerCurrentInfo.ranger : '--' }} m
+                      {{ (towerCurrentInfo || {}).ranger || '--' }} m
                     </p>
                     <p :class="{ red: towerCurrentInfo.heightAlarm != 0 }" style="white-space: nowrap">
                       <span>
@@ -961,7 +941,7 @@
                           <!-- 高度：吊钩与大臂的垂直距离 -->
                         </div>
                       </span>
-                      {{ towerCurrentInfo ? towerCurrentInfo.height : '--' }} m
+                      {{ (towerCurrentInfo || {}).height || '--' }} m
                     </p>
                     <p
                       :class="{
@@ -982,7 +962,7 @@
                           <!-- 角度：塔吊大臂正北方的相对于水平夹角 -->
                         </div>
                       </span>
-                      {{ towerCurrentInfo ? towerCurrentInfo.angle : '--' }} °
+                      {{ (towerCurrentInfo || {}).angle || '--' }} °
                     </p>
                     <p v-if="weightSet == 1" :class="{ red: towerCurrentInfo.momentAlarm != 0 }">
                       <span>
@@ -999,7 +979,7 @@
                           <!-- 力矩比：起重机的起重能力。是指起重量载荷与相应工作幅度的乘积 -->
                         </div>
                       </span>
-                      {{ towerCurrentInfo ? towerCurrentInfo.torqueRatio : '--' }}
+                      {{ (towerCurrentInfo || {}).torqueRatio || '--' }}
                       %
                     </p>
                     <p v-if="weightSet == 1">
@@ -1017,18 +997,11 @@
                           <!-- 载重比：塔吊吊装的物体重量与此时小车幅度对应最大起重量的百分比 -->
                         </div>
                       </span>
-                      {{ towerCurrentInfo ? towerCurrentInfo.loadRatio : '--' }}%
+                      {{ (towerCurrentInfo || {}).loadRatio || '--' }}%
                     </p>
                   </div>
                   <div>
-                    <div
-                      style="
-                        margin-bottom: 15px;
-                        display: flex;
-                        justify-content: space-between;
-                        align-items: center;
-                      "
-                    >
+                    <div style="margin-bottom: 15px;display: flex;justify-content: space-between;align-items: center;">
                       <div class="blockTitle blockTitle2" :class="company == 'longguang' ? 'blockTitle3' : ''">
                         <i v-if="company != 'longguang'"></i>
                         <!-- 塔吊视频 -->
@@ -1067,15 +1040,10 @@
                       ></videoModule>
                     </div>
                   </div>
-                  <div
-                    class="dialogDataBox2"
-                    :style="{
-                      'margin-top': company == 'longguang' ? '24px' : '100px'
-                    }"
-                  >
+                  <div class="dialogDataBox2" :style="{ 'margin-top': company == 'longguang' ? '24px' : '100px' }">
                     <p>
-                      <span>{{ countDown }}</span
-                      >s
+                      <span>{{ countDown }}</span>
+                      s
                     </p>
                     <p>
                       <!-- 倒计时刷新 -->
@@ -1364,22 +1332,13 @@
                         <vue-scroll style="width: 100%; height: 236px">
                           <template v-if="company == 'longguang' || item.idCard == lifterCurrentData.driverIdCard">
                             <div v-for="(item, index) in lifterInfo.driverList" :key="index" style="margin: 5px 0">
-                              <div
-                                class="deviceInfo"
-                                style="display: inline-block; width: 50%; vertical-align: middle;"
-                              >
-                                <p>
-                                  <!-- 姓名： -->{{ $t('message.dataBoard.name') + ':' }}{{ item.workerName }}
-                                </p>
-                                <p>
-                                  <!-- 年龄： -->{{ $t('message.dataBoard.age') + ':' }}{{ item.age }}
-                                </p>
+                              <div class="deviceInfo" style="display: inline-block; width: 50%; vertical-align: middle;">
+                                <p><!-- 姓名： -->{{ $t('message.dataBoard.name') + ':' }}{{ item.workerName }}</p>
+                                <p><!-- 年龄： -->{{ $t('message.dataBoard.age') + ':' }}{{ item.age }}</p>
                                 <p>
                                   <!-- 特种证书编号： -->{{ $t('message.dataBoard.certificateNumber') + ':' }}{{ item.certificateNumber }}
                                 </p>
-                                <p>
-                                  <!-- 上岗时间： -->{{ $t('message.dataBoard.workTime') + ':' }}{{ item.enterDate }}
-                                </p>
+                                <p><!-- 上岗时间： -->{{ $t('message.dataBoard.workTime') + ':' }}{{ item.enterDate }}</p>
                               </div>
                               <img
                                 width="80"
diff --git a/src/views/projectAdmin/jlw/digitalSite/components/TowerDialog.vue b/src/views/projectAdmin/jlw/digitalSite/components/TowerDialog.vue
index 5e405469..8b68ac4b 100644
--- a/src/views/projectAdmin/jlw/digitalSite/components/TowerDialog.vue
+++ b/src/views/projectAdmin/jlw/digitalSite/components/TowerDialog.vue
@@ -1,6 +1,20 @@
 <template>
   <el-dialog title="塔吊监测" :visible="true" :modal-append-to-body="false" width="95%" top="0vh" class="elevatorDialog" @close="close">
-    <div class="dllm"></div>
+    <div class="dllm">
+      <div class="left">
+        <div class="card">
+          <div class="card-title">设备信息</div>
+          <div class="device">
+            <div class="info-item">设备名称：</div>
+            <div class="info-item">设备编号：</div>
+            <div class="info-item">设备备案号：</div>
+            <div class="info-item">生产厂家：</div>
+          </div>
+        </div>
+      </div>
+      <div class="center"></div>
+      <div class="right"></div>
+    </div>
   </el-dialog>
 </template>
 
@@ -81,7 +95,9 @@ export default {
     background-size: 100% 100%;
     z-index: 3;
     display: flex;
-    flex-direction: column;
+    .left {
+      width: 440px;
+    }
     .card {
       .card-title {
         margin-bottom: 20px;
@@ -99,6 +115,13 @@ export default {
           background-color: #6ce9f0;
         }
       }
+      .device {
+        padding-left: 14px;
+        height: 100px;
+        .info-item {
+          margin-bottom: 10px;
+        }
+      }
     }
   }
 }