diff --git a/package.json b/package.json index e92f39a..bbea7cf 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "dayjs": "^1.8.0", "dom-align": "1.12.0", "echarts": "^5.4.2", + "echarts-gl": "^2.0.9", "enquire.js": "^2.1.6", "js-cookie": "^2.2.0", "lodash.get": "^4.4.2", diff --git a/src/components/Custom3DChart/index.vue b/src/components/Custom3DChart/index.vue new file mode 100644 index 0000000..da5b31b --- /dev/null +++ b/src/components/Custom3DChart/index.vue @@ -0,0 +1,51 @@ + + + diff --git a/src/components/CustomChart/index.vue b/src/components/CustomChart/index.vue index a39c9ff..f1157bc 100644 --- a/src/components/CustomChart/index.vue +++ b/src/components/CustomChart/index.vue @@ -30,7 +30,6 @@ export default { option: { handler() { if(this.chart) { - this.chart.clear() this.chart.setOption(this.option) } }, diff --git a/src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue b/src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue index 9ab5d17..46c4bf1 100644 --- a/src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue +++ b/src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue @@ -10,34 +10,51 @@ >
- + +
+ +
+
256
+
+
0
+
+
+ + + + + + + +
+ + diff --git a/src/views/spectrumAnalysis/components/SpectrumLineChart.vue b/src/views/spectrumAnalysis/components/SpectrumLineChart.vue index 4bcdfd4..116ab17 100644 --- a/src/views/spectrumAnalysis/components/SpectrumLineChart.vue +++ b/src/views/spectrumAnalysis/components/SpectrumLineChart.vue @@ -12,7 +12,7 @@ import { cloneDeep } from 'lodash' const initialOption = { grid: { top: 25, - right: 0, + right: 12, bottom: 40 }, title: { @@ -33,7 +33,9 @@ const initialOption = { } }, xAxis: { - type: 'category', + min: 0, + max: 256, + interval: 64, axisLine: { lineStyle: { color: 'rgb(119, 181, 213, 0.5)' @@ -57,10 +59,12 @@ const initialOption = { fontSize: 14, color: '#5b9cba' }, - nameGap: 25, - data: new Array(256).fill(0).map((_, index) => index) + nameGap: 25 }, yAxis: { + min: 0, + max: 21099, + interval: 21000 / 4, axisLine: { show: true, lineStyle: { @@ -84,7 +88,7 @@ const initialOption = { symbol: 'none', data: new Array(256) .fill(0) - .map((_, index) => (Math.random() < 0.05 ? parseInt(Math.random() * 19644) : parseInt(Math.random() * 800))) + .map((_, index) => [index, (Math.random() < 0.05 ? parseInt(Math.random() * 19644) : parseInt(Math.random() * 800))]) } } diff --git a/src/views/spectrumAnalysis/components/sub-operators/PopOverWithIcon.vue b/src/views/spectrumAnalysis/components/sub-operators/PopOverWithIcon.vue index 3ac6b89..7e52eb8 100644 --- a/src/views/spectrumAnalysis/components/sub-operators/PopOverWithIcon.vue +++ b/src/views/spectrumAnalysis/components/sub-operators/PopOverWithIcon.vue @@ -1,5 +1,5 @@