+
![]()
-
+
{{ item.proName }}
班组：{{ item.teamName }}
班组长：{{ item.teamLeader }}-{{ item.leaderPhone }}
@@ -25,7 +25,7 @@
- ![]()
+ ![]()
@@ -59,7 +59,7 @@
-
+ infinite-scroll-distance="0">
-
{{ item.devName }}
{{ item.warnTime }}
@@ -184,6 +184,8 @@ export default {
pageNum: 0,
pageSize: 10
},
+ // 预警信息定时刷新
+ intervalId: null
};
},
created() {
@@ -195,8 +197,34 @@ export default {
this.$refs.iframePage.src = this.htmlContent;
this.busy = false;
})
+ this.startRefresh();
+ },
+ destroyed() {
+ this.stopRefresh();
},
methods: {
+ startRefresh() {
+ // 每分钟刷新一次
+ this.intervalId = setInterval(this.refreshData, 1000 * 30 * 1);
+ },
+ stopRefresh() {
+ if (this.intervalId) {
+ clearInterval(this.intervalId);
+ this.intervalId = null;
+ }
+ },
+ refreshData() {
+ alert('刷新了');
+ // 预警信息定时刷新
+ this.tableData.splice(0);
+ this.queryParams.pageNum = 0;
+ this.isHasData = true;
+ this.loadWarnInfoData();
+ // 吊装设备定时刷新
+ this.devArr.splice(0);
+ this.isShow = false;
+ this.laodDzWarnList();
+ },
/* 吊装设备点击赋值 */
getStyle(item) {
if (item.status === "check") {
@@ -208,11 +236,17 @@ export default {
}
},
/* 向吊装视频传递参数 */
- sendParams(devCode, index) {
+ sendParams(devCode, warnPosition, index) {
this.devArr.forEach(item => {
item.status = 'nocheck'
})
this.devArr[index].status = 'check'
+ // 设置吊装预警设备动图
+ if (warnPosition) {
+ this.dz_dev_warn_img = require('../../../../assets/gif/'+warnPosition+'.gif');
+ } else {
+ this.dz_dev_warn_img = dz_dev_warn_img;
+ }
// 刷新dom
this.$forceUpdate();
this.$refs.iframePage.contentWindow.postMessage({ devCode: devCode }, '*');
@@ -262,8 +296,8 @@ export default {
})
} else {
this.isHasData = false;
- if(this.queryParams.pageNum === 1){
- this.isShow3 = false;
+ if (this.queryParams.pageNum === 1) {
+ this.isShow3 = false;
}
}
this.loading = false;
diff --git a/src/views/construction/manage/personManage/personManage.vue b/src/views/construction/manage/personManage/personManage.vue
index f07a572..a521608 100644
--- a/src/views/construction/manage/personManage/personManage.vue
+++ b/src/views/construction/manage/personManage/personManage.vue
@@ -313,6 +313,12 @@ export default {
created() {
this.getPersonsTree();
},
+ mounted(){
+ alert('页面初始化完成');
+ },
+ destroyed(){
+ alert('页面销毁了');
+ },
methods: {
// 当前日期
getTodayDate() {
@@ -352,14 +358,14 @@ export default {
},
/* 人员树过滤 */
filterNode(value, data, node) {
- if (!value) {
+ /* if (!value) {
if (node.level == 1 || node.level == 2) {
node.expanded = true
} else {
node.expanded = false
}
return true
- }
+ } */
// 查询列表是否有匹配数据
let val = value.toLowerCase()
return this.chooseNode(val, data, node)
@@ -760,8 +766,12 @@ export default {
},
//给人员树不同层级设置不同的icon
renderContent(h, { node, data }) {
+ let isTeamLeader = data.isTeamLeader, type = data.type,isWarn = data.isWarn,style = '';
+ if(isWarn === 1){
+ style = 'warnColor'
+ }
// 根据层级使用不同的图标
- let icon, span = {node.label}, isTeamLeader = data.isTeamLeader, type = data.type;
+ let icon, span = {node.label};
if (node.level === 1) {
icon = 'pro_icon';
} else if (node.level === 2) {
@@ -770,10 +780,13 @@ export default {
icon = 'team_nocheck_icon';
} else if (node.level === 4 && isTeamLeader === 1) {
icon = '';
- span = {node.label}
班组长 ; + span = {node.label}班组长 ; } else if (node.level === 4 && type === 1) { icon = ''; - span = {node.label}临时人员 ; + span = {node.label}临时人员 ; + }else if(node.level === 4 && isTeamLeader === 0 && type === 0){ + icon = ''; + span = {node.label}; } return ( @@ -1088,4 +1101,8 @@ export default { ::v-deep .team_nocheck_icon { background-image: url("../../../../assets/images/team_nocheck_icon.png") !important; } + +::v-deep .warnColor { + color: red; +} diff --git a/src/views/construction/manage/realTimeManage/realTimeManage.vue b/src/views/construction/manage/realTimeManage/realTimeManage.vue index 1d37a32..76d4efb 100644 --- a/src/views/construction/manage/realTimeManage/realTimeManage.vue +++ b/src/views/construction/manage/realTimeManage/realTimeManage.vue @@ -108,7 +108,7 @@预警信息
-
+ infinite-scroll-distance="0">
- {{ item.devTypeName }} {{ item.devName }}