From de86af61944d10020846cc65df1ed3568b699f34 Mon Sep 17 00:00:00 2001
From: Jack <1638169491@qq.com>
Date: Fri, 19 Aug 2022 17:16:38 +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=E6=A3=80=E6=B5=8B=E5=BC=B9=E6=A1=86=E5=A1=94?=
 =?UTF-8?q?=E5=90=8A=E8=BF=90=E8=A1=8C=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

---
 src/assets/js/http.js                         |   4 +-
 .../dataBoard/digitalSite/index.vue           | 113 ++++++------------
 .../digitalSite/components/TowerDialog.vue    |  36 +++++-
 3 files changed, 75 insertions(+), 78 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index fd863c2f..e4f58ee3 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -40,8 +40,8 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
   // tag: 本地
   // axios.defaults.baseURL = 'http://192.168.34.174:6023/'  // 老大本地
-//   axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
-    axios.defaults.baseURL = 'http://192.168.34.216:6023/'   // 邱平毅本地
+  axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
+  // axios.defaults.baseURL = 'http://192.168.34.216:6023/'   // 邱平毅本地
   // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
   // axios.defaults.baseURL = 'http://47.97.202.104:6023/';
   // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇
diff --git a/src/views/projectAdmin/dataBoard/digitalSite/index.vue b/src/views/projectAdmin/dataBoard/digitalSite/index.vue
index 26109173..e52f80cb 100644
--- a/src/views/projectAdmin/dataBoard/digitalSite/index.vue
+++ b/src/views/projectAdmin/dataBoard/digitalSite/index.vue
@@ -599,7 +599,31 @@
                       </div>
                     </div>
                   </div>
-                  <img src="@/assets/images/towericon/towerBG.png" ref="towerBG" v-if="company != 'longguang'" />
+                  <template v-if="company != 'longguang'">
+                    <img src="@/assets/images/towericon/towerBG.png" ref="towerBG" />
+                    <img
+                      src="@/assets/images/towericon/1.png"
+                      v-show="hideGoods"
+                      class="xMove"
+                      id="xMove"
+                      :style="{ top: '70px', left: coordData.coordX + 'px' }"
+                    />
+                    <img
+                      src="@/assets/images/towericon/line.png"
+                      class="lines"
+                      id="line"
+                      v-show="hideGoods"
+                      :style="{ left: coordData.coordX + 8 + 'px', height: coordData.lineLength + 'px', top: '78px' }"
+                    />
+                    <div
+                      class="moveBox"
+                      id="moveBox"
+                      v-show="hideGoods"
+                      :style="{ top: coordData.coordY + 'px', left: coordData.coordX - 6 + 'px' }"
+                    >
+                      <img src="@/assets/images/towericon/hock.png" />
+                    </div>
+                  </template>
                   <!-- 龙光样式 -->
                   <img
                     src="@/assets/images/towericon/towerBG2.png"
@@ -608,25 +632,6 @@
                     style="width: 496px; height: 484px"
                   />
 
-                  <img
-                    src="@/assets/images/towericon/1.png"
-                    v-show="hideGoods && company != 'longguang'"
-                    class="xMove"
-                    id="xMove"
-                    :style="{ top: '70px', left: coordData.coordX + 'px' }"
-                  />
-
-                  <img
-                    src="@/assets/images/towericon/line.png"
-                    class="lines"
-                    id="line"
-                    v-show="hideGoods && company != 'longguang'"
-                    :style="{
-                      left: coordData.coordX + 8 + 'px',
-                      height: coordData.lineLength + 'px',
-                      top: '78px'
-                    }"
-                  />
                   <!-- 龙光样式 -->
                   <img
                     src="@/assets/images/towericon/line2.png"
@@ -641,17 +646,6 @@
                     }"
                   />
 
-                  <div
-                    class="moveBox"
-                    id="moveBox"
-                    v-show="hideGoods && company != 'longguang'"
-                    :style="{
-                      top: coordData.coordY + 'px',
-                      left: coordData.coordX - 6 + 'px'
-                    }"
-                  >
-                    <img src="@/assets/images/towericon/hock.png" />
-                  </div>
                   <!-- 龙光样式 -->
                   <div
                     class="moveBox"
