From e1d3a417dadff9fd1cfb4efc42b89a12f4a7f2dc Mon Sep 17 00:00:00 2001 From: liukewei Date: Fri, 1 Dec 2023 15:47:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ui=E9=A1=B9=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=E9=A2=98=20=E4=BF=AE=E6=94=B9=E6=8B=A6=E6=88=AA=E5=99=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=92=E5=85=A5=E8=A1=A8=E7=A4=BA=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=8F=92=E5=85=A5create=5Fuser=5Fid,dept=5Fid,update?= =?UTF-8?q?=5Fuser=5Fid=20=E5=A2=9E=E5=8A=A0=E7=89=A9=E8=B5=84=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../controller/ehs/EhsMaterialController.java | 114 ++++++ .../ruoyi/web/core/config/SwaggerConfig.java | 2 +- .../ruoyi/common/core/domain/BaseEntity.java | 36 +- .../CreateAndUpdateMetaObjectHandler.java | 10 +- .../ruoyi/ehsMaterial/domain/EhsMaterial.java | 78 ++++ .../ehsMaterial/mapper/EhsMaterialMapper.java | 13 + .../service/IEhsMaterialService.java | 23 ++ .../service/impl/EhsMaterialServiceImpl.java | 57 +++ .../mapper/ehs/EhsMaterialMapper.xml | 29 ++ ruoyi-ui/.env.development | 2 +- ruoyi-ui/.env.production | 2 +- ruoyi-ui/.env.staging | 2 +- ruoyi-ui/package.json | 2 +- ruoyi-ui/src/api/ehs/ehsMaterial.js | 44 +++ .../ehs/ehsMaterial/ehsMaterial/index.vue | 370 ++++++++++++++++++ ruoyi-ui/vue.config.js | 2 +- 17 files changed, 777 insertions(+), 11 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsMaterialController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/domain/EhsMaterial.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/mapper/EhsMaterialMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/service/IEhsMaterialService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/service/impl/EhsMaterialServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/ehs/EhsMaterialMapper.xml create mode 100644 ruoyi-ui/src/api/ehs/ehsMaterial.js create mode 100644 ruoyi-ui/src/views/ehs/ehsMaterial/ehsMaterial/index.vue diff --git a/pom.xml b/pom.xml index 58d33d8..c32ec9f 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ ruoyi http://www.ruoyi.vip - 若依管理系统 + 唐河县安全隐患及应急救援管理平台 3.8.6 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsMaterialController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsMaterialController.java new file mode 100644 index 0000000..a115bc1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsMaterialController.java @@ -0,0 +1,114 @@ +package com.ruoyi.web.controller.ehs; + +import java.util.List; +import java.util.Arrays; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.ehsMaterial.domain.EhsMaterial; +import com.ruoyi.ehsMaterial.service.IEhsMaterialService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”Controller + * + * @author ruoyi + * @date 2023-12-01 + */ +@Api(tags="物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”管理") +@RestController +@RequestMapping("/ehsMaterial/ehsMaterial") +public class EhsMaterialController extends BaseController +{ + @Autowired + private IEhsMaterialService ehsMaterialService; + + /** + * 查询物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”列表 + */ + @ApiOperation("查询物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”列表") + @PreAuthorize("@ss.hasPermi('ehsMaterial:ehsMaterial:list')") + @GetMapping("/list") + public TableDataInfo list(EhsMaterial ehsMaterial) + { + startPage(); + List list = ehsMaterialService.selectEhsMaterialList(ehsMaterial); + return getDataTable(list); + } + + /** + * 导出物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”列表 + */ + @ApiOperation("导出物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”列表") + @PreAuthorize("@ss.hasPermi('ehsMaterial:ehsMaterial:export')") + @Log(title = "物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EhsMaterial ehsMaterial) + { + List list = ehsMaterialService.selectEhsMaterialList(ehsMaterial); + ExcelUtil util = new ExcelUtil(EhsMaterial.class); + util.exportExcel(response, list, "物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”数据"); + } + + /** + * 获取物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”详细信息 + */ + @ApiOperation("获取物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”详细信息") + @PreAuthorize("@ss.hasPermi('ehsMaterial:ehsMaterial:query')") + @GetMapping(value = "/{materialId}") + public AjaxResult getInfo(@PathVariable("materialId") Long materialId) + { + return success(ehsMaterialService.getById(materialId)); + } + + /** + * 新增物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资” + */ + @ApiOperation("新增物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”") + @PreAuthorize("@ss.hasPermi('ehsMaterial:ehsMaterial:add')") + @Log(title = "物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EhsMaterial ehsMaterial) + { + return toAjax(ehsMaterialService.save(ehsMaterial)); + } + + /** + * 修改物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资” + */ + @ApiOperation("修改物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”") + @PreAuthorize("@ss.hasPermi('ehsMaterial:ehsMaterial:edit')") + @Log(title = "物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EhsMaterial ehsMaterial) + { + return toAjax(ehsMaterialService.updateById(ehsMaterial)); + } + + /** + * 删除物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资” + */ + @ApiOperation("删除物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”") + @PreAuthorize("@ss.hasPermi('ehsMaterial:ehsMaterial:remove')") + @Log(title = "物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”", businessType = BusinessType.DELETE) + @DeleteMapping("/{materialIds}") + public AjaxResult remove(@PathVariable Long[] materialIds) + { + return toAjax(ehsMaterialService.removeByIds(Arrays.asList(materialIds))); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java index ae1c3ec..aa9f8a0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java @@ -113,7 +113,7 @@ public class SwaggerConfig // 用ApiInfoBuilder进行定制 return new ApiInfoBuilder() // 设置标题 - .title("标题：若依管理系统_接口文档") + .title("标题：唐河县安全隐患及应急救援管理平台_接口文档") // 描述 .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") // 作者信息 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index 0ba71a9..be3ba66 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -27,16 +27,23 @@ public class BaseEntity implements Serializable /** 创建者 */ @TableField(fill = FieldFill.INSERT) private String createBy; - + /** 创建者 */ + @TableField(fill = FieldFill.INSERT) + private Long createUserId; + /** 创建者 */ + @TableField(fill = FieldFill.INSERT) + private Long deptId; /** 创建时间 */ @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; + /** 更新者 */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long updateUserId; /** 更新者 */ @TableField(fill = FieldFill.INSERT_UPDATE) private String updateBy; - /** 更新时间 */ @TableField(fill = FieldFill.INSERT_UPDATE) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -50,6 +57,31 @@ public class BaseEntity implements Serializable @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map params; + + public Long getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(Long createUserId) { + this.createUserId = createUserId; + } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public Long getUpdateUserId() { + return updateUserId; + } + + public void setUpdateUserId(Long updateUserId) { + this.updateUserId = updateUserId; + } + public String getSearchValue() { return searchValue; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CreateAndUpdateMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CreateAndUpdateMetaObjectHandler.java index d1b6ed4..3e0d363 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CreateAndUpdateMetaObjectHandler.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CreateAndUpdateMetaObjectHandler.java @@ -29,12 +29,18 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler { ? baseEntity.getCreateTime() : new Date(); baseEntity.setCreateTime(current); baseEntity.setUpdateTime(current); - String username = StringUtils.isNotBlank(baseEntity.getCreateBy()) - ? baseEntity.getCreateBy() : SecurityUtils.getUsername(); + String username = StringUtils.isNotBlank(baseEntity.getCreateBy()) ? baseEntity.getCreateBy() : SecurityUtils.getUsername(); // 当前已登录 且 创建人为空 则填充 baseEntity.setCreateBy(username); // 当前已登录 且 更新人为空 则填充 baseEntity.setUpdateBy(username); + + Long userId = baseEntity.getCreateUserId()!=null ? baseEntity.getCreateUserId() : SecurityUtils.getUserId(); + // 当前已登录 且 创建人为空 则填充 + baseEntity.setCreateUserId(userId); + // 当前已登录 且 更新人为空 则填充 + baseEntity.setUpdateUserId(userId); + baseEntity.setDeptId(baseEntity.getDeptId()!=null ? baseEntity.getDeptId() : SecurityUtils.getDeptId()); } } catch (Exception e) { throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED); diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/domain/EhsMaterial.java b/ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/domain/EhsMaterial.java new file mode 100644 index 0000000..dd1ad1b --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/domain/EhsMaterial.java @@ -0,0 +1,78 @@ +package com.ruoyi.ehsMaterial.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.Accessors; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”对象 ehs_material + * + * @author ruoyi + * @date 2023-12-01 + */ +@Data +@ToString +@NoArgsConstructor +@Accessors(chain = true) +@TableName("ehs_material") +public class EhsMaterial extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type= IdType.AUTO) + private Long materialId; + + /** 性质 */ + @Excel(name = "性质") + private Long materialType; + + /** 类别 */ + @Excel(name = "类别") + private Long classFirst; + + /** 类别 */ + @Excel(name = "类别") + private String classSecond; + + /** 物资名称 */ + @Excel(name = "物资名称") + private String materialName; + + /** 规格/参数 */ + @Excel(name = "规格/参数") + private String materialSpecs; + + /** 数量 */ + @Excel(name = "数量") + private String materialQuantity; + + /** 储备地点 */ + @Excel(name = "储备地点") + private String reserveLocation; + + /** 管理责任人 */ + @Excel(name = "管理责任人") + private String managerPerson; + + /** 联系电话 */ + @Excel(name = "联系电话") + private String tel; + + /** 创建者部门 */ + private Long deptId; + + /** 创建者id */ + private Long createUserId; + + /** 修改着id */ + private Long updateUserId; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/mapper/EhsMaterialMapper.java b/ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/mapper/EhsMaterialMapper.java new file mode 100644 index 0000000..9044773 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/mapper/EhsMaterialMapper.java @@ -0,0 +1,13 @@ +package com.ruoyi.ehsMaterial.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.ehsMaterial.domain.EhsMaterial; + +/** + * 物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”Mapper接口 + * + * @author ruoyi + * @date 2023-12-01 + */ +public interface EhsMaterialMapper extends BaseMapper { +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/service/IEhsMaterialService.java b/ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/service/IEhsMaterialService.java new file mode 100644 index 0000000..8fbbb29 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/service/IEhsMaterialService.java @@ -0,0 +1,23 @@ +package com.ruoyi.ehsMaterial.service; + +import java.util.List; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.ehsMaterial.domain.EhsMaterial; + +/** + * 物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”Service接口 + * + * @author ruoyi + * @date 2023-12-01 + */ +public interface IEhsMaterialService extends IService { + + /** + * 查询物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”列表 + * + * @param ehsMaterial 物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资” + * @return 物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”集合 + */ + public List selectEhsMaterialList(EhsMaterial ehsMaterial); + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/service/impl/EhsMaterialServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/service/impl/EhsMaterialServiceImpl.java new file mode 100644 index 0000000..dd81de2 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/ehsMaterial/service/impl/EhsMaterialServiceImpl.java @@ -0,0 +1,57 @@ +package com.ruoyi.ehsMaterial.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import com.ruoyi.common.utils.StringUtils; +import java.util.List; +import java.util.Map; +import com.ruoyi.ehsMaterial.mapper.EhsMaterialMapper; +import com.ruoyi.ehsMaterial.domain.EhsMaterial; +import com.ruoyi.ehsMaterial.service.IEhsMaterialService; + +/** + * 物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”Service业务层处理 + * + * @author ruoyi + * @date 2023-12-01 + */ +@Service +public class EhsMaterialServiceImpl extends ServiceImpl implements IEhsMaterialService { + + @Autowired + private EhsMaterialMapper ehsMaterialMapper; + + /** + * 查询物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”列表 + * + * @param ehsMaterial 物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资” + * @return 物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资” + */ + @Override + public List selectEhsMaterialList(EhsMaterial ehsMaterial) + { + List ehsMaterialList = ehsMaterialMapper.selectList(buildQueryWrapper(ehsMaterial)); + return ehsMaterialList; + } + + + private LambdaQueryWrapper buildQueryWrapper(EhsMaterial query) { + Map params = query.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(query.getMaterialType() != null, EhsMaterial::getMaterialType, query.getMaterialType()); + lqw.eq(query.getClassFirst() != null, EhsMaterial::getClassFirst, query.getClassFirst()); + lqw.eq(StringUtils.isNotBlank(query.getClassSecond()), EhsMaterial::getClassSecond, query.getClassSecond()); + lqw.like(StringUtils.isNotBlank(query.getMaterialName()), EhsMaterial::getMaterialName, query.getMaterialName()); + lqw.eq(StringUtils.isNotBlank(query.getMaterialSpecs()), EhsMaterial::getMaterialSpecs, query.getMaterialSpecs()); + lqw.eq(StringUtils.isNotBlank(query.getMaterialQuantity()), EhsMaterial::getMaterialQuantity, query.getMaterialQuantity()); + lqw.like(StringUtils.isNotBlank(query.getReserveLocation()), EhsMaterial::getReserveLocation, query.getReserveLocation()); + lqw.like(StringUtils.isNotBlank(query.getManagerPerson()), EhsMaterial::getManagerPerson, query.getManagerPerson()); + lqw.like(StringUtils.isNotBlank(query.getTel()), EhsMaterial::getTel, query.getTel()); + lqw.orderByDesc(EhsMaterial::getCreateTime); + return lqw; + } + +} diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsMaterialMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsMaterialMapper.xml new file mode 100644 index 0000000..a70c05b --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsMaterialMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index 302ecd1..e0b83ce 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 唐河县安全隐患及应急救援管理平台 # 开发环境配置 ENV = 'development' diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production index b4893b0..90bdf96 100644 --- a/ruoyi-ui/.env.production +++ b/ruoyi-ui/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 唐河县安全隐患及应急救援管理平台 # 生产环境配置 ENV = 'production' diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging index 361859f..917aeb5 100644 --- a/ruoyi-ui/.env.staging +++ b/ruoyi-ui/.env.staging @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 唐河县安全隐患及应急救援管理平台 NODE_ENV = production diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 206c59e..871d574 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,7 +1,7 @@ { "name": "ruoyi", "version": "3.8.6", - "description": "若依管理系统", + "description": "唐河县安全隐患及应急救援管理平台", "author": "若依", "license": "MIT", "scripts": { diff --git a/ruoyi-ui/src/api/ehs/ehsMaterial.js b/ruoyi-ui/src/api/ehs/ehsMaterial.js new file mode 100644 index 0000000..becc31b --- /dev/null +++ b/ruoyi-ui/src/api/ehs/ehsMaterial.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”列表 +export function listEhsMaterial(query) { + return request({ + url: '/ehsMaterial/ehsMaterial/list', + method: 'get', + params: query + }) +} + +// 查询物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资”详细 +export function getEhsMaterial(materialId) { + return request({ + url: '/ehsMaterial/ehsMaterial/' + materialId, + method: 'get' + }) +} + +// 新增物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资” +export function addEhsMaterial(data) { + return request({ + url: '/ehsMaterial/ehsMaterial', + method: 'post', + data: data + }) +} + +// 修改物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资” +export function updateEhsMaterial(data) { + return request({ + url: '/ehsMaterial/ehsMaterial', + method: 'put', + data: data + }) +} + +// 删除物资信息包含 通用应急救援装备”“防汛抗旱应急救援装备”“森林防灭火应急救援装备”“救灾物资” +export function delEhsMaterial(materialId) { + return request({ + url: '/ehsMaterial/ehsMaterial/' + materialId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/ehs/ehsMaterial/ehsMaterial/index.vue b/ruoyi-ui/src/views/ehs/ehsMaterial/ehsMaterial/index.vue new file mode 100644 index 0000000..7f7c161 --- /dev/null +++ b/ruoyi-ui/src/views/ehs/ehsMaterial/ehsMaterial/index.vue @@ -0,0 +1,370 @@ + + + diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index f0cff54..9c8c139 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -7,7 +7,7 @@ function resolve(dir) { const CompressionPlugin = require('compression-webpack-plugin') -const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题 +const name = process.env.VUE_APP_TITLE || '唐河县安全隐患及应急救援管理平台' // 网页标题 const port = process.env.port || process.env.npm_config_port || 80 // 端口