删除功能完善

fidms-admin/src/main/java/com/fidms/web/controller/FlowFieldInputController.java

@@ -103,4 +103,12 @@ public class FlowFieldInputController extends BaseController
     @GetMapping("/getFlowFieldInOption")
     public AjaxResult getFlowFieldInOption()
     {return success(flowFieldInputService.getFlowFieldInputList());}
+
+
+    @GetMapping(value = "/FlowFieldexist/{id}")
+    public boolean checktsExistence(@PathVariable("id") Long id)
+    {
+        int count = flowFieldInputService.getflowfieldinputOption(id).size();
+        return count>0;
+    }
 }

fidms-admin/src/main/java/com/fidms/web/controller/FlowFieldOutputController.java

@@ -103,4 +103,12 @@ public class FlowFieldOutputController extends BaseController
     @GetMapping("/getFlowOutputOption")
     public AjaxResult getFlowFieldOutputOption()
     {return success(flowFieldOutputService.getFlowFieldOutputOption());}
+
+    @GetMapping(value = "/FlowFieldoutexist/{id}")
+    public boolean checktsExistence(@PathVariable("id") Long id)
+    {
+        int count = flowFieldOutputService.getflowfieldoutputOption(id).size();
+        return count>0;
+    }
+
 }

fidms-admin/src/main/java/com/fidms/web/controller/InfraredInputController.java

@@ -103,4 +103,12 @@ public class InfraredInputController extends BaseController
     {
         return success(infraredInputService.getInfraredInputOption());
     }
+
+
+    @GetMapping(value = "/InfraredInputexist/{id}")
+    public boolean checktsExistence(@PathVariable("id") Long id)
+    {
+        int count = infraredInputService.getinfraredinputOption(id).size();
+        return count>0;
+    }
 }

fidms-admin/src/main/java/com/fidms/web/controller/InfraredOutputController.java

@@ -129,6 +129,14 @@ public class InfraredOutputController extends BaseController
         return toAjax(infraredOutputService.deleteInfraredOutputByIds(ids));
     }
 
+    @GetMapping(value = "/Infraredoutputexist/{id}")
+    public boolean checktsExistence(@PathVariable("id") Long id)
+    {
+        int count = infraredOutputService.getinfraredoutputOption(id).size();
+        return count>0;
+    }
+
+
     /**
      * 打开文件夹
      * */
@@ -143,11 +151,15 @@ public class InfraredOutputController extends BaseController
         {
             dir = file.getDefaultBaseDir();
             dir += path.substring(8);
+
         }
         else
         {
             dir = path;
         }
+//        dir = "D:\\fidms\\uploadPath\\upload\\2024\\03\\14";
+        dir = dir.replace("/", "\\");
+
         FolderUtils.openFolderAndSelectFile(dir);
     }
 

fidms-admin/src/main/java/com/fidms/web/controller/Model3dController.java

@@ -104,4 +104,8 @@ public class Model3dController extends BaseController
     {
         return success(model3dService.getOption());
     }
+
+
+
+
 }

fidms-admin/src/main/java/com/fidms/web/mapper/FlowFieldInputMapper.java

@@ -60,4 +60,13 @@ public interface FlowFieldInputMapper
     public int deleteFlowFieldInputByIds(Long[] ids);
 
     public List getFlowFieldInputList();
+
+    /**
+     * 根据model3d id返回流场输入信息
+     * @param id
+     * @return
+     */
+    List getflowfieldinputOption(Long id);
+
+
 }

fidms-admin/src/main/java/com/fidms/web/mapper/FlowFieldOutputMapper.java

@@ -60,4 +60,11 @@ public interface FlowFieldOutputMapper
     public int deleteFlowFieldOutputByIds(Long[] ids);
 
     public List getFlowOutputOption();
+
+    /**
+     * 根据流场输入 id返回流场输出信息
+     * @param id
+     * @return
+     */
+    List getflowfieldoutputOption(Long id);
 }

fidms-admin/src/main/java/com/fidms/web/mapper/InfraredInputMapper.java