@@ -679,8 +673,7 @@
                     </p>
                   </div>
                 </div>
-                <div class="blockTitle blockTitle2" v-if="company == 'longguang'" :class="company == 'longguang' ? 'blockTitle3' : ''">
-                  <i v-if="company != 'longguang'"></i>
+                <div class="blockTitle blockTitle2 blockTitle3" v-if="company == 'longguang'">
                   <!-- 塔吊运行信息 -->
                   {{ $t('message.dataBoard.towerRunInfo') }}
                   <span class="tower-time">
@@ -705,8 +698,7 @@
                         {{ $t('message.dataBoard.forearmLong') + ':' + $t('message.dataBoard.forearmInfo') }}
                       </div>
                     </span>
-                    {{ (towerBasicInfo.tower || {}).forearmLength || '--' }}
-                    m
+                    {{ (towerBasicInfo.tower || {}).forearmLength || '--' }} m
                   </p>
                   <p>
                     <span>
@@ -723,8 +715,7 @@
                         <!-- 塔吊高：塔吊基础表面到吊钩下端的垂直距离。 -->
                       </div>
                     </span>
-                    {{ (towerBasicInfo.tower || {}).towerHeight || '--' }}
-                    m
+                    {{ (towerBasicInfo.tower || {}).towerHeight || '--' }} m
                   </p>
                   <p v-if="weightSet == 1">
                     <span>
@@ -743,11 +734,7 @@
                     </span>
                     {{ (towerCurrentInfo || {}).loading || '--' }} kg
                   </p>
-                  <p
-                    :class="{
-                      red: towerCurrentInfo.maxRangeAlarm != 0 || towerCurrentInfo.minRangeAlarm != 0
-                    }"
-                  >
+                  <p :class="{ red: towerCurrentInfo.maxRangeAlarm != 0 || towerCurrentInfo.minRangeAlarm != 0 }">
                     <span>
                       <i
                         @mouseenter="showTitle4 = true"
@@ -863,8 +850,7 @@
                           {{ $t('message.dataBoard.forearmLong') + ':' + $t('message.dataBoard.forearmInfo') }}
                         </div>
                       </span>
-                      {{ (towerBasicInfo.tower || {}).forearmLength || '--' }}
-                      m
+                      {{ (towerBasicInfo.tower || {}).forearmLength || '--' }}m
                     </p>
                     <p>
                       <span>
@@ -881,8 +867,7 @@
                           <!-- 塔吊高：塔吊基础表面到吊钩下端的垂直距离。 -->
                         </div>
                       </span>
-                      {{ (towerBasicInfo.tower || {}).towerHeight || '--' }}
-                      m
+                      {{ (towerBasicInfo.tower || {}).towerHeight || '--' }}m
                     </p>
                     <p v-if="weightSet == 1">
                       <span>
@@ -899,14 +884,9 @@
                           <!-- 载重：塔吊工作实时吊装重量 -->
                         </div>
                       </span>
-                      {{ (towerCurrentInfo || {}).loading || '--' }}
-                      kg
+                      {{ (towerCurrentInfo || {}).loading || '--' }}kg
                     </p>
-                    <p
-                      :class="{
-                        red: towerCurrentInfo.maxRangeAlarm != 0 || towerCurrentInfo.minRangeAlarm != 0
-                      }"
-                    >
+                    <p :class="{ red: towerCurrentInfo.maxRangeAlarm != 0 || towerCurrentInfo.minRangeAlarm != 0 }">
                       <span>
                         <i
                           @mouseenter="showTitle4 = true"
