From 014b0200fd719df5adca304d35b808b6958dfdd6 Mon Sep 17 00:00:00 2001 From: wanghao Date: Wed, 25 Sep 2024 17:35:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- .../ruoyi/api/controller/ApiController.java | 4 +- .../java/com/ruoyi/api/mapper/ApiMapper.java | 5 + .../ruoyi/api/service/impl/ApiService.java | 4 + .../src/main/resources/mapper/ApiMapper.xml | 5 + .../RecordInspectionTaskController.java | 126 ++++++++++++++++++ .../manage/domain/RecordInspectionTask.java | 105 +++++++++++++++ .../mapper/RecordInspectionTaskMapper.java | 62 +++++++++ .../service/IRecordInspectionTaskService.java | 61 +++++++++ .../impl/RecordInspectionTaskServiceImpl.java | 117 ++++++++++++++++ .../record_inspection_taskMenu.sql | 22 +++ .../manage/RecordInspectionTaskMapper.xml | 76 +++++++++++ .../record_inspection/record_inspection.html | 12 +- .../manage/record_inspection_task/add.html | 57 ++++++++ .../manage/record_inspection_task/edit.html | 58 ++++++++ .../record_inspection_task.html | 123 +++++++++++++++++ 16 files changed, 832 insertions(+), 7 deletions(-) create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionTaskController.java create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionTaskMapper.java create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionTaskService.java create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionTaskServiceImpl.java create mode 100644 ruoyi-manage/src/main/resources/create_menu_sql/record_inspection_taskMenu.sql create mode 100644 ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml create mode 100644 ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/add.html create mode 100644 ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/edit.html create mode 100644 ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/record_inspection_task.html diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 632da07..09a5920 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -9,7 +9,7 @@ ruoyi: # 实例演示开关 demoEnabled: false # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: F:/lundang/uploadPath + profile: D:/lundang/uploadPath # 获取ip地址开关 addressEnabled: false diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/controller/ApiController.java b/ruoyi-api/src/main/java/com/ruoyi/api/controller/ApiController.java index 100c8b5..cf2b5d0 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/controller/ApiController.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/controller/ApiController.java @@ -199,7 +199,7 @@ public class ApiController { private IRecordInspectionService inspectionService; @PostMapping("/xj/submit") - public AjaxResult inspectionSubmit(long tableId, String json, long inspectionId, List files) { + public AjaxResult inspectionSubmit(long tableId, String json, long inspectionId, String user,List files) { //插入 info 表 List list = JSONObject.parseArray(json, StockDto.class); apiService.insertInspectionInfo(list, inspectionId); @@ -219,7 +219,7 @@ public class ApiController { e.printStackTrace(); } System.out.println("上传图片路径：" + pathName); - //apiService.confirmSubment(inspectionId, tableId, pathName); + apiService.insertInspetionPictrue(inspectionId, tableId,user, pathName); } } diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/mapper/ApiMapper.java b/ruoyi-api/src/main/java/com/ruoyi/api/mapper/ApiMapper.java index ca7d9e3..b5b171e 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/mapper/ApiMapper.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/mapper/ApiMapper.java @@ -64,4 +64,9 @@ public interface ApiMapper { List inspectionSelectLocation(String code); void updataInspectionTaskByObjid(long tableId); + + void insertInspetionPictrue(@Param("inspetionId") long inspectionId, + @Param("tableId") long tableId, + @Param("user") String user, + @Param("pathName") String pathName); } diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/ApiService.java b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/ApiService.java index 701caa6..d0fdc2f 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/ApiService.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/ApiService.java @@ -120,4 +120,8 @@ public class ApiService { public void updataInspectionTaskByObjid(long tableId) { mapper.updataInspectionTaskByObjid(tableId); } + + public void insertInspetionPictrue(long inspectionId, long tableId, String user, String pathName) { + mapper.insertInspetionPictrue(inspectionId, tableId,user, pathName); + } } diff --git a/ruoyi-api/src/main/resources/mapper/ApiMapper.xml b/ruoyi-api/src/main/resources/mapper/ApiMapper.xml index a251cef..fba52cf 100644 --- a/ruoyi-api/src/main/resources/mapper/ApiMapper.xml +++ b/ruoyi-api/src/main/resources/mapper/ApiMapper.xml @@ -240,4 +240,9 @@ UPDATE record_inspection_task SET task_state = '完成' WHERE objid = #{tableId}; + + + INSERT INTO record_inspection_img (inspection_id, task_id, img_path, create_by) + VALUES (#{inspetionId},#{tableId}, #{pathName}, #{user}); + \ No newline at end of file diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionTaskController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionTaskController.java new file mode 100644 index 0000000..7db6761 --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInspectionTaskController.java @@ -0,0 +1,126 @@ +package com.ruoyi.manage.controller; + +import java.util.List; + +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.manage.domain.RecordInspectionTask; +import com.ruoyi.manage.service.IRecordInspectionTaskService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 巡检机位信息Controller + * + * @author wangh + * @date 2024-09-25 + */ +@Controller +@RequestMapping("/manage/record_inspection_task") +public class RecordInspectionTaskController extends BaseController { + private String prefix = "manage/record_inspection_task"; + + @Autowired + private IRecordInspectionTaskService recordInspectionTaskService; + + @RequiresPermissions("manage:record_inspection_task:view") + @GetMapping("/{id}") + public String record_inspection_task(@PathVariable("id") String id,ModelMap mmap) { + mmap.put("inspetionId",id); + System.out.println(id); + return prefix + "/record_inspection_task"; + } + @RequiresPermissions("manage:record_inspection_task:view") + @GetMapping() + public String record_inspection_task() { + return prefix + "/record_inspection_task"; + } + + /** + * 查询巡检机位信息列表 + */ + @RequiresPermissions("manage:record_inspection_task:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(RecordInspectionTask recordInspectionTask) { + startPage(); + List list = recordInspectionTaskService.selectRecordInspectionTaskList(recordInspectionTask); + return getDataTable(list); + } + + /** + * 导出巡检机位信息列表 + */ + @RequiresPermissions("manage:record_inspection_task:export") + @Log(title = "巡检机位信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(RecordInspectionTask recordInspectionTask) { + List list = recordInspectionTaskService.selectRecordInspectionTaskList(recordInspectionTask); + ExcelUtil util = new ExcelUtil(RecordInspectionTask.class); + return util.exportExcel(list, "巡检机位信息数据"); + } + + /** + * 新增巡检机位信息 + */ + @GetMapping("/add") + public String add() { + return prefix + "/add"; + } + + /** + * 新增保存巡检机位信息 + */ + @RequiresPermissions("manage:record_inspection_task:add") + @Log(title = "巡检机位信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(RecordInspectionTask recordInspectionTask) { + return toAjax(recordInspectionTaskService.insertRecordInspectionTask(recordInspectionTask)); + } + + /** + * 修改巡检机位信息 + */ + @RequiresPermissions("manage:record_inspection_task:edit") + @GetMapping("/edit/{objid}") + public String edit(@PathVariable("objid") Long objid, ModelMap mmap) { + RecordInspectionTask recordInspectionTask = recordInspectionTaskService.selectRecordInspectionTaskByObjid(objid); + mmap.put("recordInspectionTask", recordInspectionTask); + return prefix + "/edit"; + } + + /** + * 修改保存巡检机位信息 + */ + @RequiresPermissions("manage:record_inspection_task:edit") + @Log(title = "巡检机位信息", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(RecordInspectionTask recordInspectionTask) { + return toAjax(recordInspectionTaskService.updateRecordInspectionTask(recordInspectionTask)); + } + + /** + * 删除巡检机位信息 + */ + @RequiresPermissions("manage:record_inspection_task:remove") + @Log(title = "巡检机位信息", businessType = BusinessType.DELETE) + @PostMapping("/remove") + @ResponseBody + public AjaxResult remove(String ids) { + return toAjax(recordInspectionTaskService.deleteRecordInspectionTaskByObjids(ids)); + } +} diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java new file mode 100644 index 0000000..8361210 --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/RecordInspectionTask.java @@ -0,0 +1,105 @@ +package com.ruoyi.manage.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 巡检机位信息对象 record_inspection_task + * + * @author wangh + * @date 2024-09-25 + */ +public class RecordInspectionTask extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long objid; + + /** 巡检id */ + private Long inspectionId; + + /** 区域id */ + private Long areaId; + + /** 机坪名称 */ + @Excel(name = "机坪名称") + private String areaName; + + /** 机位码 */ + @Excel(name = "机位码") + private String planePosition; + + /** 完成状态 */ + @Excel(name = "完成状态") + private String taskState; + + public void setObjid(Long objid) + { + this.objid = objid; + } + + public Long getObjid() + { + return objid; + } + public void setInspectionId(Long inspectionId) + { + this.inspectionId = inspectionId; + } + + public Long getInspectionId() + { + return inspectionId; + } + public void setAreaId(Long areaId) + { + this.areaId = areaId; + } + + public Long getAreaId() + { + return areaId; + } + public void setAreaName(String areaName) + { + this.areaName = areaName; + } + + public String getAreaName() + { + return areaName; + } + public void setPlanePosition(String planePosition) + { + this.planePosition = planePosition; + } + + public String getPlanePosition() + { + return planePosition; + } + public void setTaskState(String taskState) + { + this.taskState = taskState; + } + + public String getTaskState() + { + return taskState; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objid", getObjid()) + .append("inspectionId", getInspectionId()) + .append("areaId", getAreaId()) + .append("areaName", getAreaName()) + .append("planePosition", getPlanePosition()) + .append("taskState", getTaskState()) + .toString(); + } +} diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionTaskMapper.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionTaskMapper.java new file mode 100644 index 0000000..9279361 --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInspectionTaskMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.manage.mapper; + +import java.util.List; +import com.ruoyi.manage.domain.RecordInspectionTask; +import org.springframework.stereotype.Repository; +/** + * 巡检机位信息Mapper接口 + * + * @author wangh + * @date 2024-09-25 + */ +@Repository +public interface RecordInspectionTaskMapper +{ + /** + * 查询巡检机位信息 + * + * @param objid 巡检机位信息主键 + * @return 巡检机位信息 + */ + public RecordInspectionTask selectRecordInspectionTaskByObjid(Long objid); + + /** + * 查询巡检机位信息列表 + * + * @param recordInspectionTask 巡检机位信息 + * @return 巡检机位信息集合 + */ + public List selectRecordInspectionTaskList(RecordInspectionTask recordInspectionTask); + + /** + * 新增巡检机位信息 + * + * @param recordInspectionTask 巡检机位信息 + * @return 结果 + */ + public int insertRecordInspectionTask(RecordInspectionTask recordInspectionTask); + + /** + * 修改巡检机位信息 + * + * @param recordInspectionTask 巡检机位信息 + * @return 结果 + */ + public int updateRecordInspectionTask(RecordInspectionTask recordInspectionTask); + + /** + * 删除巡检机位信息 + * + * @param objid 巡检机位信息主键 + * @return 结果 + */ + public int deleteRecordInspectionTaskByObjid(Long objid); + + /** + * 批量删除巡检机位信息 + * + * @param objids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteRecordInspectionTaskByObjids(String[] objids); +} diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionTaskService.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionTaskService.java new file mode 100644 index 0000000..54bf8b5 --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInspectionTaskService.java @@ -0,0 +1,61 @@ +package com.ruoyi.manage.service; + +import java.util.List; +import com.ruoyi.manage.domain.RecordInspectionTask; + +/** + * 巡检机位信息Service接口 + * + * @author wangh + * @date 2024-09-25 + */ +public interface IRecordInspectionTaskService +{ + /** + * 查询巡检机位信息 + * + * @param objid 巡检机位信息主键 + * @return 巡检机位信息 + */ + public RecordInspectionTask selectRecordInspectionTaskByObjid(Long objid); + + /** + * 查询巡检机位信息列表 + * + * @param recordInspectionTask 巡检机位信息 + * @return 巡检机位信息集合 + */ + public List selectRecordInspectionTaskList(RecordInspectionTask recordInspectionTask); + + /** + * 新增巡检机位信息 + * + * @param recordInspectionTask 巡检机位信息 + * @return 结果 + */ + public int insertRecordInspectionTask(RecordInspectionTask recordInspectionTask); + + /** + * 修改巡检机位信息 + * + * @param recordInspectionTask 巡检机位信息 + * @return 结果 + */ + public int updateRecordInspectionTask(RecordInspectionTask recordInspectionTask); + + /** + * 批量删除巡检机位信息 + * + * @param objids 需要删除的巡检机位信息主键集合 + * @return 结果 + */ + public int deleteRecordInspectionTaskByObjids(String objids); + + /** + * 删除巡检机位信息信息 + * + * @param objid 巡检机位信息主键 + * @return 结果 + */ + public int deleteRecordInspectionTaskByObjid(Long objid); +} diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionTaskServiceImpl.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionTaskServiceImpl.java new file mode 100644 index 0000000..83cac9c --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInspectionTaskServiceImpl.java @@ -0,0 +1,117 @@ +package com.ruoyi.manage.service.impl; + +import java.util.List; + + + + + + + + + + + + + + + + + + + + + + + + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.manage.mapper.RecordInspectionTaskMapper; +import com.ruoyi.manage.domain.RecordInspectionTask; +import com.ruoyi.manage.service.IRecordInspectionTaskService; +import com.ruoyi.common.core.text.Convert; + +/** + * 巡检机位信息Service业务层处理 + * + * @author wangh + * @date 2024-09-25 + */ +@Service +public class RecordInspectionTaskServiceImpl implements IRecordInspectionTaskService { + @Autowired + private RecordInspectionTaskMapper recordInspectionTaskMapper; + + /** + * 查询巡检机位信息 + * + * @param objid 巡检机位信息主键 + * @return 巡检机位信息 + */ + @Override + public RecordInspectionTask selectRecordInspectionTaskByObjid(Long objid) { + return recordInspectionTaskMapper.selectRecordInspectionTaskByObjid(objid); + } + + /** + * 查询巡检机位信息列表 + * + * @param recordInspectionTask 巡检机位信息 + * @return 巡检机位信息 + */ + @Override + public List selectRecordInspectionTaskList(RecordInspectionTask recordInspectionTask) { + return recordInspectionTaskMapper.selectRecordInspectionTaskList(recordInspectionTask); + } + + /** + * 新增巡检机位信息 + * + * @param recordInspectionTask 巡检机位信息 + * @return 结果 + */ + @Override + public int insertRecordInspectionTask(RecordInspectionTask recordInspectionTask) { + + + + + + + return recordInspectionTaskMapper.insertRecordInspectionTask(recordInspectionTask); + } + + /** + * 修改巡检机位信息 + * + * @param recordInspectionTask 巡检机位信息 + * @return 结果 + */ + @Override + public int updateRecordInspectionTask(RecordInspectionTask recordInspectionTask) { + return recordInspectionTaskMapper.updateRecordInspectionTask(recordInspectionTask); + } + + /** + * 批量删除巡检机位信息 + * + * @param objids 需要删除的巡检机位信息主键 + * @return 结果 + */ + @Override + public int deleteRecordInspectionTaskByObjids(String objids) { + return recordInspectionTaskMapper.deleteRecordInspectionTaskByObjids(Convert.toStrArray(objids)); + } + + /** + * 删除巡检机位信息信息 + * + * @param objid 巡检机位信息主键 + * @return 结果 + */ + @Override + public int deleteRecordInspectionTaskByObjid(Long objid) { + return recordInspectionTaskMapper.deleteRecordInspectionTaskByObjid(objid); + } +} diff --git a/ruoyi-manage/src/main/resources/create_menu_sql/record_inspection_taskMenu.sql b/ruoyi-manage/src/main/resources/create_menu_sql/record_inspection_taskMenu.sql new file mode 100644 index 0000000..1c8ced6 --- /dev/null +++ b/ruoyi-manage/src/main/resources/create_menu_sql/record_inspection_taskMenu.sql @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检机位信息', '2026', '1', '/manage/record_inspection_task', 'C', '0', 'manage:record_inspection_task:view', '#', 'admin', sysdate(), '', null, '巡检机位信息菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检机位信息查询', @parentId, '1', '#', 'F', '0', 'manage:record_inspection_task:list', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检机位信息新增', @parentId, '2', '#', 'F', '0', 'manage:record_inspection_task:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检机位信息修改', @parentId, '3', '#', 'F', '0', 'manage:record_inspection_task:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检机位信息删除', @parentId, '4', '#', 'F', '0', 'manage:record_inspection_task:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检机位信息导出', @parentId, '5', '#', 'F', '0', 'manage:record_inspection_task:export', '#', 'admin', sysdate(), '', null, ''); diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml new file mode 100644 index 0000000..c602091 --- /dev/null +++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInspectionTaskMapper.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + select objid, inspection_id, area_id, area_name, plane_position, task_state from record_inspection_task + + + + + + + + insert into record_inspection_task + + inspection_id, + area_id, + area_name, + plane_position, + task_state, + + + #{inspectionId}, + #{areaId}, + #{areaName}, + #{planePosition}, + #{taskState}, + + + + + update record_inspection_task + + inspection_id = #{inspectionId}, + area_id = #{areaId}, + area_name = #{areaName}, + plane_position = #{planePosition}, + task_state = #{taskState}, + + where objid = #{objid} + + + + delete from record_inspection_task where objid = #{objid} + + + + delete from record_inspection_task where objid in + + #{objid} + + + + \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection/record_inspection.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection/record_inspection.html index 2df2601..8566f6e 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/record_inspection/record_inspection.html +++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection/record_inspection.html @@ -102,19 +102,23 @@ }, - /* { + { title: '操作', align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('删除'); + actions.push('查看机位 '); return actions.join(''); } - }*/] + }] }; $.table.init(options); }); + + function openTaskTable(id){ + $.modal.openTab('巡检机位情况', ctx + "manage/record_inspection_task/"+id); + } initinspectionTable = function (index, row, $detail) { var childTable = $detail.html('
').find('table'); diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/add.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/add.html new file mode 100644 index 0000000..f810bad --- /dev/null +++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/add.html @@ -0,0 +1,57 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/edit.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/edit.html new file mode 100644 index 0000000..ae96815 --- /dev/null +++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/edit.html @@ -0,0 +1,58 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/record_inspection_task.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/record_inspection_task.html new file mode 100644 index 0000000..f0a7e40 --- /dev/null +++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/record_inspection_task.html @@ -0,0 +1,123 @@ + + + + + + +
+
+
+
+
+
    + +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file