Commit 93ff2951408cb54f1f08acffbd4281ad632a3c43
1 parent
59d4d9d6
设备监控信息
Showing
2 changed files
with
10 additions
and
48 deletions
src/components/VEquipment.vue
| ... | ... | @@ -2,43 +2,24 @@ |
| 2 | 2 | <div class="theme-wrap"> |
| 3 | 3 | <card-title> <span>设备监控消息</span></card-title> |
| 4 | 4 | <div class="theme-body"> |
| 5 | - <account-num> | |
| 6 | - <span>总计</span> | |
| 7 | - </account-num> | |
| 8 | - <ul class="income-echart"> | |
| 9 | - <li> | |
| 10 | - <pie-echart :chart-data="pieChartData"></pie-echart> | |
| 11 | - </li> | |
| 12 | - <li class="berth-inf"> | |
| 13 | - <p><span class="free-berth">11834</span><span>空余</span></p> | |
| 14 | - <p><span class="buss-berth">4496</span><span>占有</span></p> | |
| 15 | - </li> | |
| 16 | - </ul> | |
| 5 | + | |
| 17 | 6 | </div> |
| 18 | 7 | </div> |
| 19 | 8 | </template> |
| 20 | 9 | |
| 21 | 10 | <script> |
| 22 | 11 | import CardTitle from './base/CardTitle' |
| 23 | -import AccountNum from './base/AccountNum' | |
| 24 | -import PieEchart from './base/PieEchart' | |
| 25 | 12 | export default { |
| 26 | 13 | name: 'VEquipment', |
| 27 | 14 | components: { |
| 28 | - CardTitle, | |
| 29 | - AccountNum, | |
| 30 | - PieEchart | |
| 15 | + CardTitle | |
| 31 | 16 | }, |
| 32 | 17 | data() { |
| 33 | 18 | return { |
| 34 | - pieChartData: { | |
| 35 | - yData: [1,1], | |
| 36 | - legendData: ['空余','占有'] | |
| 37 | - }, | |
| 19 | + | |
| 38 | 20 | } |
| 39 | 21 | }, |
| 40 | 22 | mounted(){ |
| 41 | - //this.drawBar(); | |
| 42 | 23 | }, |
| 43 | 24 | methods: { |
| 44 | 25 | |
| ... | ... | @@ -54,29 +35,6 @@ export default { |
| 54 | 35 | height: calc(100% - 30px); |
| 55 | 36 | margin-left: 20px; |
| 56 | 37 | } |
| 57 | - .income-echart{ | |
| 58 | - height: 70%; | |
| 59 | - display: flex; | |
| 60 | - >li{ | |
| 61 | - flex: 1; | |
| 62 | - } | |
| 63 | - .berth-inf{ | |
| 64 | - p{ | |
| 65 | - height: 50%; | |
| 66 | - display: flex; | |
| 67 | - align-items: center; | |
| 68 | - justify-content: space-between; | |
| 69 | - padding-right: 20px; | |
| 70 | - } | |
| 71 | - .free-berth{ | |
| 72 | - @include fontStyle(24px); | |
| 73 | - background-image: $fontBlue; | |
| 74 | - } | |
| 75 | - .buss-berth{ | |
| 76 | - @include fontStyle(24px); | |
| 77 | - background-image: $fontOrange; | |
| 78 | - } | |
| 79 | - } | |
| 80 | - } | |
| 38 | + | |
| 81 | 39 | |
| 82 | 40 | </style> | ... | ... |
src/view/VHome.vue
| ... | ... | @@ -23,7 +23,9 @@ |
| 23 | 23 | <div class="frame-wrap frame-wrap-center"> |
| 24 | 24 | <v-berth></v-berth> |
| 25 | 25 | </div> |
| 26 | - <div class="frame-wrap"></div> | |
| 26 | + <div class="frame-wrap"> | |
| 27 | + <v-equipment></v-equipment> | |
| 28 | + </div> | |
| 27 | 29 | </li> |
| 28 | 30 | </ul> |
| 29 | 31 | </div> |
| ... | ... | @@ -37,6 +39,7 @@ import VToll from '../components/VToll' |
| 37 | 39 | import VInout from '../components/VInout' |
| 38 | 40 | import VIncome from '../components/VIncome' |
| 39 | 41 | import VBerth from '../components/VBerth' |
| 42 | +import VEquipment from '../components/VEquipment' | |
| 40 | 43 | export default { |
| 41 | 44 | name: 'VHome', |
| 42 | 45 | components: { |
| ... | ... | @@ -46,7 +49,8 @@ export default { |
| 46 | 49 | VToll, |
| 47 | 50 | VInout, |
| 48 | 51 | VIncome, |
| 49 | - VBerth | |
| 52 | + VBerth, | |
| 53 | + VEquipment | |
| 50 | 54 | } |
| 51 | 55 | } |
| 52 | 56 | </script> | ... | ... |