From f8e412f0e7c673f2cb9cc7de1a463a953d99d6d0 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Wed, 17 Apr 2024 10:36:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DBeta=E8=B0=B1?= =?UTF-8?q?=E5=88=86=E6=9E=90=E5=8F=B3=E4=B8=8B=E8=A7=92checkbox=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=90=8E=EF=BC=8CsavedAnalysisResult=E8=A2=AB?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/spectrumAnalysis/beta-gamma-analysis.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 95dab69..5036934 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -303,7 +303,7 @@ export default { item.nidFlag = val ? 1 : 0 } }) - this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode) + this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, this.sampleDetail.savedAnalysisResult) }, async getSampleDetail() { this.spectraType = this.SampleType[0].value From 56eb07ec2b77db1917440c63d283ce38357d9f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Wed, 17 Apr 2024 17:02:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E9=87=8D=E6=96=B0=E7=BB=98=E5=88=B6=E7=9F=A9=E5=BD=A2?= =?UTF-8?q?=E6=A1=86=E7=9A=84=E6=89=A7=E8=A1=8C=E9=A1=BA=E5=BA=8F=EF=BC=8C?= =?UTF-8?q?=E5=9C=A8updateSampleData=20=E4=B9=8B=E5=90=8E=E5=86=8D?= =?UTF-8?q?=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spectrumAnalysis/beta-gamma-analysis.vue | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 5036934..13e2305 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -562,7 +562,6 @@ export default { item.mdc = parseFloat(item.mdc.toPrecision(6)) }) this.$emit('reAnalyCurr', res.result.savedAnalysisResult, res.result.XeData) - this.handleReAnalyse(res.result) updateSampleData({ inputFileName: this.sample.inputFileName, key: 'XeData', @@ -573,6 +572,7 @@ export default { key: 'savedAnalysisResult', data: res.result.savedAnalysisResult, }) + this.handleReAnalyse(res.result) if (res.result.bProcessed) { this.$message.success(res.result.message) } else { @@ -628,19 +628,6 @@ export default { item.lc = parseFloat(item.lc.toPrecision(6)) item.mdc = parseFloat(item.mdc.toPrecision(6)) }) - - if (inputFileName == this.sample.inputFileName) { - this.$emit('sendXeData', XeData) - this.$emit('reAnalyAll', savedAnalysisResult, XeData) - this.handleReAnalyse(sampleInfo) - - if (bProcessed) { - this.$message.success(message) - } else { - this.$message.warning(message) - } - } - updateSampleData({ inputFileName, key: 'XeData', @@ -652,6 +639,17 @@ export default { key: 'savedAnalysisResult', data: savedAnalysisResult, }) + if (inputFileName == this.sample.inputFileName) { + this.$emit('sendXeData', XeData) + this.$emit('reAnalyAll', savedAnalysisResult, XeData) + this.handleReAnalyse(sampleInfo) + + if (bProcessed) { + this.$message.success(message) + } else { + this.$message.warning(message) + } + } }) } else { this.$message.warning(message) From dda6b9fb8eb0e420b149145448a011a8611efbdd Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Thu, 6 Jun 2024 18:32:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E8=8E=B7=E5=8F=96=E6=9B=B2=E7=BA=BF?= =?UTF-8?q?=E5=9B=BE=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?status=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/spectrumAnalysis/beta-gamma-analysis.vue | 3 ++- src/views/spectrumAnalysis/gamma-analysis.vue | 3 ++- src/views/spectrumAnalysis/index.vue | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 13e2305..435e1f4 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -308,7 +308,7 @@ export default { async getSampleDetail() { this.spectraType = this.SampleType[0].value - const { dbName, sampleId, inputFileName, analyst } = this.sample + const { dbName, sampleId, inputFileName, analyst, status } = this.sample try { this.cancelLastRequest() this.isLoading = true @@ -319,6 +319,7 @@ export default { dbName, sampleId, analyst, + status }, cancelToken ) diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue index c32cde4..8dd563a 100644 --- a/src/views/spectrumAnalysis/gamma-analysis.vue +++ b/src/views/spectrumAnalysis/gamma-analysis.vue @@ -523,7 +523,7 @@ export default { // 获取样品详情 async getSampleDetail() { - const { dbName, sampleId, analyst } = this.sample + const { dbName, sampleId, analyst, status } = this.sample try { // const { success, result, message } = Response this.cancelLastRequest() @@ -536,6 +536,7 @@ export default { dbName, sampleId, analyst, + status }, cancelToken ) diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 1fe5be1..75cd764 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -578,19 +578,20 @@ export default { .filter( ({ sampleType, inputFileName }) => sampleType !== 'B' && inputFileName !== this.sampleData.inputFileName ) - .forEach(({ inputFileName: fileName, dbName, sampleId, analyst }) => { + .forEach(({ inputFileName: fileName, dbName, sampleId, analyst, status }) => { const params = { sampleId, dbName, fileName, analyst, + status } getAction('/gamma/initValue', params) }) willAddList .filter(({ sampleType, inputFileName }) => sampleType == 'B' && inputFileName !== this.sampleData.inputFileName) .forEach( - ({ inputFileName: sampleFileName, gasFileName, detFileName, qcFileName, dbName, sampleId, analyst }) => { + ({ inputFileName: sampleFileName, gasFileName, detFileName, qcFileName, dbName, sampleId, analyst, status }) => { const params = { sampleId, dbName, @@ -599,6 +600,7 @@ export default { gasFileName, detFileName, qcFileName, + status } getAction('/spectrumAnalysis/initValue', params) } From b7c86bc0e556bee5c155cdd73a9d02d05ec3d07b Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Tue, 9 Jul 2024 15:09:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E7=A8=8B?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=B0=E7=AB=99=E6=97=B6=EF=BC=8C=E6=9D=A5?= =?UTF-8?q?=E5=9B=9E=E5=88=86=E9=85=8D=E5=8F=B0=E7=AB=99=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B=E4=BF=AE=E6=94=B9=E4=BB=8EDB?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E8=B0=B1=E5=88=97=E8=A1=A8=E7=9A=84rowKey?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Modals/LoadFromDBModal.vue | 5 +- src/views/system/Scheduling.vue | 73 ++++++++++--------- 2 files changed, 43 insertions(+), 35 deletions(-) diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue index 44b10d1..b3d6ee6 100644 --- a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue @@ -8,7 +8,7 @@ { if (res.success) { const result = res.result.records || res.result - result.forEach((item) => { + result.forEach((item, index) => { const fileName = item.inputFileName if (fileName) { const arr = fileName.split('/') item.inputFileName = arr[arr.length - 1] } + item._index = index }) this.dataSource = result diff --git a/src/views/system/Scheduling.vue b/src/views/system/Scheduling.vue index a8f84ed..f548e62 100644 --- a/src/views/system/Scheduling.vue +++ b/src/views/system/Scheduling.vue @@ -140,7 +140,7 @@ - - - - + + + + @@ -631,9 +631,7 @@ export default { // 穿梭框变化 onChange(targetKeys, direction, moveKeys) { - console.log(targetKeys, direction, moveKeys) - debugger - if (direction == 'left') { + if (direction == 'right') { if (!this.checkedAccount) { this.$message.warning('Please Select A Person To Assign') return @@ -959,6 +957,7 @@ export default { .ant-transfer { margin-top: 15px; margin-bottom: 10px; + flex-direction: row-reverse; ::v-deep { .ant-transfer-list { @@ -990,6 +989,10 @@ export default { width: 92px; height: 26px; padding: 0; + display: flex; + justify-content: center; + align-items: center; + .anticon { display: none; } @@ -998,25 +1001,29 @@ export default { } &:first-child { margin-bottom: 52px; - &::after { - display: inline-block; - margin-left: 13px; - content: ''; - width: 18px; - height: 10px; - background: url(~@/assets/images/system/transfer-right.png) no-repeat; - background-size: contain; - } - } - &:nth-child(2) { + gap: 13px; + &::before { - display: inline-block; - margin-right: 6px; + position: static; + display: block; content: ''; width: 18px; height: 10px; background: url(~@/assets/images/system/transfer-left.png) no-repeat; background-size: contain; + opacity: 1; + } + } + &:nth-child(2) { + gap: 6px; + + &::after { + display: inline-block; + content: ''; + width: 18px; + height: 10px; + background: url(~@/assets/images/system/transfer-right.png) no-repeat; + background-size: contain; position: static; opacity: initial; }