@@ -60,4 +60,11 @@ public interface InfraredInputMapper
     public int deleteInfraredInputByIds(Long[] ids);
 
     public List getInfraredInputOption();
+
+    /**
+     * 根据流场输出 id返回红外输入信息
+     * @param id
+     * @return
+     */
+    List getinfraredinputOption(Long id);
 }

fidms-admin/src/main/java/com/fidms/web/mapper/InfraredOutputMapper.java

@@ -58,4 +58,11 @@ public interface InfraredOutputMapper
      * @return 结果
      */
     public int deleteInfraredOutputByIds(Long[] ids);
+
+    /**
+     * 根据红外输入 id返回红外输出信息
+     * @param id
+     * @return
+     */
+    List getinfraredoutputOption(Long id);
 }

fidms-admin/src/main/java/com/fidms/web/mapper/Model3dMapper.java

@@ -60,4 +60,7 @@ public interface Model3dMapper
     public int deleteModel3dByIds(Long[] ids);
 
     List getOption();
+
+
+
 }

fidms-admin/src/main/java/com/fidms/web/service/IFlowFieldInputService.java

@@ -60,4 +60,6 @@ public interface IFlowFieldInputService
     public int deleteFlowFieldInputById(Long id);
 
     public List getFlowFieldInputList();
+
+    List getflowfieldinputOption(Long id);
 }

fidms-admin/src/main/java/com/fidms/web/service/IFlowFieldOutputService.java

@@ -60,4 +60,7 @@ public interface IFlowFieldOutputService
     public int deleteFlowFieldOutputById(Long id);
 
     public List getFlowFieldOutputOption();
+
+
+    List getflowfieldoutputOption(Long id);
 }

fidms-admin/src/main/java/com/fidms/web/service/IInfraredInputService.java

@@ -60,4 +60,7 @@ public interface IInfraredInputService
     public int deleteInfraredInputById(Long id);
 
     public List getInfraredInputOption();
+
+
+    List getinfraredinputOption(Long id);
 }

fidms-admin/src/main/java/com/fidms/web/service/IInfraredOutputService.java

@@ -58,4 +58,7 @@ public interface IInfraredOutputService
      * @return 结果
      */
     public int deleteInfraredOutputById(Long id);
+
+
+    List getinfraredoutputOption(Long id);
 }

fidms-admin/src/main/java/com/fidms/web/service/impl/FlowFieldInputServiceImpl.java

@@ -109,4 +109,9 @@ public class FlowFieldInputServiceImpl implements IFlowFieldInputService
     {
         return flowFieldInputMapper.getFlowFieldInputList();
     }
+
+    @Override
+    public List getflowfieldinputOption(Long id) {
+        return flowFieldInputMapper.getflowfieldinputOption(id);
+    }
 }

fidms-admin/src/main/java/com/fidms/web/service/impl/FlowFieldOutputServiceImpl.java

@@ -97,4 +97,9 @@ public class FlowFieldOutputServiceImpl implements IFlowFieldOutputService
 
     @Override
     public List getFlowFieldOutputOption(){return flowFieldOutputMapper.getFlowOutputOption();}
+
+    @Override
+    public List getflowfieldoutputOption(Long id) {
+        return flowFieldOutputMapper.getflowfieldoutputOption(id);
+    }
 }

fidms-admin/src/main/java/com/fidms/web/service/impl/InfraredInputServiceImpl.java

@@ -101,4 +101,9 @@ public class InfraredInputServiceImpl implements IInfraredInputService
     {
         return infraredInputMapper.getInfraredInputOption();
     }
+
+    @Override
+    public List getinfraredinputOption(Long id) {
+        return infraredInputMapper.getinfraredinputOption(id);
+    }
 }

fidms-admin/src/main/java/com/fidms/web/service/impl/InfraredOutputServiceImpl.java

@@ -94,4 +94,9 @@ public class InfraredOutputServiceImpl implements IInfraredOutputService
     {
         return infraredOutputMapper.deleteInfraredOutputById(id);
     }
