monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 07dbc8a523220c5710a1bcdf3a160f859e5a7f99 2 parents 5d87dae2 ed5cdac9

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

Inline Side-by-side
Showing 15 changed files with 164 additions and 43 deletions
@@ -209,6 +209,8 @@ @@ -209,6 +209,8 @@
209 background-color: #3B92FC; 209 background-color: #3B92FC;
210 padding-bottom: 3%; 210 padding-bottom: 3%;
211 min-height: 500px; 211 min-height: 500px;
  212 + overflow-y: auto;
  213 + max-height: 630px;
212 } 214 }
213 215
214 .network-monitor-popup{ 216 .network-monitor-popup{
@@ -426,6 +428,20 @@ @@ -426,6 +428,20 @@
426 .cursorClass{ 428 .cursorClass{
427 cursor: pointer; 429 cursor: pointer;
428 } 430 }
  431 +.table-height .el-table{
  432 + height:500px;
  433 +}
  434 +.table-height-45 .el-table{
  435 + height:450px;
  436 +}
  437 +.height-600{
  438 + height:650px;
  439 +}
  440 +.text-overflow{
  441 + white-space: nowrap;
  442 + overflow: hidden;
  443 + text-overflow: ellipsis;
  444 +}
429 .position-absolute{ 445 .position-absolute{
430 446
431 } 447 }
@@ -77,15 +77,29 @@ export default { @@ -77,15 +77,29 @@ export default {
77 let params={ 77 let params={
78 id:item.id 78 id:item.id
79 } 79 }
80 - $.get(proxy.domainName +proxy.apiUrl1+'?access_token='+localStorage.getItem('access_token'),params,function (res) {  
81 - if(res){  
82 - proxy.$global.confirm("确认删除数据吗？", function () {  
83 - proxy.$global.showMsg("删除成功","warning") 80 +
  81 + proxy.$global.confirm("确认删除数据吗？", function () {
  82 + if (true){
  83 + $.get(proxy.domainName +proxy.apiUrl1+'?access_token='+localStorage.getItem('access_token'),params,function (){
  84 + proxy.$global.showMsg("删除成功","warning");
84 proxy.getData(); 85 proxy.getData();
85 }) 86 })
86 - 87 + }
  88 + else {
  89 + proxy.$global.showMsg("删除失败","warning");
87 } 90 }
88 }) 91 })
  92 +
  93 +
  94 + // $.get(proxy.domainName +proxy.apiUrl1+'?access_token='+localStorage.getItem('access_token'),params,function (res) {
  95 + // if(res){
  96 + // proxy.$global.confirm("确认删除数据吗？", function () {
  97 + // proxy.$global.showMsg("删除成功","warning")
  98 + // proxy.getData();
  99 + // })
  100 + //
  101 + // }
  102 + // })
89 } 103 }
90 const handleUpdate=(item)=>{ 104 const handleUpdate=(item)=>{
91 window.top.location.href = window.top.location.origin + '/#/analysis/view/id=' +item.id; 105 window.top.location.href = window.top.location.origin + '/#/analysis/view/id=' +item.id;
@@ -51,9 +51,9 @@ @@ -51,9 +51,9 @@
51 <div class='info-text'>设备信息</div> 51 <div class='info-text'>设备信息</div>
52 <div class='info-text-bot'> 52 <div class='info-text-bot'>
53 <p>资源名称：{{deviceDataInfo.resName}}</p> 53 <p>资源名称：{{deviceDataInfo.resName}}</p>
54 - <p>品 牌：{{deviceDataInfo.brandName}}</p> 54 + <p>品 牌：{{deviceDataInfo.brand}}</p>
55 <p>型 号：{{deviceDataInfo.model}}</p> 55 <p>型 号：{{deviceDataInfo.model}}</p>
56 - <p>序 列 号：{{deviceDataInfo.serialNumber}}</p> 56 + <p>序 列 号：{{deviceDataInfo.serialnumber}}</p>
57 <p>业 务 IP：{{deviceDataInfo.ip}}</p> 57 <p>业 务 IP：{{deviceDataInfo.ip}}</p>
58 <p>用 途：{{deviceDataInfo.purpose}}</p> 58 <p>用 途：{{deviceDataInfo.purpose}}</p>
59 </div> 59 </div>
@@ -94,7 +94,7 @@ export default { @@ -94,7 +94,7 @@ export default {
94 }, 94 },
95 axisLabel:{ 95 axisLabel:{
96 color:'#ffffff', 96 color:'#ffffff',
97 - fontSize: 12 97 + fontSize: 11
98 }, 98 },
99 }, 99 },
100 yAxis: { 100 yAxis: {
1 -<el-dialog v-model="APMVisible" :title="titleName" width="60%" @close="closeDialog"> 1 +<el-dialog v-model="APMVisible" :title="titleName" width="90%" @close="closeDialog" top="3vh">
2 2
3 <el-row> 3 <el-row>
4 <el-col :span="24"> 4 <el-col :span="24">
@@ -30,12 +30,14 @@ @@ -30,12 +30,14 @@
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 </div> 34 </div>
  35 +
34 </div> 36 </div>
35 </el-col> 37 </el-col>
36 </el-row> 38 </el-row>
37 <el-row class="margin-bottom-50"> 39 <el-row class="margin-bottom-50">
38 - <el-col :span="24"> 40 + <el-col :span="24" class="table-height">
39 <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" 41 <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList"
40 :showIndex="true" :total="count" 42 :showIndex="true" :total="count"
41 :showBorder="true" :loading="false" 43 :showBorder="true" :loading="false"
@@ -21,12 +21,12 @@ export default { @@ -21,12 +21,12 @@ export default {
21 sortable: true, 21 sortable: true,
22 align: 'center', 22 align: 'center',
23 }, 23 },
24 - { 24 + /* {
25 prop: 'ip', 25 prop: 'ip',
26 label: 'ip地址', 26 label: 'ip地址',
27 sortable: true, 27 sortable: true,
28 align: 'center', 28 align: 'center',
29 - }, 29 + },*/
30 { 30 {
31 prop: 'kpiName', 31 prop: 'kpiName',
32 label: '指标名称', 32 label: '指标名称',
@@ -111,7 +111,7 @@ export default { @@ -111,7 +111,7 @@ export default {
111 createBy:localStorage.getItem("lgn") 111 createBy:localStorage.getItem("lgn")
112 112
113 } 113 }
114 - proxy.$http.post('/api-web/fault/conf/apm/saveOrUpdate',params,function (res){ 114 + proxy.$http.post('/api-web/fault/conf/apm/saveOrUpdate',[params],function (res){
115 if(res && res.object){ 115 if(res && res.object){
116 proxy.$global.showMsg('添加成功','success'); 116 proxy.$global.showMsg('添加成功','success');
117 proxy.targetId=res.object.targetId 117 proxy.targetId=res.object.targetId
@@ -122,12 +122,17 @@ export default { @@ -122,12 +122,17 @@ export default {
122 122
123 123
124 } 124 }
  125 + //添加所有数据
  126 + let saveAll=()=>{
  127 +
  128 + }
125 //切换资源获取指标列表 129 //切换资源获取指标列表
126 let changeRes=(val)=>{ 130 let changeRes=(val)=>{
127 proxy.getResData(); 131 proxy.getResData();
128 132
129 } 133 }
130 return { 134 return {
  135 + saveAll,
131 getResData, 136 getResData,
132 changeRes, 137 changeRes,
133 bizId, 138 bizId,
1 -<el-dialog v-model="applicationMonitorVisible" :title="titleName" width="60%" @close="closeDialog"> 1 +<el-dialog v-model="applicationMonitorVisible" :title="titleName" width="90%" @close="closeDialog" top="3vh">
2 2
3 <el-row> 3 <el-row>
4 <el-col :span="24"> 4 <el-col :span="24">
@@ -30,16 +30,23 @@ @@ -30,16 +30,23 @@
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 </div> 34 </div>
34 </div> 35 </div>
35 </el-col> 36 </el-col>
36 </el-row> 37 </el-row>
37 <el-row class="margin-bottom-50"> 38 <el-row class="margin-bottom-50">
38 - <el-col :span="24"> 39 + <el-col :span="24" class="table-height">
39 <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" 40 <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList"
40 :showIndex="true" :total="count" 41 :showIndex="true" :total="count"
41 :showBorder="true" :loading="false" 42 :showBorder="true" :loading="false"
42 :showPage="true" :showTools="true" :height="(height - 500)"> 43 :showPage="true" :showTools="true" :height="(height - 500)">
  44 + <template #default="{row,prop,column}">
  45 + <div v-if="prop == 'url'" class="text-overflow" :title="row.url">
  46 + <span class="">{{row.url }}</span>
  47 +
  48 + </div>
  49 + </template>
43 <template #tools="{scope}"> 50 <template #tools="{scope}">
44 <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)"> 51 <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)">
45 <i class="el-icon-plus"/> 添加 52 <i class="el-icon-plus"/> 添加
@@ -20,12 +20,12 @@ export default { @@ -20,12 +20,12 @@ export default {
20 sortable: true, 20 sortable: true,
21 align: 'center', 21 align: 'center',
22 }, 22 },
23 - { 23 + /*{
24 prop: 'streamId', 24 prop: 'streamId',
25 label: '链路id', 25 label: '链路id',
26 sortable: true, 26 sortable: true,
27 align: 'center', 27 align: 'center',
28 - }, 28 + },*/
29 { 29 {
30 prop: 'streamName', 30 prop: 'streamName',
31 label: '链路名称', 31 label: '链路名称',
@@ -88,9 +88,11 @@ export default { @@ -88,9 +88,11 @@ export default {
88 //添加应用 88 //添加应用
89 let addRes=(row,index)=>{ 89 let addRes=(row,index)=>{
90 // row.targetId=proxy.targetId; 90 // row.targetId=proxy.targetId;
  91 + let npmList=row;
  92 + npmList.dataScope=120;
91 let params={ 93 let params={
92 targetId:proxy.targetId, 94 targetId:proxy.targetId,
93 - npmList:[row] 95 + npmList:[npmList]
94 } 96 }
95 97
96 proxy.$http.post('/api-web/fault/conf/npm/batchAddNpm',params,function (res){ 98 proxy.$http.post('/api-web/fault/conf/npm/batchAddNpm',params,function (res){
@@ -104,7 +106,11 @@ export default { @@ -104,7 +106,11 @@ export default {
104 106
105 107
106 } 108 }
  109 + let saveAll=()=>{
  110 +
  111 + }
107 return { 112 return {
  113 + saveAll,
108 networkMonitorList, 114 networkMonitorList,
109 setBizId, 115 setBizId,
110 addRes, 116 addRes,
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <el-row> 5 <el-row>
6 <el-col :span="24"> 6 <el-col :span="24">
7 <div class="flex-div-start margin-top-bottom-10"> 7 <div class="flex-div-start margin-top-bottom-10">
8 - <span class="fault-book-input-text context-select-text">选择类型</span> 8 +<!-- <span class="fault-book-input-text context-select-text">选择类型</span>-->
9 <!-- <el-select class="margin-right-10" v-model="busTypeArr" filterable clearable collapse-tags placeholder="从业务选择"> 9 <!-- <el-select class="margin-right-10" v-model="busTypeArr" filterable clearable collapse-tags placeholder="从业务选择">
10 <el-option 10 <el-option
11 v-for="item in busTypeList" 11 v-for="item in busTypeList"
@@ -17,11 +17,11 @@ @@ -17,11 +17,11 @@
17 </el-dropdown> 17 </el-dropdown>
18 --> 18 -->
19 19
20 - <el-select class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="从资源选择"> 20 + <!--<el-select class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="从资源选择">
21 <el-option 21 <el-option
22 v-for="item in resTypeList" 22 v-for="item in resTypeList"
23 :label="item.resName" :value="item.resId"></el-option> 23 :label="item.resName" :value="item.resId"></el-option>
24 - </el-select> 24 + </el-select>-->
25 25
26 <!--<el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" /> 26 <!--<el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
27 27
@@ -35,16 +35,21 @@ @@ -35,16 +35,21 @@
35 <el-row class="margin-bottom-50"> 35 <el-row class="margin-bottom-50">
36 <el-col :span="24"> 36 <el-col :span="24">
37 <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" 37 <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList"
38 - :showIndex="false" :total="count" 38 + :showIndex="true" :total="count"
39 :showBorder="true" :loading="false" 39 :showBorder="true" :loading="false"
40 - :showPage="true" :showTools="false" :height="(height - 500)"> 40 + :showPage="true" :showTools="true" :height="(height - 500)">
41 <template #default="{row,prop,column}"> 41 <template #default="{row,prop,column}">
42 <div v-if="prop == 'kpiName'" class="list-data"> 42 <div v-if="prop == 'kpiName'" class="list-data">
43 - <span class="list-data-text">指标: {{row.kpiName }}</span>  
44 - <img :id="row.index" @click="deleteItem(row)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="img-delete cursorClass"> 43 + <span class="list-data-text">{{row.kpiName }}</span>
  44 +<!-- <img :id="row.index" @click="deleteItem(row)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="img-delete cursorClass">-->
45 45
46 </div> 46 </div>
47 </template> 47 </template>
  48 + <template #tools="{scope}">
  49 + <el-button type="text" size="small" @click.prevent="deleteItem(scope.row,scope.$index)">
  50 + 删除
  51 + </el-button>
  52 + </template>
48 </cm-table-page> 53 </cm-table-page>
49 </el-col> 54 </el-col>
50 55
@@ -6,19 +6,36 @@ export default { @@ -6,19 +6,36 @@ export default {
6 data () { 6 data () {
7 return { 7 return {
8 columns:[ 8 columns:[
9 -  
10 { 9 {
11 - prop: 'resName', 10 + prop: 'busTypeName',
12 label: '资源类型', 11 label: '资源类型',
13 sortable: true, 12 sortable: true,
14 align: 'center', 13 align: 'center',
15 }, 14 },
  15 + {
  16 + prop: 'resName',
  17 + label: '资源名称',
  18 + sortable: true,
  19 + align: 'center',
  20 + },
  21 + {
  22 + prop: 'ip',
  23 + label: 'ip地址',
  24 + sortable: true,
  25 + align: 'center',
  26 + },
16 27
17 { 28 {
18 prop: 'kpiName', 29 prop: 'kpiName',
19 label: '指标名称', 30 label: '指标名称',
20 sortable: true, 31 sortable: true,
21 align: 'center', 32 align: 'center',
  33 + },
  34 + {
  35 + prop: 'flag',
  36 + label: '指标标识',
  37 + sortable: true,
  38 + align: 'center',
22 } 39 }
23 ], 40 ],
24 environmentTableData: [ 41 environmentTableData: [
@@ -165,7 +165,7 @@ @@ -165,7 +165,7 @@
165 <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> 165 <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y">
166 <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in networkMonitorList" :key="index"> 166 <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in networkMonitorList" :key="index">
167 <div> 167 <div>
168 - <el-button class="multiple-choice-button" type="primary">{{item.linkName}}</el-button> 168 + <el-button :disabled="faultStateRadio==0" class="multiple-choice-button" type="primary">{{item.linkName}}</el-button>
169 <img :id="item.id" @click="deleteNetLink(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass"> 169 <img :id="item.id" @click="deleteNetLink(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">
170 </div> 170 </div>
171 </div> 171 </div>
@@ -202,7 +202,7 @@ @@ -202,7 +202,7 @@
202 <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> 202 <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y">
203 <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in applicationMonitorList" :key="index"> 203 <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in applicationMonitorList" :key="index">
204 <div> 204 <div>
205 - <el-button class="multiple-choice-button" type="primary">{{item.streamName}}</el-button> 205 + <el-button :disabled="faultApplicationRadio==0" class="multiple-choice-button" type="primary">{{item.streamName}}</el-button>
206 <!-- <img :id="item.id" @click="deleteItem(item.id, applicationMonitorList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">--> 206 <!-- <img :id="item.id" @click="deleteItem(item.id, applicationMonitorList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">-->
207 <img :id="item.id" @click="deleteApp(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass"> 207 <img :id="item.id" @click="deleteApp(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">
208 </div> 208 </div>
@@ -317,7 +317,7 @@ @@ -317,7 +317,7 @@
317 <el-col :span="24"> 317 <el-col :span="24">
318 <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> 318 <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y">
319 <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in apmMonitorList" :key="index" > 319 <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in apmMonitorList" :key="index" >
320 - <el-button class="multiple-choice-button" type="primary">{{item.resName}}</el-button> 320 + <el-button :disabled="faultAPMRadio==0" class="multiple-choice-button" type="primary">{{item.resName}}</el-button>
321 <img :id="item.id" @click="deleteApm(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon position-absolute cursorClass"> 321 <img :id="item.id" @click="deleteApm(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon position-absolute cursorClass">
322 322
323 </div> 323 </div>
@@ -358,7 +358,7 @@ @@ -358,7 +358,7 @@
358 <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y"> 358 <div class="context-multiple-choice flex-div-start margin-30 flex-div-wrap overflow-scroll-y">
359 <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in logDetectionList" :key="index"> 359 <div class="btn-el-btn margin-bottom-10" v-for="(item, index) in logDetectionList" :key="index">
360 <div> 360 <div>
361 - <el-button class="multiple-choice-button" type="primary">{{item.title}}</el-button> 361 + <el-button :disabled="faultLogRadio==0" class="multiple-choice-button" type="primary">{{item.title}}</el-button>
362 <img :id="item.id" @click="deleteItem(item.id, logDetectionList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon"> 362 <img :id="item.id" @click="deleteItem(item.id, logDetectionList)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon">
363 </div> 363 </div>
364 </div> 364 </div>
@@ -129,6 +129,7 @@ export default { @@ -129,6 +129,7 @@ export default {
129 APMVisible:false,//APM弹框 129 APMVisible:false,//APM弹框
130 logMonitionVisible:false,//日志监测弹框 130 logMonitionVisible:false,//日志监测弹框
131 subscriptionReportVisible:false,//订阅人员弹框 131 subscriptionReportVisible:false,//订阅人员弹框
  132 + bizName:'',//业务名称
132 } 133 }
133 }, 134 },
134 setup(props){ 135 setup(props){
@@ -421,7 +422,7 @@ export default { @@ -421,7 +422,7 @@ export default {
421 //详情页设置targetid 422 //详情页设置targetid
422 setDetailConfig(typeVal){ 423 setDetailConfig(typeVal){
423 let that=this; 424 let that=this;
424 - if(this.configData){ 425 + if(this.configData && this.configData.length>0){
425 console.log("configData",this.configData,typeVal) 426 console.log("configData",this.configData,typeVal)
426 this.configData.map((item,index)=>{ 427 this.configData.map((item,index)=>{
427 if(item.type==typeVal){ 428 if(item.type==typeVal){
@@ -438,6 +439,8 @@ export default { @@ -438,6 +439,8 @@ export default {
438 439
439 } 440 }
440 }) 441 })
  442 + }else{
  443 + that.getTargetId(typeVal)
441 } 444 }
442 445
443 this.propsData={ 446 this.propsData={
@@ -512,6 +515,7 @@ export default { @@ -512,6 +515,7 @@ export default {
512 item.targetId=val; 515 item.targetId=val;
513 } 516 }
514 }) 517 })
  518 + console.log("modeldata",this.modelData);
515 }, 519 },
516 //获取模块对应的targetId 520 //获取模块对应的targetId
517 getTargetId(type){ 521 getTargetId(type){
@@ -640,7 +644,12 @@ export default { @@ -640,7 +644,12 @@ export default {
640 } 644 }
641 645
642 if(this.type){ 646 if(this.type){
643 - this.saveConfigDetailOther(); 647 + if(this.type=='base'){
  648 + this.saveBase();
  649 + }else{
  650 + this.saveConfigDetailOther();
  651 +
  652 + }
644 }else{ 653 }else{
645 this.saveFaultDefine(); 654 this.saveFaultDefine();
646 } 655 }
@@ -682,7 +691,8 @@ export default { @@ -682,7 +691,8 @@ export default {
682 saveConfigDetailOther(){ 691 saveConfigDetailOther(){
683 console.log("save",this.state) 692 console.log("save",this.state)
684 this.setState(); 693 this.setState();
685 - this.getTargetId(this.type) 694 + this.getTargetId(this.type);
  695 + this.getBizName(this.busTypeArr);
686 let that=this; 696 let that=this;
687 let params={ 697 let params={
688 type:this.type, 698 type:this.type,
@@ -692,6 +702,7 @@ export default { @@ -692,6 +702,7 @@ export default {
692 id:this.faultConfId, 702 id:this.faultConfId,
693 name:this.name, 703 name:this.name,
694 bizId: this.busTypeArr, 704 bizId: this.busTypeArr,
  705 + bizName:this.bizName,
695 createBy:localStorage.getItem("lgn") 706 createBy:localStorage.getItem("lgn")
696 } 707 }
697 } 708 }
@@ -764,19 +775,33 @@ export default { @@ -764,19 +775,33 @@ export default {
764 this.$http.get('/api-web/fault/base/config/queryKpiInfo',{},function (res){ 775 this.$http.get('/api-web/fault/base/config/queryKpiInfo',{},function (res){
765 if(res && res.data){ 776 if(res && res.data){
766 that.alarmList=res.data; 777 that.alarmList=res.data;
  778 + if(that.alarmList && that.alarmList.length>0){
  779 + that.kpiId=that.alarmList[0].kpiId;
  780 +
  781 + }
767 782
768 - that.kpiId=that.alarmList[0].kpiId;  
769 } 783 }
770 784
771 }) 785 })
772 786
773 787
774 }, 788 },
  789 + //通过bizId查找bizName
  790 + getBizName(bizId){
  791 + let that=this;
  792 + this.busTypeList.map(item=>{
  793 + if(bizId==item.busId){
  794 + that.bizName=item.busTypeName
  795 + }
  796 + })
  797 + },
775 //故障定义模块保存 新增故障定义 798 //故障定义模块保存 新增故障定义
776 saveFaultDefine(){ 799 saveFaultDefine(){
777 let that=this; 800 let that=this;
  801 + this.getBizName(this.busTypeArr);
778 let params= { 802 let params= {
779 // state: this.state, 803 // state: this.state,
  804 + type:'alarm',
780 triggerValue: this.triggerValue, 805 triggerValue: this.triggerValue,
781 kpiId: this.kpiId, 806 kpiId: this.kpiId,
782 807
@@ -784,6 +809,7 @@ export default { @@ -784,6 +809,7 @@ export default {
784 id: this.faultConfId, 809 id: this.faultConfId,
785 name: this.name, 810 name: this.name,
786 bizId: this.busTypeArr, 811 bizId: this.busTypeArr,
  812 + bizName:this.bizName,
787 createBy: localStorage.getItem("lgn"), 813 createBy: localStorage.getItem("lgn"),
788 } 814 }
789 815
@@ -803,6 +829,29 @@ export default { @@ -803,6 +829,29 @@ export default {
803 829
804 }) 830 })
805 }, 831 },
  832 + //保存基础环境
  833 + saveBase(){
  834 + let that=this;
  835 + this.getTargetId('base')
  836 + let params={
  837 + targetId:this.targetId,
  838 + bizId:this.busTypeArr
  839 + }
  840 + this.$http.post('/api-web/fault/conf/base/saveOrUpdate',params,function (res){
  841 + if(res && res.success){
  842 + that.targetId=res.object.targetId;
  843 + that.setTargetId(that.targetId)
  844 + // that.$global.showMsg('保存成功')
  845 + // that.alarmList=res.data;
  846 + that.saveConfigDetailOther();
  847 + }else{
  848 + that.$global.showMsg('保存失败','warning')
  849 +
  850 + }
  851 + that.isLoading=false;
  852 +
  853 + })
  854 + },
806 //删除网络监测 855 //删除网络监测
807 deleteNetLink(item) { 856 deleteNetLink(item) {
808 let that=this; 857 let that=this;
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 <el-row> 2 <el-row>
3 <el-col :span="6"> 3 <el-col :span="6">
4 <div class="search-input margin-30 flex-div-start"> 4 <div class="search-input margin-30 flex-div-start">
5 - <el-input v-model="input" placeholder="故障诊断" />  
6 - <span class="search-text">搜索</span> 5 + <el-input v-model="input" placeholder="故障诊断" class="fault-book-input-text" />
  6 + <span class="search-text" style="border-radius: 4px">搜索</span>
7 </div> 7 </div>
8 8
9 </el-col> 9 </el-col>
1 -<el-dialog v-model="networkMonitorVisible" :title="titleName" width="90%" @close="closeDialog">  
2 - <el-row v-if="!tableVisible"> 1 +<el-dialog v-model="networkMonitorVisible" :title="titleName" width="90%" @close="closeDialog" top="3vh">
  2 + <el-row v-if="!tableVisible" class="height-600">
3 <el-col :span="6"> 3 <el-col :span="6">
4 <div class="grid-content bg-purple network-monitor-popup-left"> 4 <div class="grid-content bg-purple network-monitor-popup-left">
5 <div> 5 <div>
@@ -150,7 +150,7 @@ @@ -150,7 +150,7 @@
150 <el-input style="flex:1;margin-left:10px;" class="margin-right-10" v-model="nodeName" placeholder="输入节点名称" /> 150 <el-input style="flex:1;margin-left:10px;" class="margin-right-10" v-model="nodeName" placeholder="输入节点名称" />
151 </el-row> 151 </el-row>
152 <el-row class="margin-bottom-50"> 152 <el-row class="margin-bottom-50">
153 - <el-col :span="24"> 153 + <el-col :span="24" :class="[{'table-height':!flag},{'table-height-45':flag}]">
154 <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" 154 <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList"
155 :showIndex="true" :total="count" 155 :showIndex="true" :total="count"
156 :showBorder="true" :loading="false" 156 :showBorder="true" :loading="false"
1 <div class="container" :style="{'height':height+'px','max-height':height+'px'}"> 1 <div class="container" :style="{'height':height+'px','max-height':height+'px'}">
2 <div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}"> 2 <div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}">
3 <div class="search"> 3 <div class="search">
4 - <div class="condition"> 4 + <div class="condition fault-book-input-text" style="width: 250px">
5 <el-form-item> 5 <el-form-item>
6 <el-input v-model="searchForm.keyword" placeholder="输入关键字" 6 <el-input v-model="searchForm.keyword" placeholder="输入关键字"
7 - @keydown.enter.native="getPage"></el-input> 7 + @keydown.enter.native="getPage" class="fault-book-input-text"></el-input>
8 </el-form-item> 8 </el-form-item>
9 <!--<el-form-item> 9 <!--<el-form-item>
10 <el-select v-model="searchForm.category" placeholder="故障分类"> 10 <el-select v-model="searchForm.category" placeholder="故障分类">
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 </el-select> 13 </el-select>
14 </el-form-item>--> 14 </el-form-item>-->
15 </div> 15 </div>
16 - <div class="btns"> 16 + <div class="btns" style="justify-content: left;padding-left: 0px">
17 <el-form-item> 17 <el-form-item>
18 <el-button type="primary" @click="getPage"> 18 <el-button type="primary" @click="getPage">
19 搜索 19 搜索