Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
This commit is contained in:
commit
70850880ef
|
@ -1562,14 +1562,16 @@ export default {
|
||||||
try {
|
try {
|
||||||
this.$set(this.selectedTableItem, '_deleting', true)
|
this.$set(this.selectedTableItem, '_deleting', true)
|
||||||
const { inputFileName: fileName } = this.sampleData
|
const { inputFileName: fileName } = this.sampleData
|
||||||
const { success, message } = await postAction('/gamma/deleteNuclide', {
|
const { success, result, message } = await postAction('/gamma/deleteNuclide', {
|
||||||
curRow: this.curRow,
|
curRow: this.curRow,
|
||||||
nuclideName: this.model.identifiedNuclide,
|
nuclideName: this.model.identifiedNuclide,
|
||||||
fileName,
|
fileName,
|
||||||
list_identify: nuclides,
|
list_identify: nuclides,
|
||||||
})
|
})
|
||||||
if (success) {
|
if (success) {
|
||||||
nuclides.splice(findIndex, 1)
|
const { identify, table } = result
|
||||||
|
this.selectedTableItem.nuclides = identify
|
||||||
|
this.list = table
|
||||||
} else {
|
} else {
|
||||||
this.$message.error(message)
|
this.$message.error(message)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1759,13 +1759,13 @@ export default {
|
||||||
<style lang="less">
|
<style lang="less">
|
||||||
.spectrum-analysis-operators-dropdown-overlay {
|
.spectrum-analysis-operators-dropdown-overlay {
|
||||||
background-color: #03353f;
|
background-color: #03353f;
|
||||||
|
z-index: 999;
|
||||||
|
|
||||||
.ant-menu {
|
.ant-menu {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
position: relative;
|
position: relative;
|
||||||
border-right: 0;
|
border-right: 0;
|
||||||
max-height: calc(100vh - 506px);
|
|
||||||
overflow: hidden auto;
|
|
||||||
|
|
||||||
&-submenu {
|
&-submenu {
|
||||||
&-active {
|
&-active {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user