+
+    @Override
+    public List getinfraredoutputOption(Long id) {
+        return infraredOutputMapper.getinfraredoutputOption(id);
+    }
 }

fidms-admin/src/main/resources/mapper/data/FlowFieldInputMapper.xml

@@ -209,4 +209,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getFlowFieldInputList" resultType="Map">
         select id from bz_flow_field_input_t order by id desc
     </select>
+
+    <select id="getflowfieldinputOption" parameterType="Long" resultMap="FlowFieldInputResult">
+        select
+            *
+        from
+            bz_flow_field_input_t
+        where bz_flow_field_input_t.model_3d_id = #{id}
+    </select>
 </mapper>

fidms-admin/src/main/resources/mapper/data/FlowFieldOutputMapper.xml

@@ -58,7 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFlowFieldOutputVo"/>
         where id = #{id}
     </select>
-        
+
+
+
     <insert id="insertFlowFieldOutput" parameterType="FlowFieldOutput" useGeneratedKeys="true" keyProperty="id">
         insert into bz_flow_field_output_t
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -148,4 +150,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getFlowOutputOption" resultType="Map">
         select id from bz_flow_field_output_t order by id desc
     </select>
+
+
+    <select id="getflowfieldoutputOption" parameterType="Long" resultMap="FlowFieldOutputResult">
+        select
+            *
+        from
+            bz_flow_field_output_t
+        where
+              bz_flow_field_output_t.flow_field_input_id = #{id}
+    </select>
 </mapper>

fidms-admin/src/main/resources/mapper/data/InfraredInputMapper.xml

@@ -113,4 +113,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getInfraredInputOption" resultType="Map">
         select id from bz_infrared_input_t order by id desc
     </select>
+
+    <select id="getinfraredinputOption" parameterType="Long" resultMap="InfraredInputResult">
+        select
+            *
+        from
+            bz_infrared_input_t
+        where
+            bz_infrared_input_t.flow_field_output_id = #{id}
+    </select>
+
 </mapper>

fidms-admin/src/main/resources/mapper/data/InfraredOutputMapper.xml

@@ -93,4 +93,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+
+    <select id="getinfraredoutputOption" parameterType="Long" resultMap="InfraredOutputResult">
+        select
+            *
+        from
+            bz_infrared_output_t
+        where
+            bz_infrared_output_t.infrared_input_id = #{id}
+    </select>
 </mapper>

fidms-admin/src/main/resources/mapper/data/Model3dMapper.xml

@@ -88,4 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getOption" resultType="Map">
         select id, name from bz_model_3d_t order by id desc
     </select>
+
+
+
 </mapper>

fidms-ui/src/api/data/flowIn.js

@@ -49,3 +49,12 @@ export function getFlowFieldInOption(){
     method:'get'
   })
 }
+
+
+// getSysoptionOption
+export function checktsExistence(id) {
+  return request({
+    url: '/data/flowIn/FlowFieldexist/' + id,
+    method: 'get'
+  })
+}

fidms-ui/src/api/data/flowOut.js

@@ -57,3 +57,11 @@ export function getFolder(data) {
     method: 'post',
   })
 }
+
+
+export function checktsExistence(id) {
+  return request({
+    url: '/data/flowOut/FlowFieldoutexist/' + id,
+    method: 'get'
+  })
+}

fidms-ui/src/api/data/infraredIn.js

@@ -49,3 +49,9 @@ export function getInfraredInputID()
 })
 }
 
+export function checktsExistence(id) {
+  return request({
+    url: '/data/infraredIn/InfraredInputexist/' + id,
+    method: 'get'
+  })
+}

fidms-ui/src/api/data/infraredOut.js

@@ -50,3 +50,10 @@ export function getFolder(data) {
     method: 'post',
   })
 }
+
+export function checktsExistence(id) {
+  return request({
+    url: '/data/infraredOut/Infraredoutputexist/' + id,
+    method: 'get'
+  })
+}

fidms-ui/src/views/data/allinfo/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="3d模型名称" prop="name">
+
+      <el-form-item label="飞机类型" prop="aircraftType">
         <el-input
