Skip to content

W
web
Commit 8f283af2 authored by jiaxu.yan's avatar jiaxu.yan
Browse files
Options

Merge branch 'developer/yanjiaxu' into develop 

# Conflicts:
#	.env.development
#	.env.production
#	.env.staging
parents d2e7e4de 4a0c90b9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2355 additions and 72 deletions
.env.development
View file @ 8f283af2
......@@ -9,3 +9,6 @@ VUE_APP_BASE_API = '/dev-api'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
# 图片服务器地址
VUE_APP_IMAGE_API = http://49.232.167.247:22037
.env.production
View file @ 8f283af2
......@@ -6,3 +6,6 @@ ENV = 'production'
# 中汽研安全检测平台管理系统/生产环境
VUE_APP_BASE_API = 'http://49.232.167.247:22032'
# 图片服务器地址
VUE_APP_IMAGE_API = http://49.232.167.247:22037
.env.staging
View file @ 8f283af2
......@@ -8,3 +8,7 @@ ENV = 'staging'
# 中汽研安全检测平台管理系统/测试环境
VUE_APP_BASE_API = '/stage-api'
# 图片服务器地址
VUE_APP_IMAGE_API = http://49.232.167.247:22037
src/assets/styles/process.scss
View file @ 8f283af2
......@@ -19,3 +19,9 @@
margin-bottom: 0;
}
}
.bottom-btn {
text-align: center;
margin-top: 20px;
margin-bottom: 50px;
/* 调整按钮距离底部的距离 */
}
src/components/ImageUpload/index.vue
View file @ 8f283af2
......@@ -80,8 +80,8 @@ export default {
dialogImageUrl: '',
dialogVisible: false,
hideUpload: false,
baseUrl: process.env.VUE_APP_BASE_API,
uploadImgUrl: process.env.VUE_APP_BASE_API + '/common/upload', // 上传的图片服务器地址
baseUrl: process.env.VUE_APP_IMAGE_API,
uploadImgUrl: process.env.VUE_APP_BASE_API + '/common/uploadMinio', // 上传的图片服务器地址
headers: {
Authorization: 'Bearer ' + getToken()
},
......@@ -161,7 +161,8 @@ export default {
// 上传成功回调
handleUploadSuccess(res, file) {
if (res.code === 200) {
this.uploadList.push({ name: res.fileName, url: res.fileName })
// const Image = process.env.VUE_APP_IMAGE_API + res.url
this.uploadList.push({ name: res.originalFilename, url: res.url })
this.uploadedSuccessfully()
} else {
this.number--
......
src/views/processing/carReview/source-record/index.vue 0 → 100644
View file @ 8f283af2
This diff is collapsed.
src/views/processing/carReview/vehicle-type/index.vue 0 → 100644
View file @ 8f283af2
This diff is collapsed.
src/views/processing/type-check-form/index.vue → src/views/processing/carReview/write-check-form/index.vue
View file @ 8f283af2
......@@ -26,7 +26,11 @@
</div>
<!-- 步骤条 -->
<div class="top-content">
<div v-for="(item, index) in detailsList" :key="index">
<div
v-for="(item, index) in detailsList"
:key="index"
class="top-content-item"
>
<div
:class="{
'exclamation-point': item.warn,
......@@ -44,11 +48,11 @@
>
<span class="inner-text">{{ index + 1 }}</span>
</div>
<span
v-show="item.result && item.result.passed !== null"
class="tick-class"
>
<i class="el-icon-check" />
<span class="tick-class">
<i
v-show="item.result && item.result.passed !== null"
class="el-icon-check"
/>
</span>
</div>
</div>
......@@ -550,13 +554,20 @@ export default {
flex-direction: row;
/* 设置为纵向排列 */
flex-wrap: wrap;
.top-content-item {
display: flex;
// flex-direction: row;
justify-content: space-between;
align-items: center;
width: 100px;
}
/* 当容器不足时自动换行 */
.tick-class {
float: right;
// float: right;
position: relative;
top: -1.8em;
left: -1em;
width: 20px;
// top: -1.8em;
// left: -1em;
i {
color: #25c173;
......
src/views/processing/processed-review/index.vue
View file @ 8f283af2
......@@ -57,7 +57,7 @@
clearable
>
<el-option
v-for="dict in dict.type.sys_job_status"
v-for="dict in dict.type.system_task_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -147,7 +147,7 @@
<script>
import page from '@/mixins/page'
export default {
dicts: ['sys_job_status', 'sys_scene_type', 'task_type'],
dicts: ['system_task_status', 'sys_scene_type', 'task_type'],
mixins: [page],
data() {
return {
......
src/views/processing/confirm-result/index.vue → src/views/processing/systemReview/confirm-result/index.vue
View file @ 8f283af2
......@@ -6,10 +6,10 @@
<!--1-抬头标题-->
<div class="title-style">
<div class="title-content-style">
确认审查结果(所属任务：{{ model.systemReviewTask.name }})
确认体系审查结果(所属任务：{{ model.systemReviewTask.name }})
</div>
<div class="title-content-style">
<el-button type="text" @click="goToProcessedReview">返回</el-button>
<el-button type="text" @click="$router.back()">返回</el-button>
</div>
</div>
<!--2-统计值-->
......@@ -354,15 +354,9 @@ export default {
})
},
goUpdate() {
if (this.type === '1') {
this.$router.push({
path: '/processing/write-check-form?id=' + this.taskId
})
} else {
this.$router.push({
path: '/processing/type-check-form?id=' + this.taskId
})
}
this.$router.push({
path: '/processing/systemReview/write-check-form?id=' + this.taskId
})
},
getRows,
getRows2
......
src/views/processing/confirm-result/vehicle-type/index.vue → src/views/processing/systemReview/source-record/index.vue
View file @ 8f283af2
......@@ -116,6 +116,7 @@
<th>审查要点</th>
<th>审查细则</th>
<th>审查结果</th>
<th colspan="2">记录</th>
<th>填写人</th>
</tr>
</thead>
......@@ -165,6 +166,8 @@
: '__'
}}
</td>
<td align="center"></td>
<td align="center"></td>
<td align="center">
{{
v.result
......@@ -282,6 +285,7 @@ export default {
data() {
return {
isShow: true,
auditRequirement: 0,
testScenarioList: [
{ value: 0, label: 'TBOX-蜂窝以太网接口', check: false },
......@@ -446,19 +450,17 @@ export default {
amount3: 15
}
],
taskId: ''
}
},
created() {
if (this.dataList.length > 0) {
const firstItem = this.dataList[0]
this.columns = Object.keys(firstItem)
taskId: '',
type: ''
}
},
mounted() {
if (this.$route.query.id) {
this.taskId = this.$route.query.id
}
if (this.$route.query.type) {
this.type = this.$route.query.type
}
this.getTask()
},
methods: {
......@@ -675,7 +677,14 @@ thead {
background-color: #e7e6e6;
}
th,
th {
border: 1px solid black;
padding: 8px;
text-align: center;
width: 300px;
height: 100%;
}
td {
border: 1px solid black;
padding: 8px;
......
src/views/processing/unprocessed-review/index.vue
View file @ 8f283af2
......@@ -56,7 +56,7 @@
clearable
>
<el-option
v-for="dict in dict.type.sys_job_status"
v-for="dict in dict.type.system_task_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -179,7 +179,7 @@
>
<span v-if="item.reviewStatus !== 'NEW'"
>{{ item.reviewStatus !== 'FINISH' ? '(共耗时' : '已耗时('
}}{{ getHourDiff(item.taskBeginTime) }})</span
}}{{ getHourDiff(item.systemTaskBeginTime) }})</span
>
</div>
</template>
......@@ -210,7 +210,7 @@
>
<span v-if="item.carReviewStatus !== 'NEW'"
>{{ item.carReviewStatus !== 'FINISH' ? '(共耗时' : '已耗时('
}}{{ getHourDiff(item.taskBeginTime) }})</span
}}{{ getHourDiff(item.carTaskBeginTime) }})</span
>
</div>
</template>
......@@ -269,7 +269,7 @@
></el-progress>
</div>
<div
v-if="item.carReviewStatus && item.carReviewStatus !== 'NONE'"
v-if="item.carTestStatus && item.carTestStatus !== 'NONE'"
class="cell-item"
>
<el-progress
......@@ -374,9 +374,10 @@ import taskDialog from './components/dialog'
import { getHourDiff } from '@/utils/diff'
import { mapGetters } from 'vuex'
import { reviewTaskStart, reviewCarTaskStart } from '@/api/task/task'
import request from '@/utils/request'
export default {
dicts: [
'sys_job_status',
'system_task_status',
'system_review_test_btn',
'test_cartype_type_btn',
'test_cartype_task_btn',
......@@ -406,29 +407,30 @@ export default {
...mapGetters(['userId'])
},
methods: {
// loadData() {
// this.loading = true
// request({
// url: this.listUrl,
// method: 'post',
// data: this.queryParams
// })
// .then(res => {
// if (res.code === 200) {
// console.log(res.rows)
// res.rows[0].carReviewStatus = 'CONFIRM'
// this.tableData = res.rows
// this.total = res.total
// }
// this.loading = false
// })
// .catch(error => {
// if (error.msg) {
// this.$message.error(error.msg)
// }
// this.loading = false
// })
// },
loadData() {
this.loading = true
request({
url: this.listUrl,
method: 'post',
data: this.queryParams
})
.then(res => {
if (res.code === 200) {
console.log(res.rows)
res.rows[0].reviewStatus = 'SIGNED'
res.rows[0].carReviewStatus = 'FINISH'
this.tableData = res.rows
this.total = res.total
}
this.loading = false
})
.catch(error => {
if (error.msg) {
this.$message.error(error.msg)
}
this.loading = false
})
},
/**
* 企业留档文件
* @param item 对象
......@@ -568,19 +570,24 @@ export default {
// 查看体系审查检查表单
case 'NEW':
this.$router.push({
path: '/processing/review-form?type=1&id=' + id
path: '/processing/systemReview/review-form?id=' + id
})
break
// 体系审查填写审查问卷
case 'PENDING':
this.$router.push({
path: '/processing/write-check-form?id=' + id
path: '/processing/systemReview/write-check-form?id=' + id
})
break
// 确认体系审查检查表单
case 'CONFIRM':
case 'SIGNED':
this.$router.push({
path: '/processing/systemReview/confirm-result?id=' + id
})
break
case 'FINISH':
this.$router.push({
path: '/processing/confirm-result?type=1&id=' + id
path: '/processing/systemReview/source-record?id=' + id
})
break
}
......@@ -601,7 +608,7 @@ export default {
})
break
// 确认测试结果
case 'CONFIRM':
case 'SIGNED':
this.$router.push({
path: '/processing/vehicle-type'
})
......@@ -614,25 +621,25 @@ export default {
// 查看车型检查表单
case 'NEW':
this.$router.push({
path: '/processing/review-form?type=2&id=' + id
path: '/processing/carReview/review-form?id=' + id
})
break
// 填写车型检查表单
case 'PENDING':
this.$router.push({
path: '/processing/type-check-form?id=' + id
path: '/processing/carReview/write-check-form?id=' + id
})
break
// 确认车型检验结果
case 'CONFIRM':
case 'SIGNED':
this.$router.push({
path: '/processing/vehicle-type?id=' + id
path: '/processing/carReview/vehicle-type?id=' + id
})
break
// 查看车型审查记录
case 'FINISH':
this.$router.push({
path: '/processing/vehicle-type'
path: '/processing/carReview/source-record?id=' + id
})
}
},
......
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