Skip to content

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

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

parents b01ac001 ef1738fa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 598 additions and 472 deletions
.env.development
View file @ b6dceeba
# 页面标题
VUE_APP_TITLE = 安全信息检测平台
VUE_APP_TITLE = 周期性检测平台
# 开发环境配置
ENV = 'development'
......
.env.production
View file @ b6dceeba
......@@ -4,10 +4,11 @@ VUE_APP_TITLE = 周期性检测平台
# 生产环境配置
ENV = 'production'
# 中汽研安全检测平台管理系统/生产环境
VUE_APP_BASE_API = '/prod-api'
# 图片服务器地址
VUE_APP_IMAGE_API ='/'
VUE_APP_IMAGE_API ='https://10.12.48.78'
VUE_APP_CLIENT_API = 'http://10.12.48.78:8090'
VUE_APP_CLIENT_API = 'https://10.12.48.78/vvmpapi'
.env.staging
View file @ b6dceeba
# 页面标题
VUE_APP_TITLE = 安全信息检测平台
VUE_APP_TITLE = 周期性检测平台
# 开发环境配置
ENV = 'staging'
......@@ -9,4 +9,4 @@ VUE_APP_BASE_API = 'http://49.232.167.247:22032'
# 图片服务器地址
VUE_APP_IMAGE_API = 'http://49.232.167.247:22037'
VUE_APP_CLIENT_API = 'http://10.12.48.78:8090'
VUE_APP_CLIENT_API = 'https://10.12.48.78/vvmpapi'
public/index.html
View file @ b6dceeba
......@@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<!-- <link href="https://unpkg.com/tailwindcss@^2/dist/tailwind.min.css" rel="stylesheet"> -->
<script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_31435_85.f03f7ada23edcf4cd72e61338ed55693.js"></script>
<script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_31435_86.9b2d26764ccec5f05296d7ffca18aa56.js"></script>
<title><%= webpackConfig.name %></title>
<!--[if lt IE 11]>
<script>window.location.href = '/html/ie.html';</script><![endif]-->
......
src/api/task/task.js
View file @ b6dceeba
......@@ -217,4 +217,16 @@ export function geTaskCase(data) {
data
})
}
/**
*提交确认表单
*/
export function taskImageSubmit(data) {
return request({
url: '/car/test/task/submit',
method: 'post',
data
})
}
src/assets/styles/process.scss
View file @ b6dceeba
......@@ -92,7 +92,7 @@
width: calc(100% - 100px);
}
.standard-title {
width: calc(100% - 10px);
width: calc(70% - 40px);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
......@@ -709,15 +709,13 @@
width: 120px !important;
// text-align: center !important;
}
.passed{
.el-form-item__label{
margin-left: -10px;
}
}
.el-progress{
.el-progress {
display: flex;
}
.empty-message{
text-align: center;
.empty-message {
margin: 0 10px;
display: flex;
flex-flow: column;
align-items: center;
color: #ccc;
}
src/components/Page/TaskStandard.vue
View file @ b6dceeba
......@@ -36,11 +36,7 @@ export default {
},
methods: {
goBack() {
// 获取当前路由信息
const currentRoute = this.$router.currentRoute
// 获取来源页面的路由信息
const fromRoute = currentRoute.from
console.log(currentRoute)
this.$router.back()
}
}
}
......@@ -48,7 +44,7 @@ export default {
<style lang="scss" scoped>
.page-data {
padding: 0 24px;
padding-bottom: 24px;
padding-bottom: 24px;
}
.card-box {
......
src/views/echartHome/useCaseRisk.vue
View file @ b6dceeba
......@@ -19,7 +19,7 @@ export default {
// 3.配置数据
const option = {
title: {
text: '任务保密等级占比',
text: '用例风险程度概览',
left: 'left',
textStyle: {
color: '#606266',
......
src/views/index.vue
View file @ b6dceeba
......@@ -104,7 +104,7 @@
size="36"
></iconpark-icon>
</div>
<span>已完成 ：43个</span>
<span>未完成 ：43个</span>
<div>
<el-progress
:percentage="40"
......@@ -205,7 +205,7 @@
<el-row>
<el-col :span="24">
<div class="cardStyle" style="height: 500px">
<div class="cardTitle">任务完成情况占比</div>
<div class="cardTitle">参与任务情况</div>
<div
style="
display: flex;
......
src/views/processing/carReview/source-record/index.vue
View file @ b6dceeba
......@@ -212,13 +212,15 @@
<div v-else>__</div>
</td>
<td align="center">
<div
v-if="
reviewDetail.result && reviewDetail.result.fileName
"
>
《{{ reviewDetail.result.fileName }}》
{{ reviewDetail.result.catalogue }}
<div v-if="reviewDetail.result">
<div v-if="reviewDetail.result.fileList">
<template v-for="i in reviewDetail.result.fileList">
《{{ i.fileName }}》 {{ i.catalogue }}
</template>
</div>
<div v-if="reviewDetail.result.comment">
{{ reviewDetail.result.comment }}
</div>
</div>
<div v-else>__</div>
</td>
......
src/views/processing/carReview/vehicle-type/index.vue
View file @ b6dceeba
......@@ -191,18 +191,21 @@
<tr :key="reviewDetailKey">
<td align="center">{{ reviewDetail.text }}</td>
<td align="center" class="investigate-result">
<el-tag
v-if="reviewDetail.result.passed === 1"
size="medium"
type="success"
>符合</el-tag
>
<el-tag
v-if="reviewDetail.result.passed === 0"
size="medium"
type="danger"
>不符合</el-tag
>
<div v-if="reviewDetail.result">
<el-tag
v-if="reviewDetail.result.passed === 1"
size="medium"
type="success"
>符合</el-tag
>
<el-tag
v-if="reviewDetail.result.passed === 0"
size="medium"
type="warning"
>不符合</el-tag
>
</div>
<div v-else>__</div>
</td>
<td align="center" class="written-by">
{{
......@@ -230,7 +233,16 @@
<span class="title-content">确定车型试验范围</span>
</div>
<div class="img-item">
<div class="img-label" style="margin-top: 20px">选择测试场景</div>
<div class="img-label" style="margin-top: 20px">
选择测试场景
<footer-button
style="width: 80px; height: 25px"
type="primary"
@click="selectAll"
>
全部选择
</footer-button>
</div>
</div>
<!-- 测试场景 -->
<div class="test-scenario-container">
......@@ -456,6 +468,14 @@ export default {
},
closeAll() {
this.activeNames = []
}, // 全选
selectAll() {
this.model.testScenarioList.forEach(obj => {
obj.check = true
})
this.selectedScenario = this.model.testScenarioList.map(obj => {
return obj.value
})
}
}
}
......
src/views/processing/carReview/write-check-form/components/companyFile.vue
View file @ b6dceeba
......@@ -129,9 +129,6 @@ export default {
],
identifyNumber: [
{ required: true, message: '请输入文件识别号', trigger: 'blur' }
],
photo: [
{ required: true, message: '请选择文件照片', trigger: 'change' }
]
},
model: this.$modelDataSource({
......
src/views/processing/carReview/write-check-form/components/previewView.vue
View file @ b6dceeba
......@@ -99,11 +99,15 @@
<div v-else>__</div>
</td>
<td align="center">
<div
v-if="reviewDetail.result && reviewDetail.result.fileName"
>
《{{ reviewDetail.result.fileName }}》
{{ reviewDetail.result.catalogue }}
<div v-if="reviewDetail.result">
<div v-if="reviewDetail.result.fileList">
<template v-for="i in reviewDetail.result.fileList">
《{{ i.fileName }}》 {{ i.catalogue }}
</template>
</div>
<div v-if="reviewDetail.result.comment">
{{ reviewDetail.result.comment }}
</div>
</div>
<div v-else>__</div>
</td>
......
src/views/processing/carTest/confirmation-test/index.vue
View file @ b6dceeba
......@@ -15,7 +15,7 @@
<div class="task-item">
<span class="task-label">任务编号:</span>
<span class="task-content">
{{ model.carReviewTask.taskNo }}
{{ task.taskNo }}
</span>
</div>
<div class="task-item">
......@@ -30,17 +30,12 @@
{{ task.entrustedUnit }}
</span>
</div>
<div class="task-item">
<span class="task-label">任务状态:</span>
<span class="task-content">
{{
getDictData(
dict.type.test_cartype_type,
model.carReviewTask.taskStatus
)
}}
</span>
</div>
<!-- <div class="task-item">-->
<!-- <span class="task-label">任务状态:</span>-->
<!-- <span class="task-content">-->
<!-- {{ getDictData(dict.type.task_test_status, task.taskStatus) }}-->
<!-- </span>-->
<!-- </div>-->
</div>
<div class="task-body">
<!--card统计值-->
......@@ -131,46 +126,58 @@
<col style="width: 100px" />
<thead>
<tr>
<th>章节号</th>
<th style="width: 100px">章节号</th>
<th>标准技术要求</th>
<th>标准测试方法</th>
<th>测试场景</th>
<th>测试类型</th>
<th>用例编号</th>
<th>测试结果</th>
<!-- <th>用例名称</th>-->
<!-- <th>工具</th>-->
<!-- <th>对应输入</th>-->
<!-- <th style="width: 370px">测试用例</th>-->
</tr>
</thead>
<tbody>
<!-- 循环遍历 keyPointList -->
<template v-for="(i, PointIndex) in tableData.keyPointList">
<template v-for="(i, PointIndex) in tableData">
<tr :key="'PointIndex1' + PointIndex">
<td align="center" :rowspan="getRows(i)">
{{ '7.1.1' }}
<td align="center" :rowspan="getRows3(i)">
{{ i.chapter }}
</td>
<td align="center" :rowspan="getRows(i)">
<td align="center" :rowspan="getRows3(i)">
{{ i.text }}
</td>
<td align="center" :rowspan="getRows(i)">
{{ i.text }}
<td align="center" :rowspan="getRows3(i)">
{{ i.testMethod }}
</td>
</tr>
<!-- 循环遍历 reviewDetailsList -->
<template v-for="(v, reviewDetailIndex) in i.reviewDetailsList">
<tr
:key="'reviewDetailIndex' + PointIndex + reviewDetailIndex"
>
<td align="center">
{{ '测试场景' }}
<template v-for="(v, testCaseIndex) in i.testCaseList">
<tr :key="'testCaseIndex' + PointIndex + testCaseIndex">
<td align="center" rowspan="1">
{{ v.testScenario }}
</td>
<td align="center">
{{ '测试类型' }}
<td align="center" rowspan="1">
{{ v.testType }}
</td>
<td align="center">
{{ '用例编号' }}
<td align="center" rowspan="1">
{{ v.usecaseNo }}
</td>
<td align="center">
{{ '测试结果' }}
<td align="center" rowspan="1">
{{ '' }}
</td>
<!-- <td align="center" rowspan="1">-->
<!-- {{ v.name }}-->
<!-- </td>-->
<!-- <td align="center" rowspan="1">-->
<!-- {{ v.tools }}-->
<!-- </td>-->
<!-- <td align="center" rowspan="1">-->
<!-- {{ v.input }}-->
<!-- </td>-->
<!-- <td align="center" rowspan="1">-->
<!-- {{ v.description }}-->
<!-- </td>-->
</tr>
</template>
</template>
......@@ -209,6 +216,7 @@
返回
</footer-button>
<footer-button
v-if="this.isLeader !== false"
type="primary"
icon="hard-disk-one"
@click="goToProcessedReview"
......@@ -223,11 +231,12 @@
<!--js逻辑-->
<script>
import routerMixins from '@/mixins/router'
import { getRows, getRows2 } from '../../../../utils/reviewDetailsTable'
import { listInspection } from '../../../../api/setting/standardTerms'
import { getRows3 } from '../../../../utils/reviewDetailsTable'
import { testDetail } from '../../../../api/task/test'
import { getBySubtaskId, taskImageSubmit } from '../../../../api/task/task'
export default {
name: 'Index',
dicts: ['test_cartype_type'],
dicts: ['task_test_status'],
mixins: [routerMixins],
data() {
return {
......@@ -243,95 +252,56 @@ export default {
inspectionLeader: '',
result: []
},
rules: {
enterpriseLeader: [
{ required: true, message: '请输入车企负责人', trigger: 'blur' }
],
inspectionLeader: [
{ required: true, message: '请输入检验负责人', trigger: 'blur' }
]
},
taskId: '',
loading: false
loading: false,
isLeader: ''
}
},
// async mounted() {
// if (this.$route.query.id) {
// this.taskId = this.$route.query.id
// }
// await this.getTask()
// this.openAll()
// },
mounted() {
this.init()
this.getTest()
this.getTestDetail()
},
methods: {
getRows,
getRows2,
/** 获取体系审查、车型审查检验内容 */
init() {
getRows3,
/* 返回跳转*/
goToProcessedReview() {
// this.ruleForm.taskId = '1771093631118106626'
const formData = {
// imagesUrl: [
// this.ruleForm.enterpriseLeader,
// this.ruleForm.inspectionLeader
// ],
imagesUrl: [{}],
taskId: this.$route.query.id
}
console.log('formData', formData)
taskImageSubmit(formData).then(res => {
if (res.code === 200) {
this.$modal.msgSuccess('确认提交成功')
this.$router.push({
path: '/processing/unprocessed-review'
})
} else {
this.$modal.msgError(res.msg)
}
})
},
/** 获取任务详情 */
getTest() {
getBySubtaskId({ id: this.$route.query.id }).then(res => {
if (res.code === 200) {
this.task = res.data
const auditors = res.data.auditors
this.isLeader = auditors.some(item => item.isLeader === 1)
console.log('found', this.isLeader) // 输出: true 如果找到，否则输出: false
}
})
},
getTestDetail() {
this.loading = true
listInspection({ id: '1744181159757221888' }).then(res => {
testDetail({ taskId: this.$route.query.id }).then(res => {
this.tableData = res.data
this.loading = false
})
},
/**
* 获取任务详情
*/
// async getTask() {
// this.loading = true
// const res = await checkTaskDetail({
// taskId: this.taskId
// })
// this.loading = false
// if (res.code === 200) {
// this.model = res.data
// await this.getTaskDetail()
// if (this.model.carReviewTask.imagesUrl) {
// const imgs = this.model.carReviewTask.imagesUrl.split(',')
// this.ruleForm.enterpriseLeader
// ? process.env.VUE_APP_IMAGE_API + imgs[0]
// : ''
// this.ruleForm.inspectionLeader
// ? process.env.VUE_APP_IMAGE_API + imgs[1]
// : ''
// }
// } else {
// this.$modal.msgError(res.msg)
// }
// },
/**
* 获取任务详情
*/
// async getTaskDetail() {
// const result = await getBySubtaskId({
// id: this.taskId
// })
// if (result.code === 200) {
// this.task = result.data
// }
// },
/* 返回跳转*/
goToProcessedReview() {
// this.ruleForm.taskId = this.taskId
// const formData = {
// imagesUrl: [
// this.ruleForm.enterpriseLeader,
// this.ruleForm.inspectionLeader
// ],
// taskId: this.taskId
// }
// carTaskSubmit(formData).then(res => {
// if (res.code === 200) {
// this.$modal.msgSuccess('确认提交成功')
// this.$router.push({
// path: '/processing/unprocessed-review'
// })
// } else {
// this.$modal.msgError(res.msg)
// }
// })
}
}
}
......
src/views/processing/carTest/execution-test-plan/index.vue
View file @ b6dceeba
<!-- 测试用例详情 -->
<template>
<page-standard>
<task-standard>
<div class="web-page">
<iframe
:src="url"
......@@ -8,7 +8,7 @@
style="width: 100%; height: 100%"
></iframe>
</div>
</page-standard>
</task-standard>
</template>
<script>
......@@ -23,7 +23,7 @@ export default {
},
mounted() {
const id = this.$route.query.id
this.url = `http://10.12.48.80:1234/car/complianceTestingCenter/projectOverView/${id}`
this.url = `https://10.12.48.78:8090/car/complianceTestingCenter/projectOverView/${id}`
},
methods: {}
}
......
src/views/processing/carTest/review-form/index.vue
View file @ b6dceeba
......@@ -139,7 +139,6 @@ export default {
detailsList: []
},
task: {},
taskId: '',
loading: false
}
},
......@@ -150,7 +149,7 @@ export default {
methods: {
getRows3,
getTest() {
getBySubtaskId({ id: '1768527384203460609' }).then(res => {
getBySubtaskId({ id: this.$route.query.id }).then(res => {
if (res.code === 200) {
this.task = res.data
}
......@@ -159,7 +158,7 @@ export default {
/** 获取任务详情 */
getTestDetail() {
this.loading = true
testDetail({ taskId: '1768527384203460609' }).then(res => {
testDetail({ taskId: this.$route.query.id }).then(res => {
this.tableData = res.data
this.loading = false
})
......
src/views/processing/fileLibrary/components/dialog.vue
View file @ b6dceeba
......@@ -135,9 +135,6 @@ export default {
],
identifyNumber: [
{ required: true, message: '请输入文件识别号', trigger: 'blur' }
],
photo: [
{ required: true, message: '请选择文件照片', trigger: 'change' }
]
}
}
......
src/views/processing/fileLibrary/index.vue
View file @ b6dceeba
......@@ -157,6 +157,7 @@
prop="createBy"
label="创建人员"
min-width="130"
show-overflow-tooltip
align="left"
>
</el-table-column>
......
src/views/processing/systemReview/source-record/index.vue
View file @ b6dceeba
......@@ -217,13 +217,15 @@
<div v-else>__</div>
</td>
<td align="center">
<div
v-if="
reviewDetail.result && reviewDetail.result.fileName
"
>
《{{ reviewDetail.result.fileName }}》
{{ reviewDetail.result.catalogue }}
<div v-if="reviewDetail.result">
<div v-if="reviewDetail.result.fileList">
<template v-for="i in reviewDetail.result.fileList">
《{{ i.fileName }}》 {{ i.catalogue }}
</template>
</div>
<div v-if="reviewDetail.result.comment">
{{ reviewDetail.result.comment }}
</div>
</div>
<div v-else>__</div>
</td>
......
src/views/processing/systemReview/write-check-form/components/companyFile.vue
View file @ b6dceeba
......@@ -129,9 +129,6 @@ export default {
],
identifyNumber: [
{ required: true, message: '请输入文件识别号', trigger: 'blur' }
],
photo: [
{ required: true, message: '请选择文件照片', trigger: 'change' }
]
},
model: this.$modelDataSource({
......
src/views/processing/systemReview/write-check-form/components/previewView.vue
View file @ b6dceeba
......@@ -99,11 +99,15 @@
<div v-else>__</div>
</td>
<td align="center">
<div
v-if="reviewDetail.result && reviewDetail.result.fileName"
>
《{{ reviewDetail.result.fileName }}》
{{ reviewDetail.result.catalogue }}
<div v-if="reviewDetail.result">
<div v-if="reviewDetail.result.fileList">
<template v-for="i in reviewDetail.result.fileList">
《{{ i.fileName }}》 {{ i.catalogue }}
</template>
</div>
<div v-if="reviewDetail.result.comment">
{{ reviewDetail.result.comment }}
</div>
</div>
<div v-else>__</div>
</td>
......
src/views/processing/unprocessed-review/index.vue
View file @ b6dceeba
......@@ -600,7 +600,7 @@ export default {
// 确认测试结果
case 'SIGNED':
this.$router.push({
ath: `/processing/carTest/confirmation-test??id=${id}`
path: `/processing/carTest/confirmation-test??id=${id}`
})
break
case 'FINISH':
......
src/views/setting/standardTerms/components/documentReviewDialog.vue
View file @ b6dceeba
......@@ -3,7 +3,7 @@
title="检验内容"
:visible.sync="dialogManger.dialogVisible"
direction="rtl"
size="40%"
size="80%"
:before-close="handleClose"
>
<template slot="title">
......
src/views/setting/standardTerms/components/vehicleModelDialog.vue
View file @ b6dceeba
......@@ -2,7 +2,7 @@
<el-drawer
:visible.sync="dialogManger.dialogVisible"
direction="rtl"
size="40%"
size="80%"
:before-close="handleClose"
>
<template slot="title">
......
src/views/setting/testMatrix/useCaseDetails/index.vue
View file @ b6dceeba
......@@ -18,12 +18,11 @@ export default {
return {
id: this.$route.query,
url: ''
// http://10.12.48.78:8090/car/caseManage/case/casePublishDetail/case_items;375
}
},
mounted() {
const id = this.$route.query.id
this.url = `http://10.12.48.78:8090/car/caseManage/case/casePublishDetail/${id}`
this.url = `https://10.12.48.78:8090/car/caseManage/case/casePublishDetail/${id}`
},
methods: {}
}
......
src/views/system/role/authUser.vue
View file @ b6dceeba
......@@ -239,6 +239,8 @@ export default {
const roleId = this.queryParams.roleId
this.$modal
.confirm('确认要取消该用户"' + row.userName + '"角色吗？', {
type: 'warning',
title: '取消授权',
closeOnClickModal: false
})
.then(function () {
......@@ -256,6 +258,8 @@ export default {
const userIds = this.userIds.join(',')
this.$modal
.confirm('是否取消选中用户授权数据项？', {
type: 'warning',
title: '取消授权',
closeOnClickModal: false
})
.then(function () {
......
src/views/system/role/index.vue
View file @ b6dceeba
......@@ -196,12 +196,12 @@
>更多</el-button
>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
<!-- <el-dropdown-item
v-hasPermi="['system:role:edit']"
command="handleDataScope"
icon="el-icon-circle-check"
>数据权限</el-dropdown-item
>
> -->
<el-dropdown-item
v-hasPermi="['system:role:edit']"
command="handleAuthUser"
......
vue.config.js
View file @ b6dceeba
......@@ -42,7 +42,7 @@ module.exports = {
}
},
[process.env.VUE_APP_CLIENT_API]: {
target: `http://10.12.48.78:8090`,
target: `https://10.12.48.78/vvmpapi`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_CLIENT_API]: ''
......@@ -116,7 +116,7 @@ module.exports = {
.use('graphql-tag/loader')
.loader('graphql-tag/loader')
.end();
config.when(process.env.NODE_ENV !== 'development', config => {
config.when(process.env.NODE_ENV === 'production', config => {
config
.plugin('ScriptExtHtmlWebpackPlugin')
.after('html')
......
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