diff --git a/supervise-report-ui/src/main.js b/supervise-report-ui/src/main.js index dd79d76d..35d827e8 100644 --- a/supervise-report-ui/src/main.js +++ b/supervise-report-ui/src/main.js @@ -49,9 +49,9 @@ VueAMap.initAMapApiLoader({ Vue.config.productionTip = false -// let token = null -let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDAyMTA3MjF9.wq9OgbpBnuvHdJsVzaVA1FM4pdhY-dJM9GUGSkp5mPk' -// token = GetQueryString('token') +let token = null +// let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDAyOTk0NTN9.oZoMaHdDSGNsNf-3jd22RgvBYQkSemneihmQ4P12HCo' +token = GetQueryString('token') if (token) { setStorage(token) const href = window.location.href diff --git a/supervise-report-ui/src/views/index.vue b/supervise-report-ui/src/views/index.vue index 7b4df479..1eaa40d0 100644 --- a/supervise-report-ui/src/views/index.vue +++ b/supervise-report-ui/src/views/index.vue @@ -1,153 +1,161 @@ @@ -176,11 +184,72 @@ label: "333333", value: "项目3" } - ] + ], + listSalesChannelData: [{ + salesChannelCategory: '连网连锁店', + totalAmount: '2000000', + accountsReceivable: '31,914', + deductionAccountsReceivable: '35,793' + }, + { + salesChannelCategory: '连锁内加盟', + totalAmount: '28,700', + accountsReceivable: '28,749', + deductionAccountsReceivable: '58,339' + }, + { + salesChannelCategory: '配送中心', + totalAmount: '-1241.81', + accountsReceivable: '28,749', + deductionAccountsReceivable: '58,339' + }, + { + salesChannelCategory: '连锁外加盟', + totalAmount: '29822.44', + accountsReceivable: '28,749', + deductionAccountsReceivable: '58,339' + }, + { + salesChannelCategory: '配送中心', + totalAmount: '-1241.81', + accountsReceivable: '28,749', + deductionAccountsReceivable: '58,339' + }, + { + salesChannelCategory: '连锁外加盟', + totalAmount: '29822.44', + accountsReceivable: '28,749', + deductionAccountsReceivable: '58,339' + }, + { + salesChannelCategory: '配送中心', + totalAmount: '-1241.81', + accountsReceivable: '28,749', + deductionAccountsReceivable: '58,339' + }, + { + salesChannelCategory: '连锁外加盟', + totalAmount: '29822.44', + accountsReceivable: '28,749', + deductionAccountsReceivable: '58,339' + }, + { + salesChannelCategory: '配送中心', + totalAmount: '-1241.81', + accountsReceivable: '28,749', + deductionAccountsReceivable: '58,339' + }, + { + salesChannelCategory: '连锁外加盟', + totalAmount: '29822.44', + accountsReceivable: '28,749', + deductionAccountsReceivable: '58,339' + } + ], } }, - created() { + mounted() { this.drawLine() }, @@ -197,10 +266,9 @@ // 基于准备好的dom,初始化echarts实例 var myChart = echarts.init(document.getElementById('main')); // 绘制图表 - console.log('option', obj) myChart.setOption({ title: { - text: 'Stacked Line' + text: '' }, tooltip: { trigger: 'axis' @@ -215,8 +283,24 @@ containLabel: true }, toolbox: { + show: true, feature: { - saveAsImage: {} + mark: { + show: true + }, + // 数据图标 + dataView: { + show: false, + readOnly: false + }, + // 刷新图标 + restore: { + show: false + }, + // 下载图标 + saveAsImage: { + show: false + } } }, xAxis: { @@ -275,6 +359,11 @@ text-align: right; padding-right: 40px; } + .mains{ + overflow-x: hidden; + overflow-y: auto; + height: 100%; + } .index { width: 100%; @@ -449,5 +538,10 @@ } } } + + .bom { + margin-top: 36px; + padding-bottom: 50px; + } }