|
|
@@ -28,6 +28,17 @@
|
|
|
<el-option v-for="(item,index) in nameList" :label="item.name" :value="item.value" :key="index"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="测量时段" prop="timeRanges">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="queryModel.timeRanges"
|
|
|
+ type="daterange"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始时间"
|
|
|
+ end-placeholder="结束时间"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ size="mini"
|
|
|
+ ></el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@@ -144,7 +155,8 @@ export default {
|
|
|
return {
|
|
|
queryModel: {
|
|
|
deviceNo: "",
|
|
|
- name: ""
|
|
|
+ name: "",
|
|
|
+ timeRanges: null
|
|
|
},
|
|
|
loading: false,
|
|
|
tableData: [],
|
|
|
@@ -185,6 +197,16 @@ export default {
|
|
|
formData.append("deviceNo", self.queryModel.deviceNo);
|
|
|
formData.append("name", self.queryModel.name);
|
|
|
|
|
|
+ if(self.queryModel.timeRanges!=null){
|
|
|
+ if(self.queryModel.timeRanges[0]!=null){
|
|
|
+ formData.append("startTime", self.queryModel.timeRanges[0]);
|
|
|
+ }
|
|
|
+
|
|
|
+ if(self.queryModel.timeRanges[1]!=null){
|
|
|
+ formData.append("endTime", self.queryModel.timeRanges[1]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (this.field != null) {
|
|
|
formData.append("field", this.field);
|
|
|
}
|