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

fix: BUG修改

Browse Source
This commit is contained in:
cjp 2023-07-28 09:21:27 +08:00
parent a45eb31c20
commit 36db040b7d
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/companyFront/peopleManage/peopleManage.vue
View File

@ -463,7 +463,6 @@
> >
<el-option <el-option
:label=" :label="
$t('message.firmpeople.pleaseSelect') +
'7' + '7' +
$t('message.firmpeople.sky') $t('message.firmpeople.sky')
" "
@ -471,7 +470,6 @@
></el-option> ></el-option>
<el-option <el-option
:label=" :label="
$t('message.firmpeople.pleaseSelect') +
'14' + '14' +
$t('message.firmpeople.sky') $t('message.firmpeople.sky')
" "
@ -826,6 +824,7 @@ export default {
this.createdEcharts5(); this.createdEcharts5();
this.createdEcharts6(); this.createdEcharts6();
this.initMap(); this.initMap();
this.getWorkerDayCount();
} }
}); });
}, },

25
src/views/projectFront/towerCrane/antiCollision.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<!-- 防碰撞--> <!-- 防碰撞-->
<vue-scroll style="height: 100%"> <vue-scroll style="height: 100%">
<div class="alarmAnalysis" :class="{'white_bg': styleType == 1 || isDockingToWoer}" v-if="!showMore"> <div class="alarmAnalysis" :class="{'white_bg': styleType == 1 || isDockingToWoer}" v-show="!showMore">
<div class="alarmAnalysis_top flex"> <div class="alarmAnalysis_top flex">
<div class="towercrane_status"> <div class="towercrane_status">
<div class="alarmAnalysis_title"> <div class="alarmAnalysis_title">
@ -62,12 +62,12 @@
<img v-if="styleType == 2" src="./../../../assets/images/operationInfo/tower-crane3.png"> <img v-if="styleType == 2" src="./../../../assets/images/operationInfo/tower-crane3.png">
<img v-else src="./../../../assets/images/operationInfo/tower-crane3_w.png"/> <img v-else src="./../../../assets/images/operationInfo/tower-crane3_w.png"/>
<!-- 标准节数量 --> <!-- 标准节数量 -->
<span v-if="item.heightRatio" style="position: absolute;top: 50%;left: -50px;transform: translateY(-50%);">{{ $t('message.towerCrane.standardSectionNumber') }}:{{item.nodeCount?item.nodeCount:'0'}}</span> <span v-if="item.nodeCount" style="position: absolute;top: 50%;left: -50px;transform: translateY(-50%);">{{ $t('message.towerCrane.standardSectionNumber') }}:{{item.nodeCount?item.nodeCount:'0'}}</span>
<!-- 前臂长度 --> <!-- 前臂长度 -->
<span v-if="item.heightRatio" style="position: absolute;top: 30%;left: 50px;white-space:nowrap">{{ $t('message.towerCrane.forearmLength') }}:{{item.forearmLength?item.forearmLength:'0'}}</span> <span v-if="item.forearmLength" style="position: absolute;top: 30%;left: 50px;white-space:nowrap">{{ $t('message.towerCrane.forearmLength') }}:{{item.forearmLength?item.forearmLength:'0'}}</span>
<!-- <i style="height: 30%"></i> --> <!-- <i style="height: 30%"></i> -->
<div style="width: 100%;height:100%; z-index: 2; position: absolute; top: 0; left: 0;"></div> <div style="width: 100%;height:100%; z-index: 2; position: absolute; top: 0; left: 0;"></div>
<span v-if="item.heightRatio" style="position: absolute;top:100%;left: 20px;white-space:nowrap;line-height:30px;color:#2A2E3F">{{item.devName?item.devName:''}}</span> <span v-if="item.devName" style="position: absolute;top:100%;left: 20px;white-space:nowrap;line-height:30px;color:#2A2E3F">{{item.devName?item.devName:''}}</span>
</div> </div>
</div> </div>
<div class="icon_land" :style="{'height': '10%'}"> <div class="icon_land" :style="{'height': '10%'}">
@ -124,7 +124,7 @@
:class="{'active_crash': selectIndex == 0,selectShow:selectCollideAlarmListShow === index || selectCollideAlarmListShow2 === index}" :class="{'active_crash': selectIndex == 0,selectShow:selectCollideAlarmListShow === index || selectCollideAlarmListShow2 === index}"
@click="checkCrashItem(item, index)"> @click="checkCrashItem(item, index)">
<!-- 设备名称 --> <!-- 设备名称 -->
<h4>{{ $t('message.towerCrane.equipmentName') }}：{{item.devName ? item.devName : 0}}</h4> <h4 v-if="item.devName">{{ $t('message.towerCrane.equipmentName') }}：{{item.devName ? item.devName : 0}}</h4>
<h4>{{item.alarmType}}</h4> <h4>{{item.alarmType}}</h4>
<p>{{item.alarmTime}}</p> <p>{{item.alarmTime}}</p>
<!-- 报警类型:防碰撞报警 --> <!-- 报警类型:防碰撞报警 -->
@ -151,7 +151,7 @@
<h3>{{ $t('message.towerCrane.alarmDetails') }}</h3> <h3>{{ $t('message.towerCrane.alarmDetails') }}</h3>
<div class="crash_info_box flex" v-if="towerDetail1.forearmLength"> <div class="crash_info_box flex" v-if="towerDetail1.forearmLength">
<div class="crash_info_item"> <div class="crash_info_item">
<h4>{{towerDetail1.devName}}</h4> <h4 v-if="towerDetail1.devName">{{towerDetail1.devName}}</h4>
<div class="crash_info_card flex"> <div class="crash_info_card flex">
<div class="info_item b-right"> <div class="info_item b-right">
<p>{{towerDetail1.forearmLength ? towerDetail1.forearmLength : 0}}m</p> <p>{{towerDetail1.forearmLength ? towerDetail1.forearmLength : 0}}m</p>
@ -184,7 +184,7 @@
</div> </div>
</div> </div>
<div class="crash_info_item"> <div class="crash_info_item">
<h4>{{towerDetail2.devName}}</h4> <h4 v-if="towerDetail2.devName">{{towerDetail2.devName}}</h4>
<div class="crash_info_card flex"> <div class="crash_info_card flex">
<div class="info_item b-right"> <div class="info_item b-right">
<p>{{towerDetail2.forearmLength ? towerDetail2.forearmLength : 0}}m</p> <p>{{towerDetail2.forearmLength ? towerDetail2.forearmLength : 0}}m</p>
@ -264,7 +264,7 @@
</div> </div>
</div> </div>
</div> </div>
<div style="height: 100%" v-else> <div style="height: 100%" v-show="showMore">
<!-- 塔吊场布情况 --> <!-- 塔吊场布情况 -->
<el-page-header <el-page-header
style="padding-bottom: 10px" style="padding-bottom: 10px"
@ -364,11 +364,12 @@
clearTimeout(this.timer) clearTimeout(this.timer)
this.showMore = true this.showMore = true
}, },
goBack(){ async goBack(){
await this.selectTowerAlarmAndDevCount();
await this.selectCollideAlarmList();
await this.selectTowerHeight();
this.showMore = false; this.showMore = false;
this.selectTowerAlarmAndDevCount(); console.log('返回')
this.selectCollideAlarmList();
this.selectTowerHeight();
}, },
// 获取塔群高度 // 获取塔群高度
selectTowerHeight(){ selectTowerHeight(){

2
src/views/projectFront/towerCrane/home.vue
View File

@ -401,7 +401,7 @@
_this.towerCraneDetails = true _this.towerCraneDetails = true
_this.towerCraneInfo = item _this.towerCraneInfo = item
_this.devName = item.devName _this.devName = item.devName
console.log(item,index) console.log('塔吊信息',item,index)
}) })
item.g.addClass("rotate") item.g.addClass("rotate")