Commit 45eec53f authored by 智勇's avatar 智勇

增加sonar结果

parent cadf901e
...@@ -176,7 +176,7 @@ export const asyncRouterMap = [ ...@@ -176,7 +176,7 @@ export const asyncRouterMap = [
path: '', path: '',
component: () => import('@/views/proconfig/index'), component: () => import('@/views/proconfig/index'),
name: 'proconfig', name: 'proconfig',
meta: { title: '项目配置文件管理', icon: 'documentation' } meta: { title: '服务配置文件管理', icon: 'documentation' }
} }
] ]
}, },
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<el-table <el-table
:data="configs" :data="configs"
:header-cell-style="{background:'#F3F4F7',color:'#555'}" :header-cell-style="{background:'#F3F4F7',color:'#555'}"
max-height="700"
border border
highlight-current-row highlight-current-row
style="width: 100%;"> style="width: 100%;">
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<span class="link-type" @click="handleUpdate(scope.row)">{{ scope.row.application_name }}</span> <span class="link-type" @click="handleUpdate(scope.row)">{{ scope.row.application_name }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="项目->分支" align="center" width="300px"> <el-table-column label="服务->分支" align="center" width="300px">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="item in scope.row.repos" :key="item.id"><b>{{ item.repository }}</b> -> {{ item.ref.name }}</div> <div v-for="item in scope.row.repos" :key="item.id"><b>{{ item.repository }}</b> -> {{ item.ref.name }}</div>
</template> </template>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</el-form-item> </el-form-item>
<div > <div >
<div v-for="(repoAndRefItem,index) in temp.repos" :key="repoAndRefItem.id" style="width:110%;margin-bottom:20px" > <div v-for="(repoAndRefItem,index) in temp.repos" :key="repoAndRefItem.id" style="width:110%;margin-bottom:20px" >
<label style="margin-right:20px">项目</label> <label style="margin-right:20px">服务</label>
<el-select v-model="repoAndRefItem.repository" filterable value-key="id" style="width:30%" class="filter-item" @change="getRefs(repoAndRefItem.repository,true)"> <el-select v-model="repoAndRefItem.repository" filterable value-key="id" style="width:30%" class="filter-item" @change="getRefs(repoAndRefItem.repository,true)">
<el-option v-for="item in repos" :value="item.project_name" :label="item.project_name" :key="item.project_name" /> <el-option v-for="item in repos" :value="item.project_name" :label="item.project_name" :key="item.project_name" />
</el-select> </el-select>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<el-button :disabled="index===0 && temp.repos.length===1" style="margin-left:5px" @click="temp.repos.splice(index, 1)">删除</el-button> <el-button :disabled="index===0 && temp.repos.length===1" style="margin-left:5px" @click="temp.repos.splice(index, 1)">删除</el-button>
</div> </div>
<div style="width:100%;margin-bottom:20px" > <div style="width:100%;margin-bottom:20px" >
<el-button type="primary" style="width:100%" @click="newRepoAndRef()"> + 新增项目&分支</el-button> <el-button type="primary" style="width:100%" @click="newRepoAndRef()"> + 新增服务&分支</el-button>
</div> </div>
</div> </div>
<el-form-item label="通知方式" prop="noticeType"> <el-form-item label="通知方式" prop="noticeType">
...@@ -322,7 +322,7 @@ export default { ...@@ -322,7 +322,7 @@ export default {
if (item.ref.name == null || item.ref.name === '请选择') { if (item.ref.name == null || item.ref.name === '请选择') {
this.$notify({ this.$notify({
title: 'error', title: 'error',
message: '请仔细检查项目和分支名称是否填写正确', message: '请仔细检查服务和分支名称是否填写正确',
type: 'error', type: 'error',
duration: 2000 duration: 2000
}) })
...@@ -347,7 +347,7 @@ export default { ...@@ -347,7 +347,7 @@ export default {
if (item.ref.name == null || item.ref.name === '请选择') { if (item.ref.name == null || item.ref.name === '请选择') {
this.$notify({ this.$notify({
title: 'error', title: 'error',
message: '请仔细检查项目和分支名称是否填写正确', message: '请仔细检查服务和分支名称是否填写正确',
type: 'error', type: 'error',
duration: 2000 duration: 2000
}) })
......
<template> <template>
<div class="app-container"> <div class="app-container">
<div style="margin-bottom:20px"> <div style="margin-bottom:20px">
<el-input v-model="listQuery.projectName" placeholder="项目名称" clearable style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/> <el-input v-model="listQuery.projectName" placeholder="服务名称" clearable style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
...@@ -29,23 +29,28 @@ ...@@ -29,23 +29,28 @@
<el-table-column label="ID" type="index" align="center" width="65"/> <el-table-column label="ID" type="index" align="center" width="65"/>
<el-table-column sortable label="项目" prop="projectName" align="center"> <el-table-column sortable label="服务" prop="projectName" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.projectName }}</span> <span>{{ scope.row.projectName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column sortable label="Task sum" prop="run" align="center"/> <el-table-column sortable label="Sum" prop="run" align="center"/>
<el-table-column sortable label="Task success" prop="success" align="center"/> <el-table-column sortable label="OK" prop="success" align="center"/>
<el-table-column :sort-method="sortFail" sortable label="Task fail" align="center"> <el-table-column sortable label="Warn" prop="warn" align="center"/>
<el-table-column sortable label="Error" prop="error" align="center"/>
<!-- <el-table-column :sort-method="sortFail" sortable label="Warn&Error" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.fail + scope.row.exception }}</span> <span>{{ scope.row.fail + scope.row.exception }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column sortable label="Excetpion" prop="exception" align="center"/>
<el-table-column :sort-method="sortRate" sortable label="成功率" align="center"> <el-table-column :sort-method="sortRate" sortable label="通过率" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.success/scope.row.run | statusFilter">{{ scope.row.success/scope.row.run*100 | decimalsFilter }}%</el-tag> <el-tag :type="scope.row.success/scope.row.run | statusFilter">{{ scope.row.success/scope.row.run*100 | decimalsFilter }}%</el-tag>
</template> </template>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
highlight-current-row highlight-current-row
style="width: 100%;"> style="width: 100%;">
<el-table-column type="index" align="center" width="65"/> <el-table-column type="index" align="center" width="65"/>
<el-table-column label="项目" prop="projectName" align="center"/> <el-table-column label="服务" prop="projectName" align="center"/>
<el-table-column label="分支" prop="branchName" align="center"/> <el-table-column label="分支" prop="branchName" align="center"/>
<el-table-column prop="gitUser" label="触发者" align="center"/> <el-table-column prop="gitUser" label="触发者" align="center"/>
<el-table-column prop="commitMes" label="触发信息" align="center"/> <el-table-column prop="commitMes" label="触发信息" align="center"/>
...@@ -116,6 +116,9 @@ export default { ...@@ -116,6 +116,9 @@ export default {
case 'WARN': case 'WARN':
item.statusIcon = 'el-icon-warning' item.statusIcon = 'el-icon-warning'
break break
case 'FAILED':
item.statusIcon = 'el-icon-remove'
break
default: default:
item.statusIcon = 'el-icon-loading' item.statusIcon = 'el-icon-loading'
break break
......
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="filter-container"> <div class="filter-container">
<el-input v-model="listQuery.project_name" placeholder="项目名称" clearable style="width: 200px;" class="filter-item" @keyup.enter.native="getProjects"/> <el-input v-model="listQuery.project_name" placeholder="服务名称" clearable style="width: 200px;" class="filter-item" @keyup.enter.native="getProjects"/>
<el-select v-model="listQuery.type" placeholder="项目类型" clearable style="width: 200px" class="filter-item" > <el-select v-model="listQuery.type" placeholder="服务类型" clearable style="width: 200px" class="filter-item" >
<el-option v-for="item in typeOptions" :key="item.key" :label="item.display_name" :value="item.key"/> <el-option v-for="item in typeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
</el-select> </el-select>
<el-select v-model="listQuery.is_active" placeholder="是否服役" clearable style="width: 200px" class="filter-item" > <el-select v-model="listQuery.is_active" placeholder="是否服役" clearable style="width: 200px" class="filter-item" >
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<el-form-item label="负责人" style="width: 100%;" prop="auth"> <el-form-item label="负责人" style="width: 100%;" prop="auth">
<el-input v-model="temp.auth"/> <el-input v-model="temp.auth"/>
</el-form-item> </el-form-item>
<el-form-item label="项目描述" style="width: 100%;"> <el-form-item label="服务描述" style="width: 100%;">
<el-input :autosize="{ minRows: 1, maxRows: 4}" v-model="temp.des" type="textarea" placeholder="Please input"/> <el-input :autosize="{ minRows: 1, maxRows: 4}" v-model="temp.des" type="textarea" placeholder="Please input"/>
</el-form-item> </el-form-item>
<el-form-item label="API" style="width: 100%;"> <el-form-item label="API" style="width: 100%;">
...@@ -264,7 +264,7 @@ export default { ...@@ -264,7 +264,7 @@ export default {
sort: '+project_name' sort: '+project_name'
}, },
typeOptions: [], typeOptions: [],
sortOptions: [{ label: '项目名升序', key: '+project_name' }, { label: '项目名降序', key: '-project_name' }], sortOptions: [{ label: '服务名升序', key: '+project_name' }, { label: '服务名降序', key: '-project_name' }],
temp: { temp: {
}, },
dialogFormVisible: false, dialogFormVisible: false,
......
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