Skip to content

Q
qa-platform-ui
Commit bd4e4552 authored by 黎博's avatar 黎博
Browse files
Options

修复新增服务bug

parent 83790203
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 17 deletions
src/views/docker/EnvDetail.vue
View file @ bd4e4552
......@@ -6,7 +6,8 @@
<i class="el-icon-menu"></i>
基础服务
<div style="float: right;">
<el-button type="warning" size="mini" round v-show="nsList.indexOf(namespace) > -1" @click="getRepository('base')">新增服务</el-button>
<el-button type="warning" size="mini" round v-show="nsList.indexOf(namespace) > -1"
@click="getRepository('base')">新增服务</el-button>
<el-button type="success" size="mini" round @click="refresh">刷新状态</el-button>
<el-dropdown>
<el-button type="primary" size="mini" round v-show="nsList.indexOf(namespace) > -1">
......@@ -20,7 +21,8 @@
</el-dropdown>
</div>
</div>
<el-table :data="FormatTabledata.base" :header-cell-style="{background:'#F3F4F7',color:'#555'}" size="medium" align="center" style="width: 100%">
<el-table :data="FormatTabledata.base" :header-cell-style="{background:'#F3F4F7',color:'#555'}" size="medium"
align="center" style="width: 100%">
<el-table-column :index="indexMethod" type="index" label="#" />
<el-table-column v-if="serviceName!=='rabbitmq'" label="服务名">
<template slot-scope="scope">
......@@ -61,7 +63,8 @@
</el-popover> -->
</span>
<span v-if="scope.row.serviceName !== 'rabbitmq'&& scope.row.serviceName !== 'consul' && scope.row.serviceName !== 'redash'">{{ scope.row.serviceName }}</span>
<span
v-if="scope.row.serviceName !== 'rabbitmq'&& scope.row.serviceName !== 'consul' && scope.row.serviceName !== 'redash'">{{ scope.row.serviceName }}</span>
</template>
</el-table-column>
<el-table-column prop="lanIp" width="110" label="IP地址" />
......@@ -69,9 +72,11 @@
<template slot-scope="scope">
<el-tooltip v-show="scope.row.serviceName === 'redis-sentinel'" placement="top">
<div slot="content">四个端口分别为一主二从一哨兵<br>哨兵名称：qsmaster，没有密码</div>
<div><span v-for="item in scope.row.portMappings" :key="item.port">{{ item.nodePort }}->{{ item.port }} </span></div>
<div><span v-for="item in scope.row.portMappings" :key="item.port">{{ item.nodePort }}->{{ item.port }}
</span></div>
</el-tooltip>
<span v-for="item in scope.row.portMappings" v-show="scope.row.serviceName !== 'redis-sentinel'" :key="item.port">{{ item.nodePort }}->{{ item.port }} </span>
<span v-for="item in scope.row.portMappings" v-show="scope.row.serviceName !== 'redis-sentinel'"
:key="item.port">{{ item.nodePort }}->{{ item.port }} </span>
</template>
</el-table-column>
<el-table-column prop="image" label="镜像">
......@@ -106,7 +111,8 @@
<i class="el-icon-refresh"></i>
重置服务
</el-dropdown-item>
<el-dropdown-item v-show="nsList.indexOf(namespace) > -1" style="color: red" @click.native="deleteService(scope.row) ">
<el-dropdown-item v-show="nsList.indexOf(namespace) > -1" style="color: red"
@click.native="deleteService(scope.row) ">
<i class="el-icon-delete"></i>
删除服务
</el-dropdown-item>
......@@ -123,11 +129,13 @@
<i class="el-icon-menu"></i>
{{ item.projectType.toUpperCase() }} 服务
<div style="float: right">
<el-button v-show="nsList.indexOf(namespace) > -1" type="warning" size="mini" round @click="getRepository(item.projectType)">新增服务</el-button>
<el-button v-show="nsList.indexOf(namespace) > -1" type="warning" size="mini" round
@click="getRepository(item.projectType)">新增服务</el-button>
<el-button type="success" size="mini" round @click="refresh">刷新状态</el-button>
</div>
</div>
<el-table :data="FormatTabledata[item.projectType]" :header-cell-style="{background:'#F3F4F7',color:'#555'}" size="medium" align="center" style="width: 100%">
<el-table :data="FormatTabledata[item.projectType]" :header-cell-style="{background:'#F3F4F7',color:'#555'}"
size="medium" align="center" style="width: 100%">
<el-table-column :index="indexMethod" label="#" type="index" />
<el-table-column prop="serviceName" label="服务名">
<template slot-scope="scope">
......@@ -165,7 +173,8 @@
<el-table-column v-if="item.projectType==='java'" width="150" label="调试">
<template slot-scope="scope">
<span v-if="scope.row.serviceType==='NodePort'">{{ scope.row.lanIp }}:{{ scope.row.portMappings[1].nodePort }}</span>
<span
v-if="scope.row.serviceType==='NodePort'">{{ scope.row.lanIp }}:{{ scope.row.portMappings[1].nodePort }}</span>
</template>
</el-table-column>
......@@ -193,7 +202,8 @@
<i class="el-icon-document"></i>
详细信息
</el-dropdown-item>
<el-dropdown-item v-show="nsList.indexOf(namespace) > -1" @click.native="openUpdateServiceDialog(scope.row)">
<el-dropdown-item v-show="nsList.indexOf(namespace) > -1"
@click.native="openUpdateServiceDialog(scope.row)">
<i class="el-icon-refresh"></i>
更新服务
</el-dropdown-item>
......@@ -203,7 +213,8 @@
重置服务
</el-dropdown-item>
<el-dropdown-item v-show="nsList.indexOf(namespace) > -1" style="color: red" @click.native="deleteService(scope.row, item) ">
<el-dropdown-item v-show="nsList.indexOf(namespace) > -1" style="color: red"
@click.native="deleteService(scope.row, item) ">
<i class="el-icon-delete"></i>
删除服务
</el-dropdown-item>
......@@ -221,8 +232,10 @@
<p class="title-sub">选择服务</p>
<el-row :gutter="20">
<el-col :span="14">
<el-select v-model="reponame" clearable filterable class="elSelect" placeholder="请选择服务，支持模糊搜索" @change="getTag">
<el-option v-for="(item,index) in options" :key="index" :label="item.repoName.split('/')[1]" :value="item.repoName" />
<el-select v-model="reponame" clearable filterable class="elSelect" placeholder="请选择服务，支持模糊搜索"
@change="getTag">
<el-option v-for="(item,index) in options" :key="index" :label="item.repoName.split('/')[1]"
:value="item.repoName" />
</el-select>
</el-col>
</el-row>
......@@ -256,7 +269,8 @@
</el-col>
</el-row>
<p v-if="label==='node'||label==='java'||label==='go'" class="title-sub">是否调试模式<span style="font-size: 12px">(执行测试时选择默认选项否即可)</span> </p>
<p v-if="label==='node'||label==='java'||label==='go'" class="title-sub">是否调试模式<span
style="font-size: 12px">(执行测试时选择默认选项否即可)</span> </p>
<el-row v-if="label==='node'||label==='java'||label==='go'" :gutter="20">
<el-col :span="14">
<el-select v-model="debug.key" filterable clearable class="elSelect" placeholder="请选择是否调试模式，执行测试时请选择否">
......@@ -439,10 +453,16 @@ export default {
this.is_show = false
this.debug = { key: 0, display_name: '否' }
this.mock = { key: 0, display_name: '否' }
if (label === 'base') {
getSingleTypeApp({ namespace: 'qa-base', type: label }).then((resp) => {
this.options = resp.data.data.RepoInfo
})
} else {
getSingleTypeApp({ namespace: 'qa-test', type: label }).then((resp) => {
this.options = resp.data.data.RepoInfo
})
}
getSingleTypeApp({ namespace: 'qa-test', type: label }).then((resp) => {
this.options = resp.data.data.RepoInfo
})
this.dialogVisible = true
},
// 根据repoName获取镜像列表
......
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