Skip to content

G
gassafety-progress
Commit b7309a0e authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress

parents 5f69dffb f89ba726
Hide whitespace changes
Inline Side-by-side
Showing with 457 additions and 217 deletions
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TPipeInfo.java
View file @ b7309a0e
......@@ -8,7 +8,7 @@ import com.zehong.common.core.domain.BaseEntity;
/**
* 管道信息对象 t_pipe_info
*
*
* @author zehong
* @date 2022-02-09
*/
......@@ -55,6 +55,10 @@ public class TPipeInfo extends BaseEntity
@Excel(name = "建设单位")
private String buildUnit;
/**人员类型*/
@Excel(name = "人员类型")
private String peopleOccupation;
/** 权属单位 */
@Excel(name = "权属单位")
private Long beyondEnterpriseId;
......@@ -75,164 +79,173 @@ public class TPipeInfo extends BaseEntity
@Excel(name = "备注")
private String remarks;
public void setPipeId(Long pipeId)
public static long getSerialVersionUID() {
return serialVersionUID;
}
public String getPeopleOccupation() {
return peopleOccupation;
}
public void setPeopleOccupation(String peopleOccupation) {
this.peopleOccupation = peopleOccupation;
}
public void setPipeId(Long pipeId)
{
this.pipeId = pipeId;
}
public Long getPipeId()
public Long getPipeId()
{
return pipeId;
}
public void setPipeLength(BigDecimal pipeLength)
public void setPipeLength(BigDecimal pipeLength)
{
this.pipeLength = pipeLength;
}
public BigDecimal getPipeLength()
public BigDecimal getPipeLength()
{
return pipeLength;
}
public void setPipeDiameter(BigDecimal pipeDiameter)
public void setPipeDiameter(BigDecimal pipeDiameter)
{
this.pipeDiameter = pipeDiameter;
}
public BigDecimal getPipeDiameter()
public BigDecimal getPipeDiameter()
{
return pipeDiameter;
}
public void setPipePressure(BigDecimal pipePressure)
public void setPipePressure(BigDecimal pipePressure)
{
this.pipePressure = pipePressure;
}
public BigDecimal getPipePressure()
public BigDecimal getPipePressure()
{
return pipePressure;
}
public void setPipeMaterial(String pipeMaterial)
public void setPipeMaterial(String pipeMaterial)
{
this.pipeMaterial = pipeMaterial;
}
public String getPipeMaterial()
public String getPipeMaterial()
{
return pipeMaterial;
}
public void setPipeAddr(String pipeAddr)
public void setPipeAddr(String pipeAddr)
{
this.pipeAddr = pipeAddr;
}
public String getPipeAddr()
public String getPipeAddr()
{
return pipeAddr;
}
public void setBuriedDepth(BigDecimal buriedDepth)
public void setBuriedDepth(BigDecimal buriedDepth)
{
this.buriedDepth = buriedDepth;
}
public BigDecimal getBuriedDepth()
public BigDecimal getBuriedDepth()
{
return buriedDepth;
}
public void setPipeTrend(String pipeTrend)
public void setPipeTrend(String pipeTrend)
{
this.pipeTrend = pipeTrend;
}
public String getPipeTrend()
public String getPipeTrend()
{
return pipeTrend;
}
public void setBuildDate(String buildDate)
public void setBuildDate(String buildDate)
{
this.buildDate = buildDate;
}
public String getBuildDate()
public String getBuildDate()
{
return buildDate;
}
public void setBuildUnit(String buildUnit)
public void setBuildUnit(String buildUnit)
{
this.buildUnit = buildUnit;
}
public String getBuildUnit()
public String getBuildUnit()
{
return buildUnit;
}
public void setBeyondEnterpriseId(Long beyondEnterpriseId)
public void setBeyondEnterpriseId(Long beyondEnterpriseId)
{
this.beyondEnterpriseId = beyondEnterpriseId;
}
public Long getBeyondEnterpriseId()
public Long getBeyondEnterpriseId()
{
return beyondEnterpriseId;
}
public void setBeyondEnterpriseName(String beyondEnterpriseName)
public void setBeyondEnterpriseName(String beyondEnterpriseName)
{
this.beyondEnterpriseName = beyondEnterpriseName;
}
public String getBeyondEnterpriseName()
public String getBeyondEnterpriseName()
{
return beyondEnterpriseName;
}
public void setCoordinates(String coordinates)
public void setCoordinates(String coordinates)
{
this.coordinates = coordinates;
}
public String getCoordinates()
public String getCoordinates()
{
return coordinates;
}
public void setIsDel(String isDel)
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
public String getIsDel()
{
return isDel;
}
public void setRemarks(String remarks)
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
public String getRemarks()
{
return remarks;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("pipeId", getPipeId())
.append("pipeLength", getPipeLength())
.append("pipeDiameter", getPipeDiameter())
.append("pipePressure", getPipePressure())
.append("pipeMaterial", getPipeMaterial())
.append("pipeAddr", getPipeAddr())
.append("buriedDepth", getBuriedDepth())
.append("pipeTrend", getPipeTrend())
.append("buildDate", getBuildDate())
.append("buildUnit", getBuildUnit())
.append("beyondEnterpriseId", getBeyondEnterpriseId())
.append("beyondEnterpriseName", getBeyondEnterpriseName())
.append("coordinates", getCoordinates())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("isDel", getIsDel())
.append("remarks", getRemarks())
.toString();
return "TPipeInfo{" +
"pipeId=" + pipeId +
", pipeLength=" + pipeLength +
", pipeDiameter=" + pipeDiameter +
", pipePressure=" + pipePressure +
", pipeMaterial='" + pipeMaterial + '\'' +
", pipeAddr='" + pipeAddr + '\'' +
", buriedDepth=" + buriedDepth +
", pipeTrend='" + pipeTrend + '\'' +
", buildDate='" + buildDate + '\'' +
", buildUnit='" + buildUnit + '\'' +
", peopleOccupation='" + peopleOccupation + '\'' +
", beyondEnterpriseId=" + beyondEnterpriseId +
", beyondEnterpriseName='" + beyondEnterpriseName + '\'' +
", coordinates='" + coordinates + '\'' +
", isDel='" + isDel + '\'' +
", remarks='" + remarks + '\'' +
'}';
}
}
gassafetyprogress-system/src/main/resources/mapper/system/TDetectorUserMapper.xml
View file @ b7309a0e
......@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="username != null and username != ''"> and username like concat('%', #{username}, '%')</if>
<if test="nickName != null and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
</where>
group by user_id desc
</select>
<select id="selectTDetectorUserById" parameterType="Long" resultMap="TDetectorUserResult">
......
gassafetyprogress-system/src/main/resources/mapper/system/TEmployedPeopleInfoMapper.xml
View file @ b7309a0e
......@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="idCard != null and idCard != ''"> and id_card = #{idCard}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
group by employed_people_id desc
</select>
<select id="selectTEmployedPeopleInfoById" parameterType="Long" resultMap="TEmployedPeopleInfoResult">
......
gassafetyprogress-system/src/main/resources/mapper/system/TEnterpriseInfoMapper.xml
View file @ b7309a0e
......@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="annualSupervisionInspection != null and annualSupervisionInspection != ''"> and annual_supervision_inspection = #{annualSupervisionInspection}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
group by enterprise_id desc
</select>
<select id="selectTEnterpriseInfoById" parameterType="Long" resultMap="TEnterpriseInfoResult">
......
gassafetyprogress-system/src/main/resources/mapper/system/TPipeInfoMapper.xml
View file @ b7309a0e
......@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zehong.system.mapper.TPipeInfoMapper">
<resultMap type="TPipeInfo" id="TPipeInfoResult">
<result property="pipeId" column="pipe_id" />
<result property="pipeLength" column="pipe_length" />
......@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="pipeAddr" column="pipe_addr" />
<result property="buriedDepth" column="buried_depth" />
<result property="pipeTrend" column="pipe_trend" />
<result property="peopleOccupation" column="people_occupation" />
<result property="buildDate" column="build_date" />
<result property="buildUnit" column="build_unit" />
<result property="beyondEnterpriseId" column="beyond_enterprise_id" />
......@@ -27,12 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTPipeInfoVo">
select pipe_id, pipe_length, pipe_diameter, pipe_pressure, pipe_material, pipe_addr, buried_depth, pipe_trend, build_date, build_unit, beyond_enterprise_id, beyond_enterprise_name, coordinates, create_by, create_time, update_by, update_time, is_del, remarks from t_pipe_info
select pipe_id,(CASE people_occupation WHEN '1' THEN '运行维护人员' WHEN '2' THEN '抢修人员'end ) as people_occupation,
pipe_length, pipe_diameter, pipe_pressure, pipe_material, pipe_addr, buried_depth, pipe_trend, build_date, build_unit, beyond_enterprise_id, beyond_enterprise_name, coordinates, create_by, create_time, update_by, update_time, is_del, remarks from t_pipe_info
</sql>
<select id="selectTPipeInfoList" parameterType="TPipeInfo" resultMap="TPipeInfoResult">
<include refid="selectTPipeInfoVo"/>
<where>
<where>
<if test="pipeLength != null "> and pipe_length = #{pipeLength}</if>
<if test="pipeDiameter != null "> and pipe_diameter = #{pipeDiameter}</if>
<if test="pipePressure != null "> and pipe_pressure = #{pipePressure}</if>
......@@ -48,13 +50,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isDel != null and isDel != ''"> and is_del = #{isDel}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
group by pipe_id desc
</select>
<select id="selectTPipeInfoById" parameterType="Long" resultMap="TPipeInfoResult">
<include refid="selectTPipeInfoVo"/>
where pipe_id = #{pipeId}
</select>
<insert id="insertTPipeInfo" parameterType="TPipeInfo" useGeneratedKeys="true" keyProperty="pipeId">
insert into t_pipe_info
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -67,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pipeTrend != null">pipe_trend,</if>
<if test="buildDate != null">build_date,</if>
<if test="buildUnit != null">build_unit,</if>
<if test="peopleOccupation != null">people_occupation,</if>
<if test="beyondEnterpriseId != null">beyond_enterprise_id,</if>
<if test="beyondEnterpriseName != null">beyond_enterprise_name,</if>
<if test="coordinates != null">coordinates,</if>
......@@ -87,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pipeTrend != null">#{pipeTrend},</if>
<if test="buildDate != null">#{buildDate},</if>
<if test="buildUnit != null">#{buildUnit},</if>
<if test="peopleOccupation != null">#{peopleOccupation},</if>
<if test="beyondEnterpriseId != null">#{beyondEnterpriseId},</if>
<if test="beyondEnterpriseName != null">#{beyondEnterpriseName},</if>
<if test="coordinates != null">#{coordinates},</if>
......@@ -111,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pipeTrend != null">pipe_trend = #{pipeTrend},</if>
<if test="buildDate != null">build_date = #{buildDate},</if>
<if test="buildUnit != null">build_unit = #{buildUnit},</if>
<if test="peopleOccupation != null">people_occupation = #{peopleOccupation},</if>
<if test="beyondEnterpriseId != null">beyond_enterprise_id = #{beyondEnterpriseId},</if>
<if test="beyondEnterpriseName != null">beyond_enterprise_name = #{beyondEnterpriseName},</if>
<if test="coordinates != null">coordinates = #{coordinates},</if>
......@@ -129,9 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteTPipeInfoByIds" parameterType="String">
delete from t_pipe_info where pipe_id in
delete from t_pipe_info where pipe_id in
<foreach item="pipeId" collection="array" open="(" separator="," close=")">
#{pipeId}
</foreach>
</delete>
</mapper>
\ No newline at end of file
</mapper>
gassafetyprogress-system/src/main/resources/mapper/system/TSiteStationInfoMapper.xml
View file @ b7309a0e
......@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="beyondEnterpriseName != null and beyondEnterpriseName != ''"> and beyond_enterprise_name like concat('%', #{beyondEnterpriseName}, '%')</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
group by site_station_id desc
</select>
<select id="selectTSiteStationInfoById" parameterType="Long" resultMap="TSiteStationInfoResult">
......
gassafetyprogress-web/src/components/GetPos/index.vue
View file @ b7309a0e
<!--
* @Author: your name
* @Date: 2022-02-12 11:07:10
* @LastEditTime: 2022-02-15 10:33:20
* @LastEditTime: 2022-02-16 17:08:55
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/components/GetPos.vue/index.vue
......@@ -79,6 +79,7 @@ export default {
this.init();
} else {
this.map.destroy();
this.searchinput="";
}
this.$nextTick(() => {
const input = this.$refs.input.$refs.input;
......
gassafetyprogress-web/src/settings.js
View file @ b7309a0e
......@@ -19,7 +19,7 @@ module.exports = {
/**
* 是否显示 tagsView
*/
tagsView: true,
tagsView: false,
/**
* 是否固定头部
......
gassafetyprogress-web/src/views/regulation/gasuser/index.vue
View file @ b7309a0e
......@@ -74,7 +74,6 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="用户id" align="center" prop="userId" />
<el-table-column label="用户账号" align="center" prop="username" />
<el-table-column label="用户名称" align="center" prop="nickName" />
<el-table-column label="用户类型" align="center" prop="userType" />
......@@ -114,14 +113,25 @@
/>
<!-- 添加或修改燃气用户对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-dialog :title="title" :visible.sync="open"width="780px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="11">
<el-form-item label="用户账号" prop="username">
<el-input v-model="form.username" placeholder="请输入用户账号" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="用户名称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="用户类型" prop="userType">
<el-select v-model="form.userType" placeholder="请选择用户类型">
<el-option label="居民用户" value="1" />
......@@ -129,27 +139,59 @@
<el-option label="工业用户" value="3" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="地址" prop="address">
<el-input v-model="form.address" placeholder="请输入地址" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="经度" prop="longitude">
<el-input onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="form.longitude" placeholder="请输入经度" />
<el-input v-model="form.longitude" placeholder="请输入经度" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="纬度" prop="latitude">
<el-input onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="form.latitude" placeholder="请输入纬度" />
<el-input v-model="form.latitude" placeholder="请输入纬度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="联系人" prop="linkman">
<el-input v-model="form.linkman" placeholder="请输入联系人" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="电话" prop="phone">
<el-input onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="form.phone" placeholder="请输入电话" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入邮箱" />
<el-input v-model="form.email" type="textarea" placeholder="请输入邮箱" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......@@ -199,6 +241,18 @@ export default {
form: {},
// 表单校验
rules: {
username: [
{ required: true, message: "请输入用户账号", trigger: "blur" },
],
nickName: [
{ required: true, message: "请输入用户名称", trigger: "blur" },
],
userType: [
{ required: true, message: "请选择用户类型", trigger: "blur" },
],
address: [
{ required: true, message: "请输入地址", trigger: "blur" },
],
}
};
},
......
gassafetyprogress-web/src/views/regulation/info/index.vue
View file @ b7309a0e
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="企业名称" prop="enterpriseName">
<el-input
v-model="queryParams.enterpriseName"
......@@ -10,34 +10,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="注册地址" prop="registerAddress">-->
<!-- <el-input-->
<!-- v-model="queryParams.registerAddress"-->
<!-- placeholder="请输入注册地址"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="法定代表人" prop="legalRepresentative">-->
<!-- <el-input-->
<!-- v-model="queryParams.legalRepresentative"-->
<!-- placeholder="请输入法定代表人"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="经营区域" prop="businessArea">-->
<!-- <el-input-->
<!-- v-model="queryParams.businessArea"-->
<!-- placeholder="请输入经营区域"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="许可证编号" prop="licenseKey">
<el-form-item label="许可证编号" prop="licenseKey" label-width="90px">
<el-input
v-model="queryParams.licenseKey"
placeholder="请输入许可证编号"
......@@ -46,42 +19,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="许可证有效期" prop="licenseValidityTime">-->
<!-- <el-input-->
<!-- v-model="queryParams.licenseValidityTime"-->
<!-- placeholder="请输入许可证有效期"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="年度监督检查情况" prop="annualSupervisionInspection">-->
<!-- <el-input-->
<!-- v-model="queryParams.annualSupervisionInspection"-->
<!-- placeholder="请输入年度监督检查情况"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否删除(0正常，1删除)" prop="isDel">-->
<!-- <el-input-->
<!-- v-model="queryParams.isDel"-->
<!-- placeholder="请输入是否删除(0正常，1删除)"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备注" prop="remarks">-->
<!-- <el-input-->
<!-- v-model="queryParams.remarks"-->
<!-- placeholder="请输入备注"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @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>
......@@ -175,32 +112,72 @@
/>
<!-- 添加或修改企业信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-row>
<el-col :span="11">
<el-form-item label="企业名称" prop="enterpriseName">
<el-input v-model="form.enterpriseName" placeholder="请输入企业名称" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="注册地址" prop="registerAddress">
<el-input v-model="form.registerAddress" placeholder="请输入注册地址" />
</el-form-item>
<el-form-item label="法定代表人" prop="legalRepresentative">
<el-input v-model="form.legalRepresentative" placeholder="请输入法定代表人" />
</el-form-item>
<el-form-item label="经营区域" prop="businessArea">
<el-input v-model="form.businessArea" placeholder="请输入经营区域" />
</el-form-item>
<el-form-item label="许可证编号" prop="licenseKey">
<el-input v-model="form.licenseKey" placeholder="请输入许可证编号" />
</el-form-item>
<el-form-item label="许可证有效期" prop="licenseValidityTime">
<el-input v-model="form.licenseValidityTime" placeholder="请输入许可证有效期" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="法定代表人" prop="legalRepresentative">
<el-input v-model="form.legalRepresentative" placeholder="请输入法定代表人" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="许可证有效期" prop="licenseValidityTime">
<el-date-picker
v-model="form.licenseValidityTime"
type="date"
placeholder="请选择许可证有效期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="许可证编号" prop="licenseKey">
<el-input v-model="form.licenseKey" placeholder="请输入许可证编号" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="经营区域" prop="businessArea">
<el-input v-model="form.businessArea" placeholder="请输入经营区域" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="年度监督检查情况" prop="annualSupervisionInspection">
<el-input v-model="form.annualSupervisionInspection" placeholder="请输入年度监督检查情况" />
<el-input v-model="form.annualSupervisionInspection" type="textarea" placeholder="请输入年度监督检查情况" />
</el-form-item>
</el-row>
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" placeholder="请输入备注" />
<el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......@@ -257,6 +234,16 @@ export default {
form: {},
// 表单校验
rules: {
enterpriseName: [
{ required: true, message: "请输入企业名称", trigger: "blur" },
],
registerAddress: [
{ required: true, message: "请输入注册地址", trigger: "blur" },
],
legalRepresentative: [
{ required: true, message: "请输入法定代表人", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
}
};
},
......
gassafetyprogress-web/src/views/regulation/pipe/index.vue
View file @ b7309a0e
......@@ -86,10 +86,12 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="管道长度" align="center" prop="pipeLength" />
<el-table-column label="走向" align="center" prop="pipeTrend" />
<el-table-column label="管径" align="center" prop="pipeDiameter" />
<el-table-column label="压力" align="center" prop="pipePressure" />
<el-table-column label="人员类型" align="center" prop="peopleOccupation" />
<el-table-column label="建设年代" align="center" prop="buildDate" />
<el-table-column label="建设单位" align="center" prop="buildUnit" />
<el-table-column label="权属单位" align="center" prop="beyondEnterpriseId" />
<el-table-column label="权属单位" align="center" prop="beyondEnterpriseName" />
<el-table-column label="坐标" align="center" prop="coordinates" />
<el-table-column label="备注" align="center" prop="remarks" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
......@@ -121,68 +123,108 @@
/>
<!-- 添加或修改管道信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="11">
<el-form-item label="管道长度" prop="pipeLength">
<el-input v-model="form.pipeLength" placeholder="请输入管道长度" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="管径" prop="pipeDiameter">
<el-input v-model="form.pipeDiameter" placeholder="请输入管径" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="压力" prop="pipePressure">
<el-input v-model="form.pipePressure" placeholder="请输入压力" />
</el-form-item>
<el-form-item label="材质" prop="pipeMaterial">
<el-input v-model="form.pipeMaterial" placeholder="请输入材质" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="建设年代" prop="buildDate">
<el-date-picker
v-model="form.buildDate"
type="date"
placeholder="请选择建设年代"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="埋深" prop="buriedDepth">
<el-input v-model="form.buriedDepth" placeholder="请输入埋深" />
</el-form-item>
<el-form-item label="走向" prop="pipeTrend">
<el-input v-model="form.pipeTrend" placeholder="请输入走向" />
</el-form-item>
</el-col>
<el-form-item label="人员类型" prop="peopleOccupation">
<el-select v-model="form.peopleOccupation" placeholder="请选择人员类型">
<el-option label="运行维护人员" value="1" />
<el-option label="抢修人员" value="2" />
</el-select>
</el-form-item>
<el-form-item label="建设年代" prop="buildDate">
<el-date-picker
v-model="form.buildDate"
type="date"
placeholder="请选择建设年代"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="建设单位" prop="buildUnit">
<el-input v-model="form.buildUnit" placeholder="请输入建设单位" />
</el-form-item>
<el-col :span="11">
<el-form-item label="材质" prop="pipeMaterial">
<el-input v-model="form.pipeMaterial" placeholder="请输入材质" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="建设单位" prop="buildUnit">
<el-input v-model="form.buildUnit" placeholder="请输入建设单位" />
</el-form-item>
</el-col>
<!-- <el-form-item label="权属单位" prop="beyondEnterpriseId">-->
<!-- <el-input v-model="form.beyondEnterpriseId" placeholder="请输入权属单位" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="权属单位名称" prop="beyondEnterpriseName">-->
<!-- <el-input v-model="form.beyondEnterpriseName" placeholder="请输入权属单位名称" />-->
<!-- </el-form-item>-->
<el-col :span="11">
<el-form-item label="走向" prop="pipeTrend">
<el-input v-model="form.pipeTrend" placeholder="请输入走向" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="人员类型" prop="peopleOccupation">
<el-select v-model="form.peopleOccupation" placeholder="请选择人员类型">
<el-option label="运行维护人员" value="1" />
<el-option label="抢修人员" value="2" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="权属单位" prop="beyondEnterpriseName">
<el-select v-model="form.beyondEnterpriseId" placeholder="请在下拉框中选择权属单位" maxlength="255" :disabled="false" clearable>
<el-option v-for="item in test" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="坐标" prop="coordinates">
<el-input v-model="form.coordinates" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.coordinates" type="textarea" placeholder="请输入坐标" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" placeholder="请输入备注" />
<el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......@@ -248,6 +290,24 @@ export default {
test: {},
// 表单校验
rules: {
pipeLength: [
{ required: true, message: "请输入管道长度", trigger: "blur" },
],
pipeDiameter: [
{ required: true, message: "请输入管径", trigger: "blur" },
],
pipePressure: [
{ required: true, message: "请输入压力", trigger: "blur" },
],
buildDate: [
{ required: true, message: "请选择建设年代", trigger: "blur" },
],
pipeMaterial: [
{ required: true, message: "请输入材质", trigger: "blur" },
],
buriedDepth:[
{ required: true, message: "请输入埋深", trigger: "blur" },
],
}
};
},
......
gassafetyprogress-web/src/views/regulation/station/index.vue
View file @ b7309a0e
......@@ -10,7 +10,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="权属单位名称" prop="beyondEnterpriseName">
<el-form-item label="权属单位名称" label-width="100px" prop="beyondEnterpriseName">
<el-input
v-model="queryParams.beyondEnterpriseName"
placeholder="请输入权属单位名称"
......@@ -19,7 +19,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-form-item label="备注" label-width="50px" prop="remarks">
<el-input
v-model="queryParams.remarks"
placeholder="请输入备注"
......@@ -83,7 +83,6 @@
<el-table v-loading="loading" :data="stationList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="场站id" align="center" prop="siteStationId" />
<el-table-column label="场站类型" align="center" prop="siteStationType" />
<el-table-column label="场站名称" align="center" prop="siteStationName" />
<el-table-column label="建设年代" align="center" prop="buildDate" width="180">
......@@ -126,9 +125,11 @@
/>
<!-- 添加或修改场站信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="11">
<el-form-item label="场站类型" prop="siteStationType">
<el-select v-model="form.siteStationType" placeholder="请选择场站类型">
<el-option label="加气站" value="1" />
......@@ -138,10 +139,17 @@
<el-option label="气化站" value="5" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="场站名称" prop="siteStationName">
<el-input v-model="form.siteStationName" placeholder="请输入场站名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="建设年代" prop="buildDate">
<el-date-picker clearable size="small"
v-model="form.buildDate"
......@@ -150,9 +158,14 @@
placeholder="选择建设年代">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="建设单位" prop="buildUnit">
<el-input v-model="form.buildUnit" placeholder="请输入建设单位" />
</el-form-item>
</el-col>
</el-row>
<!-- <el-form-item label="权属单位" prop="beyondEnterpriseId">-->
<!-- <el-input v-model="form.beyondEnterpriseId" placeholder="请输入权属单位" />-->
<!-- </el-form-item>-->
......@@ -160,22 +173,38 @@
<!-- <el-input v-model="form.beyondEnterpriseName" placeholder="请输入权属单位名称" />-->
<!-- </el-form-item>-->
<el-form-item label="权属单位" prop="beyondEnterpriseName">
<el-select v-model="form.beyondEnterpriseId" placeholder="请在下拉框中选择权属单位" maxlength="255" :disabled="false" clearable>
<el-option v-for="item in test" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId">
</el-option>
</el-select>
</el-form-item>
<el-row>
<el-col :span="11">
<el-form-item label="经度" prop="longitude">
<el-input v-model="form.longitude" placeholder="请输入经度" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="纬度" prop="latitude">
<el-input onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="form.latitude" placeholder="请输入纬度" />
<el-input v-model="form.latitude" placeholder="请输入纬度" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="权属单位" prop="beyondEnterpriseName">
<el-select v-model="form.beyondEnterpriseId" placeholder="请在下拉框中选择权属单位" maxlength="255" :disabled="false" clearable>
<el-option v-for="item in test" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="备注" prop="remarks">
<el-input onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="form.remarks" placeholder="请输入备注" />
<el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......@@ -230,6 +259,18 @@ export default {
test: {},
// 表单校验
rules: {
siteStationType: [
{ required: true, message: "请输入场站类型", trigger: "blur" },
],
siteStationName: [
{ required: true, message: "请输入场站名称", trigger: "blur" },
],
buildDate: [
{ required: true, message: "请选择建设年代", trigger: "blur" },
],
buildUnit: [
{ required: true, message: "请输入建设单位", trigger: "blur" },
],
}
};
},
......
gassafetyprogress-web/src/views/regulation/supervise/index.vue
View file @ b7309a0e
......@@ -121,49 +121,84 @@
/>
<!-- 添加或修改从业人员信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-row>
<el-col :span="11">
<el-form-item label="姓名" prop="employedPeopleName">
<el-input v-model="form.employedPeopleName" placeholder="请输入姓名" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="form.idCard" placeholder="请输入身份证号" />
</el-form-item>
<el-form-item label="证书编号" prop="certificateNum">
<el-input v-model="form.certificateNum" placeholder="请输入证书编号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="发证日期" prop="issueDate">
<el-date-picker
v-model="form.issueDate"
type="date"
placeholder="请输入发证日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-form-item label="受聘企业名称" prop="beyondEnterpriseName">
<el-col :span="11">
<el-form-item label="受聘企业名称" prop="beyondEnterpriseId">
<el-select v-model="form.beyondEnterpriseId" placeholder="请在下拉框中选择名称" maxlength="255" :disabled="false" clearable>
<el-option v-for="item in test" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="报考类型" prop="registerExaminationType">
<el-input v-model="form.registerExaminationType" placeholder="请输入报考类型" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="人员类型" prop="peopleOccupation">
<el-select v-model="form.peopleOccupation" placeholder="请选择人员类型">
<el-option label="运行维护人员" value="1" />
<el-option label="抢修人员" value="2" />
</el-select>
</el-form-item>
<el-form-item label="发证日期" prop="issueDate">
<el-date-picker
v-model="form.issueDate"
type="date"
placeholder="请输入发证日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="证书编号" prop="certificateNum">
<el-input v-model="form.certificateNum" placeholder="请输入证书编号" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="证书变更情况" prop="certificateChange">
<el-input v-model="form.certificateChange" placeholder="请输入证书变更情况" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" placeholder="请输入备注" />
<el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......@@ -216,6 +251,16 @@ export default {
test:{},
// 表单校验
rules: {
employedPeopleName: [
{ required: true, message: "请输入姓名", trigger: "blur" },
],
beyondEnterpriseId: [
{ required: true, message: "请选择受聘企业名称", trigger: "blur" },
],
idCard: [
{ required: true, message: "请输入身份证号", trigger: "blur" },
{ min: 0, max: 20, message: "长度20位", trigger: "blur" },
],
}
};
},
......
gassafetyprogress-web/src/views/standingBook/equipment/index.vue
View file @ b7309a0e
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
<el-form :model="queryParams" ref="queryParams" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="用户名称" prop="userName">
<el-input
v-model="queryParams.userName"
......@@ -360,7 +360,16 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams = {
pageNum: 1,
pageSize: 10,
userName: null,
idCard: null,
linkMobile: null,
installTimeStart: null,
installTimeEnd: null
},
this.resetForm("queryParams");
this.handleQuery();
},
/** 新增按钮操作 */
......
gassafetyprogress-web/src/views/standingBook/hidden/index.vue
View file @ b7309a0e
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
<el-form :model="queryParams" ref="queryParams" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="隐患类型" prop="hiddenType">
<el-select v-model="queryParams.hiddenType" placeholder="请选择隐患类型" clearable size="small">
<el-option
......@@ -490,7 +490,16 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams = {
pageNum: 1,
pageSize: 10,
hiddenTitle: null,
hiddenType: null,
remediation: null,
hiddenFindDateStart: null,
hiddenFindDateEnd: null
},
this.resetForm("queryParams");
this.handleQuery();
},
/** 新增按钮操作 */
......
gassafetyprogress-web/src/views/standingBook/trouble/index.vue
View file @ b7309a0e
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
<el-form :model="queryParams" ref="queryParams" :inline="true" v-show="showSearch" label-width="100px">
<!--<el-form-item label="事故名称" prop="troubleName">
<el-input
v-model="queryParams.troubleName"
......@@ -549,7 +549,18 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams = {
pageNum: 1,
pageSize: 10,
troubleName: null,
troubleType: null,
isDeal: null,
happenDateStart: null,
happenDateEnd: null,
dealDateStart: null,
dealDateEnd: null
},
this.resetForm("queryParams");
this.handleQuery();
},
/** 新增按钮操作 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment