@@ -306,12 +306,8 @@ export default {
keyword2: "",
//保存抽检树形数据
teamTreeData: [],
- //间隔时间
- intervalTime: 1,
-
- //验证对话框单选按钮
- provingTypeRadioValue: "1",
- provingTimeValue: [''],
+ // 查看班组施工定位前，是否选中了班组
+ checkTeamId: null
};
},
created() {
@@ -343,7 +339,11 @@ export default {
this.treeData = treeData
// 设置默认展示杆塔层级
treeData.forEach(item => {
- this.idArr.push(item.id);
+ const children = item.children;
+ children.forEach(child => {
+ // 设置默认展示杆塔层级
+ this.idArr.push(child.id);
+ })
})
}
}).catch(res => {
@@ -353,7 +353,7 @@ export default {
/* 人员树过滤 */
filterNode(value, data, node) {
if (!value) {
- if (node.level == 1) {
+ if (node.level == 1 || node.level == 2) {
node.expanded = true
} else {
node.expanded = false
@@ -411,7 +411,7 @@ export default {
const teamTreeData = res.data;
if (teamTreeData && teamTreeData.length > 0) {
this.teamTreeData = teamTreeData
- // 设置默认展示杆塔层级
+ // 设置默认展示班组层级
teamTreeData.forEach(item => {
this.idArr2.push(item.id);
})
@@ -495,7 +495,7 @@ export default {
this.dialogVisible2 = false
},
// 获取班组下的人员定位及杆塔坐标
- loadPersonsInfo(params) {
+ loadPersonsInfo(params, personData) {
getPersonsInfo(params).then((res) => {
const data = res.data;
if (data) {
@@ -524,6 +524,9 @@ export default {
this.addPersonMarker(item);
}
}
+ if (personData) {
+ this.clickMarker(personData);
+ }
}
}
}).catch((res) => { })
@@ -610,13 +613,26 @@ export default {
'id': towerId,
'teamId': teamId
}
- this.loadPersonsInfo(obj);
+ this.checkTeamId = teamId;
+ this.loadPersonsInfo(obj, null);
} else if (node.level === 4) {
this.isTower = false;
this.isTeam = false;
this.isPerson = true;
- // 选中班组人员 触发事件
- this.clickMarker(data);
+ const teamId = parseInt(data.parentId.replace('team-', ''));
+ const towerId = data.gtId;
+ if (!this.checkTeamId || this.checkTeamId !== teamId) {
+ this.removeOverlay();
+ const obj = {
+ 'id': towerId,
+ 'teamId': teamId
+ }
+ this.checkTeamId = teamId;
+ this.loadPersonsInfo(obj, data);
+ } else {
+ // 选中班组人员 触发事件
+ this.clickMarker(data);
+ }
} else {
this.isTower = false;
this.isTeam = false;
@@ -711,7 +727,7 @@ export default {
'id': this.id,
'teamId': this.teamId
}
- this.loadPersonsInfo(obj);
+ this.loadPersonsInfo(obj, null);
},
// 获取人员运动轨迹
loadGj() {
@@ -900,7 +916,7 @@ export default {
.personManage .left {
- width: 20%;
+ width: 22%;
height: 100%;
padding: 0 0.5%;
box-sizing: border-box;
@@ -913,7 +929,7 @@ export default {
}
.personManage .center {
- width: 58%;
+ width: 54%;
height: 100%;
}
@@ -931,7 +947,7 @@ export default {
}
.personManage .right {
- width: 20%;
+ width: 22%;
height: 100%;
}
diff --git a/src/views/construction/manage/realTimeManage/realTimeManage.vue b/src/views/construction/manage/realTimeManage/realTimeManage.vue
index e67511f..1d37a32 100644
--- a/src/views/construction/manage/realTimeManage/realTimeManage.vue
+++ b/src/views/construction/manage/realTimeManage/realTimeManage.vue
@@ -106,7 +106,7 @@
预警信息
-
+
-
@@ -118,6 +118,7 @@
加载中...
+
@@ -159,6 +160,7 @@ export default {
//预警滚动是否有数据
isHasData: true,
busy: true,
+ isShow3:true,
// 窗口数量
boxNum: 1,//1窗口或4窗口
boxIndex:1,//视频下标
@@ -238,6 +240,9 @@ export default {
})
} else {
this.isHasData = false;
+ if(this.queryParams.pageNum === 1){
+ this.isShow3 = false;
+ }
}
this.loading = false;
this.busy = false;
@@ -735,6 +740,8 @@ export default {
ul {
padding-inline-start: 0;
+ margin-block-start: 0;
+ margin-block-end: 0;
}
.infinite-list-wrapper {