mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
removevue-chartjs chart.js
This commit is contained in:
ogerly
parent
8f42aa60d7
commit
8b45d0da58
@ -26,7 +26,6 @@
|
||||
"babel-preset-vue": "^2.0.2",
|
||||
"bootstrap": "4.3.1",
|
||||
"bootstrap-vue": "^2.5.0",
|
||||
"chart.js": "^3.5.1",
|
||||
"d3": "^5.7.0",
|
||||
"datamaps": "^0.5.9",
|
||||
"date-fns": "^1.30.1",
|
||||
@ -64,7 +63,6 @@
|
||||
"vue": "^2.6.11",
|
||||
"vue-apollo": "^3.0.7",
|
||||
"vue-bootstrap-typeahead": "^0.2.6",
|
||||
"vue-chartjs": "^3.5.1",
|
||||
"vue-cli-plugin-i18n": "^1.0.1",
|
||||
"vue-clickaway": "^2.2.2",
|
||||
"vue-clipboard2": "^0.3.0",
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
import { Bar, mixins } from 'vue-chartjs'
|
||||
const { reactiveProp } = mixins
|
||||
|
||||
export default {
|
||||
extends: Bar,
|
||||
mixins: [reactiveProp],
|
||||
props: ['options'],
|
||||
mounted () {
|
||||
// this.chartData is created in the mixin.
|
||||
// If you want to pass options please create a local options object
|
||||
this.renderChart(this.chartData, this.options)
|
||||
}
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
import { Line, mixins } from 'vue-chartjs'
|
||||
const { reactiveProp } = mixins
|
||||
|
||||
export default {
|
||||
extends: Line,
|
||||
mixins: [reactiveProp],
|
||||
props: ['options'],
|
||||
mounted () {
|
||||
// this.chartData is created in the mixin.
|
||||
// If you want to pass options please create a local options object
|
||||
this.renderChart(this.chartData, this.options)
|
||||
}
|
||||
}
|
||||
@ -10,31 +10,19 @@
|
||||
<br />
|
||||
<hr>
|
||||
GDD Statistik
|
||||
|
||||
<div class="small">
|
||||
<line-chart :chart-data="datacollectionGdd" :options="chartOptions"></line-chart>
|
||||
</div>
|
||||
|
||||
<div class="small">
|
||||
<bar-chart :chart-data="datacollectionGdd" ></bar-chart>
|
||||
</div>
|
||||
|
||||
|
||||
<hr>
|
||||
GDT Statistik
|
||||
|
||||
<div class="small">
|
||||
<line-chart :chart-data="datacollectionGdt"></line-chart>
|
||||
</div>
|
||||
|
||||
<div class="small">
|
||||
<bar-chart :chart-data="datacollectionGdt" ></bar-chart>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<template #transaction-form>
|
||||
<transaction-form :balance="balance" @set-transaction="setTransaction"></transaction-form>
|
||||
</template>
|
||||
|
||||
<!--
|
||||
|
||||
<hr />
|
||||
<gdd-transaction-list
|
||||
v-if="showContext"
|
||||
@ -45,25 +33,16 @@
|
||||
@update-transactions="updateTransactions"
|
||||
/>
|
||||
<gdd-transaction-list-footer v-if="showContext" :count="transactionCount" />
|
||||
-->
|
||||
<hr>
|
||||
<hr>
|
||||
UserAccount Statistik
|
||||
|
||||
<div class="small">
|
||||
<line-chart :chart-data="datacollectionUser" ></line-chart>
|
||||
</div>
|
||||
|
||||
<div class="small">
|
||||
<bar-chart :chart-data="datacollectionUser" ></bar-chart>
|
||||
</div>
|
||||
|
||||
</b-container>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
|
||||
import GddStatus from './AccountOverview/GddStatus.vue'
|
||||
import LineChart from '../../components/Charts/LineChart.js'
|
||||
import BarChart from '../../components/Charts/BarChart.js'
|
||||
|
||||
import GddTransactionList from './AccountOverview/GddTransactionList.vue'
|
||||
import GddTransactionListFooter from './AccountOverview/GddTransactionListFooter.vue'
|
||||
|
||||
@ -77,8 +56,7 @@ export default {
|
||||
name: 'Overview',
|
||||
components: {
|
||||
GddStatus,
|
||||
LineChart,
|
||||
BarChart,
|
||||
|
||||
GddTransactionList,
|
||||
GddTransactionListFooter,
|
||||
},
|
||||
@ -124,57 +102,8 @@ export default {
|
||||
updateTransactions(pagination) {
|
||||
this.$emit('update-transactions', pagination)
|
||||
},
|
||||
fillData () {
|
||||
this.datacollectionGdd = {
|
||||
labels:['January', 'February', 'March', 'April', 'May', 'June', 'July'],
|
||||
datasets: [
|
||||
{
|
||||
label: 'gesendet',
|
||||
backgroundColor: '#ffd600',
|
||||
data: [345, 490, 218, 2000, 490, 745, 1113]
|
||||
}, {
|
||||
label: 'empfangen',
|
||||
backgroundColor: '#f3a4b5',
|
||||
data: [700, 395, 100, 405, 39, 805, 423]
|
||||
}, {
|
||||
label: 'geschöpft',
|
||||
backgroundColor: '#2bffc6',
|
||||
data: [400, 1000, 600, 1000, 900, 800, 1000]
|
||||
}
|
||||
]
|
||||
},
|
||||
this.datacollectionGdt = {
|
||||
labels:['January', 'February', 'March', 'April', 'May', 'June', 'July'],
|
||||
datasets: [
|
||||
{
|
||||
label: 'Euro',
|
||||
backgroundColor: '#ffd600',
|
||||
data: [200, 500, 100, 200, 300, 500, 100]
|
||||
}, {
|
||||
label: 'GDT',
|
||||
backgroundColor: '#2bffc6',
|
||||
data: [2000, 5000, 1100, 2200, 3300, 5500, 1500]
|
||||
}
|
||||
]
|
||||
},
|
||||
this.datacollectionUser = {
|
||||
labels:['January', 'February', 'March', 'April', 'May', 'June', 'July'],
|
||||
datasets: [
|
||||
{
|
||||
label: 'Angemeldete User',
|
||||
backgroundColor: '#525f7f',
|
||||
data: [200, 220, 330, 420, 480, 500, 784]
|
||||
}, {
|
||||
label: 'User im Schöpfungsprozess',
|
||||
backgroundColor: '#2bffc6',
|
||||
data: [80, 133, 155, 220, 280, 320, 421]
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
|
||||
},
|
||||
mounted () {
|
||||
this.fillData()
|
||||
},
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -1730,13 +1730,6 @@
|
||||
dependencies:
|
||||
"@babel/types" "^7.3.0"
|
||||
|
||||
"@types/chart.js@^2.7.55":
|
||||
version "2.9.30"
|
||||
resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.9.30.tgz#34b99897f4f5ef0f74c8fe4ced70ac52b4d752dd"
|
||||
integrity sha512-EgjxUUZFvf6ls3kW2CwyrnSJhgyKxgwrlp/W5G9wqyPEO9iFatO63zAA7L24YqgMxiDjQ+tG7ODU+2yWH91lPg==
|
||||
dependencies:
|
||||
moment "^2.10.2"
|
||||
|
||||
"@types/d3@3.5.38":
|
||||
version "3.5.38"
|
||||
resolved "https://registry.yarnpkg.com/@types/d3/-/d3-3.5.38.tgz#76f8f2e9159ae562965b2fa0e6fbee1aa643a1bc"
|
||||
@ -3808,11 +3801,6 @@ chardet@^0.4.0:
|
||||
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
|
||||
integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=
|
||||
|
||||
chart.js@^3.5.1:
|
||||
version "3.5.1"
|
||||
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.5.1.tgz#73e24d23a4134a70ccdb5e79a917f156b6f3644a"
|
||||
integrity sha512-m5kzt72I1WQ9LILwQC4syla/LD/N413RYv2Dx2nnTkRS9iv/ey1xLTt0DnPc/eWV4zI+BgEgDYBIzbQhZHc/PQ==
|
||||
|
||||
check-types@^8.0.3:
|
||||
version "8.0.3"
|
||||
resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552"
|
||||
@ -9575,7 +9563,7 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
|
||||
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
|
||||
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
|
||||
|
||||
moment@^2.10.2, moment@^2.19.2:
|
||||
moment@^2.19.2:
|
||||
version "2.29.1"
|
||||
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
|
||||
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
|
||||
@ -13403,13 +13391,6 @@ vue-bootstrap-typeahead@^0.2.6:
|
||||
resize-observer-polyfill "^1.5.0"
|
||||
vue "^2.5.17"
|
||||
|
||||
vue-chartjs@^3.5.1:
|
||||
version "3.5.1"
|
||||
resolved "https://registry.yarnpkg.com/vue-chartjs/-/vue-chartjs-3.5.1.tgz#d25e845708f7744ae51bed9d23a975f5f8fc6529"
|
||||
integrity sha512-foocQbJ7FtveICxb4EV5QuVpo6d8CmZFmAopBppDIGKY+esJV8IJgwmEW0RexQhxqXaL/E1xNURsgFFYyKzS/g==
|
||||
dependencies:
|
||||
"@types/chart.js" "^2.7.55"
|
||||
|
||||
vue-cli-plugin-i18n@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/vue-cli-plugin-i18n/-/vue-cli-plugin-i18n-1.0.1.tgz#5a3077de5d62c9b4068e486db1fc97fce9fa0072"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user