-          v-model="queryParams.name"
-          placeholder="请输入3d模型名称"
+          v-model="queryParams.aircraftType"
+          placeholder="请输入飞机类型"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      
        <el-form-item label="来流马赫数" prop="machNumber">
         <el-input
           v-model="queryParams.machNumber"
@@ -19,15 +19,63 @@
         />
       </el-form-item>
 
-      <el-form-item label="红外波段" prop="ffiinfraredBand">
+      <el-form-item label="来流方向x" prop="flowDirectionX">
         <el-input
-        v-model="queryParams.ffiinfraredBand"
-        placeholder="请输入红外波段(流场输入)"
-        clearable
-        @keyup.enter.native="handleQuery"
+          v-model="queryParams.flowDirectionX"
+          placeholder="请输入来流方向x"
+          clearable
+          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      <el-form-item label="来流方向y" prop="flowDirectionY">
+        <el-input
+          v-model="queryParams.flowDirectionY"
+          placeholder="请输入来流方向y"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="来流方向z" prop="flowDirectionZ">
+        <el-input
+          v-model="queryParams.flowDirectionZ"
+          placeholder="请输入来流方向z"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="流速x" prop="flowVelocityX">
+        <el-input
+          v-model="queryParams.flowVelocityX"
+          placeholder="请输入流速x"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="流速y" prop="flowVelocityY">
+        <el-input
+          v-model="queryParams.flowVelocityY"
+          placeholder="请输入流速y"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="流速z" prop="flowVelocityZ">
+        <el-input
+          v-model="queryParams.flowVelocityZ"
+          placeholder="请输入流速z"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="3d模型名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入3d模型名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      
       <el-form-item label="飞行高度" prop="flightAltitude">
         <el-input
         v-model="queryParams.flightAltitude"
@@ -36,39 +84,46 @@
         @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-       <el-form-item label="流场输入编号" prop="flowFieldInputID">
+
+      <el-form-item label="红外波段" prop="ffiinfraredBand">
         <el-input
-        v-model="queryParams.flowFieldInputID"
-        placeholder="请输入流场输入编号"
+        v-model="queryParams.ffiinfraredBand"
+        placeholder="请输入红外波段"
         clearable
         @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
-      <el-form-item label="损伤区域" prop="damageArea">
+
+      <el-form-item label="探测方位角" prop="detectAngle">
         <el-input
-          v-model="queryParams.damageArea"
-          placeholder="请输入损伤区域"
+          v-model="queryParams.detectAngle"
+          placeholder="请输入探测方位角"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="探测距离" prop="detectDistance">
+
+
+
+
+      <!-- <el-form-item label="损伤区域" prop="damageArea">
         <el-input
-          v-model="queryParams.detectDistance"
-          placeholder="请输入探测距离"
+          v-model="queryParams.damageArea"
+          placeholder="请输入损伤区域"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="探测方位角" prop="detectAngle">
+      <el-form-item label="探测距离" prop="detectDistance">
         <el-input
-          v-model="queryParams.detectAngle"
-          placeholder="请输入探测方位角"
+          v-model="queryParams.detectDistance"
+          placeholder="请输入探测距离"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item label="红外波段" prop="ifiinfraredBand">
         <el-input
           v-model="queryParams.ifiinfraredBand"
@@ -84,7 +139,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -425,6 +480,30 @@ export default {
         this.$modal.msgError("来流马赫数格式不正确，请输入DECIMAL(16,6)格式数据");
         return;
       }
