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 @@ - + - - - -
- -
-
- +
{{ $t('message.dataBoard.towerRunInfo') }} @@ -705,8 +698,7 @@ {{ $t('message.dataBoard.forearmLong') + ':' + $t('message.dataBoard.forearmInfo') }}
- {{ (towerBasicInfo.tower || {}).forearmLength || '--' }} - m + {{ (towerBasicInfo.tower || {}).forearmLength || '--' }} m

@@ -723,8 +715,7 @@

- {{ (towerBasicInfo.tower || {}).towerHeight || '--' }} - m + {{ (towerBasicInfo.tower || {}).towerHeight || '--' }} m

@@ -743,11 +734,7 @@ {{ (towerCurrentInfo || {}).loading || '--' }} kg

-

+

- {{ (towerBasicInfo.tower || {}).forearmLength || '--' }} - m + {{ (towerBasicInfo.tower || {}).forearmLength || '--' }}m

@@ -881,8 +867,7 @@ - {{ (towerBasicInfo.tower || {}).towerHeight || '--' }} - m + {{ (towerBasicInfo.tower || {}).towerHeight || '--' }}m

@@ -899,14 +884,9 @@ - {{ (towerCurrentInfo || {}).loading || '--' }} - kg + {{ (towerCurrentInfo || {}).loading || '--' }}kg

-

+

{{ (towerCurrentInfo || {}).height || '--' }} m

-

+

-
+
+
+
+ 塔吊运行信息当前上传时间:{{ tower.realTime || '--' }} +
+
+
前臂长:{{ tower.forearmLength || '--' }} m
+
塔吊高:{{ tower.towerHeight || '--' }} m
+
幅度:{{ tower.ranger || '--' }} m
+
高度:{{ tower.height || '--' }} m
+
角度:{{ tower.angle || '--' }} °
+
+
+
@@ -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; + } + } + } } } }