Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web
Showing
6 changed files
with
26 additions
and
24 deletions
| @@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
| 15 | <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;align-items:center;color: #666666;font-size: 16px"> | 15 | <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;align-items:center;color: #666666;font-size: 16px"> |
| 16 | <img src="../src/style/img/fault/npm/npmLink.png"> | 16 | <img src="../src/style/img/fault/npm/npmLink.png"> |
| 17 | <span style="margin: 0px 6px 0px 6px;width: 105px">诊断应用</span> | 17 | <span style="margin: 0px 6px 0px 6px;width: 105px">诊断应用</span> |
| 18 | - <h class="text-link" @click="openBusScenarios()">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h> | 18 | + <h class="text-link" @click="openBusScenarios('','诊断应用')">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h> |
| 19 | </div> | 19 | </div> |
| 20 | | | 20 | | |
| 21 | <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;align-items:center;color: #666666;font-size: 16px"> | 21 | <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;align-items:center;color: #666666;font-size: 16px"> |
| @@ -59,7 +59,7 @@ | @@ -59,7 +59,7 @@ | ||
| 59 | <div style="width: 566px;min-height: 357px;background: url('../src/style/img/fault/apm/apmCard.png') no-repeat;background-size: 100% 100%;margin: 0px 0px 26px 90px;box-sizing: border-box;text-align: center;margin: 0 auto;padding-top: 65px"> | 59 | <div style="width: 566px;min-height: 357px;background: url('../src/style/img/fault/apm/apmCard.png') no-repeat;background-size: 100% 100%;margin: 0px 0px 26px 90px;box-sizing: border-box;text-align: center;margin: 0 auto;padding-top: 65px"> |
| 60 | <div style="color: #ffffff;font-size: 24px;">{{item.resClassName}}</div> | 60 | <div style="color: #ffffff;font-size: 24px;">{{item.resClassName}}</div> |
| 61 | <img src="../src/style/img/fault/apm/apmAbout.png" style="padding-top: 30px;"> | 61 | <img src="../src/style/img/fault/apm/apmAbout.png" style="padding-top: 30px;"> |
| 62 | - <div style="padding-top: 30px;font-size: 18px;color: #333333">应用：<span class="text-link" @click="openBusScenarios(item.resClass)">{{item.applicationName}}</span></div> | 62 | + <div style="padding-top: 30px;font-size: 18px;color: #333333">应用：<span class="text-link" @click="openBusScenarios(item.resClass,'应用')">{{item.applicationName}}</span></div> |
| 63 | <hr style="FILTER: alpha(opacity=100,finishopacity=0,style=3)" width="80%" color=#aed6f4 size=1> | 63 | <hr style="FILTER: alpha(opacity=100,finishopacity=0,style=3)" width="80%" color=#aed6f4 size=1> |
| 64 | <div style="text-align: left;display: flex;margin-top: 10px;margin-left: 76px;font-size: 18px;"> | 64 | <div style="text-align: left;display: flex;margin-top: 10px;margin-left: 76px;font-size: 18px;"> |
| 65 | <div style="width: 230px;display: flex;align-self: center;align-items:center;"> | 65 | <div style="width: 230px;display: flex;align-self: center;align-items:center;"> |
| @@ -98,7 +98,7 @@ export default { | @@ -98,7 +98,7 @@ export default { | ||
| 98 | service.sendEventMoreDialog(emit, proxy.$global, card.value); | 98 | service.sendEventMoreDialog(emit, proxy.$global, card.value); |
| 99 | } | 99 | } |
| 100 | //诊断应用 | 100 | //诊断应用 |
| 101 | - const openBusScenarios = (resClass) => { | 101 | + const openBusScenarios = (resClass,title) => { |
| 102 | let param = [{ | 102 | let param = [{ |
| 103 | prop: 'extendCol3', | 103 | prop: 'extendCol3', |
| 104 | label: '名称', | 104 | label: '名称', |
| @@ -115,7 +115,7 @@ export default { | @@ -115,7 +115,7 @@ export default { | ||
| 115 | prop: 'os', | 115 | prop: 'os', |
| 116 | label: '操作系统', | 116 | label: '操作系统', |
| 117 | }] | 117 | }] |
| 118 | - service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,resClass,'','诊断应用'); | 118 | + service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param,resClass,title); |
| 119 | } | 119 | } |
| 120 | const openKpiList = () => { | 120 | const openKpiList = () => { |
| 121 | service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase()); | 121 | service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase()); |
| @@ -4,7 +4,6 @@ | @@ -4,7 +4,6 @@ | ||
| 4 | <h3 style="margin-left: 10px;color: #666666;font-size: 18px">业务拨测</h3> | 4 | <h3 style="margin-left: 10px;color: #666666;font-size: 18px">业务拨测</h3> |
| 5 | <div style="line-height: 60px;" class="m-l-6"> | 5 | <div style="line-height: 60px;" class="m-l-6"> |
| 6 | <el-tooltip | 6 | <el-tooltip |
| 7 | - effect="light" | ||
| 8 | placement="top-start"> | 7 | placement="top-start"> |
| 9 | <template #content> | 8 | <template #content> |
| 10 | 展示每个场景的拨测结果，颜色代表拨测结果 <br/> | 9 | 展示每个场景的拨测结果，颜色代表拨测结果 <br/> |
| @@ -5,7 +5,6 @@ | @@ -5,7 +5,6 @@ | ||
| 5 | <h3 style="margin-left: 10px;color: #666666;font-size: 18px">基础资源</h3> | 5 | <h3 style="margin-left: 10px;color: #666666;font-size: 18px">基础资源</h3> |
| 6 | <div style="line-height: 60px;" class="m-l-6"> | 6 | <div style="line-height: 60px;" class="m-l-6"> |
| 7 | <el-tooltip | 7 | <el-tooltip |
| 8 | - effect="light" | ||
| 9 | placement="top-start"> | 8 | placement="top-start"> |
| 10 | <template #content> | 9 | <template #content> |
| 11 | 以图标方式展示每个资源类型的告警结果，颜色代表告警结果 <br/> | 10 | 以图标方式展示每个资源类型的告警结果，颜色代表告警结果 <br/> |
| @@ -4,7 +4,6 @@ | @@ -4,7 +4,6 @@ | ||
| 4 | <h3 style="margin-left: 10px;color: #666666;font-size: 18px">NPM</h3> | 4 | <h3 style="margin-left: 10px;color: #666666;font-size: 18px">NPM</h3> |
| 5 | <div style="line-height: 60px;" class="m-l-6"> | 5 | <div style="line-height: 60px;" class="m-l-6"> |
| 6 | <el-tooltip | 6 | <el-tooltip |
| 7 | - effect="light" | ||
| 8 | placement="top-start"> | 7 | placement="top-start"> |
| 9 | <template #content> | 8 | <template #content> |
| 10 | 展示每个链路节点数的监控结果，指标值颜色代表结果 <br/> | 9 | 展示每个链路节点数的监控结果，指标值颜色代表结果 <br/> |
| @@ -366,19 +366,21 @@ const faultEvent = () => { | @@ -366,19 +366,21 @@ const faultEvent = () => { | ||
| 366 | width: 200, | 366 | width: 200, |
| 367 | label: '诊断值', | 367 | label: '诊断值', |
| 368 | click: (row) => { | 368 | click: (row) => { |
| 369 | - sendEventLineDialog(emit, { | ||
| 370 | - faultNo: faultNo, | ||
| 371 | - targetType: targetType, | ||
| 372 | - resId: row.resId, | ||
| 373 | - kpiId: row.kpiId, | ||
| 374 | - flag: row.flag, | ||
| 375 | - resClass: '' | ||
| 376 | - }) | 369 | + if(row && row.kpiIdent == 1){ |
| 370 | + sendEventLineDialog(emit, { | ||
| 371 | + faultNo: faultNo, | ||
| 372 | + targetType: targetType, | ||
| 373 | + resId: row.resId, | ||
| 374 | + kpiId: row.kpiId, | ||
| 375 | + flag: row.flag, | ||
| 376 | + resClass: '' | ||
| 377 | + }) | ||
| 378 | + } | ||
| 377 | }, | 379 | }, |
| 378 | render: function (row) { | 380 | render: function (row) { |
| 379 | if (row) { | 381 | if (row) { |
| 380 | var lineClass = row.kpiIdent == 1 ? 'text-decoration: underline;' : ''; | 382 | var lineClass = row.kpiIdent == 1 ? 'text-decoration: underline;' : ''; |
| 381 | - return `<span style="${lineClass}">${row.diagnosisResult}</span>` | 383 | + return `<span style="${lineClass}color:#1e9fff;">${row.diagnosisResult}</span>` |
| 382 | } | 384 | } |
| 383 | return ''; | 385 | return ''; |
| 384 | } | 386 | } |
| @@ -387,14 +389,17 @@ const faultEvent = () => { | @@ -387,14 +389,17 @@ const faultEvent = () => { | ||
| 387 | width: 200, | 389 | width: 200, |
| 388 | label: '诊断结果', | 390 | label: '诊断结果', |
| 389 | click: (row) => { | 391 | click: (row) => { |
| 390 | - sendEventLineDialog(emit, { | ||
| 391 | - faultNo: faultNo, | ||
| 392 | - targetType: targetType, | ||
| 393 | - resId: row.resId, | ||
| 394 | - kpiId: row.kpiId, | ||
| 395 | - flag: row.flag, | ||
| 396 | - resClass: '' | ||
| 397 | - }) | 392 | + if(row && row.kpiIdent == 1){ |
| 393 | + sendEventLineDialog(emit, { | ||
| 394 | + faultNo: faultNo, | ||
| 395 | + targetType: targetType, | ||
| 396 | + resId: row.resId, | ||
| 397 | + kpiId: row.kpiId, | ||
| 398 | + flag: row.flag, | ||
| 399 | + resClass: '' | ||
| 400 | + }) | ||
| 401 | + } | ||
| 402 | + | ||
| 398 | }, | 403 | }, |
| 399 | render: function (row) { | 404 | render: function (row) { |
| 400 | if (row) { | 405 | if (row) { |
-
Please register or login to post a comment