monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 94864995ac1d8b054911cb47c4aaf80d803c41ae 2 parents 86826b6d 7686f204

Merge branch 'master-v32-lushangqing' into 'master' 

故障联调 update 表格复选添加按钮名称更改，应用配置列表列位置大小更改



See merge request !236
Inline Side-by-side
Showing 3 changed files with 10 additions and 9 deletions
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <div class="flex-div-start"> 30 <div class="flex-div-start">
31 <el-button type="primary" @click="onReset()">重置</el-button> 31 <el-button type="primary" @click="onReset()">重置</el-button>
32 <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> 32 <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
33 - <el-button type="primary" @click="saveAll()" style="margin-left: 10px">全部添加</el-button> 33 + <el-button type="primary" @click="saveAll()" style="margin-left: 10px">添加</el-button>
34 </div> 34 </div>
35 35
36 </div> 36 </div>
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <div class="flex-div-start"> 30 <div class="flex-div-start">
31 <el-button type="primary" @click="onReset()">重置</el-button> 31 <el-button type="primary" @click="onReset()">重置</el-button>
32 <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> 32 <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
33 - <el-button type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">全部添加</el-button> 33 + <el-button type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">添加</el-button>
34 </div> 34 </div>
35 </div> 35 </div>
36 </el-col> 36 </el-col>
@@ -14,12 +14,6 @@ export default { @@ -14,12 +14,6 @@ export default {
14 sortable: true, 14 sortable: true,
15 align: 'center', 15 align: 'center',
16 },*/ 16 },*/
17 - {  
18 - prop: 'url',  
19 - label: 'url',  
20 - sortable: true,  
21 - align: 'center',  
22 - },  
23 /*{ 17 /*{
24 prop: 'streamId', 18 prop: 'streamId',
25 label: '链路id', 19 label: '链路id',
@@ -30,8 +24,15 @@ export default { @@ -30,8 +24,15 @@ export default {
30 prop: 'streamName', 24 prop: 'streamName',
31 label: '链路名称', 25 label: '链路名称',
32 sortable: true, 26 sortable: true,
  27 + width:'260',
33 align: 'center', 28 align: 'center',
34 - } 29 + },
  30 + {
  31 + prop: 'url',
  32 + label: 'url',
  33 + sortable: true,
  34 + align: 'center',
  35 + },
35 ], 36 ],
36 } 37 }
37 }, 38 },