diff --git a/src/views/spectrumAnalysis/components/Modals/RLRModal/components/EditableCell.vue b/src/views/spectrumAnalysis/components/Modals/RLRModal/components/EditableCell.vue
new file mode 100644
index 0000000..f8bed6f
--- /dev/null
+++ b/src/views/spectrumAnalysis/components/Modals/RLRModal/components/EditableCell.vue
@@ -0,0 +1,50 @@
+
+
+
+
+ {{ value || ' ' }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/spectrumAnalysis/components/Modals/RLRModal/components/PeakFit.vue b/src/views/spectrumAnalysis/components/Modals/RLRModal/components/PeakFit.vue
index 6caa81f..ee9b9aa 100644
--- a/src/views/spectrumAnalysis/components/Modals/RLRModal/components/PeakFit.vue
+++ b/src/views/spectrumAnalysis/components/Modals/RLRModal/components/PeakFit.vue
@@ -10,48 +10,56 @@ const columns = [
{
title: 'Index',
dataIndex: 'key',
- align: 'center',
+ align: 'left',
customRender: (text,record,index) => `${index+1}`,//此处为重点
},
{
title: 'Energy(keV)',
dataIndex: 'energy',
- align: 'center'
+ align: 'left',
+ scopedSlots: { customRender: 'energy' }
},
{
title: 'Energy_err(%)',
dataIndex: 'energyErr',
- align: 'center'
+ align: 'left',
+ scopedSlots: { customRender: 'energyErr' },
},
{
title: 'Net Area',
dataIndex: 'netArea',
- align: 'center'
+ align: 'left',
+ scopedSlots: { customRender: 'netArea' },
},
{
title: 'Area_err(%)',
dataIndex: 'areaErr',
- align: 'center'
+ align: 'left',
+ scopedSlots: { customRender: 'areaErr' },
},
{
title: 'NetCountRate',
dataIndex: 'netCountRate',
- align: 'center'
+ align: 'left',
+ scopedSlots: { customRender: 'netCountRate' },
},
{
title: 'NCRate_err(%)',
dataIndex: 'ncRateErr',
- align: 'center'
+ align: 'left',
+ scopedSlots: { customRender: 'ncRateErr' },
},
{
title: 'LC',
dataIndex: 'lc',
- align: 'center'
+ align: 'left',
+ scopedSlots: { customRender: 'lc' },
},
{
title: 'Significance',
dataIndex: 'significance',
- align: 'center'
+ align: 'left',
+ scopedSlots: { customRender: 'significance' },
}
]
@@ -60,28 +68,16 @@ export default {
TableWithOperators
},
props: {
- allData: {
- type: Object,
- default: ()=>{}
+ tableData: {
+ type: Array,
+ default: ()=>[]
},
},
- watch: {
- allData: {
- handler(val) {
- console.log(val);
- },
- deep: true,
- immediate:true
- }
- },
data() {
this.columns = columns
return {
- list: []
+ list: this.tableData
}
- },
- mounted () {
- this.list = this.allData.peakFit
- },
+ }
}
diff --git a/src/views/spectrumAnalysis/components/Modals/RLRModal/components/TableWithOperators.vue b/src/views/spectrumAnalysis/components/Modals/RLRModal/components/TableWithOperators.vue
index 2b9943d..418d3f9 100644
--- a/src/views/spectrumAnalysis/components/Modals/RLRModal/components/TableWithOperators.vue
+++ b/src/views/spectrumAnalysis/components/Modals/RLRModal/components/TableWithOperators.vue
@@ -1,57 +1,34 @@
-
Insert Before
-
Insert After
-
Delete
+
Insert Before
+
Insert After
+
Delete
-
+
+
+
+
diff --git a/src/views/spectrumAnalysis/components/Modals/RLRModal/index.vue b/src/views/spectrumAnalysis/components/Modals/RLRModal/index.vue
index e7e80c9..61c6033 100644
--- a/src/views/spectrumAnalysis/components/Modals/RLRModal/index.vue
+++ b/src/views/spectrumAnalysis/components/Modals/RLRModal/index.vue
@@ -8,7 +8,7 @@
:class="activeKey == index ? 'active' : ''"
v-for="(tab, index) in tabs"
:key="index"
- @click="activeKey = index"
+ @click="handleChangeView(index)"
>
{{ tab }}
@@ -35,7 +35,7 @@
-
+
@@ -68,6 +68,12 @@
+
@@ -143,7 +149,26 @@ export default {
allInfo: {}
}
},
+ mounted () {
+ sessionStorage.setItem("isCellEmpty",false);
+ },
methods: {
+ handleSave() {
+ let val = sessionStorage.getItem("isCellEmpty")
+ if (val=="false") {
+ this.visible = false
+ } else {
+ this.$message.warning("Please finishi ti edit new inserted row first.")
+ }
+ },
+ handleChangeView(index) {
+ let val = sessionStorage.getItem("isCellEmpty")
+ if (val=="false") {
+ this.activeKey = index
+ } else {
+ this.$message.warning("Please finishi ti edit new inserted row first.")
+ }
+ },
beforeModalOpen() {
this.activeKey = 0
this.getGammaViewRLR();