Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx
Showing
5 changed files
with
24 additions
and
9 deletions
| @@ -45,7 +45,7 @@ | @@ -45,7 +45,7 @@ | ||
| 45 | </div> | 45 | </div> |
| 46 | </div> | 46 | </div> |
| 47 | <div class="d-flex" style="flex: 1"> | 47 | <div class="d-flex" style="flex: 1"> |
| 48 | - <div style="color: #666666;font-size: 16px">正常占比</div> | 48 | + <div style="color: #666666;font-size: 16px;min-width: 80px">正常占比</div> |
| 49 | <div class="progress-con"> | 49 | <div class="progress-con"> |
| 50 | <el-progress :text-inside="true" :stroke-width="26" | 50 | <el-progress :text-inside="true" :stroke-width="26" |
| 51 | :percentage="dialTest && dialTest.normalProportion ? dialTest.normalProportion*100 : 0" | 51 | :percentage="dialTest && dialTest.normalProportion ? dialTest.normalProportion*100 : 0" |
| @@ -55,7 +55,10 @@ | @@ -55,7 +55,10 @@ | ||
| 55 | </div> | 55 | </div> |
| 56 | <div v-if="cardOpen" | 56 | <div v-if="cardOpen" |
| 57 | style="margin-top:20px;background-color: whitesmoke;display: flex;justify-content: flex-start;flex-wrap: wrap;padding: 26px 26px 0px 26px;"> | 57 | style="margin-top:20px;background-color: whitesmoke;display: flex;justify-content: flex-start;flex-wrap: wrap;padding: 26px 26px 0px 26px;"> |
| 58 | - <div v-for="item in cardData" style="width: 50%;overflow: hidden;"> | 58 | + <div v-if="cardData.length == 0" class="align-center" style="flex: 1"> |
| 59 | + <el-empty :image-size="50" /> | ||
| 60 | + </div> | ||
| 61 | + <div v-else v-for="item in cardData" style="width: 50%;overflow: hidden;"> | ||
| 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"> | 62 | <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> | 63 | <div style="color: #ffffff;font-size: 24px;">{{item.resClassName}}</div> |
| 61 | <img src="../src/style/img/fault/apm/apmAbout.png" style="padding-top: 30px;"> | 64 | <img src="../src/style/img/fault/apm/apmAbout.png" style="padding-top: 30px;"> |
| @@ -55,7 +55,7 @@ | @@ -55,7 +55,7 @@ | ||
| 55 | </div> | 55 | </div> |
| 56 | </div> | 56 | </div> |
| 57 | <div class="d-flex" style="flex: 1"> | 57 | <div class="d-flex" style="flex: 1"> |
| 58 | - <div style="color: #666666;font-size: 16px">正常占比</div> | 58 | + <div style="color: #666666;font-size: 16px;min-width: 80px">正常占比</div> |
| 59 | <div class="progress-con"> | 59 | <div class="progress-con"> |
| 60 | <el-progress :text-inside="true" :stroke-width="26" | 60 | <el-progress :text-inside="true" :stroke-width="26" |
| 61 | :percentage="dialTest && dialTest.normalProportion?dialTest.normalProportion*100:0" | 61 | :percentage="dialTest && dialTest.normalProportion?dialTest.normalProportion*100:0" |
| @@ -64,7 +64,10 @@ | @@ -64,7 +64,10 @@ | ||
| 64 | </div> | 64 | </div> |
| 65 | </div> | 65 | </div> |
| 66 | <div v-if="cardOpen" style="margin-top: 10px;background-color: whitesmoke;display: flex;justify-content: flex-start;flex-wrap: wrap;padding: 6px;max-height: 390px;overflow-y: auto;"> | 66 | <div v-if="cardOpen" style="margin-top: 10px;background-color: whitesmoke;display: flex;justify-content: flex-start;flex-wrap: wrap;padding: 6px;max-height: 390px;overflow-y: auto;"> |
| 67 | - <div v-for="item in cardData" style="width: 190px"> | 67 | + <div v-if="cardData.length == 0" class="align-center" style="flex: 1"> |
| 68 | + <el-empty :image-size="50" /> | ||
| 69 | + </div> | ||
| 70 | + <div v-else v-for="item in cardData" style="width: 190px"> | ||
| 68 | <div style="width: 190px;height: 190px;background: url(../src/style/img/fault/dialtest/disBiz.png) no-repeat;background-size: 100% 100%;padding-top: 10px;"> | 71 | <div style="width: 190px;height: 190px;background: url(../src/style/img/fault/dialtest/disBiz.png) no-repeat;background-size: 100% 100%;padding-top: 10px;"> |
| 69 | <div :style="{backgroundColor: item.color}" | 72 | <div :style="{backgroundColor: item.color}" |
| 70 | style="width: 100px;height: 100px;border-radius: 100px;margin: 0px auto 10px;margin-top: 10px;color: white;line-height: 100px;text-align: center;"> | 73 | style="width: 100px;height: 100px;border-radius: 100px;margin: 0px auto 10px;margin-top: 10px;color: white;line-height: 100px;text-align: center;"> |
| @@ -55,7 +55,7 @@ | @@ -55,7 +55,7 @@ | ||
| 55 | </div> | 55 | </div> |
| 56 | </div> | 56 | </div> |
| 57 | <div class="d-flex" style="flex: 1"> | 57 | <div class="d-flex" style="flex: 1"> |
| 58 | - <div style="color: #666666;font-size: 16px">正常占比</div> | 58 | + <div style="color: #666666;font-size: 16px;min-width: 80px">正常占比</div> |
| 59 | <div class="progress-con"> | 59 | <div class="progress-con"> |
| 60 | <el-progress :text-inside="true" :stroke-width="26" | 60 | <el-progress :text-inside="true" :stroke-width="26" |
| 61 | :percentage="dialTest && dialTest.normalProportion?dialTest.normalProportion*100:0" | 61 | :percentage="dialTest && dialTest.normalProportion?dialTest.normalProportion*100:0" |
| @@ -63,8 +63,12 @@ | @@ -63,8 +63,12 @@ | ||
| 63 | </div> | 63 | </div> |
| 64 | </div> | 64 | </div> |
| 65 | </div> | 65 | </div> |
| 66 | - | ||
| 67 | - | 66 | + <div v-if="card.length == 0" class="align-center d-flex" style="flex: 1"> |
| 67 | + <el-empty :image-size="50" /> | ||
| 68 | + </div> | ||
| 69 | + <div v-else> | ||
| 68 | <res-item v-for="item in card" v-if="cardOpen" :parentEmit="parentEmit" :cardList="item" :faultNo="faultNo" :targetType="targetType"/> | 70 | <res-item v-for="item in card" v-if="cardOpen" :parentEmit="parentEmit" :cardList="item" :faultNo="faultNo" :targetType="targetType"/> |
| 71 | + </div> | ||
| 72 | + | ||
| 69 | 73 | ||
| 70 | </div> | 74 | </div> |
| @@ -48,6 +48,7 @@ export default { | @@ -48,6 +48,7 @@ export default { | ||
| 48 | 48 | ||
| 49 | store.dispatch('getFaultList', params).then((res) => { | 49 | store.dispatch('getFaultList', params).then((res) => { |
| 50 | if (res.data && res.success) { | 50 | if (res.data && res.success) { |
| 51 | + if(res.data.length > 0){ | ||
| 51 | dialTest.value = res.data[0]; | 52 | dialTest.value = res.data[0]; |
| 52 | let arr = []; | 53 | let arr = []; |
| 53 | for (var i = 1; i < res.data.length; i++) { | 54 | for (var i = 1; i < res.data.length; i++) { |
| @@ -55,6 +56,7 @@ export default { | @@ -55,6 +56,7 @@ export default { | ||
| 55 | } | 56 | } |
| 56 | card.value = arr; | 57 | card.value = arr; |
| 57 | } | 58 | } |
| 59 | + } | ||
| 58 | }).catch(e => { | 60 | }).catch(e => { |
| 59 | console.log(e); | 61 | console.log(e); |
| 60 | }) | 62 | }) |
| @@ -55,7 +55,7 @@ | @@ -55,7 +55,7 @@ | ||
| 55 | </div> | 55 | </div> |
| 56 | </div> | 56 | </div> |
| 57 | <div class="d-flex" style="flex: 1"> | 57 | <div class="d-flex" style="flex: 1"> |
| 58 | - <div style="color: #666666;font-size: 16px">正常占比</div> | 58 | + <div style="color: #666666;font-size: 16px;min-width: 80px">正常占比</div> |
| 59 | <div class="progress-con"> | 59 | <div class="progress-con"> |
| 60 | <el-progress :text-inside="true" :stroke-width="26" | 60 | <el-progress :text-inside="true" :stroke-width="26" |
| 61 | :percentage="dialTest && dialTest.normalProportion?dialTest.normalProportion*100:0" | 61 | :percentage="dialTest && dialTest.normalProportion?dialTest.normalProportion*100:0" |
| @@ -64,7 +64,10 @@ | @@ -64,7 +64,10 @@ | ||
| 64 | </div> | 64 | </div> |
| 65 | </div> | 65 | </div> |
| 66 | <div v-if="cardOpen" style="margin-top:10px;background-color: whitesmoke;display: flex;justify-content: flex-start;flex-wrap: wrap;padding: 6px;max-height: 380px;overflow-y: auto;"> | 66 | <div v-if="cardOpen" style="margin-top:10px;background-color: whitesmoke;display: flex;justify-content: flex-start;flex-wrap: wrap;padding: 6px;max-height: 380px;overflow-y: auto;"> |
| 67 | - <div v-for="item in cardData" style="width: 340px;"> | 67 | + <div v-if="cardData.length == 0" class="align-center" style="flex: 1"> |
| 68 | + <el-empty :image-size="50" /> | ||
| 69 | + </div> | ||
| 70 | + <div v-else v-for="item in cardData" style="width: 340px;"> | ||
| 68 | <div style="width: 340px;min-height: 184px;background: url('../src/style/img/fault/npm/npmCard.png') no-repeat;background-size: 100% 100%;padding-top: 20px;margin-bottom: 26px;box-sizing: border-box;"> | 71 | <div style="width: 340px;min-height: 184px;background: url('../src/style/img/fault/npm/npmCard.png') no-repeat;background-size: 100% 100%;padding-top: 20px;margin-bottom: 26px;box-sizing: border-box;"> |
| 69 | <div class="text-overflow" style="width: 220px;margin-left: 40px;font-size: 16px">{{item.streamName}}</div> | 72 | <div class="text-overflow" style="width: 220px;margin-left: 40px;font-size: 16px">{{item.streamName}}</div> |
| 70 | <div style="margin-top: 35px;"> | 73 | <div style="margin-top: 35px;"> |
-
Please register or login to post a comment