diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ + + diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ + + diff --git a/src/views/socialLive/socialLivelihoodRight.vue b/src/views/socialLive/socialLivelihoodRight.vue index 0018a00..1b625a9 100644 --- a/src/views/socialLive/socialLivelihoodRight.vue +++ b/src/views/socialLive/socialLivelihoodRight.vue @@ -23,7 +23,10 @@
-
+
+ +
+
@@ -61,6 +64,7 @@ import Access from './components/accessControl/access' import Education from './components/education/education' import Hospital from './components/hospital/hospital' +import ParkFlowLine from './components/parkingSystem/components/parkFlowLine.vue' export default { name: 'SocialLivelihoodRight', components: { @@ -71,7 +75,8 @@ ParkIncome, ParkOccupy, EcardIntroduce, - Infrastructure + Infrastructure, + ParkFlowLine }, data () { return { @@ -97,7 +102,7 @@ // this.currentComp = 0 // } this.compChange() - }, 10000) + }, 30000) }, // 停止切换人口组件 stopCompChange () { diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ + + diff --git a/src/views/socialLive/socialLivelihoodRight.vue b/src/views/socialLive/socialLivelihoodRight.vue index 0018a00..1b625a9 100644 --- a/src/views/socialLive/socialLivelihoodRight.vue +++ b/src/views/socialLive/socialLivelihoodRight.vue @@ -23,7 +23,10 @@
-
+
+ +
+
@@ -61,6 +64,7 @@ import Access from './components/accessControl/access' import Education from './components/education/education' import Hospital from './components/hospital/hospital' +import ParkFlowLine from './components/parkingSystem/components/parkFlowLine.vue' export default { name: 'SocialLivelihoodRight', components: { @@ -71,7 +75,8 @@ ParkIncome, ParkOccupy, EcardIntroduce, - Infrastructure + Infrastructure, + ParkFlowLine }, data () { return { @@ -97,7 +102,7 @@ // this.currentComp = 0 // } this.compChange() - }, 10000) + }, 30000) }, // 停止切换人口组件 stopCompChange () { diff --git a/static/plan.json b/static/plan.json index 4862f16..e226808 100644 --- a/static/plan.json +++ b/static/plan.json @@ -1,5 +1,5 @@ { - "title": "=======================规划建设==============================", + "title-left": "=======================规划建设-左侧屏==============================", "gardensDesc": "园林建设", "gardens": { "count": { @@ -160,5 +160,137 @@ {"value": 1823, "name": "潭口镇"}, {"value": 1935, "name": "高校园区"} ] + }, + + + "title-right": "=======================规划建设-左侧屏==============================", + "projectDesc": "项目概况", + "project": { + "countDesc": "总项目和同比增长", + "count": { + "total": 10, + "radio": "同比增长:+12%" + }, + + + "chart2": [ + {"title": "未启动", "data": {"total": "1324", "already": "40", "rate": 34}}, + {"title": "进行中", "data": {"total": "1324", "already": "40", "rate": 24}}, + {"title": "已完成", "data": {"total": "1324", "already": "40", "rate": 54}}, + {"title": "已延期", "data": {"total": "1324", "already": "40", "rate": 14}}, + {"title": "已归档", "data": {"total": "1324", "already": "40", "rate": 84}} + ], + + "bar": { + "xData": ["园林项目", "市政项目", "交通项目", "水利项目", "建筑项目"], + "yData": [1, 12, 2, 5, 6, 7] + }, + + "line": { + "xData": ["园林项目", "市政项目", "建筑项目", "交通项目", "水利项目" ], + "legend": ["2018", "2019", "2020"], + "yData": [ + {"name": "2020", "data": [ 855, 1078, 856, 865, 990 ], "color": "255,45,85"}, + {"name": "2019", "data": [545, 745, 546, 575, 777], "color": "0,144,255"}, + {"name": "2018", "data": [300, 232, 233, 454, 190], "color": "255,204,0"} + ] + } + }, + + "staffDesc": "施工人员", + "staff": { + "count": [ + {"name": "施工人员总数", "value": 15718, "unit": "人"}, + {"name": "在岗人数", "value": 12034, "unit": "人"}, + {"name": "缺勤人数", "value": 3684, "unit": "人"} + ], + "bar": { + "xData": [ "电工", "木工", "监工", "维修工", "管理"], + "yData": [ 4725, 5930, 318, 1761, 2984] + }, + "table": [ + ["赣州毅德商贸物流园E04地块毅德融城三期住宅项目", "312", "256", "56"], + ["万茂嘉福新天地RJ02-C01-01", "417", "374", "43"], + ["万茂嘉福新天地RJ02-B09-01地块一期", "297", "286", "11"], + ["悦蓉府建设项目", "305", "248", "57"], + ["赣州蓉江新区新路完中", "260", "213", "47"], + ["赣州中国文谷新旅明樾府H一标段", "288", "199", "89"], + ["赣州中国文谷新旅明樾府H二标段", "397", "365", "32"] + ] + }, + + + "investmentDesc": "投资金额", + "investment": { + "count": { + "name": "总投资", + "value": 100, + "unit": "万元" + }, + "pie": [ + {"value": 10, "name": "园林项目"}, + {"value": 20, "name": "市政项目"}, + {"value": 40, "name": "建筑项目"}, + {"value": 25, "name": "交通项目"}, + {"value": 5, "name": "水利项目"} + ], + "bar": [ + {"value": 10, "name": "园林项目"}, + {"value": 20, "name": "市政项目"}, + {"value": 40, "name": "建筑项目"}, + {"value": 25, "name": "交通项目"}, + {"value": 5, "name": "水利项目"} + ] + }, + + + "constructDesc": "工地建设", + "construct": { + "count": { + "total": 100, + "doing": 22, + "ready": 35, + "pause": 18, + "over": 25, + "investment": 123 + }, + + "pie": [ + {"value": 10, "name": "房屋建设"}, + {"value": 20, "name": "市政道路"}, + {"value": 34, "name": "园林绿化"}, + {"value": 26, "name": "桥梁隧道"}, + {"value": 10, "name": "其他工程"} + ], + + "bar": { + "xData": ["房屋建设", "市政道路", "园林绿化", "桥梁隧道", "其他工程"], + "yData": [10, 20, 34,26, 10] + } + }, + + "monitorDesc": "工地监测", + "monitor": { + "bar": { + "xData": ["PM2.5超标", "工作服报警", "湿度异常", "噪声过大", "TSP", "PM10"], + "yData": [21, 3, 1, 8, 15, 7] + }, + "line": { + "xData": ["周一", "周二", "周三", "周四", "周五", "周六", "周日"], + "yData": [ + {"name": "报警", "data": [38, 31, 28, 31, 20, 20, 0], "color": "255,45,85"}, + {"name": "液位超限", "data": [12, 22, 19, 24, 25, 20, 30], "color": "0,144,255"}, + {"name": "燃气泄漏", "data": [12, 2, 12, 10, 8, 12, 6], "color": "255,204,0"} + ] + }, + "table": [ + ["赣州毅德商贸物流园E04地块毅德融城三期住宅项目", "27", "57.9"], + ["万茂嘉福新天地RJ01", "17", "49.7"], + ["万茂嘉福新天地RJ02", "34", "49.7"], + ["悦蓉府建设项目", "31", "56.1"], + ["赣州蓉江新区新路完中", "42", "65.4"], + ["赣州中国文谷新旅明樾府H二标段", "19", "56.6"], + ["赣州中国文谷新旅明樾府H一标段", "34", "49.7"] + ] } } diff --git a/index.html b/index.html index ad60b94..0a7e711 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - big-data + 赣州蓉江新区智慧云脑 diff --git a/package copy.json b/package copy.json index 557b8c9..9acfb21 100644 --- a/package copy.json +++ b/package copy.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/package-lock.json b/package-lock.json index 49c409f..371b1cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index f4eff6e..b8650df 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "big-data", + "name": "赣州蓉江新区智慧云脑", "version": "1.0.0", "description": "A Vue.js project", "author": "chenyanqing", diff --git a/src/components/barChart/simpleBarChart.vue b/src/components/barChart/simpleBarChart.vue index 7eaf13a..fc78530 100644 --- a/src/components/barChart/simpleBarChart.vue +++ b/src/components/barChart/simpleBarChart.vue @@ -78,7 +78,7 @@ grid: { top: countSize(0.3), left: '3%', - right: '0', + right: '3%', bottom: '5', containLabel: true // 是否包含坐标轴的刻度标签 }, // 网格 diff --git a/src/components/earthViews/EarthViews.vue b/src/components/earthViews/EarthViews.vue index f585ada..6b5d278 100644 --- a/src/components/earthViews/EarthViews.vue +++ b/src/components/earthViews/EarthViews.vue @@ -89,7 +89,7 @@ color: #22fd0b; } .earth-box .earth-data4 { - margin: 0.52rem auto 0rem; + margin: 0.22rem auto 0rem; background: url("../../assets/images/icon-circle5.png") no-repeat; background-size: cover; color: #39edfb; diff --git a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue index 002fe67..1552442 100644 --- a/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionAlarmBar.vue @@ -18,6 +18,7 @@ diff --git a/src/views/cityConstruction/components/construction/components/constructionBar.vue b/src/views/cityConstruction/components/construction/components/constructionBar.vue index 298706d..a498b11 100644 --- a/src/views/cityConstruction/components/construction/components/constructionBar.vue +++ b/src/views/cityConstruction/components/construction/components/constructionBar.vue @@ -19,6 +19,7 @@ import ColorfulBarChart from '@/components/barChart/colorfulBarChart' import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' +import mockData from '../../../../../../static/plan.json' import {getYear} from '@/utils/formatDate' export default { @@ -36,8 +37,10 @@ } } }, - created () { - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.construct.bar.xData + this.options.seriesData = mockData.construct.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionPie.vue b/src/views/cityConstruction/components/construction/components/constructionPie.vue index ac76f41..bcc68bc 100644 --- a/src/views/cityConstruction/components/construction/components/constructionPie.vue +++ b/src/views/cityConstruction/components/construction/components/constructionPie.vue @@ -21,6 +21,7 @@ import SingleLayout from '@/components/layout/singleLayout' import {fetchConstructionByType} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPie', @@ -43,7 +44,8 @@ } }, created () { - this.getData() + // this.getData() + this.data.data = mockData.construct.pie }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/constructionState.vue b/src/views/cityConstruction/components/construction/components/constructionState.vue index b652f50..fa04f36 100644 --- a/src/views/cityConstruction/components/construction/components/constructionState.vue +++ b/src/views/cityConstruction/components/construction/components/constructionState.vue @@ -18,6 +18,7 @@ import {fetchConstructionByState, fetchConstructionCount, fetchConstructionInvestment} from '@/api/construction' import {getYear} from '@/utils/formatDate' // import {fetchInfrastructure} from '@/api/total' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionState', components: {SimpleBlock}, @@ -34,7 +35,13 @@ } }, created () { - this.getData() + // this.getData() + this.data.total.value = mockData.construct.count.total + this.data.doing.value = mockData.construct.count.doing + this.data.ready.value = mockData.construct.count.ready + this.data.pause.value = mockData.construct.count.pause + this.data.over.value = mockData.construct.count.over + this.data.investment.value = mockData.construct.count.investment }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/envDetail.vue b/src/views/cityConstruction/components/construction/components/envDetail.vue index ef77e9e..8ee6e4f 100644 --- a/src/views/cityConstruction/components/construction/components/envDetail.vue +++ b/src/views/cityConstruction/components/construction/components/envDetail.vue @@ -17,6 +17,7 @@ import ScrollBoard from '@/components/board/ScrollBoard' import {fetchConstructionEnvoriment} from '@/api/construction' import {getYear} from '@/utils/formatDate' +import mockData from '../../../../../../static/plan.json' export default { name: 'EnvDetail', @@ -48,7 +49,8 @@ } }, created () { - this.getData() + // this.getData() + this.boardConfig.data = mockData.monitor.table }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleBar.vue b/src/views/cityConstruction/components/construction/components/peopleBar.vue index a65d97e..c6d6b18 100644 --- a/src/views/cityConstruction/components/construction/components/peopleBar.vue +++ b/src/views/cityConstruction/components/construction/components/peopleBar.vue @@ -19,6 +19,7 @@ import SingleLayout from '@/components/layout/singleLayout' import SimpleBarChart from '@/components/barChart/simpleBarChart' import {fetchStaffCountByType} from '@/api/cityManage' +import mockData from '../../../../../../static/plan.json' export default { name: 'ConstructionPeopleBar', components: {SimpleBarChart, SingleLayout}, @@ -34,8 +35,10 @@ } } }, - created (){ - this.getData() + created () { + // this.getData() + this.options.xAxisData = mockData.staff.bar.xData + this.options.seriesData = mockData.staff.bar.yData }, methods: { getData () { diff --git a/src/views/cityConstruction/components/construction/components/peopleCount.vue b/src/views/cityConstruction/components/construction/components/peopleCount.vue index c415f04..566b3bf 100644 --- a/src/views/cityConstruction/components/construction/components/peopleCount.vue +++ b/src/views/cityConstruction/components/construction/components/peopleCount.vue @@ -14,6 +14,7 @@ + + diff --git a/src/views/socialLive/socialLivelihoodRight.vue b/src/views/socialLive/socialLivelihoodRight.vue index 0018a00..1b625a9 100644 --- a/src/views/socialLive/socialLivelihoodRight.vue +++ b/src/views/socialLive/socialLivelihoodRight.vue @@ -23,7 +23,10 @@
-
+
+ +
+
@@ -61,6 +64,7 @@ import Access from './components/accessControl/access' import Education from './components/education/education' import Hospital from './components/hospital/hospital' +import ParkFlowLine from './components/parkingSystem/components/parkFlowLine.vue' export default { name: 'SocialLivelihoodRight', components: { @@ -71,7 +75,8 @@ ParkIncome, ParkOccupy, EcardIntroduce, - Infrastructure + Infrastructure, + ParkFlowLine }, data () { return { @@ -97,7 +102,7 @@ // this.currentComp = 0 // } this.compChange() - }, 10000) + }, 30000) }, // 停止切换人口组件 stopCompChange () { diff --git a/static/plan.json b/static/plan.json index 4862f16..e226808 100644 --- a/static/plan.json +++ b/static/plan.json @@ -1,5 +1,5 @@ { - "title": "=======================规划建设==============================", + "title-left": "=======================规划建设-左侧屏==============================", "gardensDesc": "园林建设", "gardens": { "count": { @@ -160,5 +160,137 @@ {"value": 1823, "name": "潭口镇"}, {"value": 1935, "name": "高校园区"} ] + }, + + + "title-right": "=======================规划建设-左侧屏==============================", + "projectDesc": "项目概况", + "project": { + "countDesc": "总项目和同比增长", + "count": { + "total": 10, + "radio": "同比增长:+12%" + }, + + + "chart2": [ + {"title": "未启动", "data": {"total": "1324", "already": "40", "rate": 34}}, + {"title": "进行中", "data": {"total": "1324", "already": "40", "rate": 24}}, + {"title": "已完成", "data": {"total": "1324", "already": "40", "rate": 54}}, + {"title": "已延期", "data": {"total": "1324", "already": "40", "rate": 14}}, + {"title": "已归档", "data": {"total": "1324", "already": "40", "rate": 84}} + ], + + "bar": { + "xData": ["园林项目", "市政项目", "交通项目", "水利项目", "建筑项目"], + "yData": [1, 12, 2, 5, 6, 7] + }, + + "line": { + "xData": ["园林项目", "市政项目", "建筑项目", "交通项目", "水利项目" ], + "legend": ["2018", "2019", "2020"], + "yData": [ + {"name": "2020", "data": [ 855, 1078, 856, 865, 990 ], "color": "255,45,85"}, + {"name": "2019", "data": [545, 745, 546, 575, 777], "color": "0,144,255"}, + {"name": "2018", "data": [300, 232, 233, 454, 190], "color": "255,204,0"} + ] + } + }, + + "staffDesc": "施工人员", + "staff": { + "count": [ + {"name": "施工人员总数", "value": 15718, "unit": "人"}, + {"name": "在岗人数", "value": 12034, "unit": "人"}, + {"name": "缺勤人数", "value": 3684, "unit": "人"} + ], + "bar": { + "xData": [ "电工", "木工", "监工", "维修工", "管理"], + "yData": [ 4725, 5930, 318, 1761, 2984] + }, + "table": [ + ["赣州毅德商贸物流园E04地块毅德融城三期住宅项目", "312", "256", "56"], + ["万茂嘉福新天地RJ02-C01-01", "417", "374", "43"], + ["万茂嘉福新天地RJ02-B09-01地块一期", "297", "286", "11"], + ["悦蓉府建设项目", "305", "248", "57"], + ["赣州蓉江新区新路完中", "260", "213", "47"], + ["赣州中国文谷新旅明樾府H一标段", "288", "199", "89"], + ["赣州中国文谷新旅明樾府H二标段", "397", "365", "32"] + ] + }, + + + "investmentDesc": "投资金额", + "investment": { + "count": { + "name": "总投资", + "value": 100, + "unit": "万元" + }, + "pie": [ + {"value": 10, "name": "园林项目"}, + {"value": 20, "name": "市政项目"}, + {"value": 40, "name": "建筑项目"}, + {"value": 25, "name": "交通项目"}, + {"value": 5, "name": "水利项目"} + ], + "bar": [ + {"value": 10, "name": "园林项目"}, + {"value": 20, "name": "市政项目"}, + {"value": 40, "name": "建筑项目"}, + {"value": 25, "name": "交通项目"}, + {"value": 5, "name": "水利项目"} + ] + }, + + + "constructDesc": "工地建设", + "construct": { + "count": { + "total": 100, + "doing": 22, + "ready": 35, + "pause": 18, + "over": 25, + "investment": 123 + }, + + "pie": [ + {"value": 10, "name": "房屋建设"}, + {"value": 20, "name": "市政道路"}, + {"value": 34, "name": "园林绿化"}, + {"value": 26, "name": "桥梁隧道"}, + {"value": 10, "name": "其他工程"} + ], + + "bar": { + "xData": ["房屋建设", "市政道路", "园林绿化", "桥梁隧道", "其他工程"], + "yData": [10, 20, 34,26, 10] + } + }, + + "monitorDesc": "工地监测", + "monitor": { + "bar": { + "xData": ["PM2.5超标", "工作服报警", "湿度异常", "噪声过大", "TSP", "PM10"], + "yData": [21, 3, 1, 8, 15, 7] + }, + "line": { + "xData": ["周一", "周二", "周三", "周四", "周五", "周六", "周日"], + "yData": [ + {"name": "报警", "data": [38, 31, 28, 31, 20, 20, 0], "color": "255,45,85"}, + {"name": "液位超限", "data": [12, 22, 19, 24, 25, 20, 30], "color": "0,144,255"}, + {"name": "燃气泄漏", "data": [12, 2, 12, 10, 8, 12, 6], "color": "255,204,0"} + ] + }, + "table": [ + ["赣州毅德商贸物流园E04地块毅德融城三期住宅项目", "27", "57.9"], + ["万茂嘉福新天地RJ01", "17", "49.7"], + ["万茂嘉福新天地RJ02", "34", "49.7"], + ["悦蓉府建设项目", "31", "56.1"], + ["赣州蓉江新区新路完中", "42", "65.4"], + ["赣州中国文谷新旅明樾府H二标段", "19", "56.6"], + ["赣州中国文谷新旅明樾府H一标段", "34", "49.7"] + ] } } diff --git a/static/socialLive.json b/static/socialLive.json new file mode 100644 index 0000000..ebe8dcf --- /dev/null +++ b/static/socialLive.json @@ -0,0 +1,230 @@ +{ + "title-left": "=======================社会民生-左侧屏==============================", + "left": { + "houseDesc": "房屋", + "house": { + "bar": { + "xAxisData": ["自住", "出租", "空置", "其他"], + "seriesData": [15492, 1107, 421, 1688] + }, + "pie": [ + {"value": 15492, "name": "自住"}, + {"value": 1107, "name": "出租"}, + {"value": 421, "name": "空置"}, + {"value": 1688, "name": "其他"} + ], + "count": [ + { "name": "房屋总数", "num": "18708" }, + { "name": "入住数", "num": "15492" }, + { "name": "入住率", "num": "82.8%" } + ], + "table": [ + ["温馨家园F1-20", "2169", "1382", "63%"], + ["温馨家园A1-4", "1867", "1363", "73%"], + ["温馨家园A1-5", "1026", "352", "29%"], + ["温馨家园A1-7", "868", "818", "95%"], + ["翰林小区", "658", "464", "67%"] + ] + }, + + + "goThroughDesc": "通行", + "goThrough": { + "count": { + "people": {"name": "人通行次数", "value": "11457", "unit": "次"}, + "car": {"name": "车通行次数", "value": "4091", "unit": "次"} + }, + "barPeople": { + "xAxisData": [ + "温馨家园F1-20", "温馨家园F1-9", "温馨家园F1-7", "温馨家园F1-14", "温馨家园F1-2", + "金色春城小区", "温馨家园", "碧桂园", "516", "伟创力宿舍" + ], + "seriesData": [2586, 1372, 893, 1102, 539, 776, 1233, 693, 724, 1539] + }, + "barCar": { + "xAxisData": [ + "温馨家园F1-20", "温馨家园F1-9", "温馨家园F1-7", "温馨家园F1-14", "温馨家园F1-2", + "金色春城小区", "温馨家园", "碧桂园", "516", "伟创力宿舍" + ], + "seriesData": [624, 257, 199, 536, 210, 350, 478, 198, 256, 983] + } + }, + + + "introduceDesc": "社区总体概述", + "introduce": { + "community": 49, + "loudong": 130, + "fangwu": 18708, + "chuzu": 1107, + "kongzhi": 421, + "changzhu": 175481, + "liudong": 44661, + "jiedao": 3, + "wuye": 16, + "door": 75 + }, + + "populationDesc": "社区人口", + "population": { + "bar": { + "xAxisData": ["0~12", "12~18", "18~35", "35~60", "60以上"], + "seriesData": [1090, 668, 13882, 8275, 3101] + }, + "pieSex": [ + {"value": 14278, "name": "男"}, + {"value": 12738, "name": "女"} + ], + "pieNation": [ + {"value": 25665, "name": "汉族"}, + {"value": 500, "name": "回族"}, + {"value": 400, "name": "壮族"}, + {"value": 451, "name": "满族"} + ], + "barCommunity": { + "xAxisData": ["温馨家园小区", "金色春城小区", "碧桂园", "创业楼"], + "seriesData": [6804, 6724, 6774, 6714] + } + }, + + + "troubleDesc": "隐患", + "trouble": { + "count": { + "total": {"name": "总隐患数", "value": 36, "unit": "个"}, + "done": {"name": "已处理完成", "value": 21, "unit": "个"} + }, + "pie": [ + {"value": 20, "name": "基础设施隐患"}, + {"value": 8, "name": "消防隐患"}, + {"value": 8, "name": "其他隐患"} + ], + "table": [ + ["温馨家园F1-20", 15, 13, "87%"], + ["温馨家园A1-4", 6, 2, "33%"], + ["温馨家园A1-5", 5, 2, "40%"], + ["温馨家园A1-7", 5, 2, "40%"] + ], + "line": { + "xAxisData": ["1月", "2月", "3月", "4月"], + "seriesData": [ + {"name": "基础设施隐患", "data": [5, 8, 9, 7], "color": "0,144,255"}, + {"name": "消防隐患", "data": [2, 6, 7, 4], "color": "255,45,85"} + ] + } + } + }, + + + + + "title-right": "=======================社会民生-右半屏==============================", + "right": { + "baseDesc": "社区基础设施", + "base": { + "park": 7, + "administrativeService": 6, + "cashBussiness": 2, + "hospital": 3, + "school": 35, + "welfareHouse": 2, + "culture": 12, + "entertainment": 153, + "bussiness": 263, + "parkLot": 9 + }, + + "eCardDesc": "一卡通", + "eCard": { + "count":[ + { "name": "注册人数", "num": 1885 }, + { "name": "活跃人数", "num": 1094 }, + { "name": "入驻企业", "num": 30 } + ], + "table": { + "first": {"name": "日在线缴费笔数", "value": 248, "unit": "笔"}, + "second": {"name": "日在线缴费金额", "value": 28473, "unit": "元"}, + "third": {"name": "月在线缴费金额", "value": 686060, "unit": "元"}, + "fourth": {"name": "咨询互动数", "value": 109, "unit": "件"} + }, + "pie": [ + {"value": 34, "name": "公众互动"}, + {"value": 11, "name": "信息公开"}, + {"value": 20, "name": "民意调查"}, + {"value": 44, "name": "问题上报"} + ], + "bar": { + "xAxisData": ["图书馆", "报告厅", "运动场", "会议室"], + "legend": ["总数量", "已预约"], + "seriesData": [ + {"name": "已预约", "data": [32, 15, 18, 8], "color": "#ff9e00", "zlevel": 5}, + {"name": "总数量", "data": [54, 16, 23, 8], "color": "#0468f1", "zlevel": 0} + ] + } + }, + + + "parkDesc": "停车场管理", + "park": { + "count": [ + { "name": "总车位数", "num": 1617 }, + { "name": "已占用车位数", "num": 1309 }, + { "name": "空闲车位", "num": 308 }, + { "name": "占用率", "num": "81.3%" } + ], + "table": { + "head": ["停车场", "岗亭", "通道", "车位总数", "已占用数", "占用率"], + "data": [ + ["516双创产业园停车场", "3", "12", "48", "43", "89%"], + ["武陵村坪路小学停车场", "2", "7", "84", "66", "79%"], + ["武陵村滨江公园停车场", "5", "13", "235", "143", "61%"], + ["金色春城小学停车场", "4", "8", "62", "47", "76%"], + ["仓背岭公园停车场", "5", "11", "121", "15", "95%"] + ] + }, + "调接口": "停车场流量统计", + "incomeCount": { + "yesterday": {"name": "昨日收入", "value": 24, "unit": "元"}, + "today": {"name": "今日收入", "value": 24, "unit": "元"}, + "month": {"name": "本月收入", "value": 52, "unit": "元"}, + "year": {"name": "全年收入", "value": 2317, "unit": "元"} + }, + "lineIncome": { + "unit": "元", + "xAxisData": ["9-3", "9-4", "9-5", "9-6", "9-7", "9-8", "9-9"], + "seriesData": [ + {"name": "线上收入", "data": [120, 252, 101, 134, 290, 230, 110], "color": "255,45,85"}, + {"name": "线下收入", "data": [110, 222, 91, 82, 278, 200, 91], "color": "0,144,255"} + ] + } + }, + + + "educationDesc": "智慧教育", + "education": { + "countLeftDesc": "左侧的数量统计(学校统计)、幼儿园、小学、中学", + "countLeft": { + "kindergarten": { "name": "幼儿园", "num": 4 }, + "primarySchool": { "name": "小学", "num": 37 }, + "middleSchool": { "name": "中学", "num": 4 } + }, + "countRightDesc": "右侧(表格上方)的数量统计、幼儿园、小学、中学", + "countRight": { + "child": 278, + "pupil": 73231, + "student": 9203, + "teacher": 6891 + }, + "table": [ + ["武陵小学", "2872", "252"], + ["金色春城小学", "2632", "213"], + ["坪路小学", "2753", "197"], + ["赣州市第十四中学", "2913", "193"], + ["潭东中学", "2464", "271"], + ["潭口中心小学", "3357", "323"], + ["潭东中心小学", "1931", "183"] + ] + } + } + +}