admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

湖里大屏(数字工地)：完成塔吊检测弹框塔吊运行信息联调

Browse Source
This commit is contained in:
Jack 2022-08-19 17:16:38 +08:00
parent bd2c6e338b
commit de86af6194
3 changed files with 75 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/js/http.js
View File

@ -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/'; // 星璇

113
src/views/projectAdmin/dataBoard/digitalSite/index.vue
View File

@ -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: '',

36
src/views/projectAdmin/jlw/digitalSite/components/TowerDialog.vue
View File

@ -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;
}
}
}
}
}
}