+      if (this.queryParams.flowDirectionX &&!this.isDecimalFormat(this.queryParams.flowDirectionX)) {
+        this.$modal.msgError("来流方向X数据格式不正确，请输入DECIMAL(16,6)格式数据");
+        return;
+      }
+      if (this.queryParams.flowDirectionY &&!this.isDecimalFormat(this.queryParams.flowDirectionY)) {
+        this.$modal.msgError("来流方向Y数据格式不正确，请输入DECIMAL(16,6)格式数据");
+        return;
+      }
+      if (this.queryParams.flowDirectionZ &&!this.isDecimalFormat(this.queryParams.flowDirectionZ)) {
+        this.$modal.msgError("来流方向Z数据格式不正确，请输入DECIMAL(16,6)格式数据");
+        return;
+      }
+      if (this.queryParams.flowVelocityX &&!this.isDecimalFormat(this.queryParams.flowVelocityX)) {
+        this.$modal.msgError("流速X数据格式不正确，请输入DECIMAL(16,6)格式数据");
+        return;
+      }
+      if (this.queryParams.flowVelocityY &&!this.isDecimalFormat(this.queryParams.flowVelocityY)) {
+        this.$modal.msgError("流速Y数据格式不正确，请输入DECIMAL(16,6)格式数据");
+        return;
+      }
+      if (this.queryParams.flowVelocityZ &&!this.isDecimalFormat(this.queryParams.flowVelocityZ)) {
+        this.$modal.msgError("流速Z数据格式不正确，请输入DECIMAL(16,6)格式数据");
+        return;
+      }
       if (this.queryParams.ifiinfraredBand &&!this.isDecimalFormat(this.queryParams.ifiinfraredBand)) {
         this.$modal.msgError("红外波段数据格式不正确，请输入DECIMAL(16,6)格式数据");
         return;

fidms-ui/src/views/data/flowIn/index.vue

@@ -360,6 +360,7 @@
 <script>
 import { listFlowIn, getFlowIn, delFlowIn, addFlowIn, updateFlowIn } from "@/api/data/flowIn";
 import { getModelOption } from "@/api/data/model";
+import { checktsExistence} from "@/api/data/flowOut";
 export default {
   name: "FlowIn",
   data() {
@@ -702,15 +703,38 @@ export default {
         }
       });
     },
