Skip to content

W
web
Commit e3b5f7ac authored by 盖献康's avatar 盖献康
Browse files
Options

Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into developer/gaixiankang

parents 28311cca f4ee30cf
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 56 deletions
src/components/Breadcrumb/index.vue
View file @ e3b5f7ac
......@@ -63,7 +63,6 @@ export default {
const result = [] // 存储最终的结果数组
for (let i = 0; i < arr.length; i++) {
const title = arr[i].meta.title
console.log('面包屑', title)
if (!titles.has(title)) {
titles.add(title)
result.push(arr[i])
......
src/layout/components/TagsView/index.vue
View file @ e3b5f7ac
......@@ -228,7 +228,7 @@ export default {
toLastView(visitedViews, view) {
const latestView = visitedViews.slice(-1)[0]
if (latestView) {
this.$router.push(latestView.fullPath)
this.$router.replace(latestView.fullPath)
} else {
// now the default is to redirect to the home page if there is no tags-view,
// you can adjust it according to your needs.
......
src/mixins/page.js
View file @ e3b5f7ac
......@@ -51,7 +51,6 @@ export default {
})
.then(res => {
if (res.code === 200) {
console.log(res.rows)
this.tableData = res.rows
this.total = res.total
}
......
src/mixins/router.js
View file @ e3b5f7ac
export default {
beforeRouteEnter(to, from, next) {
next(vm => {
vm.formPath = from.path
console.log(vm.formPath)
})
},
// beforeRouteEnter(to, from, next) {
// next(vm => {
// console.log(vm.formPath)
// vm.formPath.push(from.path)
// console.log(vm.formPath);
// })
// },
data() {
return {
formPath: ''
formPath: []
}
},
methods: {
......@@ -15,13 +16,13 @@ export default {
* 返回上一页
*/
goBack() {
if (this.formPath) {
this.$router.push({
path: this.formPath
})
} else {
// if (this.formPath) {
// this.$router.push({
// path: this.formPath[0]
// })
// } else {
this.$router.back()
}
// }
}
}
}
src/views/processing/archivedTask/index.vue
View file @ e3b5f7ac
......@@ -13,7 +13,7 @@
v-for="(item, key) in standardList"
:key="key"
:value="item.id"
:label="item.standardNo + item.name"
:label="item.standardNo + ' ' + item.name"
></el-option>
</el-select>
</el-form-item>
......@@ -142,7 +142,7 @@
</div>
<div v-if="item.taskStatus === 'FINISH'" class="card-buttons">
<el-button
v-if="item.reviewStatus !== 'NONE'"
v-if="item.systemReviewTaskId"
type="primary"
plain
size="mini"
......@@ -155,7 +155,7 @@
>体系审查原始记录</el-button
>
<el-button
v-if="item.carReviewStatus !== 'NONE'"
v-if="item.carReviewTaskId"
type="primary"
plain
size="mini"
......@@ -168,7 +168,7 @@
>车型审查原始记录</el-button
>
<el-button
v-if="item.carTestStatus !== 'NONE'"
v-if="item.carReviewTaskId"
type="primary"
plain
size="mini"
......
src/views/processing/carReview/write-check-form/components/companyFile.vue
View file @ e3b5f7ac
......@@ -184,6 +184,7 @@ export default {
if (valid) {
this.model.save(
res => {
this.model.reset()
this.$store.dispatch('processing/getCompanyFiles', {
taskId: this.$route.query.taskId
})
......
src/views/processing/carReview/write-check-form/components/previewView.vue
View file @ e3b5f7ac
......@@ -54,7 +54,7 @@
</div>
<div class="standard-result">
审查结果：
<span v-if="item.passed === ''">__</span>
<span v-if="item.passed === null">__</span>
<span v-else-if="item.passed == 1" class="green">符合</span>
<span v-else class="orange">不符合</span>
</div>
......
src/views/processing/processed-review/index.vue
View file @ e3b5f7ac
......@@ -13,7 +13,7 @@
v-for="(item, key) in standardList"
:key="key"
:value="item.id"
:label="item.standardNo + item.name"
:label="item.standardNo + ' ' + item.name"
></el-option>
</el-select>
</el-form-item>
......@@ -140,7 +140,7 @@
</div>
<div class="card-buttons">
<el-button
v-if="item.reviewStatus !== 'NONE'"
v-if="item.systemReviewTaskId"
type="primary"
plain
size="mini"
......@@ -153,7 +153,7 @@
>体系审查原始记录</el-button
>
<el-button
v-if="item.carReviewStatus !== 'NONE'"
v-if="item.carReviewTaskId"
type="primary"
plain
size="mini"
......@@ -166,7 +166,7 @@
>车型审查原始记录</el-button
>
<el-button
v-if="item.carTestStatus !== 'NONE'"
v-if="item.carReviewTaskId"
type="primary"
plain
size="mini"
......
src/views/processing/systemReview/write-check-form/components/companyFile.vue
View file @ e3b5f7ac
......@@ -184,6 +184,7 @@ export default {
if (valid) {
this.model.save(
res => {
this.model.reset()
this.$store.dispatch('processing/getCompanyFiles', {
taskId: this.$route.query.taskId
})
......
src/views/processing/systemReview/write-check-form/components/previewView.vue
View file @ e3b5f7ac
......@@ -54,7 +54,7 @@
</div>
<div class="standard-result">
审查结果：
<span v-if="item.passed === ''">__</span>
<span v-if="item.passed === null">__</span>
<span v-else-if="item.passed == 1" class="green">符合</span>
<span v-else class="orange">不符合</span>
</div>
......
src/views/processing/systemReview/write-check-form/index.vue
View file @ e3b5f7ac
......@@ -302,7 +302,6 @@ export default {
dicts: ['system_review_test'],
data() {
return {
formPath: '',
sceneManger: {
dialogVisible: false
},
......@@ -426,18 +425,6 @@ export default {
this.handleCircle(0)
},
methods: {
/**
* 返回上一页
*/
goBack() {
if (this.formPath) {
this.$router.push({
path: this.formPath
})
} else {
this.$router.back()
}
},
/**
* 企业文件保存回调
*/
......
src/views/processing/unprocessed-review/index.vue
View file @ e3b5f7ac
......@@ -13,7 +13,7 @@
v-for="(item, key) in standardList"
:key="key"
:value="item.id"
:label="item.standardNo + item.name"
:label="item.standardNo + ' ' + item.name"
></el-option>
</el-select>
</el-form-item>
......
src/views/setting/company/index.vue
View file @ e3b5f7ac
......@@ -218,9 +218,11 @@ export default {
methods: {
sort_change(column, prop, order) {
this.queryParams.pageNum = 1 // 排序后返回第一页
this.queryParams.isAsc = order === 'ascending' ? 'asc' : 'desc'
this.queryParams.orderByColumn = column.prop
this.loadData()
if (column.order) {
this.queryParams.isAsc = column.order === 'ascending' ? 'asc' : 'desc'
this.queryParams.orderByColumn = column.prop
this.loadData()
}
},
handleDelete(id) {
this.$modal
......
src/views/setting/sample/taskDetails/index.vue
View file @ e3b5f7ac
......@@ -507,7 +507,7 @@
:percentage="
percentageChange(dataStatistic.testDetailsUnderNum)
"
:format="testStandards"
:format="progressLine"
text-color="#fff"
></el-progress>
<el-progress
......@@ -516,7 +516,7 @@
:percentage="
percentageChange(dataStatistic.testStandardsPassNum)
"
:format="testStandards"
:format="progressLine"
status="success"
text-color="#fff"
></el-progress>
......@@ -526,7 +526,7 @@
:percentage="
percentageChange(dataStatistic.testStandardsNoPassNum)
"
:format="testStandards"
:format="progressLine"
status="warning"
text-color="#fff"
></el-progress>
......@@ -536,7 +536,7 @@
:percentage="
percentageChange(dataStatistic.testStandardsUnderNum)
"
:format="testStandards"
:format="progressLine"
status="exception"
color="#f98921"
text-color="#fff"
......@@ -576,15 +576,23 @@
<div class="bottom">{{ item.sampleName }}</div>
</div>
</div>
<div style="margin-left: 4.8rem">
<div style="margin-left: 4.8rem; margin-top: 20px">
<div v-if="item.samplePhotos">
<image-preview
v-for="(item, index) in returnArray(item.samplePhotos)"
:key="index"
width="32px"
height="32px"
:src="item.samplePhotos"
style="margin-right: 10px"
:src="item"
></image-preview>
</div>
<div v-else>暂无样品照片</div>
<div
v-else
style="font-size: 14px; font-weight: 400; color: #bababa"
>
未上传样品照片
</div>
</div>
<el-divider></el-divider>
<el-row :gutter="20" style="margin-bottom: 20px">
......@@ -687,15 +695,23 @@
<div class="bottom">{{ item.sampleName }}</div>
</div>
</div>
<div style="margin-left: 4.8rem">
<div style="margin-left: 4.8rem; margin-top: 20px">
<div v-if="item.samplePhotos">
<image-preview
v-for="(item, index) in returnArray(item.samplePhotos)"
:key="index"
width="32px"
height="32px"
:src="item.samplePhotos"
:src="item"
style="margin-right: 10px"
></image-preview>
</div>
<div v-else>暂无样品照片</div>
<div
v-else
style="font-size: 14px; font-weight: 400; color: #bababa"
>
未上传样品照片
</div>
</div>
<el-divider></el-divider>
<el-row :gutter="20" style="margin-bottom: 20px">
......@@ -802,6 +818,9 @@ export default {
console.log('任务详情', res)
})
},
returnArray(data) {
return data.split(',')
},
tabClick() {},
formatTest(percentage) {
return (percentage = `测试通过率\n\n ${percentage}%`)
......
src/views/task/on/index.vue
View file @ e3b5f7ac
......@@ -405,7 +405,7 @@
</div>
<div class="card-buttons">
<el-button
v-if="item.reviewStatus && item.reviewStatus !== 'NONE'"
v-if="item.systemReviewTaskId"
type="primary"
plain
size="mini"
......@@ -418,7 +418,7 @@
>体系审查原始记录</el-button
>
<el-button
v-if="item.carReviewStatus && item.carReviewStatus !== 'NONE'"
v-if="item.carReviewTaskId"
type="primary"
plain
size="mini"
......@@ -431,7 +431,7 @@
>车型审查原始记录</el-button
>
<el-button
v-if="item.carTestStatus && item.carTestStatus !== 'NONE'"
v-if="item.carReviewTaskId"
type="primary"
plain
size="mini"
......
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