diff --git a/web/src/api/datamanagement/index.ts b/web/src/api/datamanagement/index.ts index 68db202..0a4d3e7 100644 --- a/web/src/api/datamanagement/index.ts +++ b/web/src/api/datamanagement/index.ts @@ -229,4 +229,11 @@ export function selectTsNodesByTskeId(params:any){ params:params, }) +} +export function confirmDeleteNodes(params:any){ + return request ({ + url:'/experimentalData/ts-nodes/confirmDeleteNodes', + method:'post', + params:params, + }) } \ No newline at end of file diff --git a/web/src/api/testtask/index.ts b/web/src/api/testtask/index.ts index c09f16b..f834dc4 100644 --- a/web/src/api/testtask/index.ts +++ b/web/src/api/testtask/index.ts @@ -39,4 +39,12 @@ export function deleteTsTaskByIds(queryParams: any) { method: 'post', params: queryParams }); +} +//查询是否可以删除 +export function confirmDeleteTask(queryParams: any) { + return request({ + url: '/experimentalData/tstask/confirmDeleteTask', + method: 'post', + params: queryParams + }); } \ No newline at end of file diff --git a/web/src/views/testdata/datamanagement/index.vue b/web/src/views/testdata/datamanagement/index.vue index 6e11f23..10938e5 100644 --- a/web/src/views/testdata/datamanagement/index.vue +++ b/web/src/views/testdata/datamanagement/index.vue @@ -13,7 +13,7 @@ import { ElMessageBox, ElMessage, ElMain } from "element-plus"; import Page from '@/components/Pagination/page.vue'; import AudioPlayer from '@/components/file/preview/AudioPlayer.vue'; import { batchDeleteReq } from "@/api/file-operator"; -import { tstaskList, obtaintestData, getTsNodesTree, addTsNodes, selectTsNodesByTskeId, updateTsNodes, deleteTsNodesById, tsFilesPage, addTsFiles, testDataScanById, updateTsFiles, deleteTsFilesById, listTsFiles, deleteTsFilesByIds, compress, Decompression, compare, downloadToLocal, uploadToBackup, addTsFile, list, moveFileFolder, copyFileFolder, startSimpleNavi, stopSimpleNavi } from "@/api/datamanagement"; +import { tstaskList, obtaintestData, getTsNodesTree, confirmDeleteNodes,addTsNodes, selectTsNodesByTskeId, updateTsNodes, deleteTsNodesById, tsFilesPage, addTsFiles, testDataScanById, updateTsFiles, deleteTsFilesById, listTsFiles, deleteTsFilesByIds, compress, Decompression, compare, downloadToLocal, uploadToBackup, addTsFile, list, moveFileFolder, copyFileFolder, startSimpleNavi, stopSimpleNavi } from "@/api/datamanagement"; import ZUpload from '@/components/file/ZUpload.vue' import useFileUpload from "@/components/file/file/useFileUpload"; import useHeaderStorageList from "@/components/header/useHeaderStorageList"; @@ -286,18 +286,26 @@ function delSubItem(row: any) { } ) .then(() => { - loading.value = true - deleteTsNodesById({ id: row.nodeId, path: row.path }).then((res: any) => { - if (res.code == 0) { - gettreedata() - ElMessage({ - type: 'success', - message: '删除成功', - }) - } + confirmDeleteNodes({id:row.nodeId}).then((res: any) => { + if (res.data.data.status == 1) { + loading.value = true + deleteTsNodesById({ id: row.nodeId, path: row.path }).then((res: any) => { + if (res.code == 0) { + gettreedata() + ElMessage({ + type: 'success', + message: '删除成功', + }) + } + }) + } else { + ElMessage.warning("该节点中含有已备份的文件，无法删除") + return + } }) + }) } @@ -1655,7 +1663,7 @@ function repstring(row: any) { {{ buttonmsg - }} + }}
diff --git a/web/src/views/testdata/testtask/index.vue b/web/src/views/testdata/testtask/index.vue index 0d35c0f..9974371 100644 --- a/web/src/views/testdata/testtask/index.vue +++ b/web/src/views/testdata/testtask/index.vue @@ -8,7 +8,7 @@ export default { import { onMounted, ref } from "vue"; import { ElMessage, ElMessageBox } from 'element-plus' import Page from '@/components/Pagination/page.vue' -import { tstaskPage, addtsTask, updatetsTask, deleteTsTaskById, deleteTsTaskByIds } from "@/api/testtask"; +import { tstaskPage, addtsTask, updatetsTask, deleteTsTaskById, deleteTsTaskByIds,confirmDeleteTask } from "@/api/testtask"; import { getDict } from '@/api/dict' //定义表格数据 const tableData: any = ref([]); @@ -104,14 +104,21 @@ function delproject(row: any) { } ) .then(() => { - loading.value = true - deleteTsTaskById({ id: row.id }).then((res: any) => { - if (res.code == 0) { - getdata() - ElMessage({ - type: 'success', - message: '删除成功', + confirmDeleteTask({ ids: row.id }).then((res: any) => { + if (res.data.data.status == 1) { + loading.value = true + deleteTsTaskById({ id: row.id }).then((res: any) => { + if (res.code == 0) { + getdata() + ElMessage({ + type: 'success', + message: '删除成功', + }) + } }) + } else { + ElMessage.warning("试验任务中含有已备份的文件，无法删除") + return } }) }) @@ -137,14 +144,21 @@ function delprojectArr() { } ) .then(() => { - loading.value = true - deleteTsTaskByIds({ ids: ids.join(',') }).then((res: any) => { - if (res.code == 0) { - ElMessage({ - type: 'success', - message: '删除成功', + confirmDeleteTask({ ids: ids.join(',') }).then((res: any) => { + if (res.data.data.status == 1) { + loading.value = true + deleteTsTaskByIds({ ids: ids.join(',') }).then((res: any) => { + if (res.code == 0) { + ElMessage({ + type: 'success', + message: '删除成功', + }) + getdata() + } }) - getdata() + } else { + ElMessage.warning("试验任务中含有已备份的文件，无法删除") + return } }) @@ -232,14 +246,14 @@ function typeName(arr: any, itemCode: any) { }); return nameone } -const logqing= ref(false) +const logqing = ref(false) const logTxt = ref('') -function Loglist(row:any,title1:any){ +function Loglist(row: any, title1: any) { title.value = title1 logqing.value = true logTxt.value = row } -function handleClose1(){ +function handleClose1() { logqing.value = false } @@ -308,8 +322,9 @@ function handleClose1(){
{{ scope.row.testDescribe }} - -
+ +
@@ -317,8 +332,9 @@ function handleClose1(){
{{ scope.row.sensorDescribe }} - -
+ + @@ -342,8 +358,9 @@ function handleClose1(){
- - + + @@ -401,28 +418,30 @@ function handleClose1(){ -
- - {{ logTxt }} - -
+
+ + {{ logTxt }} + +