diff --git a/src/components/datav/barChart.vue b/src/components/datav/barChart.vue index 0b06904..ccc116b 100644 --- a/src/components/datav/barChart.vue +++ b/src/components/datav/barChart.vue @@ -1,6 +1,6 @@ + + + Loading... -
+ @@ -39,6 +42,7 @@ import rankingBoard from './rankingBoard' import roseChart from './roseChart' import waterLevelChart from './waterLevelChart' import scrollBoard from './scrollBoard' +import scrollBoardBottom from './scrollBoardBottom' import cards from './cards' import rightTotal from './rightTotal.vue' import barChart from './barChart.vue' @@ -51,6 +55,7 @@ export default { roseChart, waterLevelChart, scrollBoard, + scrollBoardBottom, cards, rightTotal, barChart @@ -65,7 +70,7 @@ export default { totalData: [], todayData: [], showData: { - name: '永盛陶瓷只能数据看榜', + name: '永盛陶瓷智能数据看榜', times: [], leftData: [], reportedList: [], @@ -85,7 +90,7 @@ export default { createdData () { let that = this - this.$api.post2('/api/web/GetScreenReport').then(res => { + this.$api.post2('/api/web/GetScreenReport?category=A1').then(res => { if (res.code === '200') { let data = res.data; this.chartData1 = data.reportSettings[0]; @@ -194,9 +199,10 @@ export default { } .block-left-right-content { - flex: 1; + // flex: 1; + height: 70%; display: flex; - margin-top: 20px; + margin-top: 0.2rem; } .block-top-bottom-content { @@ -204,7 +210,7 @@ export default { display: flex; flex-direction: column; box-sizing: border-box; - padding-left: 20px; + margin-left: 0.2rem; } .block-top-content { diff --git a/src/components/datav/roseChart.vue b/src/components/datav/roseChart.vue index d0e9760..4228e5a 100644 --- a/src/components/datav/roseChart.vue +++ b/src/components/datav/roseChart.vue @@ -1,6 +1,6 @@