From 4d4ae0f58d20f92b65797d7df9983454a66cae0f Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Fri, 10 Jan 2025 11:35:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=B8=A6?= =?UTF-8?q?=E5=85=A8=E9=80=89=E7=9A=84=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomSelectWithAllChecking.vue/index.vue | 72 +++++++++++++++++++ src/style.less | 2 + 2 files changed, 74 insertions(+) create mode 100644 src/components/CustomSelectWithAllChecking.vue/index.vue diff --git a/src/components/CustomSelectWithAllChecking.vue/index.vue b/src/components/CustomSelectWithAllChecking.vue/index.vue new file mode 100644 index 0000000..a90170e --- /dev/null +++ b/src/components/CustomSelectWithAllChecking.vue/index.vue @@ -0,0 +1,72 @@ + + + + + \ No newline at end of file diff --git a/src/style.less b/src/style.less index d958c2e..c7fd239 100644 --- a/src/style.less +++ b/src/style.less @@ -547,6 +547,8 @@ input[type='number']::-webkit-outer-spin-button { .ant-select-dropdown-content { border: 1px solid @borderColor; overflow: visible !important; + transform: translateZ(0); + &::before { position: absolute; top: -6px; From d7cb2831219ea7570be7c1c4402bc95a5fca322d Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Fri, 10 Jan 2025 14:17:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9Nuclide=E4=B8=BA?= =?UTF-8?q?=E5=B8=A6=E5=85=A8=E9=80=89=E7=9A=84=E4=B8=8B=E6=8B=89=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E4=BF=AE=E6=94=B9Identify=20nuclides?= =?UTF-8?q?=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomSelectWithAllChecking.vue/index.vue | 1 - .../analysisMonitor/alarmRules/index.vue | 25 ++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/components/CustomSelectWithAllChecking.vue/index.vue b/src/components/CustomSelectWithAllChecking.vue/index.vue index a90170e..adb0cca 100644 --- a/src/components/CustomSelectWithAllChecking.vue/index.vue +++ b/src/components/CustomSelectWithAllChecking.vue/index.vue @@ -18,7 +18,6 @@ export default { props: { value: { type: [Array, Number], - default: () => [], }, options: { type: Array, diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue index 9f025e9..087f29d 100644 --- a/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue +++ b/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue @@ -214,7 +214,7 @@ prop="station" :rules="[{ required: true, message: 'Please select station!' }]" > - - + --> + + - + 1 ? colTime : colTime[0]) : null, xe133MDC: xe133MDC ? (xe133MDC.length > 1 ? xe133MDC : xe133MDC[0]) : null, - identifyNuclides: identifyNuclidesChecked, + identifyNuclides: identifyNuclidesChecked || null, station: stationChecked, nuclide: nuclidesChecked, @@ -704,7 +711,7 @@ export default { conditions: condition, stations: station.join(','), nuclides: nuclide.join(','), - identifyNuclides: identifyNuclides.join(','), + identifyNuclides: identifyNuclides && identifyNuclides.length ? identifyNuclides.join(',') : null, ...qcFlags, } if (this.isAdd) { From f6096da773381954b75c9d8fa4ab115abc09c52f Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Fri, 10 Jan 2025 14:45:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DIdentify=20nuclide?= =?UTF-8?q?s=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=E4=B8=BAnull=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue index 087f29d..9116afa 100644 --- a/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue +++ b/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue @@ -590,7 +590,7 @@ export default { colTime: colTime ? (colTime.length > 1 ? colTime : colTime[0]) : null, xe133MDC: xe133MDC ? (xe133MDC.length > 1 ? xe133MDC : xe133MDC[0]) : null, - identifyNuclides: identifyNuclidesChecked || null, + identifyNuclides: identifyNuclidesChecked || undefined, station: stationChecked, nuclide: nuclidesChecked,