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 Show 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' ...@@ -9,3 +9,6 @@ VUE_APP_BASE_API = '/dev-api'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true 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' ...@@ -6,3 +6,6 @@ ENV = 'production'
# 中汽研安全检测平台管理系统/生产环境 # 中汽研安全检测平台管理系统/生产环境
VUE_APP_BASE_API = 'http://49.232.167.247:22032' 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' ...@@ -8,3 +8,7 @@ ENV = 'staging'
# 中汽研安全检测平台管理系统/测试环境 # 中汽研安全检测平台管理系统/测试环境
VUE_APP_BASE_API = '/stage-api' 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 @@ ...@@ -19,3 +19,9 @@
margin-bottom: 0; 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 { ...@@ -80,8 +80,8 @@ export default {
dialogImageUrl: '', dialogImageUrl: '',
dialogVisible: false, dialogVisible: false,
hideUpload: false, hideUpload: false,
baseUrl: process.env.VUE_APP_BASE_API, baseUrl: process.env.VUE_APP_IMAGE_API,
uploadImgUrl: process.env.VUE_APP_BASE_API + '/common/upload', // 上传的图片服务器地址 uploadImgUrl: process.env.VUE_APP_BASE_API + '/common/uploadMinio', // 上传的图片服务器地址
headers: { headers: {
Authorization: 'Bearer ' + getToken() Authorization: 'Bearer ' + getToken()
}, },
...@@ -161,7 +161,8 @@ export default { ...@@ -161,7 +161,8 @@ export default {
// 上传成功回调 // 上传成功回调
handleUploadSuccess(res, file) { handleUploadSuccess(res, file) {
if (res.code === 200) { 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() this.uploadedSuccessfully()
} else { } else {
this.number-- 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 @@ ...@@ -26,7 +26,11 @@
</div> </div>
<!-- 步骤条 --> <!-- 步骤条 -->
<div class="top-content"> <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 <div
:class="{ :class="{
'exclamation-point': item.warn, 'exclamation-point': item.warn,
...@@ -44,11 +48,11 @@ ...@@ -44,11 +48,11 @@
> >
<span class="inner-text">{{ index + 1 }}</span> <span class="inner-text">{{ index + 1 }}</span>
</div> </div>
<span <span class="tick-class">
<i
v-show="item.result && item.result.passed !== null" v-show="item.result && item.result.passed !== null"
class="tick-class" class="el-icon-check"
> />
<i class="el-icon-check" />
</span> </span>
</div> </div>
</div> </div>
...@@ -550,13 +554,20 @@ export default { ...@@ -550,13 +554,20 @@ export default {
flex-direction: row; flex-direction: row;
/* 设置为纵向排列 */ /* 设置为纵向排列 */
flex-wrap: wrap; flex-wrap: wrap;
.top-content-item {
display: flex;
// flex-direction: row;
justify-content: space-between;
align-items: center;
width: 100px;
}
/* 当容器不足时自动换行 */ /* 当容器不足时自动换行 */
.tick-class { .tick-class {
float: right; // float: right;
position: relative; position: relative;
top: -1.8em; width: 20px;
left: -1em; // top: -1.8em;
// left: -1em;
i { i {
color: #25c173; color: #25c173;
......
src/views/processing/processed-review/index.vue
View file @ 8f283af2
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
clearable clearable
> >
<el-option <el-option
v-for="dict in dict.type.sys_job_status" v-for="dict in dict.type.system_task_status"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
<script> <script>
import page from '@/mixins/page' import page from '@/mixins/page'
export default { export default {
dicts: ['sys_job_status', 'sys_scene_type', 'task_type'], dicts: ['system_task_status', 'sys_scene_type', 'task_type'],
mixins: [page], mixins: [page],
data() { data() {
return { return {
......
src/views/processing/confirm-result/index.vue → src/views/processing/systemReview/confirm-result/index.vue
View file @ 8f283af2
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
<!--1-抬头标题--> <!--1-抬头标题-->
<div class="title-style"> <div class="title-style">
<div class="title-content-style"> <div class="title-content-style">
确认审查结果(所属任务：{{ model.systemReviewTask.name }}) 确认体系审查结果(所属任务：{{ model.systemReviewTask.name }})
</div> </div>
<div class="title-content-style"> <div class="title-content-style">
<el-button type="text" @click="goToProcessedReview">返回</el-button> <el-button type="text" @click="$router.back()">返回</el-button>
</div> </div>
</div> </div>
<!--2-统计值--> <!--2-统计值-->
...@@ -354,15 +354,9 @@ export default { ...@@ -354,15 +354,9 @@ export default {
}) })
}, },
goUpdate() { goUpdate() {
if (this.type === '1') {
this.$router.push({ this.$router.push({
path: '/processing/write-check-form?id=' + this.taskId path: '/processing/systemReview/write-check-form?id=' + this.taskId
}) })
} else {
this.$router.push({
path: '/processing/type-check-form?id=' + this.taskId
})
}
}, },
getRows, getRows,
getRows2 getRows2
......
src/views/processing/review-form/index.vue → src/views/processing/systemReview/review-form/index.vue
View file @ 8f283af2
...@@ -5,11 +5,8 @@ ...@@ -5,11 +5,8 @@
<div> <div>
<!--1-抬头标题--> <!--1-抬头标题-->
<div class="title-style"> <div class="title-style">
<div v-if="type === '1'" class="title-content-style"> <div class="title-content-style">
查看检查表单(所属任务：{{ model.systemReviewTask.name }}) 查看体系审查表单(所属任务：{{ model.systemReviewTask.name }})
</div>
<div v-if="type === '2'" class="title-content-style">
查看检查表单(所属任务：{{ model.carReviewTask.name }})
</div> </div>
<div class="title-content-style"> <div class="title-content-style">
<a href="/processing/unprocessed-review">返回</a> <a href="/processing/unprocessed-review">返回</a>
...@@ -22,34 +19,21 @@ ...@@ -22,34 +19,21 @@
<el-row :gutter="60"> <el-row :gutter="60">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="任务编号:"> <el-form-item label="任务编号:">
<span>{{ <span>{{ model.systemReviewTask.taskNo }}</span>
type === '1'
? model.systemReviewTask.taskNo
: model.carReviewTask.taskNo
}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="任务名称:"> <el-form-item label="任务名称:">
<span>{{ <span>{{ model.systemReviewTask.name }}</span>
type === '1'
? model.systemReviewTask.name
: model.carReviewTask.name
}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="委托单位:"> <el-form-item label="委托单位:">
<span>{{ <span>{{ model.systemReviewTask.taskInitiatorDep }}</span>
type === '1'
? model.systemReviewTask.taskInitiatorDept
: model.carReviewTask.taskInitiatorDept
}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<template v-if="type === '1'">
<!--审查问卷概要--> <!--审查问卷概要-->
<div class="form-review-questionnaire"> <div class="form-review-questionnaire">
<table class="table" style="width: 100%" border="1"> <table class="table" style="width: 100%" border="1">
...@@ -132,92 +116,8 @@ ...@@ -132,92 +116,8 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</template>
<template v-if="type === '2'">
<!--审查问卷概要-->
<div class="form-review-questionnaire">
<table class="table" style="width: 100%" border="1">
<thead>
<tr>
<th>标准章节</th>
<th>标准要求</th>
<th>审查要点</th>
<th>审查细则</th>
<th>审查结果</th>
<th colspan="2">记录</th>
<th>填写人</th>
</tr>
</thead>
<tbody>
<!-- 循环遍历 arr -->
<template
v-for="(item, index) in model.carReviewTask.standard"
>
<tr :key="'standard-' + index">
<td
align="center"
style="text-align: center"
:rowspan="getRows2(item)"
>
{{ item.chapter }}
</td>
<td align="center" :rowspan="getRows2(item)">
{{ item.text }}
</td>
</tr>
<!-- 循环遍历 keyPointList -->
<template v-for="(i, PointIndex) in item.keyPointList">
<tr :key="'PointIndex-2' + PointIndex + index">
<td align="center" :rowspan="getRows(i)">
{{ i.text }}
</td>
</tr>
<!-- 循环遍历 reviewDetailsList -->
<template
v-for="(v, reviewDetailIndex) in i.reviewDetailsList"
>
<tr
:key="
'reviewDetailIndex-3' +
PointIndex +
reviewDetailIndex +
index
"
>
<td align="center">
{{ v.text }}
</td>
<td align="center" style="text-align: center">
{{
v.result
? v.result.passed === null
? '__'
: v.result.passed === 0
? '不通过'
: '通过'
: '__'
}}
</td>
<td align="center"></td>
<td align="center"></td>
<td align="center" style="text-align: center">
{{
v.result
? v.result.userName
? v.result.userName
: '__'
: '__'
}}
</td>
</tr>
</template>
</template>
</template>
</tbody>
</table>
</div>
</template>
<!--返回按钮--> <!--返回按钮-->
<div class="bottom-btn">
<el-button <el-button
class="btn" class="btn"
type="primary" type="primary"
...@@ -227,12 +127,13 @@ ...@@ -227,12 +127,13 @@
</el-button> </el-button>
</div> </div>
</div> </div>
</div>
</page-standard> </page-standard>
</div> </div>
</template> </template>
<!--js逻辑--> <!--js逻辑-->
<script> <script>
import { reviewTaskDetail, checkTaskDetail } from '@/api/task/task' import { reviewTaskDetail } from '@/api/task/task'
import { getRows, getRows2 } from '@/utils/reviewDetailsTable.js' import { getRows, getRows2 } from '@/utils/reviewDetailsTable.js'
export default { export default {
data() { data() {
...@@ -243,7 +144,6 @@ export default { ...@@ -243,7 +144,6 @@ export default {
reviewSceneChangeTasks: {}, reviewSceneChangeTasks: {},
detailsList: [] detailsList: []
}, },
type: 1,
taskId: 1, taskId: 1,
rules: { rules: {
enterpriseLeader: [ enterpriseLeader: [
...@@ -256,9 +156,6 @@ export default { ...@@ -256,9 +156,6 @@ export default {
} }
}, },
created() { created() {
if (this.$route.query.type) {
this.type = this.$route.query.type
}
if (this.$route.query.id) { if (this.$route.query.id) {
this.taskId = this.$route.query.id this.taskId = this.$route.query.id
} }
...@@ -269,16 +166,10 @@ export default { ...@@ -269,16 +166,10 @@ export default {
* 获取任务详情 * 获取任务详情
*/ */
async getTask() { async getTask() {
let res const res = await reviewTaskDetail({
if (this.type === '1') {
res = await reviewTaskDetail({
taskId: this.taskId taskId: this.taskId
}) })
} else {
res = await checkTaskDetail({
taskId: this.taskId
})
}
if (res.code === 200) { if (res.code === 200) {
this.model = res.data this.model = res.data
} else { } else {
......
src/views/processing/confirm-result/vehicle-type/index.vue → src/views/processing/systemReview/source-record/index.vue
View file @ 8f283af2
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
<th>审查要点</th> <th>审查要点</th>
<th>审查细则</th> <th>审查细则</th>
<th>审查结果</th> <th>审查结果</th>
<th colspan="2">记录</th>
<th>填写人</th> <th>填写人</th>
</tr> </tr>
</thead> </thead>
...@@ -165,6 +166,8 @@ ...@@ -165,6 +166,8 @@
: '__' : '__'
}} }}
</td> </td>
<td align="center"></td>
<td align="center"></td>
<td align="center"> <td align="center">
{{ {{
v.result v.result
...@@ -282,6 +285,7 @@ export default { ...@@ -282,6 +285,7 @@ export default {
data() { data() {
return { return {
isShow: true, isShow: true,
auditRequirement: 0, auditRequirement: 0,
testScenarioList: [ testScenarioList: [
{ value: 0, label: 'TBOX-蜂窝以太网接口', check: false }, { value: 0, label: 'TBOX-蜂窝以太网接口', check: false },
...@@ -446,19 +450,17 @@ export default { ...@@ -446,19 +450,17 @@ export default {
amount3: 15 amount3: 15
} }
], ],
taskId: '' taskId: '',
} type: ''
},
created() {
if (this.dataList.length > 0) {
const firstItem = this.dataList[0]
this.columns = Object.keys(firstItem)
} }
}, },
mounted() { mounted() {
if (this.$route.query.id) { if (this.$route.query.id) {
this.taskId = this.$route.query.id this.taskId = this.$route.query.id
} }
if (this.$route.query.type) {
this.type = this.$route.query.type
}
this.getTask() this.getTask()
}, },
methods: { methods: {
...@@ -675,7 +677,14 @@ thead { ...@@ -675,7 +677,14 @@ thead {
background-color: #e7e6e6; background-color: #e7e6e6;
} }
th, th {
border: 1px solid black;
padding: 8px;
text-align: center;
width: 300px;
height: 100%;
}
td { td {
border: 1px solid black; border: 1px solid black;
padding: 8px; padding: 8px;
......
src/views/processing/unprocessed-review/index.vue
View file @ 8f283af2
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
clearable clearable
> >
<el-option <el-option
v-for="dict in dict.type.sys_job_status" v-for="dict in dict.type.system_task_status"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
> >
<span v-if="item.reviewStatus !== 'NEW'" <span v-if="item.reviewStatus !== 'NEW'"
>{{ item.reviewStatus !== 'FINISH' ? '(共耗时' : '已耗时(' >{{ item.reviewStatus !== 'FINISH' ? '(共耗时' : '已耗时('
}}{{ getHourDiff(item.taskBeginTime) }})</span }}{{ getHourDiff(item.systemTaskBeginTime) }})</span
> >
</div> </div>
</template> </template>
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
> >
<span v-if="item.carReviewStatus !== 'NEW'" <span v-if="item.carReviewStatus !== 'NEW'"
>{{ item.carReviewStatus !== 'FINISH' ? '(共耗时' : '已耗时(' >{{ item.carReviewStatus !== 'FINISH' ? '(共耗时' : '已耗时('
}}{{ getHourDiff(item.taskBeginTime) }})</span }}{{ getHourDiff(item.carTaskBeginTime) }})</span
> >
</div> </div>
</template> </template>
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
></el-progress> ></el-progress>
</div> </div>
<div <div
v-if="item.carReviewStatus && item.carReviewStatus !== 'NONE'" v-if="item.carTestStatus && item.carTestStatus !== 'NONE'"
class="cell-item" class="cell-item"
> >
<el-progress <el-progress
...@@ -374,9 +374,10 @@ import taskDialog from './components/dialog' ...@@ -374,9 +374,10 @@ import taskDialog from './components/dialog'
import { getHourDiff } from '@/utils/diff' import { getHourDiff } from '@/utils/diff'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { reviewTaskStart, reviewCarTaskStart } from '@/api/task/task' import { reviewTaskStart, reviewCarTaskStart } from '@/api/task/task'
import request from '@/utils/request'
export default { export default {
dicts: [ dicts: [
'sys_job_status', 'system_task_status',
'system_review_test_btn', 'system_review_test_btn',
'test_cartype_type_btn', 'test_cartype_type_btn',
'test_cartype_task_btn', 'test_cartype_task_btn',
...@@ -406,29 +407,30 @@ export default { ...@@ -406,29 +407,30 @@ export default {
...mapGetters(['userId']) ...mapGetters(['userId'])
}, },
methods: { methods: {
// loadData() { loadData() {
// this.loading = true this.loading = true
// request({ request({
// url: this.listUrl, url: this.listUrl,
// method: 'post', method: 'post',
// data: this.queryParams data: this.queryParams
// }) })
// .then(res => { .then(res => {
// if (res.code === 200) { if (res.code === 200) {
// console.log(res.rows) console.log(res.rows)
// res.rows[0].carReviewStatus = 'CONFIRM' res.rows[0].reviewStatus = 'SIGNED'
// this.tableData = res.rows res.rows[0].carReviewStatus = 'FINISH'
// this.total = res.total this.tableData = res.rows
// } this.total = res.total
// this.loading = false }
// }) this.loading = false
// .catch(error => { })
// if (error.msg) { .catch(error => {
// this.$message.error(error.msg) if (error.msg) {
// } this.$message.error(error.msg)
// this.loading = false }
// }) this.loading = false
// }, })
},
/** /**
* 企业留档文件 * 企业留档文件
* @param item 对象 * @param item 对象
...@@ -568,19 +570,24 @@ export default { ...@@ -568,19 +570,24 @@ export default {
// 查看体系审查检查表单 // 查看体系审查检查表单
case 'NEW': case 'NEW':
this.$router.push({ this.$router.push({
path: '/processing/review-form?type=1&id=' + id path: '/processing/systemReview/review-form?id=' + id
}) })
break break
// 体系审查填写审查问卷 // 体系审查填写审查问卷
case 'PENDING': case 'PENDING':
this.$router.push({ this.$router.push({
path: '/processing/write-check-form?id=' + id path: '/processing/systemReview/write-check-form?id=' + id
}) })
break break
// 确认体系审查检查表单 // 确认体系审查检查表单
case 'CONFIRM': case 'SIGNED':
this.$router.push({
path: '/processing/systemReview/confirm-result?id=' + id
})
break
case 'FINISH':
this.$router.push({ this.$router.push({
path: '/processing/confirm-result?type=1&id=' + id path: '/processing/systemReview/source-record?id=' + id
}) })
break break
} }
...@@ -601,7 +608,7 @@ export default { ...@@ -601,7 +608,7 @@ export default {
}) })
break break
// 确认测试结果 // 确认测试结果
case 'CONFIRM': case 'SIGNED':
this.$router.push({ this.$router.push({
path: '/processing/vehicle-type' path: '/processing/vehicle-type'
}) })
...@@ -614,25 +621,25 @@ export default { ...@@ -614,25 +621,25 @@ export default {
// 查看车型检查表单 // 查看车型检查表单
case 'NEW': case 'NEW':
this.$router.push({ this.$router.push({
path: '/processing/review-form?type=2&id=' + id path: '/processing/carReview/review-form?id=' + id
}) })
break break
// 填写车型检查表单 // 填写车型检查表单
case 'PENDING': case 'PENDING':
this.$router.push({ this.$router.push({
path: '/processing/type-check-form?id=' + id path: '/processing/carReview/write-check-form?id=' + id
}) })
break break
// 确认车型检验结果 // 确认车型检验结果
case 'CONFIRM': case 'SIGNED':
this.$router.push({ this.$router.push({
path: '/processing/vehicle-type?id=' + id path: '/processing/carReview/vehicle-type?id=' + id
}) })
break break
// 查看车型审查记录 // 查看车型审查记录
case 'FINISH': case 'FINISH':
this.$router.push({ 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