+
+
+
-
![]()
+
@@ -15,7 +46,7 @@
+
@@ -575,9 +576,10 @@ import '../components/background_video'
import '../components/header'
import '../components/staff-survey-chart'
import MonitAndWarning from './components/MonitAndWarning.vue'
+import projectInfoDlg from './detail/projectInfoDlg.vue'
export default {
components: {
- MonitAndWarning
+ MonitAndWarning,projectInfoDlg
},
data() {
return {
@@ -864,7 +866,8 @@ export default {
},
//项目介绍弹窗
projectIntroduction() {
- this.popupShow = true
+ //this.popupShow = true
+ this.$refs.prjInfoDlg.showDialog(this.prjs,this.project,this.projectUsers);
},
closeProjectIntroduction() {
this.popupShow = false
diff --git a/src/pages/projectProgress.vue b/src/pages/projectProgress.vue
index 5d5349a..529812a 100644
--- a/src/pages/projectProgress.vue
+++ b/src/pages/projectProgress.vue
@@ -444,6 +444,7 @@ export default {
})
this.$bus.$on("deptChange", dept => {
this.dept = dept;
+ this.groupByProjectCategory(dept.id);
this.deptChange();
this.selectScheduledAlerts();
this.selectCompletionRate();
@@ -649,6 +650,17 @@ export default {
}
return 0;
},
+ groupByProjectCategory(detpId){
+ this.$api.project.groupByProjectCategory(detpId,datas => {
+ this.projectCategory = datas;
+ this.pushCount = this.getPrjCateCount(0);
+ let item = this.projectCategory.length > 0 ? this.projectCategory[0] : null;
+ this.pushData[0].value = item && item.length > 0 ? item[0].cnt : 0;
+ this.pushData[1].value = item && item.length > 1 ? item[1].cnt : 0;
+ this.doPushNav(0, '在建项目');
+ this.elKey++;
+ });
+ },
init() {
if (localStorage.length == 0) {
var company = { text: '城投公司', id: 1, type: 1 }
@@ -662,14 +674,7 @@ export default {
this.localStorage1 = JSON.parse(localStorage.getItem("company"))
this.localStorage2 = JSON.parse(localStorage.getItem("project"))
}
- this.$api.project.groupByProjectCategory(datas => {
- this.projectCategory = datas;
- this.pushCount = this.getPrjCateCount(0);
- let item = this.projectCategory.length > 0 ? this.projectCategory[0] : null;
- this.pushData[0].value = item && item.length > 0 ? item[0].cnt : 0;
- this.pushData[1].value = item && item.length > 1 ? item[1].cnt : 0;
- this.elKey++;
- });
+
//设备概况点击事件定时器
this.overviewInterval = setInterval(this.overviewClick, 5000);
//重大节点预期预警