Compare commits

...

2 Commits

Author SHA1 Message Date
shanao ccea6bf39a Merge remote-tracking branch 'origin/dev' into dev 2024-11-14 10:34:06 +08:00
shanao 8d6a314800 【bug修改】
1. 添加隐患发现时间
2. 在考评过程,查看完隐患详情后点击“返回”,系统直接跳转到隐患列表的首页,缺少页面定位的功能
2024-11-14 10:33:41 +08:00
4 changed files with 24 additions and 6 deletions

View File

@ -35,6 +35,10 @@
<td class="tbg">隐患处置</td> <td class="tbg">隐患处置</td>
<td>限期整改</td> <td>限期整改</td>
</tr> </tr>
<tr>
<td class="tbg">发现时间</td>
<td>{{ formatDate(pd.CREATTIME,'yyyy-MM-DD HH:mm') }}</td>
</tr>
<tr> <tr>
<td class="tbg">整改期限</td> <td class="tbg">整改期限</td>
<td>{{ pd.RECTIFICATIONDEADLINE }}</td> <td>{{ pd.RECTIFICATIONDEADLINE }}</td>
@ -145,6 +149,7 @@
import { requestFN } from '@/utils/request' import { requestFN } from '@/utils/request'
import { videoPlayer } from 'vue-video-player' import { videoPlayer } from 'vue-video-player'
import 'video.js/dist/video-js.css' import 'video.js/dist/video-js.css'
import { formatDate } from 'element-ui/src/utils/date-util'
export default { export default {
components: { videoPlayer }, components: { videoPlayer },
props: { props: {
@ -184,9 +189,11 @@ export default {
} }
}, },
created() { created() {
this.activeName = this.$parent.previousPage
this.getData() this.getData()
}, },
methods: { methods: {
formatDate,
getData() { getData() {
requestFN( requestFN(
'/keyprojectcheck/findHidden', '/keyprojectcheck/findHidden',
@ -206,6 +213,7 @@ export default {
this.$refs.hdVideoPlayer.player.pause() this.$refs.hdVideoPlayer.player.pause()
}, },
goBack() { goBack() {
this.$parent.previousPage = true
if (this.activeName) { if (this.activeName) {
this.$parent.activeName = this.activeName this.$parent.activeName = this.activeName
} else { } else {

View File

@ -335,12 +335,15 @@ export default {
} }
}, },
goBack() { goBack() {
this.$parent.isEvaluationKeepAlive = false
this.$parent.activeName = 'List' this.$parent.activeName = 'List'
}, },
fnViewHidden(HIDDEN_ID) { fnViewHidden(HIDDEN_ID) {
// this.visible = true // this.visible = true
// this.HIDDEN_ID = HIDDEN_ID // this.HIDDEN_ID = HIDDEN_ID
this.$parent.HIDDEN_ID = HIDDEN_ID this.$parent.HIDDEN_ID = HIDDEN_ID
this.$parent.previousPage = this.$parent.activeName
this.$parent.isEvaluationKeepAlive = true
this.$parent.activeName = 'KeyProjectHidden' this.$parent.activeName = 'KeyProjectHidden'
}, },
fnEvaluationDialogChangeShow() { fnEvaluationDialogChangeShow() {

View File

@ -52,7 +52,7 @@
</el-table-column> </el-table-column>
<el-table-column label="重点工程安全环保奖惩"> <el-table-column label="重点工程安全环保奖惩">
<template slot-scope="{row}"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CHECK_USER" label="考评组成员"/> <el-table-column prop="CHECK_USER" label="考评组成员"/>
@ -126,6 +126,7 @@ export default {
this.$parent.CORPINFO_ID = CORPINFO_ID this.$parent.CORPINFO_ID = CORPINFO_ID
this.$parent.EVALUATIONCONFIG_ID = EVALUATIONCONFIG_ID this.$parent.EVALUATIONCONFIG_ID = EVALUATIONCONFIG_ID
this.$parent.TYPE = TYPE this.$parent.TYPE = TYPE
this.$parent.isEvaluationKeepAlive = true
this.$parent.activeName = 'Evaluation' this.$parent.activeName = 'Evaluation'
} }
} }

View File

@ -1,15 +1,19 @@
<template> <template>
<div> <div>
<List v-show="activeName=='List'"/> <keep-alive>
<Evaluation v-if="activeName=='Evaluation'"/> <List v-show="activeName === 'List'"/>
<KeyProjectHidden v-if="activeName=='KeyProjectHidden'" active-name="Evaluation"/> </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> </div>
</template> </template>
<script> <script>
import List from './components/list' import List from './components/list'
import Evaluation from './components/evaluation' import Evaluation from './components/evaluation'
// import HiddenInfo from './components/hidden_info.vue'
import KeyProjectHidden from '@/components/KeyProjectHidden/index' import KeyProjectHidden from '@/components/KeyProjectHidden/index'
export default { export default {
@ -24,7 +28,9 @@ export default {
CORPINFO_ID: '', CORPINFO_ID: '',
EVALUATIONCONFIG_ID: '', EVALUATIONCONFIG_ID: '',
HIDDEN_ID: '', HIDDEN_ID: '',
TYPE: '' TYPE: '',
previousPage: '',
isEvaluationKeepAlive: false
} }
} }
} }