Skip to content

W
web
Commit 2053f598 authored by mzx's avatar mzx
Browse files
Options

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

parents 1d77967d a74a5787
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 533 additions and 384 deletions
.env.development
View file @ 2053f598
# 页面标题
VUE_APP_TITLE = 安全信息检测平台
VUE_APP_TITLE = 周期性检测平台
# 开发环境配置
ENV = 'development'
......
.env.staging
View file @ 2053f598
# 页面标题
VUE_APP_TITLE = 安全信息检测平台
VUE_APP_TITLE = 周期性检测平台
# 开发环境配置
ENV = 'staging'
......
public/index.html
View file @ 2053f598
......@@ -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/assets/styles/process.scss
View file @ 2053f598
......@@ -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 @ 2053f598
......@@ -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/processing/carReview/source-record/index.vue
View file @ 2053f598
......@@ -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 @ 2053f598
......@@ -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">
{{
......@@ -231,6 +234,7 @@
</div>
<div class="img-item">
<div class="img-label" style="margin-top: 20px">选择测试场景</div>
<div class="img-label" style="margin-top: 20px">选择测试场景</div>
</div>
<!-- 测试场景 -->
<div class="test-scenario-container">
......
src/views/processing/carReview/write-check-form/components/companyFile.vue
View file @ 2053f598
......@@ -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 @ 2053f598
......@@ -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/execution-test-plan/index.vue
View file @ 2053f598
<!-- 测试用例详情 -->
<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>
......
src/views/processing/fileLibrary/components/dialog.vue
View file @ 2053f598
......@@ -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 @ 2053f598
......@@ -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 @ 2053f598
......@@ -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 @ 2053f598
......@@ -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 @ 2053f598
......@@ -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/setting/sample/index.vue
View file @ 2053f598
......@@ -360,7 +360,7 @@
height="150px"
></image-preview>
</div>
<div v-else>暂无数据</div>
<div v-else>--未上传--</div>
</el-form-item>
<el-form-item label="样品照片:" prop="samplePhotos">
<div v-if="clickNameForm.samplePhotos">
......@@ -373,7 +373,7 @@
:src="item"
></image-preview>
</div>
<div v-else>暂无数据</div>
<div v-else>--未上传--</div>
</el-form-item>
</el-form>
</el-dialog>
......@@ -646,8 +646,10 @@ export default {
clickSampleName(row) {
this.dialogFormVisible = true
this.clickNameForm = row
this.clickNameForm.samplePhotos =
this.clickNameForm.samplePhotos.split(',')
if (this.clickNameForm.samplePhotos) {
this.clickNameForm.samplePhotos =
this.clickNameForm.samplePhotos.split(',')
}
console.log(row)
},
closeSamplePhoto() {
......
src/views/system/role/authUser.vue
View file @ 2053f598
......@@ -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 @ 2053f598
......@@ -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"
......
src/views/system/user/index.vue
View file @ 2053f598
......@@ -142,17 +142,17 @@
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:user:import']"
type="info"
plain
icon="el-icon-upload2"
size="mini"
@click="handleImport"
>导入</el-button
>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['system:user:import']"-->
<!-- type="info"-->
<!-- plain-->
<!-- icon="el-icon-upload2"-->
<!-- size="mini"-->
<!-- @click="handleImport"-->
<!-- >导入</el-button-->
<!-- >-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">
<el-button
v-hasPermi="['system:user:export']"
......@@ -245,7 +245,7 @@
<el-table-column
label="操作"
align="center"
width="160"
min-width="200"
class-name="small-padding fixed-width"
>
<template v-if="scope.row.userId !== 1" slot-scope="scope">
......@@ -779,8 +779,8 @@ export default {
confirmButtonText: '确定',
cancelButtonText: '取消',
closeOnClickModal: false,
inputPattern: /^.{5,20}$/,
inputErrorMessage: '用户密码长度必须介于 5 和 20 之间'
inputPattern: /^.{6,20}$/,
inputErrorMessage: '用户密码长度必须介于 6 和 20 之间'
})
.then(({ value }) => {
resetUserPwd(row.userId, value).then(response => {
......
src/views/task/edit/index.vue
View file @ 2053f598
......@@ -39,7 +39,11 @@
'test-scenario': item.check === false,
'check-test-scenario': item.check === true
}"
@click="handleInspectionItem(item)"
@click="
taskDetail.taskStatus === 'NEW'
? handleInspectionItem(item)
: ''
"
>
<div>{{ item.label }}</div>
</div>
......@@ -53,6 +57,13 @@
label="请选择测试场景(可多选)"
prop="testScenarioList"
>
<footer-button
style="width: 80px; height: 25px"
type="primary"
@click="selectAll"
>
全部选择
</footer-button>
<div class="test-scenario-container">
<div
v-for="(item, index) in testScenarioList"
......@@ -414,29 +425,6 @@ export default {
// 小组成员回显数据
tableData: [],
inspectionItemList: [],
// testScenarioList: [
// { value: 0, label: 'TBOX-蜂窝以太网接口', check: false },
// { value: 1, label: 'WiFi AP接口', check: false },
// { value: 2, label: 'WiFi Client接口', check: false },
// { value: 3, label: '充电以太网接口', check: false },
// { value: 4, label: 'CAN 诊断接口（OBD）', check: false },
// { value: 5, label: '以太网诊断接口（OBD）', check: false },
// { value: 6, label: '车载摄像头以太网接口（无线）', check: false },
// { value: 7, label: '第三方应用软件', check: false },
// { value: 8, label: '远程控车应用', check: false },
// { value: 9, label: 'USB接口', check: false },
// { value: 10, label: 'XCB标定', check: false },
// { value: 11, label: 'CCP标定', check: false },
// { value: 12, label: '安全启动', check: false },
// { value: 13, label: '远程控车', check: false },
// { value: 14, label: 'V2X', check: false },
// { value: 15, label: 'BT', check: false },
// { value: 16, label: 'BLE', check: false },
// { value: 17, label: 'NFC', check: false },
// { value: 18, label: '射频钥匙', check: false },
// { value: 19, label: '软件升级', check: false },
// { value: 20, label: 'ECU固件', check: false }
// ],
rules: {
testScenarioList: [
{
......@@ -697,6 +685,14 @@ export default {
console.log('model', this.model)
})
},
selectAll() {
this.testScenarioList.forEach(obj => {
obj.check = true
})
this.model.testScenarioList = this.testScenarioList.map(obj => {
return obj.value
})
},
getInspectionItemDict() {
getDicts('inspection_item').then(response => {
this.inspectionItemList = response.data.map(
......
src/views/task/new/components/PartInfo.vue
View file @ 2053f598
......@@ -19,6 +19,7 @@
<el-select
v-model="card.sampleNumber"
:disabled="!isEdit"
:placeholder="isDetail ? '--' : '请选择'"
@change="handleSampleNumberChange(card, $event)"
>
<el-option
......@@ -31,7 +32,11 @@
</el-select>
</el-form-item>
<el-form-item label="样品名称">
<el-input v-model="card.sampleName" disabled />
<el-input
v-model="card.sampleName"
disabled
:placeholder="isDetail ? '--' : ''"
/>
</el-form-item>
</el-form>
</el-card>
......@@ -61,6 +66,10 @@ export default {
isEdit: {
type: Boolean,
default: true
},
isDetail: {
type: Boolean,
default: false
}
},
watch: {
......
src/views/task/new/index.vue
View file @ 2053f598
......@@ -49,6 +49,13 @@
label="请选择测试场景(可多选)"
prop="testScenarioList"
>
<footer-button
style="width: 80px; height: 25px"
type="primary"
@click="selectAll"
>
全部选择
</footer-button>
<div class="test-scenario-container">
<div
v-for="(item, index) in testScenarioList"
......@@ -677,6 +684,15 @@ export default {
console.log('model', this.model)
})
},
// 全选
selectAll() {
this.testScenarioList.forEach(obj => {
obj.check = true
})
this.model.testScenarioList = this.testScenarioList.map(obj => {
return obj.value
})
},
getInspectionItemDict() {
getDicts('inspection_item').then(response => {
this.inspectionItemList = response.data.map(
......@@ -1057,10 +1073,6 @@ export default {
this.$message.error('请填写整车样品信息')
return
}
// else if (this.currentPartSampleInformation.length === 0) {
// this.$message.error('请填写零部件样品信息')
// return
// }
this.$confirm('是否确认进行发布功能', '发布', {
confirmButtonText: '确定',
concelButtonText: '取消',
......
src/views/task/task-detail/index.vue
View file @ 2053f598
......@@ -245,6 +245,7 @@
v-model="partInfoArr"
class="global-left-margin"
:is-edit="false"
:is-detail="true"
:part-sample-information="partSampleInformationList"
@change="handleModChange"
/>
......
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