Merge remote-tracking branch 'origin/dev' into dev

1. 添加隐患发现时间
2. 在考评过程，查看完隐患详情后点击“返回”，系统直接跳转到隐患列表的首页，缺少页面定位的功能

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 {

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() {

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'
     }
   }

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
     }
   }
 }