diff --git a/src/views/spectrumAnalysis/components/Modals/CompareFileListModal.vue b/src/views/spectrumAnalysis/components/Modals/CompareFileListModal.vue index b49e6ec..de8c912 100644 --- a/src/views/spectrumAnalysis/components/Modals/CompareFileListModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/CompareFileListModal.vue @@ -12,7 +12,7 @@ @change="handleTableChange" >
- Compare + Ok Cancel
@@ -22,7 +22,6 @@ import { getAction } from '@/api/manage' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import ModalMixin from '@/mixins/ModalMixin' -import SampleDataMixin from '../../SampleDataMixin' const columns = [ { @@ -56,7 +55,7 @@ const formItems = [ ] export default { - mixins: [ModalMixin, JeecgListMixin, SampleDataMixin], + mixins: [ModalMixin, JeecgListMixin], data() { this.columns = columns this.formItems = formItems @@ -64,8 +63,7 @@ export default { return { queryParam: {}, selectedRowKeys: [], - selectionRows: [], - isComparing: false + selectionRows: [] } }, methods: { @@ -109,27 +107,9 @@ export default { this.$message.warn('Please Select A File to Compare') return } - try { - const { inputFileName: fileName } = this.sampleData - const compareFileName = this.selectionRows[0].name - this.isComparing = true - - const { success, result, message } = await getAction('/gamma/Compare', { - fileName, - compareFileName - }) - if (success) { - this.visible = false - this.$emit('compareWithFile', result) - } else { - this.$message.error(message) - } - } catch (error) { - console.error(error) - } finally { - this.isComparing = false - } + this.$emit('fileSelect', this.selectionRows[0].name) + this.visible = false } } } diff --git a/src/views/spectrumAnalysis/components/Modals/StripModal.vue b/src/views/spectrumAnalysis/components/Modals/StripModal.vue index f5cc095..f340871 100644 --- a/src/views/spectrumAnalysis/components/Modals/StripModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/StripModal.vue @@ -1,25 +1,45 @@