diff --git a/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordBusbarTemp.java b/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordBusbarTemp.java
index a311bae..c3a6ddb 100644
--- a/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordBusbarTemp.java
+++ b/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordBusbarTemp.java
@@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 母排测温信息对象 record_busbar_temp
- *
+ *
* @author zangch
* @date 2024-11-07
*/
@@ -81,142 +81,154 @@ public class RecordBusbarTemp extends BaseEntity
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date recordTime;
- public void setObjId(Long objId)
+ /** 巡检模式:1-自动;2-快速;3-定点 */
+ @Excel(name = "巡检模式:1-自动;2-快速;3-定点")
+ private Long routModel;
+
+ public void setObjId(Long objId)
{
this.objId = objId;
}
- public Long getObjId()
+ public Long getObjId()
{
return objId;
}
- public void setBusbarCode(Long busbarCode)
+ public void setBusbarCode(Long busbarCode)
{
this.busbarCode = busbarCode;
}
- public Long getBusbarCode()
+ public Long getBusbarCode()
{
return busbarCode;
}
- public void setCabinetCode(Long cabinetCode)
+ public void setCabinetCode(Long cabinetCode)
{
this.cabinetCode = cabinetCode;
}
- public Long getCabinetCode()
+ public Long getCabinetCode()
{
return cabinetCode;
}
- public void setTempMax(BigDecimal tempMax)
+ public void setTempMax(BigDecimal tempMax)
{
this.tempMax = tempMax;
}
- public BigDecimal getTempMax()
+ public BigDecimal getTempMax()
{
return tempMax;
}
- public void setTempMin(BigDecimal tempMin)
+ public void setTempMin(BigDecimal tempMin)
{
this.tempMin = tempMin;
}
- public BigDecimal getTempMin()
+ public BigDecimal getTempMin()
{
return tempMin;
}
- public void setTempAvg(BigDecimal tempAvg)
+ public void setTempAvg(BigDecimal tempAvg)
{
this.tempAvg = tempAvg;
}
- public BigDecimal getTempAvg()
+ public BigDecimal getTempAvg()
{
return tempAvg;
}
- public void setTempDiff(BigDecimal tempDiff)
+ public void setTempDiff(BigDecimal tempDiff)
{
this.tempDiff = tempDiff;
}
- public BigDecimal getTempDiff()
+ public BigDecimal getTempDiff()
{
return tempDiff;
}
- public void setIsAlarm(Long isAlarm)
+ public void setIsAlarm(Long isAlarm)
{
this.isAlarm = isAlarm;
}
- public Long getIsAlarm()
+ public Long getIsAlarm()
{
return isAlarm;
}
- public void setFilePath(String filePath)
+ public void setFilePath(String filePath)
{
this.filePath = filePath;
}
- public String getFilePath()
+ public String getFilePath()
{
return filePath;
}
- public void setIsFlag(Long isFlag)
+ public void setIsFlag(Long isFlag)
{
this.isFlag = isFlag;
}
- public Long getIsFlag()
+ public Long getIsFlag()
{
return isFlag;
}
- public void setCreatedBy(String createdBy)
+ public void setCreatedBy(String createdBy)
{
this.createdBy = createdBy;
}
- public String getCreatedBy()
+ public String getCreatedBy()
{
return createdBy;
}
- public void setCreatedTime(Date createdTime)
+ public void setCreatedTime(Date createdTime)
{
this.createdTime = createdTime;
}
- public Date getCreatedTime()
+ public Date getCreatedTime()
{
return createdTime;
}
- public void setUpdatedBy(String updatedBy)
+ public void setUpdatedBy(String updatedBy)
{
this.updatedBy = updatedBy;
}
- public String getUpdatedBy()
+ public String getUpdatedBy()
{
return updatedBy;
}
- public void setUpdatedTime(Date updatedTime)
+ public void setUpdatedTime(Date updatedTime)
{
this.updatedTime = updatedTime;
}
- public Date getUpdatedTime()
+ public Date getUpdatedTime()
{
return updatedTime;
}
- public void setRecordTime(Date recordTime)
+ public void setRecordTime(Date recordTime)
{
this.recordTime = recordTime;
}
- public Date getRecordTime()
+ public Date getRecordTime()
{
return recordTime;
}
+ public Long getRoutModel() {
+ return routModel;
+ }
+
+ public void setRoutModel(Long routModel) {
+ this.routModel = routModel;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -236,6 +248,7 @@ public class RecordBusbarTemp extends BaseEntity
.append("updatedBy", getUpdatedBy())
.append("updatedTime", getUpdatedTime())
.append("recordTime", getRecordTime())
+ .append("routModel", getRoutModel())
.toString();
}
}
diff --git a/ruoyi-module/src/main/resources/mapper/record/RecordBusbarTempMapper.xml b/ruoyi-module/src/main/resources/mapper/record/RecordBusbarTempMapper.xml
index ee374e6..bd2fd1d 100644
--- a/ruoyi-module/src/main/resources/mapper/record/RecordBusbarTempMapper.xml
+++ b/ruoyi-module/src/main/resources/mapper/record/RecordBusbarTempMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -38,13 +39,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
created_time,
updated_by,
updated_time,
- record_time
+ record_time,
+ rout_model
from record_busbar_temp
-
+
\ No newline at end of file
+
diff --git a/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue b/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue
index 461d50f..7ab0920 100644
--- a/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue
+++ b/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue
@@ -98,6 +98,16 @@
/>
+
+
+
+
+
+
+
+
+
+
{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
@@ -350,6 +365,17 @@
>{{dict.label}}
+
+
+
+ {{dict.label}}
+
+
+
@@ -423,7 +449,7 @@ import {getBaseCabinetInfoTree} from "@/api/base/baseCabinetInfo";
export default {
name: "RecordBusbarTemp",
- dicts: ['record_busbar_temp_is_alarm', 'record_busbar_temp_is_flag'],
+ dicts: ['record_busbar_temp_is_alarm', 'record_busbar_temp_is_flag','rout_model'],
data() {
return {
@@ -485,7 +511,8 @@ export default {
createdTime: null,
updatedBy: null,
updatedTime: null,
- recordTime: null
+ recordTime: null,
+ routModel: null
},
// 表单参数
form: {},
@@ -561,6 +588,7 @@ export default {
thermalPhoto : null,
thermalResponse : null,
visibleResponse : null,
+ routModel: null,
};
this.resetForm("form");
this.photoOpen = false;
@@ -693,33 +721,6 @@ export default {
}
};
-