Commit 4bbc8c68 authored by jiaxu.yan's avatar jiaxu.yan

feat: 预览文件 修改任务名称展示错误

parent 97d94b02
...@@ -181,3 +181,12 @@ export function getTemporaryStorage(data) { ...@@ -181,3 +181,12 @@ export function getTemporaryStorage(data) {
data data
}) })
} }
// 通过子任务id查询任务详情
export function getBySubtaskId(data) {
return request({
url: '/task/getBySubtaskId',
method: 'post',
data
})
}
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="task-item"> <div class="task-item">
<span class="task-label">任务名称:</span> <span class="task-label">任务名称:</span>
<span class="task-content"> <span class="task-content">
{{ model.carReviewTask.name }} {{ task.taskName }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
</template> </template>
<!--js逻辑--> <!--js逻辑-->
<script> <script>
import { checkTaskDetail } from '@/api/task/task' import { checkTaskDetail, getBySubtaskId } from '@/api/task/task'
import collapse from '@/components/Collapse/collapse' import collapse from '@/components/Collapse/collapse'
import collapseItem from '@/components/Collapse/collapse-item' import collapseItem from '@/components/Collapse/collapse-item'
export default { export default {
...@@ -155,6 +155,7 @@ export default { ...@@ -155,6 +155,7 @@ export default {
detailsList: [] detailsList: []
}, },
taskId: 1, taskId: 1,
task: {},
activeNames: [], activeNames: [],
rules: { rules: {
enterpriseLeader: [ enterpriseLeader: [
...@@ -186,10 +187,22 @@ export default { ...@@ -186,10 +187,22 @@ export default {
this.loading = false this.loading = false
if (res.code === 200) { if (res.code === 200) {
this.model = res.data this.model = res.data
await this.getTaskDetail()
} else { } else {
this.$modal.msgError(res.msg) this.$modal.msgError(res.msg)
} }
}, },
/**
* 获取任务详情
*/
async getTaskDetail() {
const result = await getBySubtaskId({
id: this.taskId
})
if (result.code === 200) {
this.task = result.data
}
},
openAll() { openAll() {
this.activeNames = this.model.carReviewTask.standard.map(i => { this.activeNames = this.model.carReviewTask.standard.map(i => {
return i.chapter return i.chapter
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="task-item"> <div class="task-item">
<span class="task-label">任务名称:</span> <span class="task-label">任务名称:</span>
<span class="task-content"> <span class="task-content">
{{ model.carReviewTask.name }} {{ task.taskName }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
</template> </template>
<!--js逻辑--> <!--js逻辑-->
<script> <script>
import { checkTaskDetail, taskSubmit } from '@/api/task/task' import { checkTaskDetail, getBySubtaskId } from '@/api/task/task'
import collapse from '@/components/Collapse/collapse' import collapse from '@/components/Collapse/collapse'
import collapseItem from '@/components/Collapse/collapse-item' import collapseItem from '@/components/Collapse/collapse-item'
export default { export default {
...@@ -284,7 +284,7 @@ export default { ...@@ -284,7 +284,7 @@ export default {
data() { data() {
return { return {
isShow: true, isShow: true,
task: {},
auditRequirement: 0, auditRequirement: 0,
testScenarioList: [ testScenarioList: [
{ value: 0, label: 'TBOX-蜂窝以太网接口', check: false }, { value: 0, label: 'TBOX-蜂窝以太网接口', check: false },
...@@ -360,6 +360,7 @@ export default { ...@@ -360,6 +360,7 @@ export default {
this.loading = false this.loading = false
if (res.code === 200) { if (res.code === 200) {
this.model = res.data this.model = res.data
await this.getTaskDetail()
if (this.model.carReviewTask.imagesUrl) { if (this.model.carReviewTask.imagesUrl) {
const imgs = this.model.carReviewTask.imagesUrl.split(',') const imgs = this.model.carReviewTask.imagesUrl.split(',')
this.ruleForm.enterpriseLeader this.ruleForm.enterpriseLeader
...@@ -373,6 +374,17 @@ export default { ...@@ -373,6 +374,17 @@ export default {
this.$modal.msgError(res.msg) this.$modal.msgError(res.msg)
} }
}, },
/**
* 获取任务详情
*/
async getTaskDetail() {
const result = await getBySubtaskId({
id: this.taskId
})
if (result.code === 200) {
this.task = result.data
}
},
handleTestScenario(item) { handleTestScenario(item) {
// 查看item.value在this.checkTestScenarioList里面存不存在 // 查看item.value在this.checkTestScenarioList里面存不存在
// 存在则删除 // 存在则删除
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="task-item"> <div class="task-item">
<span class="task-label">任务名称:</span> <span class="task-label">任务名称:</span>
<span class="task-content"> <span class="task-content">
{{ model.carReviewTask.name }} {{ task.taskName }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
</template> </template>
<!--js逻辑--> <!--js逻辑-->
<script> <script>
import { checkTaskDetail, carTaskSubmit } from '@/api/task/task' import { checkTaskDetail, carTaskSubmit, getBySubtaskId } from '@/api/task/task'
import collapse from '@/components/Collapse/collapse' import collapse from '@/components/Collapse/collapse'
import collapseItem from '@/components/Collapse/collapse-item' import collapseItem from '@/components/Collapse/collapse-item'
export default { export default {
...@@ -301,6 +301,7 @@ export default { ...@@ -301,6 +301,7 @@ export default {
data() { data() {
return { return {
isShow: true, isShow: true,
task: {},
auditRequirement: 0, auditRequirement: 0,
testScenarioList: [ testScenarioList: [
{ value: 0, label: 'TBOX-蜂窝以太网接口', check: false }, { value: 0, label: 'TBOX-蜂窝以太网接口', check: false },
...@@ -369,6 +370,7 @@ export default { ...@@ -369,6 +370,7 @@ export default {
this.loading = false this.loading = false
if (res.code === 200) { if (res.code === 200) {
this.model = res.data this.model = res.data
await this.getTaskDetail()
if (this.model.carReviewTask.imagesUrl) { if (this.model.carReviewTask.imagesUrl) {
const imgs = this.model.carReviewTask.imagesUrl.split(',') const imgs = this.model.carReviewTask.imagesUrl.split(',')
this.ruleForm.enterpriseLeader this.ruleForm.enterpriseLeader
...@@ -382,6 +384,17 @@ export default { ...@@ -382,6 +384,17 @@ export default {
this.$modal.msgError(res.msg) this.$modal.msgError(res.msg)
} }
}, },
/**
* 获取任务详情
*/
async getTaskDetail() {
const result = await getBySubtaskId({
id: this.taskId
})
if (result.code === 200) {
this.task = result.data
}
},
/* 返回跳转*/ /* 返回跳转*/
goToProcessedReview() { goToProcessedReview() {
if (!this.ruleForm.enterpriseLeader) { if (!this.ruleForm.enterpriseLeader) {
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<div class="task-item"> <div class="task-item">
<span class="task-label">任务名称:</span> <span class="task-label">任务名称:</span>
<span class="task-content"> <span class="task-content">
{{ model.carReviewTask.name }} {{ task.taskName }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
...@@ -264,7 +264,7 @@ import { ...@@ -264,7 +264,7 @@ import {
reviewDetailsSubmit, reviewDetailsSubmit,
carReviewTaskConfirm, carReviewTaskConfirm,
reviewDetailsConfirm, reviewDetailsConfirm,
reviewTaskConfirm getBySubtaskId
} from '@/api/task/task' } from '@/api/task/task'
import sceneView from './components/sceneView.vue' import sceneView from './components/sceneView.vue'
import companyFile from './components/companyFile.vue' import companyFile from './components/companyFile.vue'
...@@ -303,6 +303,7 @@ export default { ...@@ -303,6 +303,7 @@ export default {
catalogue: '', catalogue: '',
reviewEnterpriseArchiveId: '' reviewEnterpriseArchiveId: ''
}, },
task: {},
oldForm: { oldForm: {
passed: '', passed: '',
reviewDetailsId: '', reviewDetailsId: '',
...@@ -447,6 +448,7 @@ export default { ...@@ -447,6 +448,7 @@ export default {
this.loading = false this.loading = false
if (res.code === 200) { if (res.code === 200) {
this.model = res.data this.model = res.data
await this.getTaskDetail()
this.model.detailsList = this.model.detailsList.map((v, k) => { this.model.detailsList = this.model.detailsList.map((v, k) => {
v.order = k + 1 v.order = k + 1
return v return v
...@@ -469,6 +471,17 @@ export default { ...@@ -469,6 +471,17 @@ export default {
} }
return true return true
}, },
/**
* 获取任务详情
*/
async getTaskDetail() {
const result = await getBySubtaskId({
id: this.taskId
})
if (result.code === 200) {
this.task = result.data
}
},
/** /**
* 场景变更任务处理 * 场景变更任务处理
*/ */
......
...@@ -205,7 +205,7 @@ export default { ...@@ -205,7 +205,7 @@ export default {
dialogEditId: 0 dialogEditId: 0
}, },
baseUrl: process.env.VUE_APP_IMAGE_API, baseUrl: process.env.VUE_APP_IMAGE_API,
listUrl: '/review/enterprise/archive/findEnterpriseArchive', listUrl: '/review/enterprise/archive/findEnterpriseArchiveByTaskId',
// 表格loading状态 // 表格loading状态
tableLoading: false, tableLoading: false,
// 表格数据 // 表格数据
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<task-standard> <task-standard>
<div slot="header-right" class="clearfix"> <div slot="header-right" class="clearfix">
<header-button <header-button
icon="el-icon-back" icon="arrow-left"
class="back-btn" class="back-btn"
type="no-line" type="no-line"
@click="handleBack" @click="handleBack"
...@@ -14,7 +14,13 @@ ...@@ -14,7 +14,13 @@
</header-button> </header-button>
</div> </div>
<!-- table部分 --> <!-- table部分 -->
<iframe src="/download/download.html" frameborder="0"></iframe> <div class="pdf-box">
<iframe
:src="'http://storage.xuetangx.com/public_assets/xuetangx/PDF/PlayerAPI_v1.0.6.pdf'"
frameborder="0"
style="width: 100%; height: 100%"
></iframe>
</div>
</task-standard> </task-standard>
</template> </template>
...@@ -30,8 +36,8 @@ export default { ...@@ -30,8 +36,8 @@ export default {
} }
} }
</script> </script>
<!-- <style scoped> <style scoped>
.back-btn { .pdf-box {
margin-left: 24px !important; height: 85vh;
} }
</style> --> </style>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="task-item"> <div class="task-item">
<span class="task-label">任务名称:</span> <span class="task-label">任务名称:</span>
<span class="task-content"> <span class="task-content">
{{ model.systemReviewTask.name }} {{ task.taskName }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
</template> </template>
<!--js逻辑--> <!--js逻辑-->
<script> <script>
import { reviewTaskDetail, taskSubmit } from '@/api/task/task' import { reviewTaskDetail, taskSubmit, getBySubtaskId } from '@/api/task/task'
import collapse from '@/components/Collapse/collapse' import collapse from '@/components/Collapse/collapse'
import collapseItem from '@/components/Collapse/collapse-item' import collapseItem from '@/components/Collapse/collapse-item'
export default { export default {
...@@ -277,6 +277,7 @@ export default { ...@@ -277,6 +277,7 @@ export default {
reviewSceneChangeTasks: {}, reviewSceneChangeTasks: {},
detailsList: [] detailsList: []
}, },
task: {},
columns: [], columns: [],
ruleForm: { ruleForm: {
enterpriseLeader: '', enterpriseLeader: '',
...@@ -303,9 +304,6 @@ export default { ...@@ -303,9 +304,6 @@ export default {
this.openAll() this.openAll()
}, },
methods: { methods: {
/**
* 获取任务详情
*/
async getTask() { async getTask() {
this.loading = true this.loading = true
const res = await reviewTaskDetail({ const res = await reviewTaskDetail({
...@@ -313,6 +311,7 @@ export default { ...@@ -313,6 +311,7 @@ export default {
}) })
this.loading = false this.loading = false
if (res.code === 200) { if (res.code === 200) {
await this.getTaskDetail()
this.model = res.data this.model = res.data
if (this.model.systemReviewTask.imagesUrl) { if (this.model.systemReviewTask.imagesUrl) {
const imgs = this.model.systemReviewTask.imagesUrl.split(',') const imgs = this.model.systemReviewTask.imagesUrl.split(',')
...@@ -327,6 +326,14 @@ export default { ...@@ -327,6 +326,14 @@ export default {
this.$modal.msgError(res.msg) this.$modal.msgError(res.msg)
} }
}, },
async getTaskDetail() {
const result = await getBySubtaskId({
id: this.taskId
})
if (result.code === 200) {
this.task = result.data
}
},
/* 返回跳转*/ /* 返回跳转*/
goToProcessedReview() { goToProcessedReview() {
if (!this.ruleForm.enterpriseLeader) { if (!this.ruleForm.enterpriseLeader) {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="task-item"> <div class="task-item">
<span class="task-label">任务名称:</span> <span class="task-label">任务名称:</span>
<span class="task-content"> <span class="task-content">
{{ model.systemReviewTask.name }} {{ task.taskName }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
</template> </template>
<!--js逻辑--> <!--js逻辑-->
<script> <script>
import { reviewTaskDetail, taskSubmit } from '@/api/task/task' import { reviewTaskDetail, getBySubtaskId } from '@/api/task/task'
import collapse from '@/components/Collapse/collapse' import collapse from '@/components/Collapse/collapse'
import collapseItem from '@/components/Collapse/collapse-item' import collapseItem from '@/components/Collapse/collapse-item'
export default { export default {
...@@ -155,6 +155,7 @@ export default { ...@@ -155,6 +155,7 @@ export default {
detailsList: [] detailsList: []
}, },
columns: [], columns: [],
task: {},
ruleForm: { ruleForm: {
enterpriseLeader: '', enterpriseLeader: '',
inspectionLeader: '', inspectionLeader: '',
...@@ -191,11 +192,20 @@ export default { ...@@ -191,11 +192,20 @@ export default {
}) })
this.loading = false this.loading = false
if (res.code === 200) { if (res.code === 200) {
await this.getTaskDetail()
this.model = res.data this.model = res.data
} else { } else {
this.$modal.msgError(res.msg) this.$modal.msgError(res.msg)
} }
}, },
async getTaskDetail() {
const result = await getBySubtaskId({
id: this.taskId
})
if (result.code === 200) {
this.task = result.data
}
},
openAll() { openAll() {
this.activeNames = this.model.systemReviewTask.standard.map(i => { this.activeNames = this.model.systemReviewTask.standard.map(i => {
return i.chapter return i.chapter
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="task-item"> <div class="task-item">
<span class="task-label">任务名称:</span> <span class="task-label">任务名称:</span>
<span class="task-content"> <span class="task-content">
{{ model.systemReviewTask.name }} {{ task.taskName }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
...@@ -305,7 +305,7 @@ ...@@ -305,7 +305,7 @@
</template> </template>
<!--js逻辑--> <!--js逻辑-->
<script> <script>
import { reviewTaskDetail } from '@/api/task/task' import { reviewTaskDetail, getBySubtaskId } from '@/api/task/task'
import collapse from '@/components/Collapse/collapse' import collapse from '@/components/Collapse/collapse'
import collapseItem from '@/components/Collapse/collapse-item' import collapseItem from '@/components/Collapse/collapse-item'
export default { export default {
...@@ -321,6 +321,7 @@ export default { ...@@ -321,6 +321,7 @@ export default {
reviewSceneChangeTasks: {}, reviewSceneChangeTasks: {},
detailsList: [] detailsList: []
}, },
task: {},
columns: [], columns: [],
ruleForm: { ruleForm: {
enterpriseLeader: '', enterpriseLeader: '',
...@@ -349,7 +350,7 @@ export default { ...@@ -349,7 +350,7 @@ export default {
}, },
methods: { methods: {
/** /**
* 获取任务详情 * 获取任务详情
*/ */
async getTask() { async getTask() {
this.loading = true this.loading = true
...@@ -358,6 +359,7 @@ export default { ...@@ -358,6 +359,7 @@ export default {
}) })
this.loading = false this.loading = false
if (res.code === 200) { if (res.code === 200) {
await this.getTaskDetail()
this.model = res.data this.model = res.data
if (this.model.systemReviewTask.imagesUrl) { if (this.model.systemReviewTask.imagesUrl) {
const imgs = this.model.systemReviewTask.imagesUrl.split(',') const imgs = this.model.systemReviewTask.imagesUrl.split(',')
...@@ -372,6 +374,17 @@ export default { ...@@ -372,6 +374,17 @@ export default {
this.$modal.msgError(res.msg) this.$modal.msgError(res.msg)
} }
}, },
/**
* 获取任务详情
*/
async getTaskDetail() {
const result = await getBySubtaskId({
id: this.taskId
})
if (result.code === 200) {
this.task = result.data
}
},
goUpdate() { goUpdate() {
this.$router.push({ this.$router.push({
path: '/processing/systemReview/write-check-form?id=' + this.taskId path: '/processing/systemReview/write-check-form?id=' + this.taskId
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<div class="task-item"> <div class="task-item">
<span class="task-label">任务名称:</span> <span class="task-label">任务名称:</span>
<span class="task-content"> <span class="task-content">
{{ model.systemReviewTask.name }} {{ task.taskName }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
...@@ -268,7 +268,8 @@ import { ...@@ -268,7 +268,8 @@ import {
reviewTaskDetail, reviewTaskDetail,
reviewDetailsSubmit, reviewDetailsSubmit,
reviewTaskConfirm, reviewTaskConfirm,
reviewDetailsConfirm reviewDetailsConfirm,
getBySubtaskId
} from '@/api/task/task' } from '@/api/task/task'
import sceneView from './components/sceneView.vue' import sceneView from './components/sceneView.vue'
import companyFile from './components/companyFile.vue' import companyFile from './components/companyFile.vue'
...@@ -308,6 +309,7 @@ export default { ...@@ -308,6 +309,7 @@ export default {
catalogue: '', catalogue: '',
reviewEnterpriseArchiveId: '' reviewEnterpriseArchiveId: ''
}, },
task: {},
oldForm: { oldForm: {
passed: '', passed: '',
reviewDetailsId: '', reviewDetailsId: '',
...@@ -457,6 +459,7 @@ export default { ...@@ -457,6 +459,7 @@ export default {
this.loading = false this.loading = false
if (res.code === 200) { if (res.code === 200) {
this.model = res.data this.model = res.data
await this.getTaskDetail()
this.model.detailsList = this.model.detailsList.map((v, k) => { this.model.detailsList = this.model.detailsList.map((v, k) => {
v.order = k + 1 v.order = k + 1
return v return v
...@@ -479,6 +482,17 @@ export default { ...@@ -479,6 +482,17 @@ export default {
} }
return true return true
}, },
/**
* 获取任务详情
*/
async getTaskDetail() {
const result = await getBySubtaskId({
id: this.taskId
})
if (result.code === 200) {
this.task = result.data
}
},
/** /**
* 场景变更任务处理 * 场景变更任务处理
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment