monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 5f15663d8cd92a814c4093186d4eb8749d5216a3 2 parents a603e488 fe64ddc5

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

故障 应用检测表格数据默认选中



See merge request !251
Inline Side-by-side
Showing 8 changed files with 196 additions and 121 deletions
1 <div > 1 <div >
2 <!-- 表格--> 2 <!-- 表格-->
3 - <el-table :border="showBorder" v-loading="loading" :size="size" @selection-change="handleSelectionChange" :data="dataList" stripe header-row-class-name="tbl-header-class" :height="height" 3 + <el-table :border="showBorder" v-loading="loading" :size="size" ref="multipleTable" @selection-change="handleSelectionChange" :data="dataList" stripe header-row-class-name="tbl-header-class" :height="height"
4 style="width: 100%;margin: 0px 0px;"> 4 style="width: 100%;margin: 0px 0px;">
5 <el-table-column v-if="showSelection && columns.length > 0" type="selection" width="55" /> 5 <el-table-column v-if="showSelection && columns.length > 0" type="selection" width="55" />
6 <el-table-column v-if="showIndex && columns.length > 0" type="index" :label="indexLabel" align="center" width="50"/> 6 <el-table-column v-if="showIndex && columns.length > 0" type="index" :label="indexLabel" align="center" width="50"/>
@@ -81,14 +81,19 @@ export default { @@ -81,14 +81,19 @@ export default {
81 type: String, 81 type: String,
82 default: 'small' 82 default: 'small'
83 }, 83 },
  84 + multipleSelection:{
  85 + type:Array,
  86 + default:[]
  87 + }
