diff --git a/ui/dasadmin/src/views/backend/historyData/index.vue b/ui/dasadmin/src/views/backend/historyData/index.vue index 0e128ae6..2d9edf3c 100644 --- a/ui/dasadmin/src/views/backend/historyData/index.vue +++ b/ui/dasadmin/src/views/backend/historyData/index.vue @@ -168,7 +168,7 @@ @@ -726,12 +726,14 @@ const moveRemove = (index: number, item: { label: string; prop: string }) => { const realProp = item.prop.split('--') const type = realProp[1] as 'interpolation' | 'average' | 'max' | 'min' const selectRowIndex = selectRowList.value.findIndex((row) => row.attributeCode === realProp[0])! - selectRowList.value[selectRowIndex][type] = false + if(selectRowIndex > -1){ + selectRowList.value[selectRowIndex][type] = false + } if ( - !selectRowList.value[selectRowIndex].interpolation && - !selectRowList.value[selectRowIndex].average && - !selectRowList.value[selectRowIndex].max && - !selectRowList.value[selectRowIndex].min + !selectRowList.value[selectRowIndex]?.interpolation && + !selectRowList.value[selectRowIndex]?.average && + !selectRowList.value[selectRowIndex]?.max && + !selectRowList.value[selectRowIndex]?.min ) { selectRowList.value.splice(selectRowIndex, 1) } @@ -760,7 +762,7 @@ const submitPointDialog = () => { ElMessage.error('请选择风机') return } - if (!selectRowList.value.length) { + if (!multipleSelection.value.length) { ElMessage.error('请选择测点') return } @@ -769,7 +771,9 @@ const submitPointDialog = () => { tableColumn.value = [...oririnTableColumn, ...submitParams.column] pointDialogVisible.value = false } - +const cancelPointDialog = () => { + pointDialogVisible.value = false +} const exportExcel = () => { const title = tableColumn.value.map((item: any) => item.label).join('\t,') + '\n' const titleKeyArr = tableColumn.value.map((item: any) => item.prop) @@ -959,10 +963,12 @@ const exportExcel = () => { } } } + } .templateOption { display: flex; align-items: center; justify-content: space-between; } +