diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/train/TrainTrainingSiteController.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/train/TrainTrainingSiteController.java index a88fe16cd..8b71d8c75 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/train/TrainTrainingSiteController.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/train/TrainTrainingSiteController.java @@ -4,6 +4,7 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -67,6 +68,17 @@ public class TrainTrainingSiteController extends BaseController return toAjax(trainTrainingSiteService.insertTrainTrainingSite(trainTrainingSite)); } + /** + * 删除实训场地 (RESTful DELETE /train/training-site/{siteIds}) + */ + @PreAuthorize("@ss.hasPermi('train:site:edit')") + @Log(title = "实训场地", businessType = BusinessType.DELETE) + @DeleteMapping("/{siteIds}") + public AjaxResult remove(@PathVariable String[] siteIds) + { + return toAjax(trainTrainingSiteService.deleteTrainTrainingSiteBySiteIds(siteIds)); + } + /** * 修改实训场地 (RESTful PUT /train/training-site/{siteId}) */ diff --git a/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainTrainingSiteMapper.xml b/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainTrainingSiteMapper.xml index 00656ba4a..4646c43f9 100644 --- a/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainTrainingSiteMapper.xml +++ b/RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainTrainingSiteMapper.xml @@ -29,10 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where del_flag = '0' and site_name like concat('%', #{siteName}, '%') - and site_location = #{siteLocation} + and site_location like concat('%', #{siteLocation}, '%') and capacity = #{capacity} and site_device = #{siteDevice} and site_status = #{siteStatus} + and major like concat('%', #{major}, '%') and create_by = #{createBy} order by create_time desc diff --git a/build_ui/src/api/train/site.js b/build_ui/src/api/train/site.js index e2e38964e..7f3dbfeb5 100644 --- a/build_ui/src/api/train/site.js +++ b/build_ui/src/api/train/site.js @@ -26,6 +26,14 @@ export function addSite(data) { }) } +// 删除实训场地 +export function delSite(ids) { + return request({ + url: '/train/training-site/' + ids, + method: 'delete' + }) +} + // 修改实训场地 export function updateSite(data) { return request({ diff --git a/build_ui/src/views/train/site/index.vue b/build_ui/src/views/train/site/index.vue index ac3084397..c49f696b0 100644 --- a/build_ui/src/views/train/site/index.vue +++ b/build_ui/src/views/train/site/index.vue @@ -23,6 +23,14 @@ + + + 搜索 重置 @@ -63,6 +71,7 @@ {{ scope.row.capacity }} 人 + - + @@ -104,6 +120,9 @@ + + + @@ -126,7 +145,7 @@