From 8d6a314800dcf77fb9b9d442904abc6f2450c6e3 Mon Sep 17 00:00:00 2001
From: shanao <wangpeng@zcloudchina.com>
Date: Thu, 14 Nov 2024 10:33:41 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E4=BF=AE=E6=94=B9=E3=80=91=201.=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9A=90=E6=82=A3=E5=8F=91=E7=8E=B0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=202.=20=E5=9C=A8=E8=80=83=E8=AF=84=E8=BF=87=E7=A8=8B?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E7=9C=8B=E5=AE=8C=E9=9A=90=E6=82=A3=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=90=8E=E7=82=B9=E5=87=BB=E2=80=9C=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E2=80=9D=EF=BC=8C=E7=B3=BB=E7=BB=9F=E7=9B=B4=E6=8E=A5=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E9=9A=90=E6=82=A3=E5=88=97=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=EF=BC=8C=E7=BC=BA=E5=B0=91=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/KeyProjectHidden/index.vue        |  8 ++++++++
 .../components/evaluation.vue                    |  3 +++
 .../branch_hazard_assessment/components/list.vue |  3 ++-
 .../branch_hazard_assessment/index.vue           | 16 +++++++++++-----
 4 files changed, 24 insertions(+), 6 deletions(-)

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 @@
           <td class="tbg">隐患处置</td>
           <td>限期整改</td>
         </tr>
+        <tr>
+          <td class="tbg">发现时间</td>
+          <td>{{ formatDate(pd.CREATTIME,'yyyy-MM-DD HH:mm') }}</td>
+        </tr>
         <tr>
           <td class="tbg">整改期限</td>
           <td>{{ pd.RECTIFICATIONDEADLINE }}</td>
@@ -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 @@
       </el-table-column>
       <el-table-column label="重点工程安全环保奖惩">
         <template slot-scope="{row}">
-          {{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 }}
         </template>
       </el-table-column>
       <el-table-column prop="CHECK_USER" label="考评组成员"/>
@@ -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 @@
 <template>
   <div>
-    <List v-show="activeName=='List'"/>
-    <Evaluation v-if="activeName=='Evaluation'"/>
-    <KeyProjectHidden v-if="activeName=='KeyProjectHidden'" active-name="Evaluation"/>
+    <keep-alive>
+      <List v-show="activeName === 'List'"/>
+    </keep-alive>
+    <keep-alive :include="isEvaluationKeepAlive ? 'Evaluation' : ''" :exclude="!isEvaluationKeepAlive ? 'Evaluation' : ''">
+      <Evaluation v-if="activeName === 'Evaluation'"/>
+    </keep-alive>
+    <KeyProjectHidden v-if="activeName === 'KeyProjectHidden'" active-name="Evaluation"/>
   </div>
 </template>
 
+
 <script>
 import List from './components/list'
 import Evaluation from './components/evaluation'
-// import HiddenInfo from './components/hidden_info.vue'
 import KeyProjectHidden from '@/components/KeyProjectHidden/index'
 
 export default {
@@ -24,7 +28,9 @@ export default {
       CORPINFO_ID: '',
       EVALUATIONCONFIG_ID: '',
       HIDDEN_ID: '',
-      TYPE: ''
+      TYPE: '',
+      previousPage: '',
+      isEvaluationKeepAlive: false
     }
   }
 }