ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
贾同学
2025-10-29 14:24:41 +08:00
parent ba1748830a 0054f989c0
commit 6fde670f96
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/views/plan/planList/components/planPopup.vue
View File

@@ -1201,11 +1201,17 @@ const handleDataSourceChange = () => {
// 判断是否同时包含 '3s' 和 '分钟' // 判断是否同时包含 '3s' 和 '分钟'
const hasThreeSeconds = selectedLabels.some(label => label.includes('3s')) const hasThreeSeconds = selectedLabels.some(label => label.includes('3s'))
const hasMinuteStats = selectedLabels.some(label => label.includes('分钟')) const hasMinuteStats = selectedLabels.some(label => label.includes('分钟'))
const hasLuBo = selectedLabels.some(label => label.includes('录波'))
if (hasThreeSeconds && hasMinuteStats) { if (hasThreeSeconds && hasMinuteStats) {
ElMessage.warning('3s实时数据与分钟统计数据不能同时选择') ElMessage.warning('3s实时数据与分钟统计数据不能同时选择')
formContent.datasourceIds = [] formContent.datasourceIds = []
} }
if(hasLuBo && hasMinuteStats){
ElMessage.warning('录波数据与分钟统计数据不能同时选择')
formContent.datasourceIds = []
}
// 判断是否选择了多个“分钟统计数据”项 // 判断是否选择了多个“分钟统计数据”项
const minuteStatLabels = selectedLabels.filter(label => label.includes('分钟')) const minuteStatLabels = selectedLabels.filter(label => label.includes('分钟'))
if (minuteStatLabels.length > 1) { if (minuteStatLabels.length > 1) {