diff --git a/package.json b/package.json index cd2bd6b1..f8674b53 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dvcp-weapps", - "version": "0.1.0", + "version": "1.1.0", "private": false, "author": "Kubbo", "scripts": { diff --git a/src/apps/AppResidentFile/AppResidentFile.vue b/src/apps/AppResidentFile/AppResidentFile.vue index 5f5329d3..d737c6f1 100644 --- a/src/apps/AppResidentFile/AppResidentFile.vue +++ b/src/apps/AppResidentFile/AppResidentFile.vue @@ -283,39 +283,39 @@ export default { initEcharts1(data) { var option = { legend: { - borderColor: 'pink', data: ['群成员总数', '入群人数', '退群人数'], + y: 'bottom', }, + color: ['#4A86FD', '#32C5FF', '#FFAA44'], tooltip: { trigger: 'axis', }, grid: { - top: '12%', + top: '9%', left: '6%', right: '8%', - bottom: '6%', + bottom: '9%', containLabel: true, }, xAxis: { type: 'category', data: Object.keys(data).map((e) => e.substring(e.length - 5, e.length)), axisLine: { - lineStyle: { color: '#157EFF' }, + show: true, + lineStyle: { color: '#666' }, }, axisLabel: { show: true, interval: 0, }, axisTick: { - interval: 'auto', + show: false, }, }, yAxis: { type: 'value', axisLine: { - lineStyle: { - color: '#666', - }, + show: false, }, splitLine: { show: true, @@ -327,10 +327,13 @@ export default { show: true, interval: 0, }, + axisTick: { + show: false, + }, }, series: [ { - itemStyle: { + lineStyle: { normal: { lineStyle: { color: '#4A86FD', @@ -344,7 +347,7 @@ export default { data: Object.values(data).map((e) => e.total), }, { - itemStyle: { + lineStyle: { normal: { lineStyle: { color: '#32C5FF', @@ -358,7 +361,7 @@ export default { data: Object.values(data).map((e) => e.increase), }, { - itemStyle: { + lineStyle: { normal: { lineStyle: { color: '#FFAA44', @@ -381,15 +384,17 @@ export default { var options = { legend: { data: ['居民总数', '新增居民数', '流失居民数'], + y: 'bottom', }, + color: ['#4A86FD', '#32C5FF', '#FFAA44'], tooltip: { trigger: 'axis', }, grid: { - top: '12%', + top: '9%', left: '6%', right: '8%', - bottom: '6%', + bottom: '9%', containLabel: true, }, xAxis: { @@ -403,15 +408,13 @@ export default { interval: 0, }, axisTick: { - interval: 'auto', + show: false, }, }, yAxis: { type: 'value', axisLine: { - lineStyle: { - color: '#666', - }, + show: false, }, splitLine: { show: true, @@ -423,10 +426,13 @@ export default { show: true, interval: 0, }, + axisTick: { + show: false, + }, }, series: [ { - itemStyle: { + lineStyle: { normal: { lineStyle: { color: '#4A86FD', @@ -440,7 +446,7 @@ export default { data: Object.values(data).map((e) => e.total), }, { - itemStyle: { + lineStyle: { normal: { lineStyle: { color: '#32C5FF', @@ -454,7 +460,7 @@ export default { data: Object.values(data).map((e) => e.increase), }, { - itemStyle: { + lineStyle: { normal: { lineStyle: { color: '#FFAA44', @@ -605,7 +611,7 @@ uni-page-body { .echartes { margin-top: 64px; - padding-top: 20px; + padding-bottom: 20px; height: 616px; background: #fff; box-sizing: border-box;