84 }, 88 },
85 data() { 89 data() {
86 return {} 90 return {}
87 }, 91 },
88 setup(props, {attrs, slots, emit}) { 92 setup(props, {attrs, slots, emit}) {
  93 + const {proxy} = Vue.getCurrentInstance();
89 let currentPage = Vue.ref(1); 94 let currentPage = Vue.ref(1);
90 let pageSize = Vue.ref(props.pageSize); 95 let pageSize = Vue.ref(props.pageSize);
91 - let multipleSelection=Vue.ref([]); 96 + // let multipleSelection=Vue.ref([]);
92 97
93 98
94 /** 99 /**
@@ -172,21 +177,48 @@ export default { @@ -172,21 +177,48 @@ export default {
172 // Vue.watch(() => filterText.value, (newValue, oldVlaue) => { 177 // Vue.watch(() => filterText.value, (newValue, oldVlaue) => {
173 // proxy.$refs.tree.filter(newValue) 178 // proxy.$refs.tree.filter(newValue)
174 // }); 179 // });
  180 +
175 //全选事件 181 //全选事件
176 let handleSelectionChange=(val)=>{ 182 let handleSelectionChange=(val)=>{
177 - multipleSelection.value = val  
178 - emit('selectionChange', multipleSelection.value) 183 + // multipleSelection.value = val
  184 + emit('selectionChange', val)
179 185
180 } 186 }
181 - 187 + //设置默认选中
  188 + let toggleSelection=(rows)=> {
  189 + console.log("rows",rows)
  190 + proxy.$nextTick(function () {
  191 + console.log("set",props.dataList,props.multipleSelection)
  192 +
  193 + if (rows) {
  194 + rows.forEach(row => {
  195 + //设置该表格选框选中
  196 + proxy.$refs.multipleTable.toggleRowSelection(row);
  197 + });
  198 + } else {
  199 + proxy.$refs.multipleTable.clearSelection();
  200 + }
  201 + })
  202 + }
182 // 挂载完 203 // 挂载完
183 Vue.onMounted(() => { 204 Vue.onMounted(() => {
184 //callback(); 205 //callback();
  206 +
  207 + })
  208 + Vue.watch(()=>props.dataList,(newValue, oldValue)=>{
  209 + setTimeout(function (){
  210 + if(props.showSelection){
  211 + toggleSelection(props.multipleSelection)
  212 + }
  213 + },100)
  214 +
  215 +
185 }) 216 })
186 217
187 return { 218 return {
  219 + toggleSelection,
188 handleSelectionChange, 220 handleSelectionChange,
189 - multipleSelection, 221 + // multipleSelection,
190 currentPage, 222 currentPage,
191 pageSize, 223 pageSize,
192 handleSizeChange, 224 handleSizeChange,
@@ -91,7 +91,7 @@ export default { @@ -91,7 +91,7 @@ export default {
91 } 91 }
92 // 点击按钮搜索 92 // 点击按钮搜索
93 let onBtnSearch = () => { 93 let onBtnSearch = () => {
94 - proxy.loadTableDataList(); 94 + proxy.getNodeList();
95 } 95 }
96 //获取接收到的传值 bizid 96 //获取接收到的传值 bizid
97 let setBizId=()=>{ 97 let setBizId=()=>{
@@ -192,7 +192,14 @@ export default { @@ -192,7 +192,14 @@ export default {
192 proxy.getResData(); 192 proxy.getResData();
193 193
194 } 194 }
  195 + //重新加载表格数据
  196 + let loadTableDataList = ({page, limit}) => {
  197 + proxy.page=page;
  198 + proxy.pageSize=limit;
  199 + proxy.getNodeList()
  200 + }
195 return { 201 return {
  202 + loadTableDataList,
196 saveAllData, 203 saveAllData,
197 page, 204 page,
198 pageSize, 205 pageSize,
@@ -231,13 +238,7 @@ export default { @@ -231,13 +238,7 @@ export default {
231 saveList(){ 238 saveList(){
232 this.APMVisible=false; 239 this.APMVisible=false;
233 }, 240 },
234 - //重新加载表格数据  
235 - loadTableDataList(val){  
236 - console.log("page",val)  
237 - this.page=val.page;  
238 - this.pageSize=val.limit;  
239 - this.getNodeList()  
240 - }, 241 +
241 //获取apm配置列表数据 242 //获取apm配置列表数据
242 getNodeList(){ 243 getNodeList(){
243 let that=this; 244 let that=this;
1 -<cm-dialog :title="titleName" width="90%" :showDialogVisible="applicationMonitorVisible" @hidedialog="closeDialog" >  
2 - <template v-slot>  
3 - <el-row>  
4 - <el-col :span="24"> 1 +<el-dialog v-model="applicationMonitorVisible" :title="titleName" width="90%" @close="closeDialog" top="3vh">
  2 + <el-row>
  3 + <el-col :span="24">
5 4
6 - <div class="set-add-div">  
7 - <el-row>  
8 - <el-col :span="24">  
9 - <div class="flex-div-start margin-top-bottom-10"> 5 + <div class="set-add-div">
  6 + <el-row>
  7 + <el-col :span="24">
  8 + <div class="flex-div-start margin-top-bottom-10">
10 9
11 - <!-- <el-select class="margin-right-10" v-model="busTypeArr" filterable clearable collapse-tags placeholder="请选择业务">  
12 - <el-option  
13 - v-for="item in busTypeList"  
14 - :label="item.busTypeName" :value="item.busId"></el-option>  
15 - </el-select>  
16 - -->  
17 - <!-- <el-dropdown class="margin-right-10">  
18 - <cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/>  
19 - </el-dropdown> 10 + <!-- <el-select class="margin-right-10" v-model="busTypeArr" filterable clearable collapse-tags placeholder="请选择业务">
  11 + <el-option
  12 + v-for="item in busTypeList"
  13 + :label="item.busTypeName" :value="item.busId"></el-option>
  14 + </el-select>
  15 + -->
  16 + <!-- <el-dropdown class="margin-right-10">
  17 + <cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/>
  18 + </el-dropdown>
20 19
21 20
22 - <el-select class="margin-right-10" v-model="kpiTypeArr" multiple filterable clearable collapse-tags placeholder="请选择指标">  
23 - <el-option  
24 - v-for="item in kpiList"  
25 - :label="item.kpiName" :value="item.kpiId"></el-option>  
26 - </el-select>--> 21 + <el-select class="margin-right-10" v-model="kpiTypeArr" multiple filterable clearable collapse-tags placeholder="请选择指标">
  22 + <el-option
  23 + v-for="item in kpiList"
  24 + :label="item.kpiName" :value="item.kpiId"></el-option>
  25 + </el-select>-->
27 26
28 - <el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" /> 27 + <el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
29 28
30 - <div class="flex-div-start">  
31 - <el-button type="primary" @click="onReset()">重置</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>  
34 - <el-button type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>  
35 - </div> 29 + <div class="flex-div-start">
  30 + <el-button type="primary" @click="onReset()">重置</el-button>
  31 + <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
  32 + <el-button type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
  33 + <el-button type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>
36 </div> 34 </div>
37 - </el-col>  
38 - </el-row>  
39 - <el-row class="margin-bottom-50">  
40 - <el-col :span="24" class="table-height">  
41 - <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList"  
42 - :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange"  
43 - :showBorder="true" :loading="false" :pageSize="pageSize"  
44 - :showPage="true" :showTools="true" :height="(height - 500)">  
45 - <template #default="{row,prop,column}">  
46 - <div v-if="prop == 'url'" class="text-overflow" :title="row.url">  
47 - <span class="">{{row.url }}</span>  
48 -  
49 - </div>  
50 - </template>  
51 - <template #tools="{scope}">  
52 - <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)">  
53 - <i class="el-icon-plus"/> 添加  
54 - </el-button>  
55 - </template>  
56 - </cm-table-page>  
57 - </el-col> 35 + </div>
  36 + </el-col>
  37 + </el-row>
  38 + <el-row class="margin-bottom-50">
  39 + <el-col :span="24" class="table-height">
  40 + <cm-table-page v-if="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="applicationMonitorListChecked"
  41 + :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange"
  42 + :showBorder="true" :loading="false" :pageSize="pageSize"
  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>
58 47
59 - </el-row> 48 + </div>
  49 + </template>
  50 + <template #tools="{scope}">
  51 + <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)">
  52 + <i class="el-icon-plus"/> 添加
  53 + </el-button>
  54 + </template>
  55 + </cm-table-page>
  56 + </el-col>
60 57
  58 + </el-row>
61 59
62 - </div>  
63 60
  61 + </div>
64 62
65 - </el-col>  
66 63
  64 + </el-col>
67 65
68 - </el-row>  
69 - <div class="margin-top flex-center position-bottom">  
70 - <el-button @click="cancleList">取消</el-button>  
71 - <!-- <el-button @click="saveList" type="primary">保存</el-button>-->  
72 - </div>  
73 - </template>  
74 -</cm-dialog>  
75 -<!--<el-dialog v-model="applicationMonitorVisible" :title="titleName" width="90%" @close="closeDialog" top="3vh">  
76 66
77 -</el-dialog>--> 67 + </el-row>
  68 + <div class="margin-top flex-center position-bottom">
  69 + <el-button @click="cancleList">取消</el-button>
  70 + <!-- <el-button @click="saveList" type="primary">保存</el-button>-->
  71 + </div>
  72 +</el-dialog>
@@ -2,11 +2,11 @@ export default { @@ -2,11 +2,11 @@ export default {
2 name: 'applicationMoni', 2 name: 'applicationMoni',
3 template: '', 3 template: '',
4 components: {}, 4 components: {},
5 - props:['propsData'], 5 + props:['propsData','applicationMonitorList'],
6 data () { 6 data () {
7 return { 7 return {
8 - titleName:'添加内容',  
9 - applicationMonitorVisible: true, 8 + titleName:'应用配置',
  9 + // applicationMonitorVisible: true,
10 columns:[ 10 columns:[
11 /*{ 11 /*{
12 prop: 'busTypeName', 12 prop: 'busTypeName',
@@ -57,6 +57,9 @@ export default { @@ -57,6 +57,9 @@ export default {
57 let page=Vue.ref(1);//当前页 57 let page=Vue.ref(1);//当前页
58 let pageSize=Vue.ref(5);//每页显示条数 58 let pageSize=Vue.ref(5);//每页显示条数
59 let modleId=Vue.ref();//模块id 59 let modleId=Vue.ref();//模块id
  60 + let applicationMonitorVisible=Vue.ref(true);
  61 + let faultConfId=Vue.ref();
  62 + let bizName=Vue.ref();
60 let init = () =>{ 63 let init = () =>{
61 proxy.$http.get("/api-web/manage/kpi/list", {}, function(res) { 64 proxy.$http.get("/api-web/manage/kpi/list", {}, function(res) {
62 if (res && res.data) { 65 if (res && res.data) {
@@ -78,7 +81,7 @@ export default { @@ -78,7 +81,7 @@ export default {
78 } 81 }
79 // 点击按钮搜索 82 // 点击按钮搜索
80 let onBtnSearch = () => { 83 let onBtnSearch = () => {
81 - proxy.loadTableDataList(); 84 + proxy.getNodeList();
82 } 85 }
83 //获取接收到的传值 bizid 86 //获取接收到的传值 bizid
84 let setBizId=()=>{ 87 let setBizId=()=>{
@@ -86,8 +89,8 @@ export default { @@ -86,8 +89,8 @@ export default {
86 proxy.bizId=props.propsData.bizId; 89 proxy.bizId=props.propsData.bizId;
87 proxy.targetId=props.propsData.targetId; 90 proxy.targetId=props.propsData.targetId;
88 proxy.busTypeArr=[props.propsData.bizId]; 91 proxy.busTypeArr=[props.propsData.bizId];
89 - proxy.faultConfId=props.faultConfId;  
90 - proxy.bizName=props.bizName; 92 + proxy.faultConfId=props.propsData.faultConfId;
  93 + proxy.bizName=props.propsData.bizName;
91 proxy.modleId=props.propsData.modleId; 94 proxy.modleId=props.propsData.modleId;
92 } 95 }
93 console.log("*",props.propsData,proxy.bizId,proxy.busTypeArr) 96 console.log("*",props.propsData,proxy.bizId,proxy.busTypeArr)
@@ -181,8 +184,66 @@ export default { @@ -181,8 +184,66 @@ export default {
181 184
182 185
183 } 186 }
  187 + //重新加载表格数据
  188 + let loadTableDataList = ({page, limit}) => {
  189 + proxy.page=page;
  190 + proxy.pageSize=limit;
  191 + proxy.getNodeList()
  192 + }
  193 + //显示已添加过的应用列表数据
  194 + let applicationMonitorListChecked=Vue.ref([]);
  195 + let setListData=()=>{
  196 + if(props.applicationMonitorList){
  197 + props.applicationMonitorList.map((item,index)=>{
  198 + proxy.tableDataList.map(v=>{
  199 + if(item.streamId==v.streamId){
  200 + proxy.applicationMonitorListChecked.push(v)
  201 +
  202 + }
  203 + })
  204 +
  205 + })
  206 + }
  207 +
  208 + }
  209 +
  210 + //获取应用监测配置列表数据
  211 + let getNodeList=()=>{
  212 + let that=this;
  213 + proxy.$http.get(`/api-web/fault/conf/npmBase/list`, proxy.getParams(), function (res) {
  214 + if (res && res.success) {
  215 + proxy.count = res.count;
  216 + tableDataList.value = res.data;
  217 +
  218 + proxy.setListData();
  219 + }
  220 + });
  221 + }
  222 + //关闭弹框
  223 + let closeDialog=()=>{
  224 + proxy.restData();
  225 + let obj={
  226 + targetId:proxy.targetId,
  227 + faultConfId:proxy.faultConfId,
  228 +
  229 + }
  230 + proxy.$emit('callbackApp',obj);
  231 + }
  232 + //清除数据
  233 + let restData=()=>{
  234 + proxy.tableDataList='';
  235 + }
184 236
185 return { 237 return {
  238 + closeDialog,
  239 + restData,
  240 + getNodeList,
  241 + faultConfId,
  242 + bizName,
  243 + applicationMonitorVisible,
  244 + applicationMonitorListChecked,
  245 + setListData,
  246 + loadTableDataList,
186 modleId, 247 modleId,
187 saveAlldata, 248 saveAlldata,
188 page, 249 page,
@@ -213,31 +274,17 @@ export default { @@ -213,31 +274,17 @@ export default {
213 }, 274 },
214 methods: { 275 methods: {
215 276
216 - //取消节点列表配置 277 + //取消应用列表配置
217 cancleList(){ 278 cancleList(){
218 this.applicationMonitorVisible=false; 279 this.applicationMonitorVisible=false;
219 280
220 }, 281 },
221 - //保存节点添加配置 282 + //保存应用添加配置
222 saveList(){ 283 saveList(){
223 this.applicationMonitorVisible=false; 284 this.applicationMonitorVisible=false;
224 }, 285 },
225 - //重新加载表格数据  
226 - loadTableDataList(val){  
227 - this.page=val.page;  
228 - this.pageSize=val.limit;  
229 - this.getNodeList()  
230 - },  
231 - //获取应用监测配置列表数据  
232 - getNodeList(){  
233 - let that=this;  
234 - this.$http.get(`/api-web/fault/conf/npmBase/list`, this.getParams(), function (res) {  
235 - if (res && res.success) {  
236 - that.count = res.count;  
237 - that.tableDataList = res.data;  
238 - }  
239 - });  
240 - }, 286 +
  287 +
241 //配置参数 288 //配置参数
242 getParams(){ 289 getParams(){
243 return { 290 return {
@@ -251,10 +298,7 @@ export default { @@ -251,10 +298,7 @@ export default {
251 pageSize: this.pageSize 298 pageSize: this.pageSize
252 } 299 }
253 }, 300 },
254 - //关闭弹框  
255 - closeDialog(){  
256 - this.$emit('callbackApp', this.targetId);  
257 - }, 301 +
258 //保存模块 302 //保存模块
259 saveModel(){ 303 saveModel(){
260 let that=this; 304 let that=this;
@@ -290,15 +334,9 @@ export default { @@ -290,15 +334,9 @@ export default {
290 334
291 335
292 }, 336 },
293 - watch:{  
294 - applicationMonitorVisible(newValue, oldValue) {  
295 - console.log("applicationMonitorVisible",newValue)  
296 -  
297 - }  
298 -  
299 - },  
300 mounted () { 337 mounted () {
301 // this.init(); 338 // this.init();
  339 +
302 this.setBizId(); 340 this.setBizId();
303 this.getNodeList(); 341 this.getNodeList();
304 }, 342 },
@@ -178,7 +178,7 @@ @@ -178,7 +178,7 @@
178 </el-row> 178 </el-row>
179 </div> 179 </div>
180 180
181 - <!--应用监测--> 181 + <!--应用检测-->
182 <div class="application-monitor margin-30" v-if="applicationMonitorHide"> 182 <div class="application-monitor margin-30" v-if="applicationMonitorHide">
183 <el-row> 183 <el-row>
184 <el-col :span="6"> 184 <el-col :span="6">
@@ -204,7 +204,8 @@ @@ -204,7 +204,8 @@
204 <div> 204 <div>
205 <el-button :disabled="faultApplicationRadio==0" 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" v-if="faultApplicationRadio==1" @click="deleteApp(item)" src="./src/assets/images/faultDiagnosis/icon-item-delete.png" class="multiple-choice-icon cursorClass">
  208 + <img src="" v-else style="width:12px;height:12px;" class="multiple-choice-icon" alt="">
208 </div> 209 </div>
209 210
210 </div> 211 </div>
@@ -409,8 +410,8 @@ @@ -409,8 +410,8 @@
409 <div class="network-monitor-popup popup-bg"> 410 <div class="network-monitor-popup popup-bg">
410 <!--网络检测弹窗--> 411 <!--网络检测弹窗-->
411 <DiagnosisNet v-if="networkMonitorVisible" :propsData="propsData" @callback="getNetworkMonitorList" ></DiagnosisNet> 412 <DiagnosisNet v-if="networkMonitorVisible" :propsData="propsData" @callback="getNetworkMonitorList" ></DiagnosisNet>
412 - <!--应用监测弹框-->  
413 - <ApplicationMoni v-if="applicationMonitorVisible" :propsData="propsData" @callbackApp="getApplicationMoniList"></ApplicationMoni> 413 + <!--应用检测弹框-->
  414 + <ApplicationMoni v-if="applicationMonitorVisible" :applicationMonitorList="applicationMonitorList" :propsData="propsData" @callbackApp="getApplicationMoniList"></ApplicationMoni>
414 <!--APM弹框--> 415 <!--APM弹框-->
415 <APM v-if="APMVisible" :propsData="propsData" @callbackAPM="getAPMList"></APM> 416 <APM v-if="APMVisible" :propsData="propsData" @callbackAPM="getAPMList"></APM>
416 <!--日志监测弹框--> 417 <!--日志监测弹框-->
@@ -125,7 +125,7 @@ export default { @@ -125,7 +125,7 @@ export default {
125 // nodeData:[{name:'',img:''}] 125 // nodeData:[{name:'',img:''}]
126 //所属业务列表数据 126 //所属业务列表数据
127 busTypeList:'', 127 busTypeList:'',
128 - applicationMonitorVisible:false,//应用检测弹框 128 + // applicationMonitorVisible:false,//应用检测弹框
129 APMVisible:false,//APM弹框 129 APMVisible:false,//APM弹框
130 logMonitionVisible:false,//日志监测弹框 130 logMonitionVisible:false,//日志监测弹框
131 subscriptionReportVisible:false,//订阅人员弹框 131 subscriptionReportVisible:false,//订阅人员弹框
@@ -134,6 +134,7 @@ export default { @@ -134,6 +134,7 @@ export default {
134 } 134 }
135 }, 135 },
136 setup(props){ 136 setup(props){
  137 + let applicationMonitorVisible=Vue.ref(false);
137 //btn加载中 138 //btn加载中
138 let isLoading=Vue.ref(false); 139 let isLoading=Vue.ref(false);
139 //所属业务id 140 //所属业务id
@@ -207,6 +208,7 @@ export default { @@ -207,6 +208,7 @@ export default {
207 //模块id 208 //模块id
208 let modleId=Vue.ref(); 209 let modleId=Vue.ref();
209 return{ 210 return{
  211 + applicationMonitorVisible,
210 modleId, 212 modleId,
211 ruleId, 213 ruleId,
212 ruleName, 214 ruleName,
@@ -485,7 +487,7 @@ export default { @@ -485,7 +487,7 @@ export default {
485 }else{ 487 }else{
486 that.getTargetId(typeVal) 488 that.getTargetId(typeVal)
487 } 489 }
488 - 490 + this.getBizName(this.busTypeArr);
489 this.propsData={ 491 this.propsData={
490 bizId:this.busTypeArr, 492 bizId:this.busTypeArr,
491 docId:this.docId, 493 docId:this.docId,
@@ -579,7 +581,11 @@ export default { @@ -579,7 +581,11 @@ export default {
579 //关闭应用监测添加弹框 581 //关闭应用监测添加弹框
580 getApplicationMoniList(itemData){ 582 getApplicationMoniList(itemData){
581 this.applicationMonitorVisible=false; 583 this.applicationMonitorVisible=false;
582 - this.setTargetId(itemData); 584 + if(itemData.faultConfId){
  585 + this.faultConfId=itemData.faultConfId;
  586 + }
  587 + this.setTargetId(itemData.targetId);
  588 +
583 // this.targetId=itemData; 589 // this.targetId=itemData;
584 // this.applicationMonitorList=itemData; 590 // this.applicationMonitorList=itemData;
585 this.getAppList(); 591 this.getAppList();
@@ -138,7 +138,7 @@ export default { @@ -138,7 +138,7 @@ export default {
138 } 138 }
139 // 点击按钮搜索 139 // 点击按钮搜索
140 let onBtnSearch = () => { 140 let onBtnSearch = () => {
141 - proxy.loadTableDataList(); 141 + proxy.getNodeList();
142 } 142 }
143 143
144 //获取链路信息列表 144 //获取链路信息列表
@@ -220,12 +220,14 @@ export default { @@ -220,12 +220,14 @@ export default {
220 }else{ 220 }else{
221 console.log("2*2") 221 console.log("2*2")
222 bNetNodeList.nodeName=proxy.nodeName; 222 bNetNodeList.nodeName=proxy.nodeName;
223 - bNetNodeList.type='dot'; 223 + bNetNodeList.type='point';
  224 + bNetNodeList.nodeType='point';
224 225
225 proxy.backLink(bNetNodeList,index); 226 proxy.backLink(bNetNodeList,index);
226 } 227 }
227 }else{ 228 }else{
228 bNetNodeList.type='line'; 229 bNetNodeList.type='line';
  230 + bNetNodeList.nodeType='line';
229 proxy.backLink(bNetNodeList,index); 231 proxy.backLink(bNetNodeList,index);
230 } 232 }
231 233
@@ -421,7 +423,7 @@ export default { @@ -421,7 +423,7 @@ export default {
421 this.addSetLIstVisible=false; 423 this.addSetLIstVisible=false;
422 424
423 } 425 }
424 - this.titleName='添加内容'; 426 + this.titleName='网络配置';
425 this.init(); 427 this.init();
426 this.getNodeList(); 428 this.getNodeList();
427 }, 429 },