@@ -939,11 +919,7 @@
                       </span>
                       {{ (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"
@@ -2020,7 +1996,6 @@ import {
 } from '@/assets/js/api/towerCrane' //塔吊
 import { getSelectLifterBySnApi, getLifterCurrentDataApi, getSelectLifterWorkCycleListApi, getLifterAlarmApi } from '@/assets/js/api/lifter' //升降机
 import {
-  getGantryCranelistApi, //查询设备列表
   getGantryCraneBySnApi, //通过设备devsn(设备编号)查询设备详情
   getNewestGantryCraneCurrentDataApi //查询龙门吊设备最新一条实时数据
 } from '@/assets/js/api/gantryCrane' //龙门吊
@@ -2112,29 +2087,17 @@ export default {
         voltageA: '--',
         uploadTime: '--'
       },
-      electricBoxPos: {
-        x: 0,
-        y: 0
-      },
-      carBoxPos: {
-        x: 0,
-        y: 0
-      },
+      electricBoxPos: { x: 0, y: 0 },
+      carBoxPos: { x: 0, y: 0 },
       carList: [],
-      carDetail: {
-        name: ''
-      },
+      carDetail: { name: '' },
       electricDevDetail: { name: 'ddd', devSn: '' },
       showCarDialog: false,
       showCarDialog2: false,
       towerBasicInfo: {}, //塔吊基本信息,
       nutHostId: '', //螺母主机id
       towerCurrentInfo: {}, //塔吊实时信息
-      coordData: {
-        coordX: 0,
-        coordY: 0,
-        lineLength: 0
-      },
+      coordData: { coordX: 0, coordY: 0, lineLength: 0 },
       hideGoods: false,
       selectList: [], //视频数据源
       videoId: '',
diff --git a/src/views/projectAdmin/jlw/digitalSite/components/TowerDialog.vue b/src/views/projectAdmin/jlw/digitalSite/components/TowerDialog.vue
index 116933d0..c73132f9 100644
--- a/src/views/projectAdmin/jlw/digitalSite/components/TowerDialog.vue
+++ b/src/views/projectAdmin/jlw/digitalSite/components/TowerDialog.vue
@@ -57,7 +57,20 @@
         <div class="box"></div>
         <div class="circle"></div>
       </div>
-      <div class="right"></div>
+      <div class="right">
+        <div class="card">
+          <div class="card-title">
+            塔吊运行信息<span>当前上传时间：{{ tower.realTime || '--' }}</span>
+          </div>
+          <div class="tower content">
+            <div class="tower-item"><i class="el-icon-question"></i>前臂长：{{ tower.forearmLength || '--' }} m</div>
+            <div class="tower-item"><i class="el-icon-question"></i>塔吊高：{{ tower.towerHeight || '--' }} m</div>
+            <div class="tower-item"><i class="el-icon-question"></i>幅度：{{ tower.ranger || '--' }} m</div>
+            <div class="tower-item"><i class="el-icon-question"></i>高度：{{ tower.height || '--' }} m</div>
+            <div class="tower-item"><i class="el-icon-question"></i>角度：{{ tower.angle || '--' }} °</div>
+          </div>
+        </div>
+      </div>
     </div>
   </el-dialog>
 </template>
@@ -87,6 +100,7 @@ export default {
       fileUrl: this.$store.state.FILEURL,
       deviceInfo: {},
       drivers: [],
+      tower: [],
       alerts: []
     }
   },
@@ -102,6 +116,7 @@ export default {
       getSelectTowerBySnApi({ devSn: '555' }).then(res => {
         if (res.code == 200) {
           this.drivers = res.result.driverList
+          this.tower = res.result.tower
         }
       })
     },
@@ -196,6 +211,13 @@ export default {
           margin-right: 8px;
           background-color: #6ce9f0;
         }
+        span {
+          margin-right: 30px;
+          margin-left: auto;
+          font-size: 14px;
+          font-weight: normal;
+          color: #fff;
+        }
       }
       .content {
         padding-left: 14px;
@@ -234,6 +256,18 @@ export default {
             }
           }
         }
+        &.tower {
+          display: flex;
+          flex-wrap: wrap;
+          .tower-item {
+            margin-bottom: 20px;
+            width: 50%;
+            i {
+              margin-right: 6px;
+              color: #5ec6d0;
+            }
+          }
+        }
       }
     }
   }