diff --git a/src/components/KeyProjectHidden/index.vue b/src/components/KeyProjectHidden/index.vue
index b3d7267..89b0c09 100644
--- a/src/components/KeyProjectHidden/index.vue
+++ b/src/components/KeyProjectHidden/index.vue
@@ -35,6 +35,10 @@
隐患处置 |
限期整改 |
+
+ 发现时间 |
+ {{ formatDate(pd.CREATTIME,'yyyy-MM-DD HH:mm') }} |
+
整改期限 |
{{ pd.RECTIFICATIONDEADLINE }} |
@@ -145,6 +149,7 @@
import { requestFN } from '@/utils/request'
import { videoPlayer } from 'vue-video-player'
import 'video.js/dist/video-js.css'
+import { formatDate } from 'element-ui/src/utils/date-util'
export default {
components: { videoPlayer },
props: {
@@ -184,9 +189,11 @@ export default {
}
},
created() {
+ this.activeName = this.$parent.previousPage
this.getData()
},
methods: {
+ formatDate,
getData() {
requestFN(
'/keyprojectcheck/findHidden',
@@ -206,6 +213,7 @@ export default {
this.$refs.hdVideoPlayer.player.pause()
},
goBack() {
+ this.$parent.previousPage = true
if (this.activeName) {
this.$parent.activeName = this.activeName
} else {
diff --git a/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue b/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue
index 03460a9..4c7fb05 100644
--- a/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue
+++ b/src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue
@@ -335,12 +335,15 @@ export default {
}
},
goBack() {
+ this.$parent.isEvaluationKeepAlive = false
this.$parent.activeName = 'List'
},
fnViewHidden(HIDDEN_ID) {
// this.visible = true
// this.HIDDEN_ID = HIDDEN_ID
this.$parent.HIDDEN_ID = HIDDEN_ID
+ this.$parent.previousPage = this.$parent.activeName
+ this.$parent.isEvaluationKeepAlive = true
this.$parent.activeName = 'KeyProjectHidden'
},
fnEvaluationDialogChangeShow() {
diff --git a/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue b/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue
index 9f169ae..7f286c8 100644
--- a/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue
+++ b/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue
@@ -52,7 +52,7 @@
- {{row.CORP_NAME == '秦港股份有限公司' ? row.checked_count2 : row.checked_count3 }} / {{row.CORP_NAME == '秦港股份有限公司' ? row.count2 : row.checked_count3 }}
+ {{ row.CORP_NAME == '秦港股份有限公司' ? row.checked_count2 : row.checked_count3 }} / {{ row.CORP_NAME == '秦港股份有限公司' ? row.count2 : row.checked_count3 }}
@@ -126,6 +126,7 @@ export default {
this.$parent.CORPINFO_ID = CORPINFO_ID
this.$parent.EVALUATIONCONFIG_ID = EVALUATIONCONFIG_ID
this.$parent.TYPE = TYPE
+ this.$parent.isEvaluationKeepAlive = true
this.$parent.activeName = 'Evaluation'
}
}
diff --git a/src/views/keyproject_evaluation/branch_hazard_assessment/index.vue b/src/views/keyproject_evaluation/branch_hazard_assessment/index.vue
index 5e38916..1459e91 100644
--- a/src/views/keyproject_evaluation/branch_hazard_assessment/index.vue
+++ b/src/views/keyproject_evaluation/branch_hazard_assessment/index.vue
@@ -1,15 +1,19 @@
-
-
-
+
+
+
+
+
+
+
+