Skip to content

H
huaxin-rq
Commit 62598602 authored by zhangjianqian's avatar zhangjianqian
Browse files
Options

设备检验和设备台账

parent 0dd23efe
Show whitespace changes
Inline Side-by-side
Showing with 486 additions and 2 deletions
huaxin-system/src/main/java/com/zehong/system/domain/TDevLifeCycle.java
View file @ 62598602
...@@ -60,6 +60,39 @@ public class TDevLifeCycle extends BaseEntity ...@@ -60,6 +60,39 @@ public class TDevLifeCycle extends BaseEntity
@Excel(name = "设备描述") @Excel(name = "设备描述")
private String devDescribe; private String devDescribe;
/** 规格型号 */
@Excel(name = "规格型号")
private String devModel;
/** 公称通径/公称直径/介质/-/- */
@Excel(name = "公称通径/公称直径/介质/-/-")
private String devDiameter;
/** 计量范围/-/精准度/-/流量范围 */
@Excel(name = "计量范围/-/精准度/-/流量范围")
private String devFlowRange;
/** 精度等级/压力等级/防护等级/-/准确度等级 */
@Excel(name = "精度等级/压力等级/防护等级/-/准确度等级")
private String devLevel;
/** 公称压力 */
@Excel(name = "公称压力")
private String devPressure;
/** 连接口方向/整定压力/报警限值/设备类别/工作电源 */
@Excel(name = "连接口方向/整定压力/报警限值/设备类别/工作电源")
private String workElectricity;
/** 出厂编号 */
@Excel(name = "出厂编号")
private String devNumber;
/** 生产日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date devDate;
/** 制造单位 */ /** 制造单位 */
@Excel(name = "制造单位") @Excel(name = "制造单位")
private String devCompany; private String devCompany;
...@@ -170,6 +203,71 @@ public class TDevLifeCycle extends BaseEntity ...@@ -170,6 +203,71 @@ public class TDevLifeCycle extends BaseEntity
this.devCompany = devCompany; this.devCompany = devCompany;
} }
public String getDevModel() {
return devModel;
}
public void setDevModel(String devModel) {
this.devModel = devModel;
}
public String getDevDiameter() {
return devDiameter;
}
public void setDevDiameter(String devDiameter) {
this.devDiameter = devDiameter;
}
public String getDevFlowRange() {
return devFlowRange;
}
public void setDevFlowRange(String devFlowRange) {
this.devFlowRange = devFlowRange;
}
public String getDevLevel() {
return devLevel;
}
public void setDevLevel(String devLevel) {
this.devLevel = devLevel;
}
public String getDevPressure() {
return devPressure;
}
public void setDevPressure(String devPressure) {
this.devPressure = devPressure;
}
public String getWorkElectricity() {
return workElectricity;
}
public void setWorkElectricity(String workElectricity) {
this.workElectricity = workElectricity;
}
public String getDevNumber() {
return devNumber;
}
public void setDevNumber(String devNumber) {
this.devNumber = devNumber;
}
public Date getDevDate() {
return devDate;
}
public void setDevDate(Date devDate) {
this.devDate = devDate;
}
public void setDevStatus(String devStatus) public void setDevStatus(String devStatus)
{ {
this.devStatus = devStatus; this.devStatus = devStatus;
......
huaxin-system/src/main/resources/mapper/system/TDevLifeCycleMapper.xml
View file @ 62598602
...@@ -13,6 +13,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -13,6 +13,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="devAddr" column="dev_addr" /> <result property="devAddr" column="dev_addr" />
<result property="devDescribe" column="dev_describe" /> <result property="devDescribe" column="dev_describe" />
<result property="devCompany" column="dev_company" /> <result property="devCompany" column="dev_company" />
<result property="devModel" column="dev_model" />
<result property="devDiameter" column="dev_diameter" />
<result property="devFlowRange" column="dev_flow_range" />
<result property="devLevel" column="dev_level" />
<result property="devPressure" column="dev_pressure" />
<result property="workElectricity" column="work_electricity" />
<result property="devNumber" column="dev_number" />
<result property="devDate" column="dev_date" />
<result property="devStatus" column="dev_status" /> <result property="devStatus" column="dev_status" />
<result property="alarmDays" column="alarm_days" /> <result property="alarmDays" column="alarm_days" />
<result property="useDate" column="use_date" /> <result property="useDate" column="use_date" />
...@@ -25,11 +33,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -25,11 +33,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectTDevLifeCycleVo"> <sql id="selectTDevLifeCycleVo">
select id, dev_type,dev_name, dev_no, dev_addr, dev_describe, dev_company, dev_status, alarm_days, use_date, curr_overhaul_date, next_overhaul_date, curr_maintenance_date, next_maintenance_date, create_time from t_dev_life_cycle select id, dev_type, dev_name, dev_no, dev_addr, dev_company, dev_model, dev_diameter, dev_flow_range, dev_level, dev_pressure, work_electricity, dev_number, dev_date, dev_describe, dev_status, alarm_days, use_date, curr_overhaul_date, next_overhaul_date, curr_maintenance_date, next_maintenance_date, create_time from t_dev_life_cycle
</sql> </sql>
<select id="selectTDevLifeCycleList" parameterType="TDevLifeCycle" resultMap="TDevLifeCycleResult"> <select id="selectTDevLifeCycleList" parameterType="TDevLifeCycle" resultMap="TDevLifeCycleResult">
select id, dev_type,(select dict_label from sys_dict_data where dict_type='cytle_dev_type' and dict_value=dev_type) dev_type_name, dev_name, dev_no, dev_addr, dev_describe, dev_company, dev_status, alarm_days, use_date, curr_overhaul_date, next_overhaul_date, curr_maintenance_date, next_maintenance_date, create_time from t_dev_life_cycle select id, dev_type,(select dict_label from sys_dict_data where dict_type='cytle_dev_type' and dict_value=dev_type) dev_type_name, dev_name,
dev_model, dev_diameter, dev_flow_range, dev_level, dev_pressure, work_electricity, dev_number, dev_date,
dev_no, dev_addr, dev_describe, dev_company, dev_status, alarm_days, use_date, curr_overhaul_date, next_overhaul_date, curr_maintenance_date, next_maintenance_date, create_time from t_dev_life_cycle
<where> <where>
<if test="devType != null and devType != ''"> and dev_type = #{devType}</if> <if test="devType != null and devType != ''"> and dev_type = #{devType}</if>
<if test="devName != null and devName != ''"> and dev_name like concat('%', #{devName}, '%')</if> <if test="devName != null and devName != ''"> and dev_name like concat('%', #{devName}, '%')</if>
...@@ -84,6 +94,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -84,6 +94,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="devNo != null">dev_no,</if> <if test="devNo != null">dev_no,</if>
<if test="devAddr != null">dev_addr,</if> <if test="devAddr != null">dev_addr,</if>
<if test="devDescribe != null">dev_describe,</if> <if test="devDescribe != null">dev_describe,</if>
<if test="devModel != null">dev_model,</if>
<if test="devDiameter != null">dev_diameter,</if>
<if test="devFlowRange != null">dev_flow_range,</if>
<if test="devLevel != null">dev_level,</if>
<if test="devPressure != null">dev_pressure,</if>
<if test="workElectricity != null">work_electricity,</if>
<if test="devNumber != null">dev_number,</if>
<if test="devDate != null">dev_date,</if>
<if test="devCompany != null">dev_company,</if> <if test="devCompany != null">dev_company,</if>
<if test="devStatus != null">dev_status,</if> <if test="devStatus != null">dev_status,</if>
<if test="alarmDays != null">alarm_days,</if> <if test="alarmDays != null">alarm_days,</if>
...@@ -100,6 +118,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -100,6 +118,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="devNo != null">#{devNo},</if> <if test="devNo != null">#{devNo},</if>
<if test="devAddr != null">#{devAddr},</if> <if test="devAddr != null">#{devAddr},</if>
<if test="devDescribe != null">#{devDescribe},</if> <if test="devDescribe != null">#{devDescribe},</if>
<if test="devModel != null">#{devModel},</if>
<if test="devDiameter != null">#{devDiameter},</if>
<if test="devFlowRange != null">#{devFlowRange},</if>
<if test="devLevel != null">#{devLevel},</if>
<if test="devPressure != null">#{devPressure},</if>
<if test="workElectricity != null">#{workElectricity},</if>
<if test="devNumber != null">#{devNumber},</if>
<if test="devDate != null">#{devDate},</if>
<if test="devCompany != null">#{devCompany},</if> <if test="devCompany != null">#{devCompany},</if>
<if test="devStatus != null">#{devStatus},</if> <if test="devStatus != null">#{devStatus},</if>
<if test="alarmDays != null">#{alarmDays},</if> <if test="alarmDays != null">#{alarmDays},</if>
...@@ -121,6 +147,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -121,6 +147,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="devAddr != null">dev_addr = #{devAddr},</if> <if test="devAddr != null">dev_addr = #{devAddr},</if>
<if test="devDescribe != null">dev_describe = #{devDescribe},</if> <if test="devDescribe != null">dev_describe = #{devDescribe},</if>
<if test="devCompany != null">dev_company = #{devCompany},</if> <if test="devCompany != null">dev_company = #{devCompany},</if>
<if test="devModel != null">dev_model = #{devModel},</if>
<if test="devDiameter != null">dev_diameter = #{devDiameter},</if>
<if test="devFlowRange != null">dev_flow_range = #{devFlowRange},</if>
<if test="devLevel != null">dev_level = #{devLevel},</if>
<if test="devPressure != null">dev_pressure = #{devPressure},</if>
<if test="workElectricity != null">work_electricity = #{workElectricity},</if>
<if test="devNumber != null">dev_number = #{devNumber},</if>
<if test="devDate != null">dev_date = #{devDate},</if>
<if test="devStatus != null">dev_status = #{devStatus},</if> <if test="devStatus != null">dev_status = #{devStatus},</if>
<if test="alarmDays != null">alarm_days = #{alarmDays},</if> <if test="alarmDays != null">alarm_days = #{alarmDays},</if>
<if test="useDate != null">use_date = #{useDate},</if> <if test="useDate != null">use_date = #{useDate},</if>
......
huaxin-web/src/views/cycle/components/CycleDetailInfo.vue
View file @ 62598602
...@@ -27,6 +27,185 @@ ...@@ -27,6 +27,185 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="form.devType==1">
<el-col :span="12">
<el-form-item label="计量范围" prop="devFlowRange">
<span v-if="form.devFlowRange">{{ form.devFlowRange }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="精度等级" prop="devLevel">
<span v-if="form.devLevel">{{ form.devLevel }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==1">
<el-col :span="12">
<el-form-item label="连接口方向" prop="workElectricity">
<span v-if="form.workElectricity">{{ form.workElectricity }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="内部编号" prop="devNumber">
<span v-if="form.devNumber">{{ form.devNumber }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==2">
<el-col :span="12">
<el-form-item label="公称直径" prop="devDiameter">
<span v-if="form.devDiameter">{{ form.devDiameter }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公称压力" prop="devPressure">
<span v-if="form.devPressure">{{ form.devPressure }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==2">
<el-col :span="12">
<el-form-item label="压力等级" prop="devLevel">
<span v-if="form.devLevel">{{ form.devLevel }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="整定压力" prop="workElectricity">
<span v-if="form.workElectricity">{{ form.workElectricity }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==3">
<el-col :span="12">
<el-form-item label="介质" prop="devDiameter">
<span v-if="form.devDiameter">{{ form.devDiameter }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="精准度" prop="devFlowRange">
<span v-if="form.devFlowRange">{{ form.devFlowRange }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==3">
<el-col :span="12">
<el-form-item label="防护等级" prop="devLevel">
<span v-if="form.devLevel">{{ form.devLevel }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报警限值" prop="workElectricity">
<span v-if="form.workElectricity">{{ form.workElectricity }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==3">
<el-col :span="12">
<el-form-item label="生产日期" prop="devDate">
<span v-if="form.devDate">{{ form.devDate }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==4">
<el-col :span="12">
<el-form-item label="设备类别" prop="devDiameter">
<span v-if="form.devDiameter">{{ form.devDiameter }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==5">
<el-col :span="12">
<el-form-item label="公称通径" prop="devDiameter">
<span v-if="form.devDiameter">{{ form.devDiameter }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="流量范围" prop="devFlowRange">
<span v-if="form.devFlowRange">{{ form.devFlowRange }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==5">
<el-col :span="12">
<el-form-item label="准确度等级" prop="devLevel">
<span v-if="form.devLevel">{{ form.devLevel }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公称压力" prop="devPressure">
<span v-if="form.devPressure">{{ form.devPressure }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==5">
<el-col :span="12">
<el-form-item label="工作电源" prop="workElectricity">
<span v-if="form.workElectricity">{{ form.workElectricity }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产日期" prop="devDate">
<span v-if="form.devDate">{{ form.devDate }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-form-item label="设备描述"> <el-form-item label="设备描述">
<span v-if="form.devDescribe">{{ form.devDescribe }}</span> <span v-if="form.devDescribe">{{ form.devDescribe }}</span>
......
huaxin-web/src/views/cycle/index.vue
View file @ 62598602
...@@ -224,11 +224,176 @@ ...@@ -224,11 +224,176 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="设备描述" prop="devDescribe"> <el-form-item label="设备描述" prop="devDescribe">
<el-input type="textarea" v-model="form.devDescribe" placeholder="请输入设备描述" /> <el-input type="textarea" v-model="form.devDescribe" placeholder="请输入设备描述" />
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row v-if="form.devType==1">
<el-col :span="12">
<el-form-item label="计量范围" prop="devFlowRange">
<el-input v-model="form.devFlowRange" placeholder="请输入计量范围" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="精度等级" prop="devLevel">
<el-input v-model="form.devLevel" placeholder="请输入精度等级" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==1">
<el-col :span="12">
<el-form-item label="连接口方向" prop="workElectricity">
<el-input v-model="form.workElectricity" placeholder="请输入连接口方向" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="内部编号" prop="devNumber">
<el-input v-model="form.devNumber" placeholder="请输入内部编号" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==2">
<el-col :span="12">
<el-form-item label="公称直径" prop="devDiameter">
<el-input v-model="form.devDiameter" placeholder="请输公称直径" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公称压力" prop="devPressure">
<el-input v-model="form.devPressure" placeholder="请输入公称压力" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==2">
<el-col :span="12">
<el-form-item label="压力等级" prop="devLevel">
<el-input v-model="form.devLevel" placeholder="请输入压力等级" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="整定压力" prop="workElectricity">
<el-input v-model="form.workElectricity" placeholder="请输入公称压力" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==3">
<el-col :span="12">
<el-form-item label="介质" prop="devDiameter">
<el-input v-model="form.devDiameter" placeholder="请输介质" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="精准度" prop="devFlowRange">
<el-input v-model="form.devFlowRange" placeholder="请输入精准度" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==3">
<el-col :span="12">
<el-form-item label="防护等级" prop="devLevel">
<el-input v-model="form.devLevel" placeholder="请输入防护等级" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报警限值" prop="workElectricity">
<el-input v-model="form.workElectricity" placeholder="请输入报警限值" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==3">
<el-col :span="12">
<el-form-item label="生产日期" prop="devDate">
<el-date-picker clearable size="small"
v-model="form.devDate"
type="date"
style="width: 100%"
value-format="yyyy-MM-dd"
placeholder="选择启用日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==4">
<el-col :span="12">
<el-form-item label="设备类别" prop="devDiameter">
<el-input v-model="form.devDiameter" placeholder="请输入设备类别" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==5">
<el-col :span="12">
<el-form-item label="公称通径" prop="devDiameter">
<el-input v-model="form.devDiameter" placeholder="请输入公称通径" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="流量范围" prop="devFlowRange">
<el-input v-model="form.devFlowRange" placeholder="请输入流量范围" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==5">
<el-col :span="12">
<el-form-item label="准确度等级" prop="devLevel">
<el-input v-model="form.devLevel" placeholder="请输入准确度等级" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公称压力" prop="devPressure">
<el-input v-model="form.devPressure" placeholder="请输入公称压力" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="form.devType==5">
<el-col :span="12">
<el-form-item label="工作电源" prop="workElectricity">
<el-input v-model="form.workElectricity" placeholder="请输入工作电源" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产日期" prop="devDate">
<el-date-picker clearable size="small"
v-model="form.devDate"
type="date"
style="width: 100%"
value-format="yyyy-MM-dd"
placeholder="选择启用日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="制造单位" prop="devCompany"> <el-form-item label="制造单位" prop="devCompany">
...@@ -351,6 +516,14 @@ export default { ...@@ -351,6 +516,14 @@ export default {
devNo: null, devNo: null,
devAddr: null, devAddr: null,
devDescribe: null, devDescribe: null,
devModel: null,
devDiameter: null,
devFlowRange: null,
devLevel: null,
devPressure: null,
workElectricity: null,
devNumber: null,
devDate: null,
devStatus: null, devStatus: null,
alarmDays: null, alarmDays: null,
useDate: null, useDate: null,
......
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