-    /** 删除按钮操作 */
+    // /** 删除按钮操作 */
+    // handleDelete(row) {
+    //   const ids = row.id || this.ids;
+    //   this.$modal.confirm('是否确认删除流场输入编号为"' + ids + '"的数据项？').then(function() {
+    //     return delFlowIn(ids);
+    //   }).then(() => {
+    //     this.getList();
+    //     this.$modal.msgSuccess("删除成功");
+    //   }).catch(() => {});
+    // },
+
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除流场输入编号为"' + ids + '"的数据项？').then(function() {
-        return delFlowIn(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      checktsExistence(ids).then(resp => {
+        if(resp){
+          this.$modal.confirm('编号为"' + ids + '"的流场输入关联了流场输出，确定是否删除？').then(function(){
+              return delFlowIn(ids);
+            }).then(() => {
+              this.getList();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+            }
+            else{
+              this.$modal.confirm('是否确认删除流场输入编号为"' + ids + '"的数据项？').then(function() {
+                  return delFlowIn(ids);
+                }).then(() => {
+                  this.getList();
+                  this.$modal.msgSuccess("删除成功");
+                }).catch(() => {});
+      }
+      });
+
     },
     /** 导出按钮操作 */
     handleExport() {

fidms-ui/src/views/data/flowOut/index.vue

@@ -241,6 +241,7 @@
 <script>
 import { listFlowOut, getFlowOut, delFlowOut, addFlowOut, updateFlowOut,getFolder } from "@/api/data/flowOut";
 import { getFlowFieldInOption} from "@/api/data/flowIn";
+import { checktsExistence} from "@/api/data/infraredIn";
 export default {
   name: "FlowOut",
   dicts: ['sys_common_status'],
@@ -445,14 +446,37 @@ export default {
       });
     },
     /** 删除按钮操作 */
+    // handleDelete(row) {
+    //   const ids = row.id || this.ids;
+    //   this.$modal.confirm('是否确认删除流场输出编号为"' + ids + '"的数据项？').then(function() {
+    //     return delFlowOut(ids);
+    //   }).then(() => {
+    //     this.getList();
+    //     this.$modal.msgSuccess("删除成功");
+    //   }).catch(() => {});
+    // },
+
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除流场输出编号为"' + ids + '"的数据项？').then(function() {
-        return delFlowOut(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      checktsExistence(ids).then(resp => {
+        if(resp){
+          this.$modal.confirm('编号为"' + ids + '"的流场输出关联了红外输入，确定是否删除？').then(function(){
+              return delFlowOut(ids);
+            }).then(() => {
+              this.getList();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+            }
+            else{
+              this.$modal.confirm('是否确认删除流场输出编号为"' + ids + '"的数据项？').then(function() {
+                  return delFlowOut(ids);
+                }).then(() => {
+                  this.getList();
+                  this.$modal.msgSuccess("删除成功");
+                }).catch(() => {});
+      }
+      });
+
     },
     /** 导出按钮操作 */
     handleExport() {

fidms-ui/src/views/data/infraredIn/index.vue

@@ -172,6 +172,7 @@
 <script>
 import { listInfraredIn, getInfraredIn, delInfraredIn, addInfraredIn, updateInfraredIn } from "@/api/data/infraredIn";
 import { getFlowFieldOutputID } from "@/api/data/flowOut";
+import { checktsExistence} from "@/api/data/infraredOut";
 
 
 export default {
@@ -424,14 +425,38 @@ export default {
       });
     },
     /** 删除按钮操作 */
+    // handleDelete(row) {
+    //   const ids = row.id || this.ids;
+    //   this.$modal.confirm('是否确认删除红外输入编号为"' + ids + '"的数据项？').then(function() {
+    //     return delInfraredIn(ids);
+    //   }).then(() => {
+    //     this.getList();
+    //     this.$modal.msgSuccess("删除成功");
+    //   }).catch(() => {});
+    // },
+
+
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除红外输入编号为"' + ids + '"的数据项？').then(function() {
-        return delInfraredIn(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      checktsExistence(ids).then(resp => {
+        if(resp){
+          this.$modal.confirm('编号为"' + ids + '"的红外输入关联了红外输出，确定是否删除？').then(function(){
+              return delInfraredIn(ids);;
+            }).then(() => {
+              this.getList();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+            }
+            else{
+              this.$modal.confirm('是否确认删除红外输入编号为"' + ids + '"的数据项？').then(function() {
+                  return delInfraredIn(ids);;
+                }).then(() => {
+                  this.getList();
+                  this.$modal.msgSuccess("删除成功");
+                }).catch(() => {});
+      }
+      });
+
     },
     /** 导出按钮操作 */
     handleExport() {

fidms-ui/src/views/data/model/index.vue

@@ -131,6 +131,7 @@
 
 <script>
 import { listModel, getModel, delModel, addModel, updateModel,getFolder} from "@/api/data/model";
+import { checktsExistence} from "@/api/data/flowIn";
 
 export default {
   name: "Model",
@@ -265,15 +266,37 @@ export default {
         }
       });
     },
-    /** 删除按钮操作 */
+    // /** 删除按钮操作 */
+    // handleDelete(row) {
+    //   const ids = row.id || this.ids;
+    //   this.$modal.confirm('是否确认删除3D模型编号为"' + ids + '"的数据项？').then(function() {
+    //     return delModel(ids);
+    //   }).then(() => {
+    //     this.getList();
+    //     this.$modal.msgSuccess("删除成功");
+    //   }).catch(() => {});
+    // },
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除3D模型编号为"' + ids + '"的数据项？').then(function() {
-        return delModel(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      checktsExistence(ids).then(resp => {
+        if(resp){
+          this.$modal.confirm('编号为"' + ids + '"的3D模型关联了流场输入，确定是否删除？').then(function(){
+              return delModel(ids);
+            }).then(() => {
+              this.getList();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+            }
+            else{
+              this.$modal.confirm('是否确认删除3D模型编号为"' + ids + '"的数据项？').then(function() {
+                  return delModel(ids);
+                }).then(() => {
+                  this.getList();
+                  this.$modal.msgSuccess("删除成功");
+                }).catch(() => {});
+      }
+      });
+
     },
     /** 导出按钮操作 */
     handleExport() {