Commit 8a80081f authored by mzx's avatar mzx

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

parents b67513ca e98ace24
......@@ -4,11 +4,11 @@ VUE_APP_TITLE = 周期性检测平台
# 开发环境配置
ENV = 'development'
# 中汽研安全检测平台管理系统/开发环境
VUE_APP_BASE_API = '/dev-api'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
# 中汽研安全检测平台管理系统/生产环境
VUE_APP_BASE_API = '/api'
# 图片服务器地址
VUE_APP_IMAGE_API = http://49.232.167.247:22037
VUE_APP_IMAGE_API = '/vehicle-quality-review-oss'
......@@ -5,7 +5,7 @@ VUE_APP_TITLE = 周期性检测平台
ENV = 'production'
# 中汽研安全检测平台管理系统/生产环境
VUE_APP_BASE_API = '/prod-api/'
VUE_APP_BASE_API = 'http://10.12.48.79:22032'
# 图片服务器地址
VUE_APP_IMAGE_API = '/vehicle-quality-review-oss'
VUE_APP_IMAGE_API = http://10.12.48.79:22038
......@@ -3,7 +3,9 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
<% if (process.env.NODE_ENV === 'production') { %>
<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
<% } %>
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
......
......@@ -2,18 +2,18 @@ import request from '@/utils/request'
// 获取测试场景
export function listTestScenar(data) {
return request({
url: '/system/scenario/getList',
method: 'post',
data: data
})
return request({
url: '/system/scenario/getList',
method: 'post',
data: data
})
}
// 获取场景类型
export function listTestType(data) {
return request({
url: '/system/type/getList',
method: 'post',
data: data
})
return request({
url: '/system/type/getList',
method: 'post',
data: data
})
}
......@@ -173,7 +173,6 @@ export function temporaryTask(data) {
})
}
export function getTemporaryStorage(data) {
return request({
url: '/task/getTemporaryStorage',
......@@ -189,4 +188,3 @@ export function getBySubtaskId(data) {
data
})
}
......@@ -512,7 +512,7 @@
flex-flow: column;
align-items: center;
justify-content: center;
.img-text{
.img-text {
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
......@@ -600,7 +600,7 @@
// }
.option-cell {
flex:1;
flex: 1;
height: 5rem;
display: flex;
flex-flow: row;
......@@ -612,7 +612,7 @@
}
}
.card-buttons {
flex:1;
flex: 1;
height: 80px;
margin-top: 20px;
display: flex;
......
......@@ -30,13 +30,7 @@
size="18"
fill="#1a6fd7"
/>
<icon-park
v-else
type="add"
theme="outline"
size="18"
fill="#1a6fd7"
/>
<icon-park v-else type="add" theme="outline" size="18" fill="#1a6fd7" />
<slot name="title"></slot>
</div>
</div>
......
......@@ -15,7 +15,13 @@
>
<i class="el-icon-loading" v-if="loading"></i>
<slot name="icon " v-if="icon && !loading">
<icon-park :type="icon" theme="outline" class="el-icon" size="16" :fill="color" />
<icon-park
:type="icon"
theme="outline"
class="el-icon"
size="16"
:fill="color"
/>
</slot>
<span v-if="$slots.default"><slot></slot></span>
</button>
......@@ -40,23 +46,23 @@ export default {
disabled: Boolean,
line: Boolean
},
data(){
data() {
return {
color: "#1a6fd7"
color: '#1a6fd7'
}
},
mounted(){
switch(this.type){
case "default":
this.color = "#1a6fd7"
break
case "primary":
this.color = "#ffffff"
break
case "no-line":
this.color = "#1a6fd7"
break
}
mounted() {
switch (this.type) {
case 'default':
this.color = '#1a6fd7'
break
case 'primary':
this.color = '#ffffff'
break
case 'no-line':
this.color = '#1a6fd7'
break
}
},
methods: {
handleClick(evt) {
......@@ -150,8 +156,8 @@ export default {
}
.footer-button--primary {
color: #fff;
background-color: #1A6FD7;
border-color: #1A6FD7;
background-color: #1a6fd7;
border-color: #1a6fd7;
}
.footer-button--primary:focus,
.footer-button--primary:hover {
......
......@@ -14,7 +14,13 @@
>
<i class="el-icon-loading" v-if="loading"></i>
<slot name="icon" v-if="icon && !loading">
<icon-park :type="icon" theme="outline" class="el-icon" size="16" :fill="color" />
<icon-park
:type="icon"
theme="outline"
class="el-icon"
size="16"
:fill="color"
/>
</slot>
<span v-if="$slots.default"><slot></slot></span>
</button>
......@@ -39,23 +45,23 @@ export default {
disabled: Boolean,
line: Boolean
},
data(){
data() {
return {
color: "#1a6fd7"
color: '#1a6fd7'
}
},
mounted(){
switch(this.type){
case "default":
this.color = "#1a6fd7"
break
case "primary":
this.color = "#ffffff"
break
case "no-line":
this.color = "#1a6fd7"
break
}
mounted() {
switch (this.type) {
case 'default':
this.color = '#1a6fd7'
break
case 'primary':
this.color = '#ffffff'
break
case 'no-line':
this.color = '#1a6fd7'
break
}
},
methods: {
handleClick(evt) {
......@@ -149,8 +155,8 @@ export default {
}
.header-button--primary {
color: #fff;
background-color: #1A6FD7;
border-color: #1A6FD7;
background-color: #1a6fd7;
border-color: #1a6fd7;
}
.header-button--primary:focus,
.header-button--primary:hover {
......
<template>
<el-tooltip effect="dark" :content="title" placement="bottom-start">
<div class="page-btn" @click="handleClick" @mouseover="handleMouseOver('#1a6fd7')"
@mouseleave="handleMouseOver('#1a6fd7')">
<div
class="page-btn"
@click="handleClick"
@mouseover="handleMouseOver('#1a6fd7')"
@mouseleave="handleMouseOver('#1a6fd7')"
>
<icon-park :type="icon" theme="outline" size="16" :fill="color" />
</div>
</el-tooltip>
......@@ -18,9 +22,8 @@ export default {
},
data() {
return {
color: '#1a6fd7',
color: '#1a6fd7'
}
},
methods: {
handleMouseOver(evt) {
......@@ -43,8 +46,6 @@ export default {
justify-content: center;
align-items: center;
&:hover {
background-color: #e3eefc;
}
......@@ -56,8 +57,6 @@ export default {
// --color-1: #1a6fd7;
// --color-2: #ffffff;
// &:active {
// color: #1764c1;
// --color-1: #1764c1;
......
......@@ -7,10 +7,14 @@
<span class="header">{{ $route.meta.title }}</span>
<div class="header-right">
<slot name="header-right">
<header-button icon="arrow-left" type="no-line" @click="$router.back()">
返回
</header-button>
</slot>
<header-button
icon="arrow-left"
type="no-line"
@click="$router.back()"
>
返回
</header-button>
</slot>
</div>
</div>
<div class="page-box">
......@@ -65,8 +69,8 @@ export default {
align-items: center;
justify-content: space-between;
}
.header-right{
::v-deep .header-button{
.header-right {
::v-deep .header-button {
margin-left: 24px;
}
}
......
......@@ -23,7 +23,7 @@ empty
:content="item.name"
placement="bottom-start"
>
<div class="standard-item">{{ item.name }}</div>
<div class="standard-item">{{ item.standardNo }}</div>
</el-tooltip>
</li>
</template>
......
......@@ -27,14 +27,14 @@
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<div class="menu-title">
<img v-if="logo" :src="logo" class="sidebar-logo" />
<h1
class="sidebar-title"
:style="{
color: variables.logoTitleColor
}"
>
{{ title }}
</h1>
<h1
class="sidebar-title"
:style="{
color: variables.logoTitleColor
}"
>
{{ title }}
</h1>
</div>
</router-link>
</transition>
......@@ -71,7 +71,7 @@ export default {
</script>
<style lang="scss" scoped>
.menu-title{
.menu-title {
display: flex;
flex-flow: column;
align-items: center;
......
......@@ -36,6 +36,7 @@ export default {
pageNum: this.queryParams.pageNum,
pageSize: this.queryParams.pageSize
}
this.handleQuery()
},
handleQuery() {
this.queryParams.pageNum = 1
......
......@@ -14,7 +14,9 @@ const actions = {
getCompanyFiles({ commit }, data) {
getCompanyFile(data).then(res => {
// 筛选数组返回其中某一个元素成为新数组
const resData = res.rows.map(item => { return { "value": item.fileName, "id": item.id } })
const resData = res.rows.map(item => {
return { value: item.fileName, id: item.id }
})
commit('SET_FILES', resData)
})
}
......
......@@ -3,7 +3,6 @@
<page-standard>
<el-table
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
......
......@@ -43,7 +43,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button
type="default"
......@@ -64,7 +64,6 @@
</div>
<el-table
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
......
......@@ -55,7 +55,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">
重置</el-button
......@@ -68,13 +68,7 @@
<!-- @queryTable="getList"-->
<!-- ></right-toolbar>-->
<!-- </el-row>-->
<el-table
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:data="tableData"
>
<el-table v-loading="loading" border :scroll-x="'1500px'" :data="tableData">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
......
......@@ -50,7 +50,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......
......@@ -64,7 +64,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......
......@@ -59,7 +59,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......
......@@ -29,7 +29,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......
......@@ -83,7 +83,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button
type="default"
......
......@@ -33,7 +33,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button
type="default"
......@@ -53,7 +53,6 @@
</el-form>
<el-table
v-loading="tableLoading"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
......
......@@ -33,7 +33,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button
type="default"
......@@ -46,7 +46,6 @@
</el-form>
<el-table
v-loading="tableLoading"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
......
......@@ -63,7 +63,6 @@
</el-form>
<el-table
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
......
......@@ -88,7 +88,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button
type="default"
......@@ -108,7 +108,6 @@
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
......
......@@ -68,7 +68,6 @@
</el-form>
<el-table
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
......
......@@ -48,7 +48,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......@@ -79,7 +79,6 @@
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
......
......@@ -35,7 +35,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......@@ -52,7 +52,6 @@
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
......
......@@ -36,7 +36,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button
type="default"
......@@ -49,7 +49,6 @@
</el-form>
<el-table
v-loading="loading"
style="width: 100%; min-height: 88px"
border
tooltip-effect="dark"
@selection-change="handleSelectionChange"
......
......@@ -36,7 +36,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button
type="default"
......@@ -49,7 +49,6 @@
</el-form>
<el-table
v-loading="loading"
style="width: 100%; min-height: 88px"
border
tooltip-effect="dark"
@selection-change="handleSelectionChange"
......
......@@ -105,7 +105,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button
type="default"
......@@ -194,7 +194,6 @@
<el-table
v-if="refreshTable && Number(queryParams.type) === 3"
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
......
......@@ -38,7 +38,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button
type="default"
......@@ -60,7 +60,6 @@
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:default-sort="{ prop: 'createTime', order: 'descending' }"
:scroll-x="'1500px'"
......
......@@ -36,7 +36,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button
type="default"
......@@ -49,7 +49,6 @@
</el-form>
<el-table
v-loading="loading"
style="width: 100%; min-height: 88px"
border
tooltip-effect="dark"
@selection-change="handleSelectionChange"
......
......@@ -2,7 +2,6 @@
<page-standard>
<el-table
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:span-method="objectSpanMethod"
:scroll-x="'1500px'"
......
......@@ -42,7 +42,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button
type="default"
......@@ -63,7 +63,6 @@
</div>
<el-table
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }"
......
......@@ -20,12 +20,7 @@
<!-- </el-form-item>-->
<!-- </el-form>-->
</div>
<el-table
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:data="tableData"
>
<el-table v-loading="loading" border :data="tableData">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
......
......@@ -38,7 +38,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button
type="default"
......@@ -60,7 +60,6 @@
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:default-sort="{ prop: 'createTime', order: 'descending' }"
:scroll-x="'1500px'"
......
......@@ -54,7 +54,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">
重置</el-button
......@@ -67,13 +67,7 @@
<!-- @queryTable="getList"-->
<!-- ></right-toolbar>-->
<!-- </el-row>-->
<el-table
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:scroll-x="'1500px'"
:data="tableData"
>
<el-table v-loading="loading" border :scroll-x="'1500px'" :data="tableData">
<el-table-column type="index" width="55" label="序号" align="center">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
......
......@@ -57,7 +57,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......
......@@ -35,7 +35,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......
......@@ -46,7 +46,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......
......@@ -58,7 +58,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......
......@@ -35,7 +35,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......
......@@ -44,7 +44,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button
type="default"
......
......@@ -44,7 +44,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......
......@@ -31,7 +31,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......
......@@ -57,7 +57,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......
......@@ -30,7 +30,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......
......@@ -87,7 +87,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
......
......@@ -102,7 +102,6 @@
<el-table
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData"
......
......@@ -39,20 +39,14 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">
重置
</el-button>
</el-form-item>
</el-form>
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:data="tableData"
>
<el-table v-if="refreshTable" v-loading="loading" border :data="tableData">
<el-table-column label="开始时间" align="left" prop="createTime">
<template slot-scope="{ row }">
<span>{{ parseTime(row.createTime) }}</span>
......
......@@ -39,20 +39,14 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">
重置
</el-button>
</el-form-item>
</el-form>
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 88px"
border
:data="tableData"
>
<el-table v-if="refreshTable" v-loading="loading" border :data="tableData">
<el-table-column label="开始时间" align="left" prop="createTime">
<template slot-scope="{ row }">
<span>{{ parseTime(row.createTime) }}</span>
......
......@@ -30,7 +30,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button
type="default"
......
......@@ -41,7 +41,7 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>查询</el-button
>
<el-button
type="default"
......
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