|
|
@@ -56,6 +56,9 @@
|
|
|
<el-form-item label="设备别称" prop="aliasName">
|
|
|
<el-input type="text" size="mini" v-model="queryModel.aliasName"></el-input>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="匹配状态" prop="matchMsg">
|
|
|
+ <el-input type="text" size="mini" v-model="queryModel.matchMsg"></el-input>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@@ -154,7 +157,8 @@ export default {
|
|
|
position: "",
|
|
|
temperatureBegin: "",
|
|
|
temperatureEnd: "",
|
|
|
- temperatureRanges: ""
|
|
|
+ temperatureRanges: "",
|
|
|
+ matchMsg:""
|
|
|
},
|
|
|
loading: false,
|
|
|
tableData: [],
|
|
|
@@ -199,6 +203,7 @@ export default {
|
|
|
formData.append("aliasName", self.queryModel.aliasName);
|
|
|
formData.append("companyId", self.queryModel.companyId);
|
|
|
formData.append("position", self.queryModel.position);
|
|
|
+ formData.append("matchMsg", self.queryModel.matchMsg);
|
|
|
|
|
|
// formData.append(
|
|
|
// "temperatureRanges",
|
|
|
@@ -301,7 +306,7 @@ export default {
|
|
|
lastDate.setDate(0);
|
|
|
//获取上个月最后一天=本月最后一天
|
|
|
var lastDay = lastDate.getDate();
|
|
|
- var endTime = date.getFullYear() + "-" + month + "-" + lastDay + " 00:00:00";
|
|
|
+ var endTime = date.getFullYear() + "-" + month + "-" + lastDay + " 23:59:59";
|
|
|
|
|
|
self.queryModel.timeRanges = [startTime, endTime];
|
|
|
}
|
xiao547607