diff --git a/src/api/manage.js b/src/api/manage.js index e7e422f..bdeb08a 100644 --- a/src/api/manage.js +++ b/src/api/manage.js @@ -70,7 +70,7 @@ export function putAction(url, parameter) { } //get -export function getAction(url, parameter) { +export function getAction(url, parameter, cancelToken) { let sign = signMd5Utils.getSign(url, parameter); //将签名和时间戳,添加在请求接口 Header // update-begin--author:taoyan---date:20220421--for: VUEN-410【签名改造】 X-TIMESTAMP牵扯 @@ -81,7 +81,8 @@ export function getAction(url, parameter) { url: url, method: 'get', params: parameter, - headers: signHeader + headers: signHeader, + cancelToken }) } diff --git a/src/components/ColorPicker/index.vue b/src/components/ColorPicker/index.vue index 6ae501e..8062b26 100644 --- a/src/components/ColorPicker/index.vue +++ b/src/components/ColorPicker/index.vue @@ -5,7 +5,7 @@
- +
@@ -16,8 +16,8 @@ import { Chrome } from 'vue-color' export default { props: { value: { - type: Object, - default: () => ({ rgba: { r: 255, g: 255, b: 255, a: 1 } }) + type: String, + required: true } }, components: { @@ -43,7 +43,7 @@ export default { computed: { color: { set(val) { - this.$emit('input', val) + this.$emit('input', val.hex) }, get() { return this.value diff --git a/src/components/Custom3DChart/index.vue b/src/components/Custom3DChart/index.vue deleted file mode 100644 index 32d9744..0000000 --- a/src/components/Custom3DChart/index.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - diff --git a/src/components/CustomChart/index.vue b/src/components/CustomChart/index.vue index d6994d6..d568449 100644 --- a/src/components/CustomChart/index.vue +++ b/src/components/CustomChart/index.vue @@ -3,10 +3,10 @@ - - diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/EditSlopeModal.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/EditSlopeModal.vue new file mode 100644 index 0000000..5b5e4e1 --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/EditSlopeModal.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/GeneralCommentModal.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/GeneralCommentModal.vue new file mode 100644 index 0000000..0d4b994 --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/GeneralCommentModal.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewChart.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewChart.vue index 6829e1d..52b8ec4 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewChart.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewChart.vue @@ -86,7 +86,7 @@ export default { type: 'line', data: pointlist.map(({ x, y }) => [x, y]), itemStyle: { - color: `rgb(${color})` + color }, symbol: 'none', animation: false diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/PeakCommentModal.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/PeakCommentModal.vue new file mode 100644 index 0000000..6dbc02d --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/PeakCommentModal.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue index 8a15e03..ff76c75 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue @@ -40,8 +40,8 @@
Nuclide Review Window - Add Peak Comment - Add General Comment + Add Peak Comment + Add General Comment
@@ -60,7 +60,7 @@ Delete
- Fit + Fit
@@ -81,16 +81,22 @@ (R)emove CP
- (M)odify CP + (M)odify CP
- Edit (S)lope + Edit (S)lope
- Undo + Undo
- Replot + Replot
Accept @@ -115,19 +121,21 @@
Possible Nuclide
-
- -
+ +
+ +
+
@@ -158,9 +166,14 @@
- - - + + + + + + + + + + + + diff --git a/src/views/spectrumAnalysis/components/SubOperators/GraphAssistance.vue b/src/views/spectrumAnalysis/components/SubOperators/GraphAssistance.vue index d29b79d..a388db6 100644 --- a/src/views/spectrumAnalysis/components/SubOperators/GraphAssistance.vue +++ b/src/views/spectrumAnalysis/components/SubOperators/GraphAssistance.vue @@ -20,6 +20,8 @@ @@ -1063,3 +1250,19 @@ export default { } } + diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 62654ac..8564210 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -81,11 +81,7 @@ - + @@ -493,11 +489,6 @@ export default { this.$refs.betaGammaAnalysisRef && this.$refs.betaGammaAnalysisRef.resize() }, - // 从分析工具刷新gamma图表 - handleRefreshGamma(data) { - this.$refs.gammaAnalysisRef.refresh(data) - }, - // Beta-Gamma Energy Calibration 的重新分析 handleReanalyse(...data) { this.$refs.betaGammaAnalysisRef.reanalyse(data)