故障联调 apm和基础环境风格统一及页码切换,表格数据默认选中
Showing
8 changed files
with
147 additions
and
64 deletions
1 | -<el-dialog v-model="APMVisible" :title="titleName" width="90%" @close="closeDialog" top="3vh"> | ||
2 | - | 1 | +<cm-dialog :title="titleName" width="90%" :showDialogVisible="APMVisible" @hidedialog="closeDialog" :showFooter="false"> |
2 | + <template v-slot> | ||
3 | <el-row> | 3 | <el-row> |
4 | <el-col :span="24"> | 4 | <el-col :span="24"> |
5 | 5 | ||
@@ -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 | <el-button type="primary" @click="saveAllData()" style="margin-left: 10px">全部添加</el-button> | 34 | <el-button type="primary" @click="saveAllData()" style="margin-left: 10px">全部添加</el-button> |
35 | </div> | 35 | </div> |
36 | 36 | ||
@@ -39,7 +39,7 @@ | @@ -39,7 +39,7 @@ | ||
39 | </el-row> | 39 | </el-row> |
40 | <el-row class="margin-bottom-50"> | 40 | <el-row class="margin-bottom-50"> |
41 | <el-col :span="24" class="table-height"> | 41 | <el-col :span="24" class="table-height"> |
42 | - <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" | 42 | + <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="apmMonitorListChecked" |
43 | :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" | 43 | :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" |
44 | :showBorder="true" :loading="false" :pageSize="pageSize" | 44 | :showBorder="true" :loading="false" :pageSize="pageSize" |
45 | :showPage="true" :showTools="true" :height="(height - 500)"> | 45 | :showPage="true" :showTools="true" :height="(height - 500)"> |
@@ -61,8 +61,10 @@ | @@ -61,8 +61,10 @@ | ||
61 | 61 | ||
62 | 62 | ||
63 | </el-row> | 63 | </el-row> |
64 | - <div class="margin-top flex-center position-bottom"> | 64 | + <div class="margin-top btn-faultDiagnosis flex-center position-bottom"> |
65 | <el-button @click="cancleList">取消</el-button> | 65 | <el-button @click="cancleList">取消</el-button> |
66 | -<!-- <el-button @click="saveList" type="primary">保存</el-button>--> | 66 | + <!-- <el-button @click="saveList" type="primary">保存</el-button>--> |
67 | </div> | 67 | </div> |
68 | -</el-dialog> | 68 | + </template> |
69 | +</cm-dialog> | ||
70 | + |
@@ -2,12 +2,12 @@ export default { | @@ -2,12 +2,12 @@ export default { | ||
2 | name: 'APM', | 2 | name: 'APM', |
3 | template: '', | 3 | template: '', |
4 | components: {}, | 4 | components: {}, |
5 | - props:['propsData'], | 5 | + props:['propsData','apmMonitorList','isDisplay'], |
6 | data () { | 6 | data () { |
7 | return { | 7 | return { |
8 | - titleName:'添加内容', | 8 | + titleName:'APM配置', |
9 | tableVisible:false,//添加配置列表是否显示 | 9 | tableVisible:false,//添加配置列表是否显示 |
10 | - APMVisible: true, | 10 | + // APMVisible: true, |
11 | columns:[ | 11 | columns:[ |
12 | { | 12 | { |
13 | prop: 'busTypeName', | 13 | prop: 'busTypeName', |
@@ -61,6 +61,22 @@ export default { | @@ -61,6 +61,22 @@ export default { | ||
61 | let targetId=Vue.ref();//所属模块id | 61 | let targetId=Vue.ref();//所属模块id |
62 | let page=Vue.ref(1);//当前页 | 62 | let page=Vue.ref(1);//当前页 |
63 | let pageSize=Vue.ref(5);//每页显示条数 | 63 | let pageSize=Vue.ref(5);//每页显示条数 |
64 | + let APMVisible=Vue.ref(false); | ||
65 | + let modleId=Vue.ref();//模块id | ||
66 | + let faultConfId=Vue.ref(); | ||
67 | + let bizName=Vue.ref(); | ||
68 | + let name=Vue.ref(); | ||
69 | + | ||
70 | + Vue.watch(()=>props.isDisplay,(newValue, oldValue)=>{ | ||
71 | + proxy.APMVisible=newValue; | ||
72 | + if(newValue){ | ||
73 | + proxy.setBizId(); | ||
74 | + proxy.init(); | ||
75 | + proxy.getResData(); | ||
76 | + proxy.getNodeList(); | ||
77 | + } | ||
78 | + | ||
79 | + }) | ||
64 | let init = () =>{ | 80 | let init = () =>{ |
65 | 81 | ||
66 | let params1={ | 82 | let params1={ |
@@ -99,6 +115,10 @@ export default { | @@ -99,6 +115,10 @@ export default { | ||
99 | proxy.bizId=props.propsData.bizId; | 115 | proxy.bizId=props.propsData.bizId; |
100 | proxy.targetId=props.propsData.targetId; | 116 | proxy.targetId=props.propsData.targetId; |
101 | proxy.busTypeArr=[props.propsData.bizId]; | 117 | proxy.busTypeArr=[props.propsData.bizId]; |
118 | + proxy.faultConfId=props.propsData.faultConfId; | ||
119 | + proxy.bizName=props.propsData.bizName; | ||
120 | + proxy.modleId=props.propsData.modleId; | ||
121 | + proxy.name=props.propsData.name; | ||
102 | } | 122 | } |
103 | console.log("*",props.propsData,proxy.bizId,proxy.busTypeArr) | 123 | console.log("*",props.propsData,proxy.bizId,proxy.busTypeArr) |
104 | 124 | ||
@@ -121,7 +141,8 @@ export default { | @@ -121,7 +141,8 @@ export default { | ||
121 | if(res && res.object){ | 141 | if(res && res.object){ |
122 | proxy.$global.showMsg('添加成功','success'); | 142 | proxy.$global.showMsg('添加成功','success'); |
123 | proxy.targetId=res.src; | 143 | proxy.targetId=res.src; |
124 | - proxy.APMVisible=false; | 144 | + proxy.saveModel(); |
145 | + // proxy.APMVisible=false; | ||
125 | } | 146 | } |
126 | 147 | ||
127 | }) | 148 | }) |
@@ -139,7 +160,8 @@ export default { | @@ -139,7 +160,8 @@ export default { | ||
139 | if(res && res.success){ | 160 | if(res && res.success){ |
140 | proxy.$global.showMsg('添加成功','success'); | 161 | proxy.$global.showMsg('添加成功','success'); |
141 | proxy.targetId=res.src; | 162 | proxy.targetId=res.src; |
142 | - proxy.APMVisible=false; | 163 | + proxy.saveModel(); |
164 | + // proxy.APMVisible=false; | ||
143 | } | 165 | } |
144 | 166 | ||
145 | }) | 167 | }) |
@@ -182,7 +204,8 @@ export default { | @@ -182,7 +204,8 @@ export default { | ||
182 | if(res && res.object){ | 204 | if(res && res.object){ |
183 | proxy.$global.showMsg('添加成功','success'); | 205 | proxy.$global.showMsg('添加成功','success'); |
184 | proxy.targetId=res.src; | 206 | proxy.targetId=res.src; |
185 | - proxy.APMVisible=false; | 207 | + proxy.saveModel(); |
208 | + // proxy.APMVisible=false; | ||
186 | } | 209 | } |
187 | 210 | ||
188 | }) | 211 | }) |
@@ -198,7 +221,30 @@ export default { | @@ -198,7 +221,30 @@ export default { | ||
198 | proxy.pageSize=limit; | 221 | proxy.pageSize=limit; |
199 | proxy.getNodeList() | 222 | proxy.getNodeList() |
200 | } | 223 | } |
224 | + //显示已添加过的应用列表数据 | ||
225 | + let apmMonitorListChecked=Vue.ref([]); | ||
226 | + let setListData=()=>{ | ||
227 | + if(props.apmMonitorList){ | ||
228 | + props.apmMonitorList.map((item,index)=>{ | ||
229 | + proxy.tableDataList.map(v=>{ | ||
230 | + if(item.streamId==v.streamId){ | ||
231 | + proxy.apmMonitorListChecked.push(v) | ||
232 | + | ||
233 | + } | ||
234 | + }) | ||
235 | + | ||
236 | + }) | ||
237 | + } | ||
238 | + | ||
239 | + } | ||
201 | return { | 240 | return { |
241 | + faultConfId, | ||
242 | + bizName, | ||
243 | + name, | ||
244 | + modleId, | ||
245 | + apmMonitorListChecked, | ||
246 | + setListData, | ||
247 | + APMVisible, | ||
202 | loadTableDataList, | 248 | loadTableDataList, |
203 | saveAllData, | 249 | saveAllData, |
204 | page, | 250 | page, |
@@ -254,22 +300,58 @@ export default { | @@ -254,22 +300,58 @@ export default { | ||
254 | if (res && res.success) { | 300 | if (res && res.success) { |
255 | that.count = res.count; | 301 | that.count = res.count; |
256 | that.tableDataList = res.data; | 302 | that.tableDataList = res.data; |
303 | + that.setListData(); | ||
257 | } | 304 | } |
258 | }); | 305 | }); |
259 | }, | 306 | }, |
260 | 307 | ||
261 | //关闭弹框 | 308 | //关闭弹框 |
262 | closeDialog(){ | 309 | closeDialog(){ |
263 | - this.$emit('callbackAPM', this.targetId); | 310 | + let obj={ |
311 | + targetId:this.targetId, | ||
312 | + faultConfId:this.faultConfId, | ||
313 | + | ||
314 | + } | ||
315 | + this.$emit('callbackAPM', obj); | ||
316 | + }, | ||
317 | + //保存模块 | ||
318 | + saveModel(){ | ||
319 | + let that=this; | ||
320 | + let params={ | ||
321 | + type:'npm', | ||
322 | + targetId:this.targetId, | ||
323 | + state:'1', | ||
324 | + id:this.modleId, | ||
325 | + faultConfig:{ | ||
326 | + id:this.faultConfId, | ||
327 | + name:this.name, | ||
328 | + bizId: this.bizId, | ||
329 | + bizName:this.bizName, | ||
330 | + createBy:localStorage.getItem("lgn") | ||
331 | + } | ||
332 | + } | ||
333 | + this.$http.post('/api-web/fault/conf/detail/saveConfigDetail',params,function (res){ | ||
334 | + if(res && res.success){ | ||
335 | + that.targetId=res.map.configDetail.targetId; | ||
336 | + that.faultConfId=res.map.configDetail.faultConfId; | ||
337 | + | ||
338 | + that.APMVisible=false; | ||
339 | + | ||
340 | + }else{ | ||
341 | + that.$global.showMsg('模块保存失败','warning') | ||
342 | + | ||
343 | + } | ||
344 | + | ||
345 | + }) | ||
264 | } | 346 | } |
265 | 347 | ||
266 | 348 | ||
267 | }, | 349 | }, |
268 | mounted () { | 350 | mounted () { |
269 | - this.setBizId(); | 351 | + /* this.setBizId(); |
270 | this.init(); | 352 | this.init(); |
271 | this.getResData(); | 353 | this.getResData(); |
272 | - this.getNodeList(); | 354 | + this.getNodeList();*/ |
273 | }, | 355 | }, |
274 | unmounted () {} | 356 | unmounted () {} |
275 | 357 |
@@ -66,7 +66,7 @@ | @@ -66,7 +66,7 @@ | ||
66 | 66 | ||
67 | 67 | ||
68 | </el-row> | 68 | </el-row> |
69 | - <div class="margin-top flex-center position-bottom"> | 69 | + <div class="margin-top btn-faultDiagnosis flex-center position-bottom"> |
70 | <el-button @click="cancleList">取消</el-button> | 70 | <el-button @click="cancleList">取消</el-button> |
71 | <!-- <el-button @click="saveList" type="primary">保存</el-button>--> | 71 | <!-- <el-button @click="saveList" type="primary">保存</el-button>--> |
72 | </div> | 72 | </div> |
@@ -36,7 +36,7 @@ | @@ -36,7 +36,7 @@ | ||
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="true" :total="count" | 38 | :showIndex="true" :total="count" |
39 | - :showBorder="true" :loading="false" | 39 | + :showBorder="true" :loading="false" :pageSize="pageSize" |
40 | :showPage="true" :showTools="isDetail" :height="(height - 500)"> | 40 | :showPage="true" :showTools="isDetail" :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"> |
@@ -7,10 +7,11 @@ export default { | @@ -7,10 +7,11 @@ export default { | ||
7 | return { | 7 | return { |
8 | columns:[ | 8 | columns:[ |
9 | { | 9 | { |
10 | - prop: 'busTypeName', | 10 | + prop: 'resTypeName', |
11 | label: '资源类型', | 11 | label: '资源类型', |
12 | sortable: true, | 12 | sortable: true, |
13 | align: 'center', | 13 | align: 'center', |
14 | + width:'120' | ||
14 | }, | 15 | }, |
15 | { | 16 | { |
16 | prop: 'resName', | 17 | prop: 'resName', |
@@ -23,6 +24,7 @@ export default { | @@ -23,6 +24,7 @@ export default { | ||
23 | label: 'ip地址', | 24 | label: 'ip地址', |
24 | sortable: true, | 25 | sortable: true, |
25 | align: 'center', | 26 | align: 'center', |
27 | + width:'150' | ||
26 | }, | 28 | }, |
27 | 29 | ||
28 | { | 30 | { |
@@ -30,12 +32,14 @@ export default { | @@ -30,12 +32,14 @@ export default { | ||
30 | label: '指标名称', | 32 | label: '指标名称', |
31 | sortable: true, | 33 | sortable: true, |
32 | align: 'center', | 34 | align: 'center', |
35 | + width:'180' | ||
33 | }, | 36 | }, |
34 | { | 37 | { |
35 | prop: 'flag', | 38 | prop: 'flag', |
36 | label: '指标标识', | 39 | label: '指标标识', |
37 | sortable: true, | 40 | sortable: true, |
38 | align: 'center', | 41 | align: 'center', |
42 | + width:'150' | ||
39 | } | 43 | } |
40 | ], | 44 | ], |
41 | environmentTableData: [ | 45 | environmentTableData: [ |
@@ -87,6 +91,8 @@ export default { | @@ -87,6 +91,8 @@ export default { | ||
87 | let busTypeList = Vue.ref([]); | 91 | let busTypeList = Vue.ref([]); |
88 | let bizId=Vue.ref();//所属业务id | 92 | let bizId=Vue.ref();//所属业务id |
89 | let targetId=Vue.ref();//所属模块id | 93 | let targetId=Vue.ref();//所属模块id |
94 | + let page=Vue.ref(1);//当前页 | ||
95 | + let pageSize=Vue.ref(8);//每页显示条数 | ||
90 | //是否是详情页面 | 96 | //是否是详情页面 |
91 | let isDetail=Vue.ref(false); | 97 | let isDetail=Vue.ref(false); |
92 | 98 | ||
@@ -114,10 +120,11 @@ export default { | @@ -114,10 +120,11 @@ export default { | ||
114 | } | 120 | } |
115 | // 点击按钮搜索 | 121 | // 点击按钮搜索 |
116 | let onBtnSearch = () => { | 122 | let onBtnSearch = () => { |
117 | - proxy.loadTableDataList(); | 123 | + proxy.getEnvironmentData(); |
118 | } | 124 | } |
119 | //获取接收到的传值 bizid | 125 | //获取接收到的传值 bizid |
120 | let setBizId=()=>{ | 126 | let setBizId=()=>{ |
127 | + console.log("props.propsData",props.propsData) | ||
121 | if(props.propsData){ | 128 | if(props.propsData){ |
122 | proxy.bizId=props.propsData.bizId; | 129 | proxy.bizId=props.propsData.bizId; |
123 | proxy.targetId=props.propsData.targetId; | 130 | proxy.targetId=props.propsData.targetId; |
@@ -128,9 +135,9 @@ export default { | @@ -128,9 +135,9 @@ export default { | ||
128 | } | 135 | } |
129 | // 监听编辑状态 | 136 | // 监听编辑状态 |
130 | Vue.watch(() => props.propsData.bizId, (newValue, oldVlaue) => { | 137 | Vue.watch(() => props.propsData.bizId, (newValue, oldVlaue) => { |
131 | - console.log("bizidnew",newValue) | ||
132 | proxy.bizId=newValue; | 138 | proxy.bizId=newValue; |
133 | proxy.resTypeArr=''; | 139 | proxy.resTypeArr=''; |
140 | + proxy.setBizId(); | ||
134 | proxy.init(); | 141 | proxy.init(); |
135 | proxy.getEnvironmentData(); | 142 | proxy.getEnvironmentData(); |
136 | 143 | ||
@@ -141,7 +148,16 @@ export default { | @@ -141,7 +148,16 @@ export default { | ||
141 | proxy.getEnvironmentData(); | 148 | proxy.getEnvironmentData(); |
142 | 149 | ||
143 | } | 150 | } |
151 | + //重新加载表格数据 | ||
152 | + let loadTableDataList = ({page, limit}) => { | ||
153 | + proxy.page=page; | ||
154 | + proxy.pageSize=limit; | ||
155 | + proxy.getEnvironmentData() | ||
156 | + } | ||
144 | return { | 157 | return { |
158 | + loadTableDataList, | ||
159 | + page, | ||
160 | + pageSize, | ||
145 | isDetail, | 161 | isDetail, |
146 | changeRes, | 162 | changeRes, |
147 | setBizId, | 163 | setBizId, |
@@ -174,35 +190,11 @@ export default { | @@ -174,35 +190,11 @@ export default { | ||
174 | saveList(){ | 190 | saveList(){ |
175 | this.APMVisible=false; | 191 | this.APMVisible=false; |
176 | }, | 192 | }, |
177 | - //重新加载表格数据 | ||
178 | - loadTableDataList(){ | ||
179 | - this.getNodeList() | ||
180 | - }, | ||
181 | - //获取配置节点列表数据 | ||
182 | - getNodeList(){ | ||
183 | - let that=this; | ||
184 | - this.$http.get(`/api-web/ContrastAnalysis/notAdded`, this.getParams(), function (res) { | ||
185 | - if (res && res.success) { | ||
186 | - that.count = res.count; | ||
187 | - that.tableDataList = res.data; | ||
188 | - } | ||
189 | - }); | ||
190 | - }, | ||
191 | - //配置参数 | ||
192 | - getParams(){ | ||
193 | - return { | ||
194 | - keyWords: this.keyWords, | ||
195 | - resType: this.resTypeArr, | ||
196 | - kpiId: this.kpiTypeArr.join(','), | ||
197 | - busId: this.busTypeArr.join(','), | ||
198 | - configId: this.config, | ||
199 | - page: 1, | ||
200 | - limit: 5 | ||
201 | - } | ||
202 | - }, | 193 | + |
194 | + | ||
203 | //关闭弹框 | 195 | //关闭弹框 |
204 | closeDialog(){ | 196 | closeDialog(){ |
205 | - this.$emit('callbackLog', 'log'); | 197 | + this.$emit('callbackLog', 'base'); |
206 | }, | 198 | }, |
207 | //删除表格指标 | 199 | //删除表格指标 |
208 | deleteItem(item){ | 200 | deleteItem(item){ |
@@ -229,8 +221,8 @@ export default { | @@ -229,8 +221,8 @@ export default { | ||
229 | let params={ | 221 | let params={ |
230 | busId:this.bizId, | 222 | busId:this.bizId, |
231 | resId:this.resTypeArr, | 223 | resId:this.resTypeArr, |
232 | - page:1, | ||
233 | - pageSize:5 | 224 | + page:this.page, |
225 | + pageSize:this.pageSize | ||
234 | 226 | ||
235 | } | 227 | } |
236 | console.log("*/*/*",this.targetId) | 228 | console.log("*/*/*",this.targetId) |
@@ -413,7 +413,7 @@ | @@ -413,7 +413,7 @@ | ||
413 | <!--应用检测弹框--> | 413 | <!--应用检测弹框--> |
414 | <ApplicationMoni v-show="applicationMonitorVisible" :isDisplay="applicationMonitorVisible" :applicationMonitorList="applicationMonitorList" :propsData="propsData" @callbackApp="getApplicationMoniList"></ApplicationMoni> | 414 | <ApplicationMoni v-show="applicationMonitorVisible" :isDisplay="applicationMonitorVisible" :applicationMonitorList="applicationMonitorList" :propsData="propsData" @callbackApp="getApplicationMoniList"></ApplicationMoni> |
415 | <!--APM弹框--> | 415 | <!--APM弹框--> |
416 | - <APM v-if="APMVisible" :propsData="propsData" @callbackAPM="getAPMList"></APM> | 416 | + <APM v-show="APMVisible" :isDisplay="APMVisible" :apmMonitorList="apmMonitorList" :propsData="propsData" @callbackAPM="getAPMList"></APM> |
417 | <!--日志监测弹框--> | 417 | <!--日志监测弹框--> |
418 | <LogMonition v-if="logMonitionVisible" :propsData="propsData" @callbackLog="getLogMonitionList"></LogMonition> | 418 | <LogMonition v-if="logMonitionVisible" :propsData="propsData" @callbackLog="getLogMonitionList"></LogMonition> |
419 | <!--订阅人员弹框--> | 419 | <!--订阅人员弹框--> |
@@ -59,16 +59,6 @@ export default { | @@ -59,16 +59,6 @@ export default { | ||
59 | title: "电子税务局外用链路1", | 59 | title: "电子税务局外用链路1", |
60 | type: "networkMonitor", | 60 | type: "networkMonitor", |
61 | id: "networkMonitor1" | 61 | id: "networkMonitor1" |
62 | - }, | ||
63 | - { | ||
64 | - title: "电子税务局外用链路2", | ||
65 | - type: "networkMonitor", | ||
66 | - id: "networkMonitor2" | ||
67 | - }, | ||
68 | - { | ||
69 | - title: "电子税务局外用链路3", | ||
70 | - type: "networkMonitor", | ||
71 | - id: "networkMonitor3" | ||
72 | } | 62 | } |
73 | ], | 63 | ], |
74 | //应用检测选中项集合 | 64 | //应用检测选中项集合 |
@@ -268,11 +258,14 @@ export default { | @@ -268,11 +258,14 @@ export default { | ||
268 | if(!this.isSaveModel()){ | 258 | if(!this.isSaveModel()){ |
269 | return; | 259 | return; |
270 | } | 260 | } |
261 | + if(this.configData){ | ||
271 | this.configData.map(item=>{ | 262 | this.configData.map(item=>{ |
272 | if(item.type=='netlink'){ | 263 | if(item.type=='netlink'){ |
273 | this.modleId=item.id; | 264 | this.modleId=item.id; |
274 | } | 265 | } |
275 | }) | 266 | }) |
267 | + } | ||
268 | + | ||
276 | this.hiddenAll(); | 269 | this.hiddenAll(); |
277 | this.networkMonitorHide = true; | 270 | this.networkMonitorHide = true; |
278 | this.isActiveIndex=index; | 271 | this.isActiveIndex=index; |
@@ -288,11 +281,14 @@ export default { | @@ -288,11 +281,14 @@ export default { | ||
288 | if(!this.isSaveModel()){ | 281 | if(!this.isSaveModel()){ |
289 | return; | 282 | return; |
290 | } | 283 | } |
284 | + if(this.configData){ | ||
291 | this.configData.map(item=>{ | 285 | this.configData.map(item=>{ |
292 | if(item.type=='npm'){ | 286 | if(item.type=='npm'){ |
293 | this.modleId=item.id; | 287 | this.modleId=item.id; |
294 | } | 288 | } |
295 | }) | 289 | }) |
290 | + } | ||
291 | + | ||
296 | this.hiddenAll(); | 292 | this.hiddenAll(); |
297 | this.applicationMonitorHide = true; | 293 | this.applicationMonitorHide = true; |
298 | this.isActiveIndex=index; | 294 | this.isActiveIndex=index; |
@@ -307,11 +303,14 @@ export default { | @@ -307,11 +303,14 @@ export default { | ||
307 | if(!this.isSaveModel()){ | 303 | if(!this.isSaveModel()){ |
308 | return; | 304 | return; |
309 | } | 305 | } |
306 | + if(this.configData){ | ||
310 | this.configData.map(item=>{ | 307 | this.configData.map(item=>{ |
311 | if(item.type=='base'){ | 308 | if(item.type=='base'){ |
312 | this.modleId=item.id; | 309 | this.modleId=item.id; |
313 | } | 310 | } |
314 | }) | 311 | }) |
312 | + } | ||
313 | + | ||
315 | this.postPropsData('base',index); | 314 | this.postPropsData('base',index); |
316 | /*if(this.busTypeArr){ | 315 | /*if(this.busTypeArr){ |
317 | this.hiddenAll(); | 316 | this.hiddenAll(); |
@@ -471,6 +470,7 @@ export default { | @@ -471,6 +470,7 @@ export default { | ||
471 | let that=this; | 470 | let that=this; |
472 | if(this.configData && this.configData.length>0){ | 471 | if(this.configData && this.configData.length>0){ |
473 | console.log("configData",this.configData,typeVal) | 472 | console.log("configData",this.configData,typeVal) |
473 | + console.log("that.docid",that.docId) | ||
474 | this.configData.map((item,index)=>{ | 474 | this.configData.map((item,index)=>{ |
475 | if(item.type==typeVal){ | 475 | if(item.type==typeVal){ |
476 | // that.targetId=item.targetId; | 476 | // that.targetId=item.targetId; |
@@ -490,6 +490,10 @@ export default { | @@ -490,6 +490,10 @@ export default { | ||
490 | that.getTargetId(typeVal) | 490 | that.getTargetId(typeVal) |
491 | } | 491 | } |
492 | this.getBizName(this.busTypeArr); | 492 | this.getBizName(this.busTypeArr); |
493 | + if(typeVal=='base'){ | ||
494 | + this.getTargetId(typeVal); | ||
495 | + } | ||
496 | + console.log("lll",this.targetId) | ||
493 | this.propsData={ | 497 | this.propsData={ |
494 | bizId:this.busTypeArr, | 498 | bizId:this.busTypeArr, |
495 | docId:this.docId, | 499 | docId:this.docId, |
@@ -624,7 +628,10 @@ export default { | @@ -624,7 +628,10 @@ export default { | ||
624 | getAPMList(itemData){ | 628 | getAPMList(itemData){ |
625 | this.APMVisible=false; | 629 | this.APMVisible=false; |
626 | // this.apmMonitorList=itemData; | 630 | // this.apmMonitorList=itemData; |
627 | - this.setTargetId(itemData); | 631 | + if(itemData.faultConfId){ |
632 | + this.faultConfId=itemData.faultConfId; | ||
633 | + } | ||
634 | + this.setTargetId(itemData.targetId); | ||
628 | // this.targetId=itemData; | 635 | // this.targetId=itemData; |
629 | this.getApmListInfo(); | 636 | this.getApmListInfo(); |
630 | }, | 637 | }, |
@@ -79,7 +79,7 @@ | @@ -79,7 +79,7 @@ | ||
79 | <li><span>标识名称:</span>{{itemNode[1].name}}</li> | 79 | <li><span>标识名称:</span>{{itemNode[1].name}}</li> |
80 | </ul> | 80 | </ul> |
81 | </template> | 81 | </template> |
82 | - <span @click="addTableList(false,itemNode)" v-if="index+1<nodeData.length" :class="['list-line','cursorClass',{'isActive':itemNode.length>1}]"></span> | 82 | + <span v-if="index+1<nodeData.length" :class="['list-line','cursorClass',{'isActive':itemNode.length>1}]"></span> |
83 | </el-tooltip> | 83 | </el-tooltip> |
84 | </div> | 84 | </div> |
85 | <div v-show="itemNode[0].nodeName" class="list-step-name flex-div-start"> | 85 | <div v-show="itemNode[0].nodeName" class="list-step-name flex-div-start"> |
@@ -178,7 +178,7 @@ | @@ -178,7 +178,7 @@ | ||
178 | 178 | ||
179 | 179 | ||
180 | </el-row> | 180 | </el-row> |
181 | - <div v-if="tableVisible" class="margin-top flex-center position-bottom"> | 181 | + <div v-if="tableVisible" class="margin-top btn-faultDiagnosis flex-center position-bottom"> |
182 | <el-button @click="cancleList">取消</el-button> | 182 | <el-button @click="cancleList">取消</el-button> |
183 | <!-- <el-button @click="saveList" type="primary">保存</el-button>--> | 183 | <!-- <el-button @click="saveList" type="primary">保存</el-button>--> |
184 | </div> | 184 | </div> |
-
Please register or login to post a comment