Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

src/views/spectrumAnalysis/components/Modals/FtransltModal/components/SpectrumTransferCom.vue

@@ -145,7 +145,16 @@ export default {
             }
           }
         }
+
+        const { station, detector } = this.params
+        const regExp = new RegExp(`^${station}_\\d{1,}$`)
+        const detectorOK = regExp.test(detector)
+        if (!detectorOK) {
+          this.$message.warn('The detetor code must be consistent with the station code')
+        }
+        return detectorOK
       }
+
       return true
     },