Merge branch 'master-v32-xwx' into 'master'
故障诊断诊断业务场景和诊断指标弹框 See merge request !795
Showing
10 changed files
with
95 additions
and
23 deletions
| @@ -15,13 +15,13 @@ | @@ -15,13 +15,13 @@ | ||
| 15 | <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> | 15 | <div style="width: 230px;margin-left: 20px;display: flex;align-self: 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">{{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;color: #666666;font-size: 16px"> | 21 | <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> |
| 22 | <img src="../src/style/img/fault/disKpi.png"> | 22 | <img src="../src/style/img/fault/disKpi.png"> |
| 23 | <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span> | 23 | <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span> |
| 24 | - <h class="text-link">{{getFaultItemValue(dialTest,'diagnosticIndicators')}}</h> | 24 | + <h class="text-link" @click="openKpiList()">{{getFaultItemValue(dialTest,'diagnosticIndicators')}}</h> |
| 25 | </div> | 25 | </div> |
| 26 | | | 26 | | |
| 27 | <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> | 27 | <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> |
| @@ -92,7 +92,22 @@ export default { | @@ -92,7 +92,22 @@ export default { | ||
| 92 | const openMoreDialog = () => { | 92 | const openMoreDialog = () => { |
| 93 | service.sendEventMoreDialog(emit, proxy.$global, card.value); | 93 | service.sendEventMoreDialog(emit, proxy.$global, card.value); |
| 94 | } | 94 | } |
| 95 | - | 95 | + //诊断应用 |
| 96 | + const openBusScenarios = () => { | ||
| 97 | + let param = [{ | ||
| 98 | + prop: 'taskName', | ||
| 99 | + width: 150, | ||
| 100 | + label: '名称', | ||
| 101 | + },{ | ||
| 102 | + prop: 'taskType', | ||
| 103 | + width: 120, | ||
| 104 | + label: '类型', | ||
| 105 | + }] | ||
| 106 | + service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param); | ||
| 107 | + } | ||
| 108 | + const openKpiList = () => { | ||
| 109 | + service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase()); | ||
| 110 | + } | ||
| 96 | // 挂载完 | 111 | // 挂载完 |
| 97 | Vue.onMounted(() => { | 112 | Vue.onMounted(() => { |
| 98 | getNpmList(); | 113 | getNpmList(); |
| @@ -110,7 +125,9 @@ export default { | @@ -110,7 +125,9 @@ export default { | ||
| 110 | getDialtestCard, | 125 | getDialtestCard, |
| 111 | openMoreDialog, | 126 | openMoreDialog, |
| 112 | openAlarm, | 127 | openAlarm, |
| 113 | - getFaultItemValue: service.getFaultItemValue | 128 | + getFaultItemValue: service.getFaultItemValue, |
| 129 | + openBusScenarios, | ||
| 130 | + openKpiList | ||
| 114 | } | 131 | } |
| 115 | } | 132 | } |
| 116 | } | 133 | } |
| @@ -15,14 +15,13 @@ | @@ -15,14 +15,13 @@ | ||
| 15 | <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> | 15 | <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> |
| 16 | <img src="../src/style/img/fault/disRes.png"> | 16 | <img src="../src/style/img/fault/disRes.png"> |
| 17 | <span style="margin: 0px 6px 0px 6px;width: 105px">诊断业务场景</span> | 17 | <span style="margin: 0px 6px 0px 6px;width: 105px">诊断业务场景</span> |
| 18 | - | ||
| 19 | - <h class="text-link">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h> | 18 | + <h class="text-link" @click="openBusScenarios()">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h> |
| 20 | </div> | 19 | </div> |
| 21 | | | 20 | | |
| 22 | <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> | 21 | <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> |
| 23 | <img src="../src/style/img/fault/disKpi.png"> | 22 | <img src="../src/style/img/fault/disKpi.png"> |
| 24 | <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span> | 23 | <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span> |
| 25 | - <h class="text-link">{{ getFaultItemValue(dialTest,'diagnosticIndicators') }}</h> | 24 | + <h class="text-link" @click="openKpiList()">{{ getFaultItemValue(dialTest,'diagnosticIndicators') }}</h> |
| 26 | </div> | 25 | </div> |
| 27 | | | 26 | | |
| 28 | <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> | 27 | <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> |
| @@ -83,6 +83,22 @@ export default { | @@ -83,6 +83,22 @@ export default { | ||
| 83 | }); | 83 | }); |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | + const openBusScenarios = () => { | ||
| 87 | + let param = [{ | ||
| 88 | + prop: 'taskName', | ||
| 89 | + width: 150, | ||
| 90 | + label: '名称', | ||
| 91 | + },{ | ||
| 92 | + prop: 'taskType', | ||
| 93 | + width: 120, | ||
| 94 | + label: '类型', | ||
| 95 | + }] | ||
| 96 | + service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param); | ||
| 97 | + } | ||
| 98 | + const openKpiList = () => { | ||
| 99 | + service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase()); | ||
| 100 | + } | ||
| 101 | + | ||
| 86 | const openMoreDialog = () => { | 102 | const openMoreDialog = () => { |
| 87 | service.sendEventMoreDialog(emit, proxy.$global, card.value); | 103 | service.sendEventMoreDialog(emit, proxy.$global, card.value); |
| 88 | } | 104 | } |
| @@ -102,7 +118,9 @@ export default { | @@ -102,7 +118,9 @@ export default { | ||
| 102 | getDialtestCard, | 118 | getDialtestCard, |
| 103 | cardData, | 119 | cardData, |
| 104 | openMoreDialog, | 120 | openMoreDialog, |
| 105 | - getFaultItemValue: service.getFaultItemValue | 121 | + openBusScenarios, |
| 122 | + openKpiList, | ||
| 123 | + getFaultItemValue: service.getFaultItemValue, | ||
| 106 | } | 124 | } |
| 107 | } | 125 | } |
| 108 | } | 126 | } |
| @@ -15,13 +15,13 @@ | @@ -15,13 +15,13 @@ | ||
| 15 | <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> | 15 | <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> |
| 16 | <img src="../src/style/img/fault/disRes.png"> | 16 | <img src="../src/style/img/fault/disRes.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">{{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;color: #666666;font-size: 16px"> | 21 | <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> |
| 22 | <img src="../src/style/img/fault/disKpi.png"> | 22 | <img src="../src/style/img/fault/disKpi.png"> |
| 23 | <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span> | 23 | <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span> |
| 24 | - <h class="text-link">{{getFaultItemValue(dialTest,'diagnosticIndicators')}}</h> | 24 | + <h class="text-link" @click="openKpiList()">{{getFaultItemValue(dialTest,'diagnosticIndicators')}}</h> |
| 25 | </div> | 25 | </div> |
| 26 | | | 26 | | |
| 27 | <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> | 27 | <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> |
| @@ -66,6 +66,23 @@ export default { | @@ -66,6 +66,23 @@ export default { | ||
| 66 | const openMoreDialog = () => { | 66 | const openMoreDialog = () => { |
| 67 | service.sendEventMoreDialog(emit, proxy.$global, card.value); | 67 | service.sendEventMoreDialog(emit, proxy.$global, card.value); |
| 68 | } | 68 | } |
| 69 | + //诊断资源 | ||
| 70 | + const openBusScenarios = () => { | ||
| 71 | + let param = [{ | ||
| 72 | + prop: 'taskName', | ||
| 73 | + width: 150, | ||
| 74 | + label: '名称', | ||
| 75 | + },{ | ||
| 76 | + prop: 'taskType', | ||
| 77 | + width: 120, | ||
| 78 | + label: '类型', | ||
| 79 | + }] | ||
| 80 | + service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param); | ||
| 81 | + } | ||
| 82 | + //诊断指标 | ||
| 83 | + const openKpiList = () => { | ||
| 84 | + service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase()); | ||
| 85 | + } | ||
| 69 | // 挂载完 | 86 | // 挂载完 |
| 70 | Vue.onMounted(() => { | 87 | Vue.onMounted(() => { |
| 71 | getDialtestList(); | 88 | getDialtestList(); |
| @@ -79,7 +96,9 @@ export default { | @@ -79,7 +96,9 @@ export default { | ||
| 79 | openOrCloseBase, | 96 | openOrCloseBase, |
| 80 | openMoreDialog, | 97 | openMoreDialog, |
| 81 | openAlarm, | 98 | openAlarm, |
| 82 | - getFaultItemValue: service.getFaultItemValue | 99 | + getFaultItemValue: service.getFaultItemValue, |
| 100 | + openBusScenarios, | ||
| 101 | + openKpiList | ||
| 83 | } | 102 | } |
| 84 | } | 103 | } |
| 85 | } | 104 | } |
| @@ -64,7 +64,7 @@ export default { | @@ -64,7 +64,7 @@ export default { | ||
| 64 | } | 64 | } |
| 65 | let getAlarmColor = (cardList) =>{ | 65 | let getAlarmColor = (cardList) =>{ |
| 66 | if (cardList.alarmLevel = '0'){ | 66 | if (cardList.alarmLevel = '0'){ |
| 67 | - alarmColor.value = '#05345d'; | 67 | + alarmColor.value = '#00A522'; |
| 68 | }else if (cardList.alarmLevel = '1'){ | 68 | }else if (cardList.alarmLevel = '1'){ |
| 69 | alarmColor.value = '#f97d04'; | 69 | alarmColor.value = '#f97d04'; |
| 70 | }else if (cardList.alarmLevel = '2'){ | 70 | }else if (cardList.alarmLevel = '2'){ |
| @@ -75,19 +75,18 @@ export default { | @@ -75,19 +75,18 @@ export default { | ||
| 75 | } | 75 | } |
| 76 | const openAlarm = () => { | 76 | const openAlarm = () => { |
| 77 | service.sendEventAlarmDialog(emit, { | 77 | service.sendEventAlarmDialog(emit, { |
| 78 | - cardList: props.cardList | 78 | + cardList: props.cardList, |
| 79 | + targetType: props.targetType | ||
| 79 | }); | 80 | }); |
| 80 | } | 81 | } |
| 81 | const openMoreDialog = () => { | 82 | const openMoreDialog = () => { |
| 82 | service.sendEventMoreDialog(emit, proxy.$global, cardList.faultFixInfoList); | 83 | service.sendEventMoreDialog(emit, proxy.$global, cardList.faultFixInfoList); |
| 83 | } | 84 | } |
| 84 | 85 | ||
| 85 | - | ||
| 86 | // 挂载完 | 86 | // 挂载完 |
| 87 | Vue.onMounted(() => { | 87 | Vue.onMounted(() => { |
| 88 | let cardList = props.cardList; | 88 | let cardList = props.cardList; |
| 89 | getAlarmColor(cardList); | 89 | getAlarmColor(cardList); |
| 90 | - getDialtestList(); | ||
| 91 | }) | 90 | }) |
| 92 | 91 | ||
| 93 | return { | 92 | return { |
| @@ -15,13 +15,13 @@ | @@ -15,13 +15,13 @@ | ||
| 15 | <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> | 15 | <div style="width: 230px;margin-left: 20px;display: flex;align-self: 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">{{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;color: #666666;font-size: 16px"> | 21 | <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> |
| 22 | <img src="../src/style/img/fault/disKpi.png"> | 22 | <img src="../src/style/img/fault/disKpi.png"> |
| 23 | <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span> | 23 | <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span> |
| 24 | - <h class="text-link">{{getFaultItemValue(dialTest,'diagnosticIndicators')}}</h> | 24 | + <h class="text-link" @click="openKpiList()">{{getFaultItemValue(dialTest,'diagnosticIndicators')}}</h> |
| 25 | </div> | 25 | </div> |
| 26 | | | 26 | | |
| 27 | <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> | 27 | <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px"> |
| @@ -89,6 +89,24 @@ export default { | @@ -89,6 +89,24 @@ export default { | ||
| 89 | const openMoreDialog = () => { | 89 | const openMoreDialog = () => { |
| 90 | service.sendEventMoreDialog(emit, proxy.$global, card.value); | 90 | service.sendEventMoreDialog(emit, proxy.$global, card.value); |
| 91 | } | 91 | } |
| 92 | + //诊断链路场景 | ||
| 93 | + const openBusScenarios = () => { | ||
| 94 | + let param = [{ | ||
| 95 | + prop: 'taskName', | ||
| 96 | + width: 150, | ||
| 97 | + label: '名称', | ||
| 98 | + },{ | ||
| 99 | + prop: 'taskType', | ||
| 100 | + width: 120, | ||
| 101 | + label: '类型', | ||
| 102 | + }] | ||
| 103 | + service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param); | ||
| 104 | + } | ||
| 105 | + | ||
| 106 | + //诊断指标 | ||
| 107 | + const openKpiList = () => { | ||
| 108 | + service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase()); | ||
| 109 | + } | ||
| 92 | 110 | ||
| 93 | // 挂载完 | 111 | // 挂载完 |
| 94 | Vue.onMounted(() => { | 112 | Vue.onMounted(() => { |
| @@ -106,7 +124,9 @@ export default { | @@ -106,7 +124,9 @@ export default { | ||
| 106 | cardData, | 124 | cardData, |
| 107 | openMoreDialog, | 125 | openMoreDialog, |
| 108 | openAlarm, | 126 | openAlarm, |
| 109 | - getFaultItemValue: service.getFaultItemValue | 127 | + getFaultItemValue: service.getFaultItemValue, |
| 128 | + openBusScenarios, | ||
| 129 | + openKpiList | ||
| 110 | } | 130 | } |
| 111 | } | 131 | } |
| 112 | } | 132 | } |
| @@ -344,7 +344,7 @@ const faultEvent = () => { | @@ -344,7 +344,7 @@ const faultEvent = () => { | ||
| 344 | store.dispatch('getFaultBusinessList', {faultNo: faultNo, targetType: targetType}).then((res) => { | 344 | store.dispatch('getFaultBusinessList', {faultNo: faultNo, targetType: targetType}).then((res) => { |
| 345 | if (res && res.success) { | 345 | if (res && res.success) { |
| 346 | obj.data = res.data; | 346 | obj.data = res.data; |
| 347 | - emit('openDialog', 'more', obj); | 347 | + emit('openDialog', 'more', {},obj); |
| 348 | } | 348 | } |
| 349 | }); | 349 | }); |
| 350 | } | 350 | } |
| @@ -360,8 +360,7 @@ const faultEvent = () => { | @@ -360,8 +360,7 @@ const faultEvent = () => { | ||
| 360 | const sendEventDiagnoseKpiList = (emit, faultNo, targetType) => { | 360 | const sendEventDiagnoseKpiList = (emit, faultNo, targetType) => { |
| 361 | 361 | ||
| 362 | var obj = { | 362 | var obj = { |
| 363 | - columns: columns, | ||
| 364 | - data: [{ | 363 | + columns: [{ |
| 365 | prop: 'kpiId', | 364 | prop: 'kpiId', |
| 366 | label: "指标ID", | 365 | label: "指标ID", |
| 367 | },{ | 366 | },{ |
| @@ -381,13 +380,14 @@ const faultEvent = () => { | @@ -381,13 +380,14 @@ const faultEvent = () => { | ||
| 381 | return '基本指标'; | 380 | return '基本指标'; |
| 382 | } | 381 | } |
| 383 | } | 382 | } |
| 384 | - }] | 383 | + }], |
| 384 | + data: '', | ||
| 385 | } | 385 | } |
| 386 | 386 | ||
| 387 | store.dispatch('getFaultKpiList', {faultNo: faultNo, targetType: targetType}).then((res) => { | 387 | store.dispatch('getFaultKpiList', {faultNo: faultNo, targetType: targetType}).then((res) => { |
| 388 | if (res && res.success) { | 388 | if (res && res.success) { |
| 389 | obj.data = res.data; | 389 | obj.data = res.data; |
| 390 | - emit('openDialog', 'more', obj); | 390 | + emit('openDialog', 'more',{}, obj); |
| 391 | } | 391 | } |
| 392 | }); | 392 | }); |
| 393 | 393 |
-
Please register or login to post a comment