-新增装置台账

-密封点台账关联装置台账
-修改服务端口
-前台添加i18n

master/pom.xml

@@ -22,6 +22,7 @@
         <swagger.version>3.0.0</swagger.version>
         <kaptcha.version>2.3.2</kaptcha.version>
         <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
+        <mybatisplus.version>3.3.1</mybatisplus.version>
         <pagehelper.boot.version>1.4.3</pagehelper.boot.version>
         <fastjson.version>2.0.14</fastjson.version>
         <oshi.version>6.2.2</oshi.version>
@@ -150,7 +151,6 @@
                 <version>${kaptcha.version}</version>
             </dependency>
 
-
         </dependencies>
     </dependencyManagement>
 
@@ -339,6 +339,19 @@
             <artifactId>commons-collections</artifactId>
         </dependency>
 
+        <!--mybatisplus-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>${mybatisplus.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.baomidou</groupId>
+                    <artifactId>mybatis-plus-generator</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <!-- 定时任务 -->
         <dependency>
             <groupId>org.quartz-scheduler</groupId>

master/src/main/java/com/ruoyi/project/base/controller/TBasePlantController.java

@@ -0,0 +1,115 @@
+package com.ruoyi.project.base.controller;
+
+import java.util.Date;
+import java.util.List;
+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 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.project.base.domain.TBasePlant;
+import com.ruoyi.project.base.service.ITBasePlantService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 装置Controller
+ *
+ * @author ruoyi
+ * @date 2022-11-14
+ */
+@RestController
+@RequestMapping("/base/plant")
+public class TBasePlantController extends BaseController
+{
+    @Autowired
+    private ITBasePlantService tBasePlantService;
+
+    /**
+     * 查询装置列表
+     */
+    @PreAuthorize("@ss.hasPermi('base:plant:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TBasePlant tBasePlant)
+    {
+        startPage();
+        List<TBasePlant> list = tBasePlantService.selectTBasePlantList(tBasePlant);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/allPlantName")
+    public AjaxResult selectAllPlantName()
+    {
+        return AjaxResult.success(tBasePlantService.selectAllPlantName());
+    }
+
+    /**
+     * 导出装置列表
+     */
+    @PreAuthorize("@ss.hasPermi('base:plant:export')")
+    @Log(title = "装置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TBasePlant tBasePlant)
+    {
+        List<TBasePlant> list = tBasePlantService.selectTBasePlantList(tBasePlant);
+        ExcelUtil<TBasePlant> util = new ExcelUtil<TBasePlant>(TBasePlant.class);
+        util.exportExcel(response, list, "装置数据");
+    }
+
+    /**
+     * 获取装置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('base:plant:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tBasePlantService.selectTBasePlantById(id));
+    }
+
+    /**
+     * 新增装置
+     */
+    @PreAuthorize("@ss.hasPermi('base:plant:add')")
+    @Log(title = "装置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBasePlant tBasePlant)
+    {
+        tBasePlant.setUpdatedate(new Date());
+        tBasePlant.setUpdaterCode(getUserId());
+        return toAjax(tBasePlantService.insertTBasePlant(tBasePlant));
+    }
+
+    /**
+     * 修改装置
+     */
+    @PreAuthorize("@ss.hasPermi('base:plant:edit')")
+    @Log(title = "装置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TBasePlant tBasePlant)
+    {
+        tBasePlant.setUpdatedate(new Date());
+        tBasePlant.setUpdaterCode(getUserId());
+        return toAjax(tBasePlantService.updateTBasePlant(tBasePlant));
+    }
+
+    /**
+     * 删除装置
+     */
+    @PreAuthorize("@ss.hasPermi('base:plant:remove')")
+    @Log(title = "装置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tBasePlantService.deleteTBasePlantByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/base/controller/TBasePointController.java

@@ -0,0 +1,109 @@
+package com.ruoyi.project.base.controller;
+
+import java.util.Date;
+import java.util.List;
+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 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.project.base.domain.TBasePoint;
+import com.ruoyi.project.base.service.ITBasePointService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 密封点Controller
+ *
+ * @author ruoyi
+ * @date 2022-11-11
+ */
+@RestController
+@RequestMapping("/base/point")
+public class TBasePointController extends BaseController
+{
+    @Autowired
+    private ITBasePointService tBasePointService;
+
+    /**
+     * 查询密封点列表
+     */
+    @PreAuthorize("@ss.hasPermi('base:point:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TBasePoint tBasePoint)
+    {
+        startPage();
+        List<TBasePoint> list = tBasePointService.selectTBasePointList(tBasePoint);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出密封点列表
+     */
+    @PreAuthorize("@ss.hasPermi('base:point:export')")
+    @Log(title = "密封点", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TBasePoint tBasePoint)
+    {
+        List<TBasePoint> list = tBasePointService.selectTBasePointList(tBasePoint);
+        ExcelUtil<TBasePoint> util = new ExcelUtil<TBasePoint>(TBasePoint.class);
+        util.exportExcel(response, list, "密封点数据");
+    }
+
+    /**
+     * 获取密封点详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('base:point:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tBasePointService.selectTBasePointById(id));
+    }
+
+    /**
+     * 新增密封点
+     */
+    @PreAuthorize("@ss.hasPermi('base:point:add')")
+    @Log(title = "密封点", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBasePoint tBasePoint)
+    {
+        tBasePoint.setUpdatedate(new Date());
+        tBasePoint.setUpdaterCode(getUserId());
+        return toAjax(tBasePointService.insertTBasePoint(tBasePoint));
+    }
+
+    /**
+     * 修改密封点
+     */
+    @PreAuthorize("@ss.hasPermi('base:point:edit')")
+    @Log(title = "密封点", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TBasePoint tBasePoint)
+    {
+        tBasePoint.setUpdatedate(new Date());
+        tBasePoint.setUpdaterCode(getUserId());
+        return toAjax(tBasePointService.updateTBasePoint(tBasePoint));
+    }
+
+    /**
+     * 删除密封点
+     */
+    @PreAuthorize("@ss.hasPermi('base:point:remove')")
+    @Log(title = "密封点", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tBasePointService.deleteTBasePointByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/base/domain/TBasePlant.java

@@ -0,0 +1,232 @@
+package com.ruoyi.project.base.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 装置对象 t_base_plant
+ *
+ * @author ruoyi
+ * @date 2022-11-14
+ */
+public class TBasePlant extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识id */
+    private Long id;
+
+    /** 编号 */
+    @Excel(name = "编号")
+    private String plantCode;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String plantName;
+
+    /** 加工/生产能力 */
+    @Excel(name = "加工/生产能力")
+    private String proAbility;
+
+    /** 类别 */
+    @Excel(name = "类别")
+    private String plantType;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    private String remarks;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private Long approveStatus;
+
+    /** 最新申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最新申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approveTime;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 状态 1 ：正常 ；0：删除 */
+    private Integer delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updater;
+    private Long updaterCode;
+
+    public String getUpdater() {
+        return updater;
+    }
+
+    public void setUpdater(String updater) {
+        this.updater = updater;
+    }
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setPlantCode(String plantCode)
+    {
+        this.plantCode = plantCode;
+    }
+
+    public String getPlantCode()
+    {
+        return plantCode;
+    }
+    public void setPlantName(String plantName)
+    {
+        this.plantName = plantName;
+    }
+
+    public String getPlantName()
+    {
+        return plantName;
+    }
+    public void setProAbility(String proAbility)
+    {
+        this.proAbility = proAbility;
+    }
+
+    public String getProAbility()
+    {
+        return proAbility;
+    }
+    public void setPlantType(String plantType)
+    {
+        this.plantType = plantType;
+    }
+
+    public String getPlantType()
+    {
+        return plantType;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+    public void setApproveStatus(Long approveStatus)
+    {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus()
+    {
+        return approveStatus;
+    }
+    public void setApproveTime(Date approveTime)
+    {
+        this.approveTime = approveTime;
+    }
+
+    public Date getApproveTime()
+    {
+        return approveTime;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setDelFlag(Integer delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(Long createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public Long getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("plantNum", getPlantCode())
+            .append("plantName", getPlantName())
+            .append("proAbility", getProAbility())
+            .append("plantType", getPlantType())
+            .append("remarks", getRemarks())
+            .append("approveStatus", getApproveStatus())
+            .append("approveTime", getApproveTime())
+            .append("deptId", getDeptId())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/base/domain/TBasePoint.java

@@ -0,0 +1,665 @@
+package com.ruoyi.project.base.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 密封点对象 t_base_point
+ *
+ * @author ruoyi
+ * @date 2022-11-11
+ */
+public class TBasePoint extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识id
+     */
+    private Long id;
+
+    /**
+     * 检测净值
+     */
+    @Excel(name = "检测净值")
+    private Integer ppm;
+
+    /**
+     * 泄漏程度
+     */
+    @Excel(name = "泄漏程度")
+    private String leakageDegree;
+
+    /**
+     * 装置ID
+     */
+    @Excel(name = "装置ID")
+    private Long plantId;
+
+    /**
+     * 区域ID
+     */
+    @Excel(name = "区域ID")
+    private Long regionId;
+
+    /**
+     * 设备id
+     */
+    @Excel(name = "设备id")
+    private Long devId;
+
+    /**
+     * 介质
+     */
+    @Excel(name = "介质")
+    private String medium;
+
+    /**
+     * 介质状态
+     */
+    @Excel(name = "介质状态")
+    private String mediumType;
+
+    /**
+     * 密封点类型
+     */
+    @Excel(name = "密封点类型")
+    private String pointType;
+
+    /**
+     * 平台
+     */
+    @Excel(name = "平台")
+    private String layer;
+
+    /**
+     * 群组位置
+     */
+    @Excel(name = "群组位置")
+    private String groupPosition;
+
+    /**
+     * 密封点位置
+     */
+    @Excel(name = "密封点位置")
+    private String pointPosition;
+
+    /**
+     * 群组编码
+     */
+    @Excel(name = "群组编码")
+    private String groupCode;
+
+    /**
+     * 扩展编码
+     */
+    @Excel(name = "扩展编码")
+    private String extendCoude;
+
+    /**
+     * 密封点子类型
+     */
+    @Excel(name = "密封点子类型")
+    private String subPointType;
+
+    /**
+     * 公称直径
+     */
+    @Excel(name = "公称直径")
+    private String dia;
+
+    /**
+     * 是否不可达点
+     */
+    @Excel(name = "是否不可达点")
+    private String unarrive;
+
+    /**
+     * 不可达原因
+     */
+    @Excel(name = "不可达原因")
+    private String unarriveReason;
+
+    /**
+     * 是否保温/保冷
+     */
+    @Excel(name = "是否保温/保冷")
+    private String keepWarm;
+
+    /**
+     * 工艺温度
+     */
+    @Excel(name = "工艺温度")
+    private String temperature;
+
+    /**
+     * 工艺压力
+     */
+    @Excel(name = "工艺压力")
+    private String pressure;
+
+    /**
+     * 运行时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "运行时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date runTime;
+
+    /**
+     * PID图号
+     */
+    @Excel(name = "PID图号")
+    private String pidNo;
+
+    /**
+     * PID图文件地址
+     */
+    @Excel(name = "PID图文件地址")
+    private String pidUrl;
+
+    /**
+     * 群组照片号
+     */
+    @Excel(name = "群组照片号")
+    private String picNo;
+
+    /**
+     * 群组照片文件地址
+     */
+    @Excel(name = "群组照片文件地址")
+    private String picUrl;
+
+    /**
+     * TOC质量分数
+     */
+    @Excel(name = "TOC质量分数")
+    private String tocMark;
+
+    /**
+     * 甲烷质量分数
+     */
+    @Excel(name = "甲烷质量分数")
+    private String methaneMark;
+
+    /**
+     * VOCs质量分数
+     */
+    @Excel(name = "VOCs质量分数")
+    private String vocsMark;
+
+    /**
+     * 描述
+     */
+    @Excel(name = "描述")
+    private String remarks;
+
+    /**
+     * 审核状态
+     */
+    @Excel(name = "审核状态")
+    private Long approveStatus;
+
+    /**
+     * 最新申请时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最新申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approveTime;
+
+    /**
+     * 部门编号
+     */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /**
+     * 状态 1 ：正常 ；0：删除
+     */
+    private Integer delFlag;
+
+    /**
+     * 创建人
+     */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /**
+     * 修改人
+     */
+
+    private Long updaterCode;
+    @Excel(name = "修改人")
+    @TableField(exist = false)
+    private String updater;
+
+    @Excel(name = "装置名称")
+    @TableField(exist = false)
+    private String plantName;
+    @Excel(name = "装置编码")
+    @TableField(exist = false)
+    private String plantCode;
+    @Excel(name = "装置类别")
+    @TableField(exist = false)
+    private String plantType;
+    @Excel(name = "设备名称")
+    @TableField(exist = false)
+    private String devName;
+    @Excel(name = "设备编码")
+    @TableField(exist = false)
+    private String devNum;
+
+    /**
+     * 修改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    public String getPlantName() {
+        return plantName;
+    }
+
+    public void setPlantName(String plantName) {
+        this.plantName = plantName;
+    }
+
+    public String getPlantCode() {
+        return plantCode;
+    }
+
+    public void setPlantCode(String plantCode) {
+        this.plantCode = plantCode;
+    }
+
+    public String getPlantType() {
+        return plantType;
+    }
+
+    public void setPlantType(String plantType) {
+        this.plantType = plantType;
+    }
+
+    public String getDevName() {
+        return devName;
+    }
+
+    public void setDevName(String devName) {
+        this.devName = devName;
+    }
+
+    public String getDevNum() {
+        return devNum;
+    }
+
+    public void setDevNum(String devNum) {
+        this.devNum = devNum;
+    }
+
+    public String getUpdater() {
+        return updater;
+    }
+
+    public void setUpdater(String updater) {
+        this.updater = updater;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setPpm(Integer ppm) {
+        this.ppm = ppm;
+    }
+
+    public Integer getPpm() {
+        return ppm;
+    }
+
+    public void setLeakageDegree(String leakageDegree) {
+        this.leakageDegree = leakageDegree;
+    }
+
+    public String getLeakageDegree() {
+        return leakageDegree;
+    }
+
+    public void setPlantId(Long plantId) {
+        this.plantId = plantId;
+    }
+
+    public Long getPlantId() {
+        return plantId;
+    }
+
+    public void setRegionId(Long regionId) {
+        this.regionId = regionId;
+    }
+
+    public Long getRegionId() {
+        return regionId;
+    }
+
+    public void setDevId(Long devId) {
+        this.devId = devId;
+    }
+
+    public Long getDevId() {
+        return devId;
+    }
+
+    public void setMedium(String medium) {
+        this.medium = medium;
+    }
+
+    public String getMedium() {
+        return medium;
+    }
+
+    public void setMediumType(String mediumType) {
+        this.mediumType = mediumType;
+    }
+
+    public String getMediumType() {
+        return mediumType;
+    }
+
+    public void setPointType(String pointType) {
+        this.pointType = pointType;
+    }
+
+    public String getPointType() {
+        return pointType;
+    }
+
+    public void setLayer(String layer) {
+        this.layer = layer;
+    }
+
+    public String getLayer() {
+        return layer;
+    }
+
+    public void setGroupPosition(String groupPosition) {
+        this.groupPosition = groupPosition;
+    }
+
+    public String getGroupPosition() {
+        return groupPosition;
+    }
+
+    public void setPointPosition(String pointPosition) {
+        this.pointPosition = pointPosition;
+    }
+
+    public String getPointPosition() {
+        return pointPosition;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
+
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setExtendCoude(String extendCoude) {
+        this.extendCoude = extendCoude;
+    }
+
+    public String getExtendCoude() {
+        return extendCoude;
+    }
+
+    public void setSubPointType(String subPointType) {
+        this.subPointType = subPointType;
+    }
+
+    public String getSubPointType() {
+        return subPointType;
+    }
+
+    public void setDia(String dia) {
+        this.dia = dia;
+    }
+
+    public String getDia() {
+        return dia;
+    }
+
+    public void setUnarrive(String unarrive) {
+        this.unarrive = unarrive;
+    }
+
+    public String getUnarrive() {
+        return unarrive;
+    }
+
+    public void setUnarriveReason(String unarriveReason) {
+        this.unarriveReason = unarriveReason;
+    }
+
+    public String getUnarriveReason() {
+        return unarriveReason;
+    }
+
+    public void setKeepWarm(String keepWarm) {
+        this.keepWarm = keepWarm;
+    }
+
+    public String getKeepWarm() {
+        return keepWarm;
+    }
+
+    public void setTemperature(String temperature) {
+        this.temperature = temperature;
+    }
+
+    public String getTemperature() {
+        return temperature;
+    }
+
+    public void setPressure(String pressure) {
+        this.pressure = pressure;
+    }
+
+    public String getPressure() {
+        return pressure;
+    }
+
+    public void setRunTime(Date runTime) {
+        this.runTime = runTime;
+    }
+
+    public Date getRunTime() {
+        return runTime;
+    }
+
+    public void setPidNo(String pidNo) {
+        this.pidNo = pidNo;
+    }
+
+    public String getPidNo() {
+        return pidNo;
+    }
+
+    public void setPidUrl(String pidUrl) {
+        this.pidUrl = pidUrl;
+    }
+
+    public String getPidUrl() {
+        return pidUrl;
+    }
+
+    public void setPicNo(String picNo) {
+        this.picNo = picNo;
+    }
+
+    public String getPicNo() {
+        return picNo;
+    }
+
+    public void setPicUrl(String picUrl) {
+        this.picUrl = picUrl;
+    }
+
+    public String getPicUrl() {
+        return picUrl;
+    }
+
+    public void setTocMark(String tocMark) {
+        this.tocMark = tocMark;
+    }
+
+    public String getTocMark() {
+        return tocMark;
+    }
+
+    public void setMethaneMark(String methaneMark) {
+        this.methaneMark = methaneMark;
+    }
+
+    public String getMethaneMark() {
+        return methaneMark;
+    }
+
+    public void setVocsMark(String vocsMark) {
+        this.vocsMark = vocsMark;
+    }
+
+    public String getVocsMark() {
+        return vocsMark;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setApproveStatus(Long approveStatus) {
+        this.approveStatus = approveStatus;
+    }
+
+    public Long getApproveStatus() {
+        return approveStatus;
+    }
+
+    public void setApproveTime(Date approveTime) {
+        this.approveTime = approveTime;
+    }
+
+    public Date getApproveTime() {
+        return approveTime;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    public void setCreaterCode(Long createrCode) {
+        this.createrCode = createrCode;
+    }
+
+    public Long getCreaterCode() {
+        return createrCode;
+    }
+
+    public void setCreatedate(Date createdate) {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate() {
+        return createdate;
+    }
+
+    public void setUpdaterCode(Long updaterCode) {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode() {
+        return updaterCode;
+    }
+
+    public void setUpdatedate(Date updatedate) {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate() {
+        return updatedate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("ppm", getPpm())
+                .append("leakageDegree", getLeakageDegree())
+                .append("plantId", getPlantId())
+                .append("regionId", getRegionId())
+                .append("devId", getDevId())
+                .append("medium", getMedium())
+                .append("mediumType", getMediumType())
+                .append("pointType", getPointType())
+                .append("layer", getLayer())
+                .append("groupPosition", getGroupPosition())
+                .append("pointPosition", getPointPosition())
+                .append("groupCode", getGroupCode())
+                .append("extendCoude", getExtendCoude())
+                .append("subPointType", getSubPointType())
+                .append("dia", getDia())
+                .append("unarrive", getUnarrive())
+                .append("unarriveReason", getUnarriveReason())
+                .append("keepWarm", getKeepWarm())
+                .append("temperature", getTemperature())
+                .append("pressure", getPressure())
+                .append("runTime", getRunTime())
+                .append("pidNo", getPidNo())
+                .append("pidUrl", getPidUrl())
+                .append("picNo", getPicNo())
+                .append("picUrl", getPicUrl())
+                .append("tocMark", getTocMark())
+                .append("methaneMark", getMethaneMark())
+                .append("vocsMark", getVocsMark())
+                .append("remarks", getRemarks())
+                .append("approveStatus", getApproveStatus())
+                .append("approveTime", getApproveTime())
+                .append("deptId", getDeptId())
+                .append("delFlag", getDelFlag())
+                .append("createrCode", getCreaterCode())
+                .append("createdate", getCreatedate())
+                .append("updaterCode", getUpdaterCode())
+                .append("updatedate", getUpdatedate())
+                .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/base/mapper/TBasePlantMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.project.base.mapper;
+
+import java.util.List;
+import com.ruoyi.project.base.domain.TBasePlant;
+
+/**
+ * 装置Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-11-14
+ */
+public interface TBasePlantMapper
+{
+    /**
+     * 查询装置
+     *
+     * @param id 装置主键
+     * @return 装置
+     */
+    public TBasePlant selectTBasePlantById(Long id);
+
+    /**
+     * 查询装置列表
+     *
+     * @param tBasePlant 装置
+     * @return 装置集合
+     */
+    public List<TBasePlant> selectTBasePlantList(TBasePlant tBasePlant);
+    public List<TBasePlant> selectAllPlantName();
+
+    /**
+     * 新增装置
+     *
+     * @param tBasePlant 装置
+     * @return 结果
+     */
+    public int insertTBasePlant(TBasePlant tBasePlant);
+
+    /**
+     * 修改装置
+     *
+     * @param tBasePlant 装置
+     * @return 结果
+     */
+    public int updateTBasePlant(TBasePlant tBasePlant);
+
+    /**
+     * 删除装置
+     *
+     * @param id 装置主键
+     * @return 结果
+     */
+    public int deleteTBasePlantById(Long id);
+
+    /**
+     * 批量删除装置
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTBasePlantByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/base/mapper/TBasePointMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.base.mapper;
+
+import java.util.List;
+import com.ruoyi.project.base.domain.TBasePoint;
+
+/**
+ * 密封点Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-11-11
+ */
+public interface TBasePointMapper 
+{
+    /**
+     * 查询密封点
+     * 
+     * @param id 密封点主键
+     * @return 密封点
+     */
+    public TBasePoint selectTBasePointById(Long id);
+
+    /**
+     * 查询密封点列表
+     * 
+     * @param tBasePoint 密封点
+     * @return 密封点集合
+     */
+    public List<TBasePoint> selectTBasePointList(TBasePoint tBasePoint);
+
+    /**
+     * 新增密封点
+     * 
+     * @param tBasePoint 密封点
+     * @return 结果
+     */
+    public int insertTBasePoint(TBasePoint tBasePoint);
+
+    /**
+     * 修改密封点
+     * 
+     * @param tBasePoint 密封点
+     * @return 结果
+     */
+    public int updateTBasePoint(TBasePoint tBasePoint);
+
+    /**
+     * 删除密封点
+     * 
+     * @param id 密封点主键
+     * @return 结果
+     */
+    public int deleteTBasePointById(Long id);
+
+    /**
+     * 批量删除密封点
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTBasePointByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/base/service/ITBasePlantService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.project.base.service;
+
+import java.util.List;
+import com.ruoyi.project.base.domain.TBasePlant;
+
+/**
+ * 装置Service接口
+ *
+ * @author ruoyi
+ * @date 2022-11-14
+ */
+public interface ITBasePlantService
+{
+    /**
+     * 查询装置
+     *
+     * @param id 装置主键
+     * @return 装置
+     */
+    public TBasePlant selectTBasePlantById(Long id);
+
+    /**
+     * 查询装置列表
+     *
+     * @param tBasePlant 装置
+     * @return 装置集合
+     */
+    public List<TBasePlant> selectTBasePlantList(TBasePlant tBasePlant);
+    public List<TBasePlant> selectAllPlantName();
+
+    /**
+     * 新增装置
+     *
+     * @param tBasePlant 装置
+     * @return 结果
+     */
+    public int insertTBasePlant(TBasePlant tBasePlant);
+
+    /**
+     * 修改装置
+     *
+     * @param tBasePlant 装置
+     * @return 结果
+     */
+    public int updateTBasePlant(TBasePlant tBasePlant);
+
+    /**
+     * 批量删除装置
+     *
+     * @param ids 需要删除的装置主键集合
+     * @return 结果
+     */
+    public int deleteTBasePlantByIds(Long[] ids);
+
+    /**
+     * 删除装置信息
+     *
+     * @param id 装置主键
+     * @return 结果
+     */
+    public int deleteTBasePlantById(Long id);
+}

master/src/main/java/com/ruoyi/project/base/service/ITBasePointService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.base.service;
+
+import java.util.List;
+import com.ruoyi.project.base.domain.TBasePoint;
+
+/**
+ * 密封点Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-11-11
+ */
+public interface ITBasePointService 
+{
+    /**
+     * 查询密封点
+     * 
+     * @param id 密封点主键
+     * @return 密封点
+     */
+    public TBasePoint selectTBasePointById(Long id);
+
+    /**
+     * 查询密封点列表
+     * 
+     * @param tBasePoint 密封点
+     * @return 密封点集合
+     */
+    public List<TBasePoint> selectTBasePointList(TBasePoint tBasePoint);
+
+    /**
+     * 新增密封点
+     * 
+     * @param tBasePoint 密封点
+     * @return 结果
+     */
+    public int insertTBasePoint(TBasePoint tBasePoint);
+
+    /**
+     * 修改密封点
+     * 
+     * @param tBasePoint 密封点
+     * @return 结果
+     */
+    public int updateTBasePoint(TBasePoint tBasePoint);
+
+    /**
+     * 批量删除密封点
+     * 
+     * @param ids 需要删除的密封点主键集合
+     * @return 结果
+     */
+    public int deleteTBasePointByIds(Long[] ids);
+
+    /**
+     * 删除密封点信息
+     * 
+     * @param id 密封点主键
+     * @return 结果
+     */
+    public int deleteTBasePointById(Long id);
+}

master/src/main/java/com/ruoyi/project/base/service/impl/TBasePlantServiceImpl.java

@@ -0,0 +1,98 @@
+package com.ruoyi.project.base.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.base.mapper.TBasePlantMapper;
+import com.ruoyi.project.base.domain.TBasePlant;
+import com.ruoyi.project.base.service.ITBasePlantService;
+
+/**
+ * 装置Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-11-14
+ */
+@Service
+public class TBasePlantServiceImpl implements ITBasePlantService
+{
+    @Autowired
+    private TBasePlantMapper tBasePlantMapper;
+
+    /**
+     * 查询装置
+     *
+     * @param id 装置主键
+     * @return 装置
+     */
+    @Override
+    public TBasePlant selectTBasePlantById(Long id)
+    {
+        return tBasePlantMapper.selectTBasePlantById(id);
+    }
+
+    /**
+     * 查询装置列表
+     *
+     * @param tBasePlant 装置
+     * @return 装置
+     */
+    @Override
+    public List<TBasePlant> selectTBasePlantList(TBasePlant tBasePlant)
+    {
+        return tBasePlantMapper.selectTBasePlantList(tBasePlant);
+    }
+@Override
+    public List<TBasePlant> selectAllPlantName()
+    {
+        return tBasePlantMapper.selectAllPlantName();
+    }
+
+    /**
+     * 新增装置
+     *
+     * @param tBasePlant 装置
+     * @return 结果
+     */
+    @Override
+    public int insertTBasePlant(TBasePlant tBasePlant)
+    {
+        return tBasePlantMapper.insertTBasePlant(tBasePlant);
+    }
+
+    /**
+     * 修改装置
+     *
+     * @param tBasePlant 装置
+     * @return 结果
+     */
+    @Override
+    public int updateTBasePlant(TBasePlant tBasePlant)
+    {
+        return tBasePlantMapper.updateTBasePlant(tBasePlant);
+    }
+
+    /**
+     * 批量删除装置
+     *
+     * @param ids 需要删除的装置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBasePlantByIds(Long[] ids)
+    {
+        return tBasePlantMapper.deleteTBasePlantByIds(ids);
+    }
+
+    /**
+     * 删除装置信息
+     *
+     * @param id 装置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBasePlantById(Long id)
+    {
+        return tBasePlantMapper.deleteTBasePlantById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/base/service/impl/TBasePointServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.base.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.base.mapper.TBasePointMapper;
+import com.ruoyi.project.base.domain.TBasePoint;
+import com.ruoyi.project.base.service.ITBasePointService;
+
+/**
+ * 密封点Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2022-11-11
+ */
+@Service
+public class TBasePointServiceImpl implements ITBasePointService 
+{
+    @Autowired
+    private TBasePointMapper tBasePointMapper;
+
+    /**
+     * 查询密封点
+     * 
+     * @param id 密封点主键
+     * @return 密封点
+     */
+    @Override
+    public TBasePoint selectTBasePointById(Long id)
+    {
+        return tBasePointMapper.selectTBasePointById(id);
+    }
+
+    /**
+     * 查询密封点列表
+     * 
+     * @param tBasePoint 密封点
+     * @return 密封点
+     */
+    @Override
+    public List<TBasePoint> selectTBasePointList(TBasePoint tBasePoint)
+    {
+        return tBasePointMapper.selectTBasePointList(tBasePoint);
+    }
+
+    /**
+     * 新增密封点
+     * 
+     * @param tBasePoint 密封点
+     * @return 结果
+     */
+    @Override
+    public int insertTBasePoint(TBasePoint tBasePoint)
+    {
+        return tBasePointMapper.insertTBasePoint(tBasePoint);
+    }
+
+    /**
+     * 修改密封点
+     * 
+     * @param tBasePoint 密封点
+     * @return 结果
+     */
+    @Override
+    public int updateTBasePoint(TBasePoint tBasePoint)
+    {
+        return tBasePointMapper.updateTBasePoint(tBasePoint);
+    }
+
+    /**
+     * 批量删除密封点
+     * 
+     * @param ids 需要删除的密封点主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBasePointByIds(Long[] ids)
+    {
+        return tBasePointMapper.deleteTBasePointByIds(ids);
+    }
+
+    /**
+     * 删除密封点信息
+     * 
+     * @param id 密封点主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBasePointById(Long id)
+    {
+        return tBasePointMapper.deleteTBasePointById(id);
+    }
+}

master/src/main/resources/application.yml

@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 8090
   servlet:
     # 应用的访问路径
     context-path: /
@@ -134,7 +134,7 @@ gen:
   # 作者
   author: ruoyi
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ruoyi.system
+  packageName: com.ruoyi.project.base
   # 自动去除表前缀，默认是false
   autoRemovePre: false
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）

master/src/main/resources/mybatis/base/TBasePlantMapper.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.base.mapper.TBasePlantMapper">
+
+    <resultMap type="TBasePlant" id="TBasePlantResult">
+        <result property="id"    column="id"    />
+        <result property="plantCode"    column="plant_code"    />
+        <result property="plantName"    column="plant_name"    />
+        <result property="proAbility"    column="pro_ability"    />
+        <result property="plantType"    column="plant_type"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
+        <result property="approveTime"    column="approve_time"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updater"    column="updater"    />
+        <result property="updatedate"    column="updatedate"    />
+    </resultMap>
+
+    <sql id="selectTBasePlantVo">
+        select id, plant_code, plant_name, pro_ability, plant_type, remarks, approve_status, approve_time, dept_id, del_flag, creater_code, createdate, updater_code, updatedate from t_base_plant
+    </sql>
+
+    <select id="selectAllPlantName" resultMap="TBasePlantResult">
+        select d.id,d.plant_name from t_base_plant d
+    </select>
+
+    <select id="selectTBasePlantList" parameterType="TBasePlant" resultMap="TBasePlantResult">
+        select d.id, d.plant_code, d.plant_name, d.pro_ability, d.plant_type, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, su.user_name updater, d.updatedate from t_base_plant d
+        left join sys_user su on su.user_id = d.updater_code
+        <where>
+            <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
+            <if test="plantName != null  and plantName != ''"> and plant_name like concat('%', #{plantName}, '%')</if>
+            <if test="proAbility != null  and proAbility != ''"> and pro_ability = #{proAbility}</if>
+            <if test="plantType != null  and plantType != ''"> and plant_type = #{plantType}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="approveTime != null "> and approve_time = #{approveTime}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="createrCode != null "> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null "> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+        </where>
+    </select>
+
+    <select id="selectTBasePlantById" parameterType="Long" resultMap="TBasePlantResult">
+        <include refid="selectTBasePlantVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTBasePlant" parameterType="TBasePlant" useGeneratedKeys="true" keyProperty="id">
+        insert into t_base_plant
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="plantCode != null">plant_code,</if>
+            <if test="plantName != null">plant_name,</if>
+            <if test="proAbility != null">pro_ability,</if>
+            <if test="plantType != null">plant_type,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
+            <if test="approveTime != null">approve_time,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            createdate,
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="plantCode != null">#{plantCode},</if>
+            <if test="plantName != null">#{plantName},</if>
+            <if test="proAbility != null">#{proAbility},</if>
+            <if test="plantType != null">#{plantType},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
+            <if test="approveTime != null">#{approveTime},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            sysdate(),
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBasePlant" parameterType="TBasePlant">
+        update t_base_plant
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="plantCode != null">plant_code = #{plantCode},</if>
+            <if test="plantName != null">plant_name = #{plantName},</if>
+            <if test="proAbility != null">pro_ability = #{proAbility},</if>
+            <if test="plantType != null">plant_type = #{plantType},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="approveTime != null">approve_time = #{approveTime},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTBasePlantById" parameterType="Long">
+        delete from t_base_plant where id = #{id}
+    </delete>
+
+    <delete id="deleteTBasePlantByIds" parameterType="String">
+        delete from t_base_plant where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

master/src/main/resources/mybatis/base/TBasePointMapper.xml

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.base.mapper.TBasePointMapper">
+
+    <resultMap type="TBasePoint" id="TBasePointResult">
+        <result property="id"    column="id"    />
+        <result property="ppm"    column="ppm"    />
+        <result property="leakageDegree"    column="leakage_degree"    />
+        <result property="plantId"    column="plant_id"    />
+        <result property="plantType"    column="plant_type"    />
+        <result property="plantName"    column="plant_name"    />
+        <result property="plantCode"    column="plant_code"    />
+        <result property="regionId"    column="region_id"    />
+        <result property="devId"    column="dev_id"    />
+        <result property="devName"    column="dev_name"    />
+        <result property="devNum"    column="dev_num"    />
+        <result property="medium"    column="medium"    />
+        <result property="mediumType"    column="medium_type"    />
+        <result property="pointType"    column="point_type"    />
+        <result property="layer"    column="layer"    />
+        <result property="groupPosition"    column="group_position"    />
+        <result property="pointPosition"    column="point_position"    />
+        <result property="groupCode"    column="group_code"    />
+        <result property="extendCoude"    column="extend_coude"    />
+        <result property="subPointType"    column="sub_point_type"    />
+        <result property="dia"    column="dia"    />
+        <result property="unarrive"    column="unarrive"    />
+        <result property="unarriveReason"    column="unarrive_reason"    />
+        <result property="keepWarm"    column="keep_warm"    />
+        <result property="temperature"    column="temperature"    />
+        <result property="pressure"    column="pressure"    />
+        <result property="runTime"    column="run_time"    />
+        <result property="pidNo"    column="pid_no"    />
+        <result property="pidUrl"    column="pid_url"    />
+        <result property="picNo"    column="pic_no"    />
+        <result property="picUrl"    column="pic_url"    />
+        <result property="tocMark"    column="toc_mark"    />
+        <result property="methaneMark"    column="methane_mark"    />
+        <result property="vocsMark"    column="vocs_mark"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="approveStatus"    column="approve_status"    />
+        <result property="approveTime"    column="approve_time"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updater"    column="updater"    />
+        <result property="updatedate"    column="updatedate"    />
+    </resultMap>
+
+    <sql id="selectTBasePointVo">
+        select id, ppm, leakage_degree, plant_id, region_id, dev_id, medium, medium_type, point_type, layer, group_position, point_position, group_code, extend_coude, sub_point_type, dia, unarrive, unarrive_reason, keep_warm, temperature, pressure, run_time, pid_no, pid_url, pic_no, pic_url, toc_mark, methane_mark, vocs_mark, remarks, approve_status, approve_time, dept_id, del_flag, creater_code, createdate, updater_code, updatedate from t_base_point
+    </sql>
+
+    <select id="selectTBasePointList" parameterType="TBasePoint" resultMap="TBasePointResult">
+        select d.id, d.ppm, d.leakage_degree, d.plant_id,bp.plant_name,bp.plant_type,bp.plant_code, d.region_id, d.dev_id,d.medium, d.medium_type, d.point_type, d.layer, d.group_position, d.point_position, d.group_code, d.extend_coude, d.sub_point_type, d.dia, d.unarrive, d.unarrive_reason, d.keep_warm, d.temperature, d.pressure, d.run_time, d.pid_no, d.pid_url, d.pic_no, d.pic_url, d.toc_mark, d.methane_mark, d.vocs_mark, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, su.user_name updater, d.updatedate from t_base_point d
+        left join sys_user su on su.user_id = d.updater_code
+        left join t_base_plant bp on bp.id = d.plant_id
+        <where>
+            <if test="ppm != null "> and ppm = #{ppm}</if>
+            <if test="leakageDegree != null  and leakageDegree != ''"> and leakage_degree = #{leakageDegree}</if>
+            <if test="plantId != null "> and plant_id = #{plantId}</if>
+            <if test="regionId != null "> and region_id = #{regionId}</if>
+            <if test="devId != null "> and dev_id = #{devId}</if>
+            <if test="medium != null  and medium != ''"> and medium = #{medium}</if>
+            <if test="mediumType != null  and mediumType != ''"> and medium_type = #{mediumType}</if>
+            <if test="pointType != null  and pointType != ''"> and point_type = #{pointType}</if>
+            <if test="layer != null  and layer != ''"> and layer = #{layer}</if>
+            <if test="groupPosition != null  and groupPosition != ''"> and group_position = #{groupPosition}</if>
+            <if test="pointPosition != null  and pointPosition != ''"> and point_position = #{pointPosition}</if>
+            <if test="groupCode != null  and groupCode != ''"> and group_code = #{groupCode}</if>
+            <if test="extendCoude != null  and extendCoude != ''"> and extend_coude = #{extendCoude}</if>
+            <if test="subPointType != null  and subPointType != ''"> and sub_point_type = #{subPointType}</if>
+            <if test="dia != null  and dia != ''"> and dia = #{dia}</if>
+            <if test="unarrive != null  and unarrive != ''"> and unarrive = #{unarrive}</if>
+            <if test="unarriveReason != null  and unarriveReason != ''"> and unarrive_reason = #{unarriveReason}</if>
+            <if test="keepWarm != null  and keepWarm != ''"> and keep_warm = #{keepWarm}</if>
+            <if test="temperature != null  and temperature != ''"> and temperature = #{temperature}</if>
+            <if test="pressure != null  and pressure != ''"> and pressure = #{pressure}</if>
+            <if test="runTime != null "> and run_time = #{runTime}</if>
+            <if test="pidNo != null  and pidNo != ''"> and pid_no = #{pidNo}</if>
+            <if test="pidUrl != null  and pidUrl != ''"> and pid_url = #{pidUrl}</if>
+            <if test="picNo != null  and picNo != ''"> and pic_no = #{picNo}</if>
+            <if test="picUrl != null  and picUrl != ''"> and pic_url = #{picUrl}</if>
+            <if test="tocMark != null  and tocMark != ''"> and toc_mark = #{tocMark}</if>
+            <if test="methaneMark != null  and methaneMark != ''"> and methane_mark = #{methaneMark}</if>
+            <if test="vocsMark != null  and vocsMark != ''"> and vocs_mark = #{vocsMark}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="approveTime != null "> and approve_time = #{approveTime}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="createrCode != null "> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null "> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+        </where>
+    </select>
+
+    <select id="selectTBasePointById" parameterType="Long" resultMap="TBasePointResult">
+        <include refid="selectTBasePointVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTBasePoint" parameterType="TBasePoint" useGeneratedKeys="true" keyProperty="id">
+        insert into t_base_point
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="ppm != null">ppm,</if>
+            <if test="leakageDegree != null">leakage_degree,</if>
+            <if test="plantId != null">plant_id,</if>
+            <if test="regionId != null">region_id,</if>
+            <if test="devId != null">dev_id,</if>
+            <if test="medium != null">medium,</if>
+            <if test="mediumType != null">medium_type,</if>
+            <if test="pointType != null">point_type,</if>
+            <if test="layer != null">layer,</if>
+            <if test="groupPosition != null">group_position,</if>
+            <if test="pointPosition != null">point_position,</if>
+            <if test="groupCode != null">group_code,</if>
+            <if test="extendCoude != null">extend_coude,</if>
+            <if test="subPointType != null">sub_point_type,</if>
+            <if test="dia != null">dia,</if>
+            <if test="unarrive != null">unarrive,</if>
+            <if test="unarriveReason != null">unarrive_reason,</if>
+            <if test="keepWarm != null">keep_warm,</if>
+            <if test="temperature != null">temperature,</if>
+            <if test="pressure != null">pressure,</if>
+            <if test="runTime != null">run_time,</if>
+            <if test="pidNo != null">pid_no,</if>
+            <if test="pidUrl != null">pid_url,</if>
+            <if test="picNo != null">pic_no,</if>
+            <if test="picUrl != null">pic_url,</if>
+            <if test="tocMark != null">toc_mark,</if>
+            <if test="methaneMark != null">methane_mark,</if>
+            <if test="vocsMark != null">vocs_mark,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="approveStatus != null">approve_status,</if>
+            <if test="approveTime != null">approve_time,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            createdate,
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="ppm != null">#{ppm},</if>
+            <if test="leakageDegree != null">#{leakageDegree},</if>
+            <if test="plantId != null">#{plantId},</if>
+            <if test="regionId != null">#{regionId},</if>
+            <if test="devId != null">#{devId},</if>
+            <if test="medium != null">#{medium},</if>
+            <if test="mediumType != null">#{mediumType},</if>
+            <if test="pointType != null">#{pointType},</if>
+            <if test="layer != null">#{layer},</if>
+            <if test="groupPosition != null">#{groupPosition},</if>
+            <if test="pointPosition != null">#{pointPosition},</if>
+            <if test="groupCode != null">#{groupCode},</if>
+            <if test="extendCoude != null">#{extendCoude},</if>
+            <if test="subPointType != null">#{subPointType},</if>
+            <if test="dia != null">#{dia},</if>
+            <if test="unarrive != null">#{unarrive},</if>
+            <if test="unarriveReason != null">#{unarriveReason},</if>
+            <if test="keepWarm != null">#{keepWarm},</if>
+            <if test="temperature != null">#{temperature},</if>
+            <if test="pressure != null">#{pressure},</if>
+            <if test="runTime != null">#{runTime},</if>
+            <if test="pidNo != null">#{pidNo},</if>
+            <if test="pidUrl != null">#{pidUrl},</if>
+            <if test="picNo != null">#{picNo},</if>
+            <if test="picUrl != null">#{picUrl},</if>
+            <if test="tocMark != null">#{tocMark},</if>
+            <if test="methaneMark != null">#{methaneMark},</if>
+            <if test="vocsMark != null">#{vocsMark},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="approveStatus != null">#{approveStatus},</if>
+            <if test="approveTime != null">#{approveTime},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            sysdate(),
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBasePoint" parameterType="TBasePoint">
+        update t_base_point
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="ppm != null">ppm = #{ppm},</if>
+            <if test="leakageDegree != null">leakage_degree = #{leakageDegree},</if>
+            <if test="plantId != null">plant_id = #{plantId},</if>
+            <if test="regionId != null">region_id = #{regionId},</if>
+            <if test="devId != null">dev_id = #{devId},</if>
+            <if test="medium != null">medium = #{medium},</if>
+            <if test="mediumType != null">medium_type = #{mediumType},</if>
+            <if test="pointType != null">point_type = #{pointType},</if>
+            <if test="layer != null">layer = #{layer},</if>
+            <if test="groupPosition != null">group_position = #{groupPosition},</if>
+            <if test="pointPosition != null">point_position = #{pointPosition},</if>
+            <if test="groupCode != null">group_code = #{groupCode},</if>
+            <if test="extendCoude != null">extend_coude = #{extendCoude},</if>
+            <if test="subPointType != null">sub_point_type = #{subPointType},</if>
+            <if test="dia != null">dia = #{dia},</if>
+            <if test="unarrive != null">unarrive = #{unarrive},</if>
+            <if test="unarriveReason != null">unarrive_reason = #{unarriveReason},</if>
+            <if test="keepWarm != null">keep_warm = #{keepWarm},</if>
+            <if test="temperature != null">temperature = #{temperature},</if>
+            <if test="pressure != null">pressure = #{pressure},</if>
+            <if test="runTime != null">run_time = #{runTime},</if>
+            <if test="pidNo != null">pid_no = #{pidNo},</if>
+            <if test="pidUrl != null">pid_url = #{pidUrl},</if>
+            <if test="picNo != null">pic_no = #{picNo},</if>
+            <if test="picUrl != null">pic_url = #{picUrl},</if>
+            <if test="tocMark != null">toc_mark = #{tocMark},</if>
+            <if test="methaneMark != null">methane_mark = #{methaneMark},</if>
+            <if test="vocsMark != null">vocs_mark = #{vocsMark},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="approveTime != null">approve_time = #{approveTime},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTBasePointById" parameterType="Long">
+        delete from t_base_point where id = #{id}
+    </delete>
+
+    <delete id="deleteTBasePointByIds" parameterType="String">
+        delete from t_base_point where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

master/src/main/resources/vm/vue/index.vue.vm

@@ -170,7 +170,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -369,7 +369,7 @@ export default {
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
-      showSearch: true,
+      showSearch: false,
       // 总条数
       total: 0,
       // ${functionName}表格数据

ui/src/api/base/plant.js

@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+// 查询装置列表
+export function listPlant(query) {
+  return request({
+    url: '/base/plant/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询装置详细
+export function getPlant(id) {
+  return request({
+    url: '/base/plant/' + id,
+    method: 'get'
+  })
+}
+
+// 新增装置
+export function addPlant(data) {
+  return request({
+    url: '/base/plant',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改装置
+export function updatePlant(data) {
+  return request({
+    url: '/base/plant',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除装置
+export function delPlant(id) {
+  return request({
+    url: '/base/plant/' + id,
+    method: 'delete'
+  })
+}
+
+export function getAllPlantName() {
+  return request({
+    url: '/base/plant/allPlantName',
+    method: 'get'
+  })
+}

ui/src/api/base/point.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询密封点列表
+export function listPoint(query) {
+  return request({
+    url: '/base/point/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询密封点详细
+export function getPoint(id) {
+  return request({
+    url: '/base/point/' + id,
+    method: 'get'
+  })
+}
+
+// 新增密封点
+export function addPoint(data) {
+  return request({
+    url: '/base/point',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改密封点
+export function updatePoint(data) {
+  return request({
+    url: '/base/point',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除密封点
+export function delPoint(id) {
+  return request({
+    url: '/base/point/' + id,
+    method: 'delete'
+  })
+}

ui/src/layout/components/Sidebar/Logo.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
+import logoImg from '@/assets/logo/logo1.png'
 import variables from '@/assets/styles/variables.scss'
 
 export default {

ui/src/router/index.js

@@ -68,7 +68,7 @@ export const constantRoutes = [
     children: [
       {
         path: 'index',
-        component: () => import('@/views/index'),
+        component: () => import('@/views'),
         name: 'Index',
         meta: { title: '首页', icon: 'dashboard', affix: true }
       }

ui/src/utils/ruoyi.js

@@ -75,8 +75,8 @@ export function selectDictLabel(datas, value) {
   }
   var actions = [];
   Object.keys(datas).some((key) => {
-    if (datas[key].value == ('' + value)) {
-      actions.push(datas[key].label);
+    if (datas[key].dictValue == ('' + value)) {
+      actions.push(datas[key].dictLabel);
       return true;
     }
   })
@@ -97,8 +97,8 @@ export function selectDictLabels(datas, value, separator) {
   Object.keys(value.split(currentSeparator)).some((val) => {
     var match = false;
     Object.keys(datas).some((key) => {
-      if (datas[key].value == ('' + temp[val])) {
-        actions.push(datas[key].label + currentSeparator);
+      if (datas[key].dictValue == ('' + temp[val])) {
+        actions.push(datas[key].dictLabel + currentSeparator);
         match = true;
       }
     })

ui/src/views/base/plant/index.vue

@@ -0,0 +1,412 @@
+<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="编号" prop="plantCode">
+        <el-input
+          v-model="queryParams.plantCode"
+          placeholder="请输入编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="名称" prop="plantName">
+        <el-input
+          v-model="queryParams.plantName"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="类别" prop="plantType">
+        <el-select v-model="queryParams.plantType" @change="handleQuery" placeholder="请选择类别" clearable size="small"
+                   style="width: 200px">
+          <el-option
+            v-for="dict in plantTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="加工/生产能力(t/a)" prop="proAbility" label-width="140px">
+        <el-input
+          v-model="queryParams.proAbility"
+          placeholder="请输入加工/生产能力(t/a)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['base:plant:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['base:plant:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['base:plant:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['base:plant:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-position"
+          size="mini"
+          @click="handleToApprove"
+        >送审
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-s-check"
+          size="mini"
+          @click="handleApprove"
+        >审核
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" ref="plantTable" :data="plantList" @selection-change="handleSelectionChange"
+              :height="clientHeight" border :cell-style="tableCellStyle">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="审核状态"  align="center" prop="approveStatus"
+                       :formatter="approveStatusFormat"/>
+      <el-table-column label="编号" align="center" prop="plantCode"/>
+      <el-table-column label="名称" align="center" prop="plantName"/>
+      <el-table-column label="加工/生产能力(t/a)" align="center" prop="proAbility"/>
+      <el-table-column label="类别" align="center" prop="plantType" :formatter="plantTypeFormat"/>
+      <el-table-column label="最后维护人" align="center" prop="updater"/>
+      <el-table-column label="维护时间" align="center" prop="updatedate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="描述" align="center" prop="remarks"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['base:plant:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['base:plant:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改装置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="编号" prop="plantCode">
+          <el-input v-model="form.plantCode" placeholder="请输入编号"/>
+        </el-form-item>
+        <el-form-item label="名称" prop="plantName">
+          <el-input v-model="form.plantName" placeholder="请输入名称"/>
+        </el-form-item>
+        <el-form-item label="类别" prop="plantType">
+          <el-select v-model="form.plantType" placeholder="请选择类别" clearable size="small" style="width: 100%">
+            <el-option
+              v-for="dict in plantTypeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="加工/生产能力" prop="proAbility">
+          <el-input v-model="form.proAbility" placeholder="请输入加工/生产能力"/>
+        </el-form-item>
+        <el-form-item label="描述" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入描述"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {listPlant, getPlant, delPlant, addPlant, updatePlant} from "@/api/base/plant";
+
+export default {
+  name: "Plant",
+  data() {
+    return {
+      plantTypeOptions: [],
+      approveStatusOperation: [],
+      clientHeight: 300,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 装置表格数据
+      plantList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        plantCode: null,
+        plantName: null,
+        proAbility: null,
+        plantType: null,
+        remarks: null,
+        approveStatus: null,
+        approveTime: null,
+        deptId: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        plantName: [
+          {required: true, message: this.$t('装置名称') + this.$t('不能为空'), trigger: "blur"}
+        ],
+        plantCode: [
+          {required: true, message: this.$t('装置编号') + this.$t('不能为空'), trigger: "blur"}
+        ],
+        plantType: [
+          {required: true, message: this.$t('装置类别') + this.$t('不能为空'), trigger: "blur"}
+        ],
+      }
+    };
+  },
+  watch: {
+    tableData(val) {
+      this.doLayout();
+    }
+  },
+  created() {
+
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = (document.body.clientHeight - 80) * 0.8
+    });
+    this.getDicts("plant_type").then(response => {
+      this.plantTypeOptions = response.data;
+    });
+    this.getDicts("base_approve_status").then(response => {
+      this.approveStatusOperation = response.data;
+    });
+    this.getList();
+  },
+  methods: {
+    tableCellStyle({row, column, rowIndex, columnIndex}) {
+      if (columnIndex === 1 && row.approveStatus == 2) {
+        return "color:#00ff00;";
+      }
+      if (columnIndex === 1 && row.approveStatus == 1) {
+        return "color:#FFDF00;";
+      }
+      if (columnIndex === 1 && row.approveStatus == 0) {
+        return "color:#ff0000;";
+      }
+    },
+    /* 重新渲染table组件 */
+    doLayout(){
+      this.$nextTick(() => {
+        this.$refs.plantTable.doLayout()
+      })
+    },
+    plantTypeFormat(row, column) {
+      return this.selectDictLabel(this.plantTypeOptions, row.plantType);
+    },
+    approveStatusFormat(row, column) {
+      return this.selectDictLabel(this.approveStatusOperation, row.approveStatus);
+    },
+    /** 查询装置列表 */
+    getList() {
+      this.loading = true;
+      listPlant(this.queryParams).then(response => {
+        this.plantList = response.rows;
+        this.total = response.total;
+        this.$nextTick(() => {
+          this.$refs.plantTable.doLayout(); // 解决表格错位
+        });
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        plantCode: null,
+        plantName: null,
+        proAbility: null,
+        plantType: null,
+        remarks: null,
+        approveStatus: 0,
+        approveTime: null,
+        deptId: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加装置";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getPlant(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改装置";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updatePlant(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPlant(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除装置编号为"' + ids + '"的数据项？').then(function () {
+        return delPlant(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('base/plant/export', {
+        ...this.queryParams
+      }, `plant_${new Date().getTime()}.xlsx`)
+    },
+    handleToApprove() {
+      alert("功能开发中......")
+    },handleApprove() {
+      alert("功能开发中......")
+    }
+  }
+};
+</script>

ui/src/views/base/point/index.vue

@@ -0,0 +1,737 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="装置" prop="plantId">
+        <el-select v-model="queryParams.plantId" @change="handleQuery" placeholder="请选择装置" clearable size="small">
+                    <el-option
+                      v-for="plant in plantOperation"
+                      :key="plant.id"
+                      :label="plant.plantName"
+                      :value="plant.id"
+                    />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="区域" prop="regionId">
+        <el-select v-model="queryParams.regionId" @change="handleQuery" placeholder="请选择区域" clearable size="small">
+          <!--          <el-option
+                      v-for="dict in classesOptions"
+                      :key="dict.dictValue"
+                      :label="dict.dictLabel"
+                      :value="dict.dictValue"
+                    />-->
+        </el-select>
+      </el-form-item>
+      <el-form-item label="设备" prop="devId">
+        <el-select v-model="queryParams.devId" @change="handleQuery" placeholder="请选择设备" clearable size="small">
+          <!--          <el-option
+                      v-for="dict in classesOptions"
+                      :key="dict.dictValue"
+                      :label="dict.dictLabel"
+                      :value="dict.dictValue"
+                    />-->
+        </el-select>
+      </el-form-item>
+      <el-form-item label="群组编码" prop="groupCode">
+        <el-input
+          v-model="queryParams.groupCode"
+          placeholder="请输入群组编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="介质" prop="medium">
+        <el-input
+          v-model="queryParams.medium"
+          placeholder="请输入介质"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="泄漏程度" prop="leakageDegree">
+        <el-select v-model="queryParams.leakageDegree" @change="handleQuery" placeholder="请选择泄漏程度" clearable
+                   size="small">
+          <!--          <el-option
+                      v-for="dict in classesOptions"
+                      :key="dict.dictValue"
+                      :label="dict.dictLabel"
+                      :value="dict.dictValue"
+                    />-->
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是/否不可达点" prop="unarrive">
+        <el-select v-model="queryParams.unarrive" @change="handleQuery" placeholder="请选择是/否" clearable
+                   size="small">
+                    <el-option
+                      v-for="dict in yesOrNoOperation"
+                      :key="dict.dictValue"
+                      :label="dict.dictLabel"
+                      :value="dict.dictValue"
+                    />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="密封点类型" prop="pointType">
+        <el-select v-model="queryParams.pointType" @change="handleQuery" placeholder="请选择密封点类型" clearable
+                   size="small">
+          <!--          <el-option
+                      v-for="dict in classesOptions"
+                      :key="dict.dictValue"
+                      :label="dict.dictLabel"
+                      :value="dict.dictValue"
+                    />-->
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核状态" prop="approveStatus">
+        <el-select v-model="queryParams.approveStatus" @change="handleQuery" placeholder="请选择审核状态" clearable
+                   size="small">
+                    <el-option
+                      v-for="dict in approveStatusOperation"
+                      :key="dict.dictValue"
+                      :label="dict.dictLabel"
+                      :value="dict.dictValue"
+                    />
+        </el-select>
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['base:point:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['base:point:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['base:point:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['base:point:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-position"
+          size="mini"
+          @click="handleToApprove"
+        >送审
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-s-check"
+          size="mini"
+          @click="handleApprove"
+        >审核
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="pointList" :cell-style="tableCellStyle" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="检测净值(ppm)" align="center" prop="ppm" width="110" :show-overflow-tooltip="true"/>
+      <el-table-column label="泄漏程度" align="center" prop="leakageDegree" :formatter="leakageFormat"/>
+      <el-table-column label="装置名称" align="center" prop="plantName":show-overflow-tooltip="true"/>
+      <el-table-column label="装置编码" align="center" prop="plantCode"/>
+      <el-table-column label="装置类别" align="center" prop="plantType" :formatter="plantTypeFormat"/>
+      <el-table-column label="区域名称" align="center" prop="regionName"/>
+      <el-table-column label="区域编码" align="center" prop="regionCode"/>
+      <el-table-column label="设备/管线名称" align="center" prop="devName" width="110"/>
+      <el-table-column label="设备/管线编码" align="center" prop="devCode" width="110"/>
+      <el-table-column label="介质" align="center" prop="medium"/>
+      <el-table-column label="介质状态" align="center" prop="mediumType"/>
+      <el-table-column label="密封点类型" align="center" prop="pointType" width="100"/>
+      <el-table-column label="平台(层)" align="center" prop="layer"/>
+      <el-table-column label="群组位置" align="center" prop="groupPosition"/>
+      <el-table-column label="密封点位置" align="center" prop="pointPosition" width="110"/>
+      <el-table-column label="群组编码" align="center" prop="groupCode"/>
+      <el-table-column label="扩展编码" align="center" prop="extendCoude"/>
+      <el-table-column label="密封点子类型" align="center" prop="subPointType" width="110"/>
+      <el-table-column label="公称直径(mm)" align="center" prop="dia" width="110"/>
+      <el-table-column label="是否不可达点" align="center" prop="unarrive" width="110" :formatter="unarriveFormat"/>
+      <el-table-column label="不可达原因" align="center" prop="unarriveReason" width="110"/>
+      <el-table-column label="是否保温/保冷" align="center" prop="keepWarm" width="110" :formatter="keepWarmFormat"/>
+      <el-table-column label="工艺温度(℃)" align="center" prop="temperature" width="110"/>
+      <el-table-column label="工艺压力(Mpa)" align="center" prop="pressure" width="110"/>
+      <el-table-column label="运行时间" align="center" prop="runTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.runTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="PID图号" align="center" prop="pidNo"/>
+      <el-table-column label="群组照片号" align="center" prop="picNo" width="110"/>
+      <el-table-column label="TOC质量分数" align="center" prop="tocMark" width="110"/>
+      <el-table-column label="甲烷质量分数" align="center" prop="methaneMark" width="110"/>
+      <el-table-column label="VOCs质量分数" align="center" prop="vocsMark" width="110"/>
+      <el-table-column label="审核状态" align="center" fixed="left" prop="approveStatus" :formatter="approveStatusFormat"/>
+      <el-table-column label="最后维护人" align="center" prop="updater" width="110"/>
+      <el-table-column label="最后维护时间" align="center" prop="updatedate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="描述" align="center" prop="remarks"/>
+      <el-table-column label="操作" align="center" width="140px" fixed="right" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['base:point:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['base:point:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改密封点对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="装置" prop="plantId">
+              <el-select v-model="form.plantId" placeholder="请选择装置" clearable size="small" style="width: 100%">
+                          <el-option
+                            v-for="dict in plantOperation"
+                            :key="dict.id"
+                            :label="dict.plantName"
+                            :value="dict.id"
+                          />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="区域" prop="regionId">
+              <el-select v-model="form.regionId" placeholder="请选择区域" clearable size="small" style="width: 100%">
+                <!--          <el-option
+                            v-for="dict in classesOptions"
+                            :key="dict.dictValue"
+                            :label="dict.dictLabel"
+                            :value="dict.dictValue"
+                          />-->
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="设备" prop="devId">
+              <el-select v-model="form.devId" placeholder="请选择设备" clearable size="small" style="width: 100%">
+                <!--          <el-option
+                            v-for="dict in classesOptions"
+                            :key="dict.dictValue"
+                            :label="dict.dictLabel"
+                            :value="dict.dictValue"
+                          />-->
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="介质" prop="medium">
+              <el-input v-model="form.medium" placeholder="请输入介质"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="密封点类型" prop="pointType">
+              <el-select v-model="form.pointType" placeholder="请选择密封点类型" clearable size="small" style="width: 100%">
+                <!--          <el-option
+                            v-for="dict in classesOptions"
+                            :key="dict.dictValue"
+                            :label="dict.dictLabel"
+                            :value="dict.dictValue"
+                          />-->
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公称直径(mm)" prop="dia">
+              <el-input v-model="form.dia" placeholder="请输入公称直径(mm)"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="介质状态" prop="mediumType">
+              <el-select v-model="form.mediumType" placeholder="请选择介质状态" clearable size="small" style="width: 100%">
+                <!--          <el-option
+                            v-for="dict in classesOptions"
+                            :key="dict.dictValue"
+                            :label="dict.dictLabel"
+                            :value="dict.dictValue"
+                          />-->
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="密封点子类型" prop="subPointType">
+              <el-input v-model="form.subPointType" placeholder="请输入密封点子类型"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="平台(层)" prop="layer">
+              <el-input v-model="form.layer" placeholder="请输入平台"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="群组位置" prop="groupPosition">
+              <el-input v-model="form.groupPosition" placeholder="请输入群组位置"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="密封点位置" prop="pointPosition">
+              <el-input v-model="form.pointPosition" placeholder="请输入密封点位置"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="群组编码" prop="groupCode">
+              <el-input v-model="form.groupCode" placeholder="请输入群组编码"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="扩展编码" prop="extendCoude">
+              <el-input v-model="form.extendCoude" placeholder="请输入扩展编码"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="VOCs质量分数" prop="vocsMark">
+              <el-input v-model="form.vocsMark" placeholder="请输入VOCs质量分数"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是/否不可达点" prop="unarrive">
+              <el-select v-model="form.unarrive" placeholder="请选择是/否" clearable size="small" style="width: 100%">
+                <el-option
+                  v-for="dict in yesOrNoOperation"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="不可达原因" prop="unarriveReason">
+              <el-input v-model="form.unarriveReason" placeholder="请输入不可达原因"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否保温/保冷" prop="keepWarm">
+              <el-select v-model="form.keepWarm" placeholder="请选择是/否" clearable size="small" style="width: 100%">
+                <el-option
+                  v-for="dict in yesOrNoOperation"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工艺温度" prop="temperature">
+              <el-input v-model="form.temperature" placeholder="请输入工艺温度"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="工艺压力" prop="pressure">
+              <el-input v-model="form.pressure" placeholder="请输入工艺压力"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="运行时间" prop="runTime">
+              <el-date-picker clearable
+                              v-model="form.runTime"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择运行时间"
+                              style="width: 100%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="PID图号" prop="pidNo">
+              <el-input v-model="form.pidNo" placeholder="请输入PID图号"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="群组照片号" prop="picNo">
+              <el-input v-model="form.picNo" placeholder="请输入群组照片号"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="TOC质量分数" prop="tocMark">
+              <el-input v-model="form.tocMark" placeholder="请输入TOC质量分数"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="甲烷质量分数" prop="methaneMark">
+              <el-input v-model="form.methaneMark" placeholder="请输入甲烷质量分数"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="描述" prop="remarks">
+              <el-input v-model="form.remarks" placeholder="请输入描述"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {listPoint, getPoint, delPoint, addPoint, updatePoint} from "@/api/base/point";
+import {getAllPlantName} from "@/api/base/plant";
+
+export default {
+  name: "Point",
+  data() {
+    return {
+      plantOperation: [],
+      plantTypeOptions: [],
+      leakageDegreeOperation: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      clientHeight: 300,
+      // 显示搜索条件
+      showSearch: false,
+      yesOrNoOperation: [],
+      approveStatusOperation: [],
+      // 总条数
+      total: 0,
+      // 密封点表格数据
+      pointList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        ppm: null,
+        leakageDegree: null,
+        plantId: null,
+        regionId: null,
+        devId: null,
+        medium: null,
+        mediumType: null,
+        pointType: null,
+        layer: null,
+        groupPosition: null,
+        pointPosition: null,
+        groupCode: null,
+        extendCoude: null,
+        subPointType: null,
+        dia: null,
+        unarrive: null,
+        unarriveReason: null,
+        keepWarm: null,
+        temperature: null,
+        pressure: null,
+        runTime: null,
+        pidNo: null,
+        pidUrl: null,
+        picNo: null,
+        picUrl: null,
+        tocMark: null,
+        methaneMark: null,
+        vocsMark: null,
+        remarks: null,
+        approveStatus: null,
+        approveTime: null,
+        deptId: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        plantId: [
+          {required: true, message: this.$t('装置') + this.$t('不能为空'), trigger: "blur"}
+        ],
+      }
+    };
+  },
+  created() {
+    this.getDicts("plant_type").then(response => {
+      this.plantTypeOptions = response.data;
+    });
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = (document.body.clientHeight - 80) * 0.8
+    });
+    this.getDicts("yes_no").then(response => {
+      this.yesOrNoOperation = response.data;
+    });
+    this.getDicts("base_approve_status").then(response => {
+      this.approveStatusOperation = response.data;
+    });
+    this.getDicts("leakage_degree").then(response => {
+      this.leakageDegreeOperation = response.data;
+    });
+    this.getList();
+    getAllPlantName().then(response => {
+      this.plantOperation = response.data;
+    })
+  },
+  methods: {
+    tableCellStyle({row, column, rowIndex, columnIndex}) {
+      if (columnIndex === 1 && row.approveStatus == 2) {
+        return "color:#00ff00;";
+      }
+      if (columnIndex === 1&& row.approveStatus == 1) {
+        return "color:#FFDF00;";
+      }
+      if (columnIndex === 1 && row.approveStatus == 0) {
+        return "color:#ff0000;";
+      }
+      if (columnIndex === 3 && row.leakageDegree == 1) {
+        return "color:#00ff00;font-size:200%";
+      }
+      if (columnIndex === 3 && row.leakageDegree == 2) {
+        return "color:#FFDF00;font-size:200%";
+      }
+      if (columnIndex === 3 && row.leakageDegree == 3) {
+        return "color:#ff0000;font-size:200%";
+      }
+    },
+    leakageFormat(row, column) {
+      return row.leakageDegree?"●":null;
+    },
+    unarriveFormat(row, column) {
+      return this.selectDictLabel(this.yesOrNoOperation, row.unarrive);
+    },
+    keepWarmFormat(row, column) {
+      return this.selectDictLabel(this.yesOrNoOperation, row.keepWarm);
+    },
+    approveStatusFormat(row, column) {
+      return this.selectDictLabel(this.approveStatusOperation, row.approveStatus);
+    },
+    plantTypeFormat(row, column) {
+      return this.selectDictLabel(this.plantTypeOptions, row.plantType);
+    },
+    /** 查询密封点列表 */
+    getList() {
+      this.loading = true;
+      listPoint(this.queryParams).then(response => {
+        this.pointList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        ppm: null,
+        leakageDegree: null,
+        plantId: null,
+        regionId: null,
+        devId: null,
+        medium: null,
+        mediumType: null,
+        pointType: null,
+        layer: null,
+        groupPosition: null,
+        pointPosition: null,
+        groupCode: null,
+        extendCoude: null,
+        subPointType: null,
+        dia: null,
+        unarrive: null,
+        unarriveReason: null,
+        keepWarm: null,
+        temperature: null,
+        pressure: null,
+        runTime: null,
+        pidNo: null,
+        pidUrl: null,
+        picNo: null,
+        picUrl: null,
+        tocMark: null,
+        methaneMark: null,
+        vocsMark: null,
+        remarks: null,
+        approveStatus: 0,
+        approveTime: null,
+        deptId: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加密封点";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getPoint(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改密封点";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updatePoint(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPoint(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除密封点编号为"' + ids + '"的数据项？').then(function () {
+        return delPoint(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('base/point/export', {
+        ...this.queryParams
+      }, `point_${new Date().getTime()}.xlsx`)
+    },
+    handleToApprove() {
+      alert("功能开发中......")
+    },handleApprove() {
+      alert("功能开发中......")
+    }
+  }
+};
+</script>

ui/src/views/dashboard/PanelGroup.vue

@@ -3,39 +3,39 @@
     <el-col :xs="16" :sm="16" :lg="8" class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
         <div class="card-panel-icon-wrapper icon-people">
-          <svg-icon icon-class="peoples" class-name="card-panel-icon" />
+          <svg-icon icon-class="dashboard" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
             初始排放量
           </div>
-          <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="12345" :duration="2600" class="card-panel-num" />吨/年
         </div>
       </div>
     </el-col>
     <el-col :xs="16" :sm="16" :lg="8" class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('messages')">
         <div class="card-panel-icon-wrapper icon-message">
-          <svg-icon icon-class="message" class-name="card-panel-icon" />
+          <svg-icon icon-class="dashboard" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
             减排量
           </div>
-          <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="12345" :duration="3000" class="card-panel-num" />吨/年
         </div>
       </div>
     </el-col>
     <el-col :xs="16" :sm="18" :lg="8" class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('purchases')">
         <div class="card-panel-icon-wrapper icon-money">
-          <svg-icon icon-class="money" class-name="card-panel-icon" />
+          <svg-icon icon-class="dashboard" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
             最终排放量
           </div>
-          <count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
+          <count-to :start-val="0" autopa :end-val="1235.123" :duration="3200" :decimals="4" class="card-panel-num" />吨/年
         </div>
       </div>
     </el-col>

ui/src/views/dashboard/TransactionTable.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { transactionList } from '@/api/remote-search'
+
 
 export default {
   filters: {

ui/src/views/index.vue

@@ -25,29 +25,16 @@
       </el-col>
     </el-row>
 
-    <el-row :gutter="8">
-      <el-col :xs="{span: 24}" :sm="{span: 24}" :md="{span: 24}" :lg="{span: 12}" :xl="{span: 12}" style="padding-right:8px;margin-bottom:30px;">
-        <transaction-table />
-      </el-col>
-      <el-col :xs="{span: 24}" :sm="{span: 12}" :md="{span: 12}" :lg="{span: 6}" :xl="{span: 6}" style="margin-bottom:30px;">
-        <todo-list />
-      </el-col>
-      <el-col :xs="{span: 24}" :sm="{span: 12}" :md="{span: 12}" :lg="{span: 6}" :xl="{span: 6}" style="margin-bottom:30px;">
-        <box-card />
-      </el-col>
-    </el-row>
+
   </div>
 </template>
 
 <script>
-import PanelGroup from '@/views/dashboard/PanelGroup'
-import LineChart from '@/views/dashboard/LineChart'
-import RaddarChart from '@/views/dashboard/RaddarChart'
-import PieChart from '@/views/dashboard/PieChart'
-import BarChart from '@/views/dashboard/BarChart'
-import TransactionTable from '@/views/dashboard/TransactionTable'
-import TodoList from '@/views/dashboard/TodoList'
-import BoxCard from '@/views/dashboard/BoxCard'
+import PanelGroup from './dashboard/PanelGroup'
+import LineChart from './dashboard/LineChart'
+import RaddarChart from './dashboard/RaddarChart'
+import PieChart from './dashboard/PieChart'
+import BarChart from './dashboard/BarChart'
 
 const lineChartData = {
   newVisitis: {
@@ -69,16 +56,13 @@ const lineChartData = {
 }
 
 export default {
-  name: 'DashboardAdmin',
+  name: 'Index',
   components: {
     PanelGroup,
     LineChart,
     RaddarChart,
     PieChart,
-    BarChart,
-    TransactionTable,
-    TodoList,
-    BoxCard
+    BarChart
   },
   data() {
     return {
@@ -99,13 +83,6 @@ export default {
   background-color: rgb(240, 242, 245);
   position: relative;
 
-  .github-corner {
-    position: absolute;
-    top: 0px;
-    border: 0;
-    right: 0;
-  }
-
   .chart-wrapper {
     background: #fff;
     padding: 16px 16px 0;

ui/src/views/tool/build/index.vue

@@ -147,7 +147,7 @@ import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/
 import { makeUpJs } from '@/utils/generator/js'
 import { makeUpCss } from '@/utils/generator/css'
 import drawingDefault from '@/utils/generator/drawingDefault'
-import logo from '@/assets/logo/logo.png'
+import logo from '@/assets/logo/logo1.png'
 import CodeTypeDialog from './CodeTypeDialog'
 import DraggableItem from './DraggableItem'
 

ui/vue.config.js

@@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 
 const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
 
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
+const port = process.env.port || process.env.npm_config_port || 90 // 端口
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        target: `http://localhost:8090`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''