Compare commits
No commits in common. "ccea6bf39a5978c474f6072a43a2521737f53b1f" and "4c6d4b7709626fc172d02c6651e1460577a1b397" have entirely different histories.
ccea6bf39a
...
4c6d4b7709
|
@ -35,10 +35,6 @@
|
||||||
<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>
|
||||||
|
@ -149,7 +145,6 @@
|
||||||
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: {
|
||||||
|
@ -189,11 +184,9 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.activeName = this.$parent.previousPage
|
|
||||||
this.getData()
|
this.getData()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
formatDate,
|
|
||||||
getData() {
|
getData() {
|
||||||
requestFN(
|
requestFN(
|
||||||
'/keyprojectcheck/findHidden',
|
'/keyprojectcheck/findHidden',
|
||||||
|
@ -213,7 +206,6 @@ 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 {
|
||||||
|
|
|
@ -335,15 +335,12 @@ 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() {
|
||||||
|
|
|
@ -126,7 +126,6 @@ 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'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,19 +1,15 @@
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<keep-alive>
|
<List v-show="activeName=='List'"/>
|
||||||
<List v-show="activeName === 'List'"/>
|
<Evaluation v-if="activeName=='Evaluation'"/>
|
||||||
</keep-alive>
|
<KeyProjectHidden v-if="activeName=='KeyProjectHidden'" active-name="Evaluation"/>
|
||||||
<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 {
|
||||||
|
@ -28,9 +24,7 @@ export default {
|
||||||
CORPINFO_ID: '',
|
CORPINFO_ID: '',
|
||||||
EVALUATIONCONFIG_ID: '',
|
EVALUATIONCONFIG_ID: '',
|
||||||
HIDDEN_ID: '',
|
HIDDEN_ID: '',
|
||||||
TYPE: '',
|
TYPE: ''
|
||||||
previousPage: '',
|
|
||||||
isEvaluationKeepAlive: false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue