Skip to content

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

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

parents 7fdb8213 018deb17
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 55 deletions
.env.production
View file @ bb45518d
...@@ -10,4 +10,4 @@ VUE_APP_BASE_API = '/prod-api' ...@@ -10,4 +10,4 @@ VUE_APP_BASE_API = '/prod-api'
# 图片服务器地址 # 图片服务器地址
VUE_APP_IMAGE_API ='/' VUE_APP_IMAGE_API ='/'
VUE_APP_CLIENT_API = 'http://10.12.48.80:1234' VUE_APP_CLIENT_API = 'http://10.12.48.78:8090'
.env.staging
View file @ bb45518d
...@@ -9,4 +9,4 @@ VUE_APP_BASE_API = 'http://49.232.167.247:22032' ...@@ -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_IMAGE_API = 'http://49.232.167.247:22037'
VUE_APP_CLIENT_API = 'http://10.12.48.80:1234' VUE_APP_CLIENT_API = 'http://10.12.48.78:8090'
public/index.html
View file @ bb45518d
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <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 rel="icon" href="<%= BASE_URL %>favicon.ico">
<!-- <link href="https://unpkg.com/tailwindcss@^2/dist/tailwind.min.css" rel="stylesheet"> --> <!-- <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_55.923da21ede831095d4d7a8ab05fe30cb.js"></script> <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_31435_85.f03f7ada23edcf4cd72e61338ed55693.js"></script>
<title><%= webpackConfig.name %></title> <title><%= webpackConfig.name %></title>
<!--[if lt IE 11]> <!--[if lt IE 11]>
<script>window.location.href = '/html/ie.html';</script><![endif]--> <script>window.location.href = '/html/ie.html';</script><![endif]-->
......
src/components/TopNav/index.vue
View file @ bb45518d
<template> <template>
<el-menu <el-menu
style="margin-bottom: 30px"
:default-active="activeMenu" :default-active="activeMenu"
mode="horizontal" mode="horizontal"
@select="handleSelect" @select="handleSelect"
......
src/views/echartHome/standardClassification.vue
View file @ bb45518d
...@@ -60,9 +60,9 @@ export default { ...@@ -60,9 +60,9 @@ export default {
length2: 10 // 挨着文字的直线的长度 length2: 10 // 挨着文字的直线的长度
}, },
data: [ data: [
{ value: 40, name: 'rose 1' }, { value: 40, name: '网络安全' },
{ value: 38, name: 'rose 2' }, { value: 38, name: '软件升级' },
{ value: 32, name: 'rose 3' } { value: 32, name: '数据安全' }
] ]
}, },
{ {
...@@ -85,9 +85,9 @@ export default { ...@@ -85,9 +85,9 @@ export default {
show: false show: false
}, },
data: [ data: [
{ value: 40, name: 'rose 1' }, { value: 40, name: '网络安全' },
{ value: 38, name: 'rose 2' }, { value: 38, name: '软件升级' },
{ value: 32, name: 'rose 3' } { value: 32, name: '数据安全' }
] ]
} }
] ]
......
src/views/index.vue
View file @ bb45518d
...@@ -83,14 +83,9 @@ ...@@ -83,14 +83,9 @@
<div class="cardTitle">任务完成情况占比</div> <div class="cardTitle">任务完成情况占比</div>
<div style="display: flex; justify-content: space-between"> <div style="display: flex; justify-content: space-between">
<div class="cardChild" style="background: rgba(18, 190, 223, 0.08)"> <div class="cardChild" style="background: rgba(18, 190, 223, 0.08)">
<div <div>
style=" <iconpark-icon name="renwuwancheng" size="36"></iconpark-icon>
width: 36px; </div>
height: 36px;
background: #12bedf;
border-radius: 8px;
"
></div>
<span>已完成 ：43个</span> <span>已完成 ：43个</span>
<div> <div>
<el-progress <el-progress
...@@ -103,14 +98,12 @@ ...@@ -103,14 +98,12 @@
</div> </div>
</div> </div>
<div class="cardChild" style="background: rgba(230, 88, 104, 0.08)"> <div class="cardChild" style="background: rgba(230, 88, 104, 0.08)">
<div <div>
style=" <iconpark-icon
width: 36px; name="renwuweiwancheng"
height: 36px; size="36"
background: #e55868; ></iconpark-icon>
border-radius: 8px; </div>
"
></div>
<span>已完成 ：43个</span> <span>已完成 ：43个</span>
<div> <div>
<el-progress <el-progress
...@@ -150,17 +143,23 @@ ...@@ -150,17 +143,23 @@
style="background: rgba(230, 88, 104, 0.08)" style="background: rgba(230, 88, 104, 0.08)"
> >
<div class="lineOne">高危</div> <div class="lineOne">高危</div>
<div>高危</div> <div>
<iconpark-icon name="gaowei" size="24"></iconpark-icon>
</div>
<div class="lineLast">83</div> <div class="lineLast">83</div>
</div> </div>
<div class="dangerousCard" style="background: #fef6e9"> <div class="dangerousCard" style="background: #fef6e9">
<div class="lineOne">中危</div> <div class="lineOne">中危</div>
<div>高危</div> <div>
<iconpark-icon name="zhongwei" size="24"></iconpark-icon>
</div>
<div class="lineLast">45</div> <div class="lineLast">45</div>
</div> </div>
<div class="dangerousCard" style="background: #e8f1fb"> <div class="dangerousCard" style="background: #e8f1fb">
<div class="lineOne">低危</div> <div class="lineOne">低危</div>
<div>高危</div> <div>
<iconpark-icon name="diwei" size="24"></iconpark-icon>
</div>
<div class="lineLast">78</div> <div class="lineLast">78</div>
</div> </div>
</div> </div>
...@@ -273,16 +272,16 @@ export default { ...@@ -273,16 +272,16 @@ export default {
} }
], ],
taskCompleted: [ taskCompleted: [
{ name: '站哨', value: 90 }, { name: '张晓刚', value: 90 },
{ name: '站哨', value: 90 }, { name: '王小虎', value: 90 },
{ name: '站哨', value: 90 }, { name: '刘生', value: 90 },
{ name: '站哨', value: 90 }, { name: '李丽', value: 90 },
{ name: '站哨', value: 90 }, { name: '赵明明', value: 90 },
{ name: '站哨', value: 90 }, { name: '张晓刚', value: 90 },
{ name: '站哨', value: 90 }, { name: '王小虎', value: 90 },
{ name: '站哨', value: 90 }, { name: '刘生', value: 90 },
{ name: '站哨', value: 90 }, { name: '李丽', value: 90 },
{ name: '站哨', value: 90 } { name: '赵明明', value: 90 }
] ]
} }
}, },
......
src/views/processing/carTest/review-form/index.vue
View file @ bb45518d
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="task-item"> <div class="task-item">
<span class="task-label">任务编号:</span> <span class="task-label">任务编号:</span>
<span class="task-content"> <span class="task-content">
{{ model.systemReviewTask.taskNo }} {{ task.taskNo }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
...@@ -37,12 +37,7 @@ ...@@ -37,12 +37,7 @@
<div class="task-item"> <div class="task-item">
<span class="task-label">任务状态:</span> <span class="task-label">任务状态:</span>
<span class="task-content"> <span class="task-content">
{{ {{ getDictData(dict.type.task_test_status, task.taskStatus) }}
getDictData(
dict.type.task_test_status,
model.systemReviewTask.taskStatus
)
}}
</span> </span>
</div> </div>
</div> </div>
...@@ -54,7 +49,7 @@ ...@@ -54,7 +49,7 @@
<col style="width: 100px" /> <col style="width: 100px" />
<thead> <thead>
<tr> <tr>
<th>章节号</th> <th style="width: 100px">章节号</th>
<th>标准技术要求</th> <th>标准技术要求</th>
<th>标准测试方法</th> <th>标准测试方法</th>
<th>测试场景</th> <th>测试场景</th>
...@@ -63,7 +58,7 @@ ...@@ -63,7 +58,7 @@
<th>用例名称</th> <th>用例名称</th>
<th>工具</th> <th>工具</th>
<th>对应输入</th> <th>对应输入</th>
<th>测试用例</th> <th style="width: 370px">测试用例</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -155,8 +150,8 @@ export default { ...@@ -155,8 +150,8 @@ export default {
methods: { methods: {
getRows3, getRows3,
getTest() { getTest() {
getBySubtaskId({ taskId: '1768527384203460609' }).then(res => { getBySubtaskId({ id: '1768527384203460609' }).then(res => {
if (res === 200) { if (res.code === 200) {
this.task = res.data this.task = res.data
} }
}) })
......
src/views/system/dict/data.vue
View file @ bb45518d
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:dict:edit']" v-hasPermi="['system:dict:edit']"
type="success" type="success"
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
@click="handleUpdate" @click="handleUpdate"
>修改</el-button >修改</el-button
> >
</el-col> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:dict:remove']" v-hasPermi="['system:dict:remove']"
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
>删除</el-button >删除</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:dict:export']" v-hasPermi="['system:dict:export']"
type="warning" type="warning"
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
@click="handleExport" @click="handleExport"
>导出</el-button >导出</el-button
> >
</el-col> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
......
src/views/system/role/index.vue
View file @ bb45518d
...@@ -528,10 +528,11 @@ export default { ...@@ -528,10 +528,11 @@ export default {
handleStatusChange(row) { handleStatusChange(row) {
const text = row.status === '0' ? '启用' : '停用' const text = row.status === '0' ? '启用' : '停用'
this.$modal this.$modal
.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？', { .confirm('确认要"' + text + '""' + row.roleName + '"角色吗？' ,{
type: 'warning',
title: text,
closeOnClickModal: false closeOnClickModal: false
}) })
.then(function () { .then(function () {
return changeRoleStatus(row.roleId, row.status) return changeRoleStatus(row.roleId, row.status)
}) })
......
src/views/system/user/index.vue
View file @ bb45518d
...@@ -678,6 +678,8 @@ export default { ...@@ -678,6 +678,8 @@ export default {
const text = row.status === '0' ? '启用' : '停用' const text = row.status === '0' ? '启用' : '停用'
this.$modal this.$modal
.confirm('确认要"' + text + '""' + row.userName + '"用户吗？', { .confirm('确认要"' + text + '""' + row.userName + '"用户吗？', {
type: 'warning',
title: text,
closeOnClickModal: false closeOnClickModal: false
}) })
.then(function () { .then(function () {
......
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