Merge remote-tracking branch 'origin/main' into main

web/src/api/datamanagement/index.ts

@@ -230,3 +230,10 @@ export function selectTsNodesByTskeId(params:any){
        
     })
 }
+export function confirmDeleteNodes(params:any){
+    return request ({
+        url:'/experimentalData/ts-nodes/confirmDeleteNodes',
+        method:'post',
+        params:params,
+    })
+}

web/src/api/testtask/index.ts

@@ -40,3 +40,11 @@ export function deleteTsTaskByIds(queryParams: any) {
         params: queryParams
     });
 } 
+//查询是否可以删除
+export function confirmDeleteTask(queryParams: any) {
+    return request({
+        url: '/experimentalData/tstask/confirmDeleteTask',
+        method: 'post',
+        params: queryParams
+    });
+} 

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,6 +286,8 @@ function delSubItem(row: any) {
         }
     )
         .then(() => {
+            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) {
@@ -297,6 +299,12 @@ function delSubItem(row: any) {
                         }
 
                     })
+                } else {
+                    ElMessage.warning("该节点中含有已备份的文件，无法删除")
+                    return
+                }
+            })
+
 
         })
 

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,6 +104,8 @@ function delproject(row: any) {
         }
     )
         .then(() => {
+            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) {
@@ -114,6 +116,11 @@ function delproject(row: any) {
                             })
                         }
                     })
+                } else {
+                    ElMessage.warning("试验任务中含有已备份的文件，无法删除")
+                    return
+                }
+            })
         })
 }
 //表格多选
@@ -137,6 +144,8 @@ function delprojectArr() {
         }
     )
         .then(() => {
+            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) {
@@ -147,6 +156,11 @@ function delprojectArr() {
                             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
 }
 </script>
@@ -308,7 +322,8 @@ function handleClose1(){
                         <!-- <span>{{ scope.row.testDescribe }}</span> -->
                         <div class="ellipsis">
                             <span class="single-line-ellipsis">{{ scope.row.testDescribe }}</span>
-                            <img src="@/assets/MenuIcon/xqing.png" alt="" title="详情" @click="Loglist(scope.row.testDescribe,'试验描述详情')" style="cursor: pointer;" > 
+                            <img src="@/assets/MenuIcon/xqing.png" alt="" title="详情"
+                                @click="Loglist(scope.row.testDescribe, '试验描述详情')" style="cursor: pointer;">
                         </div>
                     </template>
                 </el-table-column>
@@ -317,7 +332,8 @@ function handleClose1(){
                         <!-- <span>{{ scope.row.testDescribe }}</span> -->
                         <div class="ellipsis">
                             <span class="single-line-ellipsis">{{ scope.row.sensorDescribe }}</span>
-                            <img src="@/assets/MenuIcon/xqing.png" alt="" title="详情" @click="Loglist(scope.row.sensorDescribe,'传感器描述详情')" style="cursor: pointer;" > 
+                            <img src="@/assets/MenuIcon/xqing.png" alt="" title="详情"
+                                @click="Loglist(scope.row.sensorDescribe, '传感器描述详情')" style="cursor: pointer;">
                         </div>
                     </template>
                 </el-table-column>
@@ -342,8 +358,9 @@ function handleClose1(){
             <el-form ref="ruleFormRef" style="max-width:100%" :model="projectForme" :rules="moderules"
                 label-width="auto" class="demo-ruleForm" status-icon>
                 <div style="width: 100%;display: flex;justify-content: space-between;align-items: center;">
-                    <el-form-item label="任务编号" style="width: 50%;" >
-                        <el-input v-model="projectForme.taskCode" maxlength="40" show-word-limit disabled style="width: 100%;" />
+                    <el-form-item label="任务编号" style="width: 50%;">
+                        <el-input v-model="projectForme.taskCode" maxlength="40" show-word-limit disabled
+                            style="width: 100%;" />
                     </el-form-item>
                     <el-form-item label="任务名称" style="width: 50%;margin-left: 15px;">
                         <el-input v-model="projectForme.taskName" show-word-limit disabled />
@@ -411,18 +428,20 @@ function handleClose1(){
 </template>
 
 <style lang="scss" scoped>
-.texlog{
+.texlog {
     width: 100%;
     padding: 10px;
     border: 1px solid #ccc;
     border-radius: 5px;
 }
-.ellipsis{
+
+.ellipsis {
     display: flex;
     width: 100%;
     align-items: center;
     justify-content: space-between;
 }
+
 .single-line-ellipsis {
     width: 270px;
     /* 限制容器宽度 */
@@ -433,6 +452,7 @@ function handleClose1(){
     text-overflow: ellipsis;
     /* 使用省略号 */
 }
+
 .record-box {
     padding: 20px;
     width: 100%;