Merge remote-tracking branch 'origin/main'

src/views/ems/record/recordIOTInstant/index.vue

@@ -36,15 +36,18 @@
                                 @keyup.enter.native="handleQuery"
                         />
                     </el-form-item>
-                    <el-form-item label="采集时间" prop="collectTime">
-                        <el-date-picker clearable
-                                        v-model="queryParams.collectTime"
-                                        type="date"
-                                        value-format="yyyy-MM-dd"
-                                        placeholder="请选择采集时间">
-                        </el-date-picker>
+                    <el-form-item label="采集时间">
+                        <el-date-picker
+                            v-model="daterangeCollectTime"
+                            style="width: 340px"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="datetimerange"
+                            range-separator="-"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间"
+                        ></el-date-picker>
                     </el-form-item>
-                    <el-form-item label="温度" prop="tempreture">
+                    <!-- <el-form-item label="温度" prop="tempreture">
                         <el-input
                                 v-model="queryParams.tempreture"
                                 placeholder="请输入温度"
@@ -83,14 +86,17 @@
                                 clearable
                                 @keyup.enter.native="handleQuery"
                         />
-                    </el-form-item>
-                    <el-form-item label="记录时间" prop="recodeTime">
-                        <el-date-picker clearable
-                                        v-model="queryParams.recodeTime"
-                                        type="date"
-                                        value-format="yyyy-MM-dd"
-                                        placeholder="请选择记录时间">
-                        </el-date-picker>
+                    </el-form-item> -->
+                    <el-form-item label="记录时间">
+                        <el-date-picker
+                            v-model="daterangeRecordTime"
+                            style="width: 340px"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="datetimerange"
+                            range-separator="-"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间"
+                        ></el-date-picker>
                     </el-form-item>
                     <!-- <el-form-item label=" " prop="confirmPersonID">
                         <el-input
@@ -312,6 +318,7 @@
         },
         data() {
             return {
+                workUnitName:null,
                 //下拉树List
                 baseMonitorInfoOptions: [],
                 //左侧树结构List
@@ -322,6 +329,10 @@
                         children: 'children',
                         label: 'label'
                 },
+                // 记录时间时间范围
+                daterangeCollectTime: [],
+                // 记录时间时间范围
+                daterangeRecordTime: [],
                 // 遮罩层
                 loading: true,
                 // 选中数组
@@ -342,6 +353,7 @@
                 open: false,
                 // 查询参数
                 queryParams: {
+                    params:{},
                     pageNum: 1,
                     pageSize: 10,
                     monitorId: null,
@@ -382,6 +394,12 @@
             };
         },
         created() {
+            // const nowDate = this.parseTime(new Date(), '{y}-{m}-{d}')
+            // this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
+            // this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
+            
+            // this.daterangeRecordTime[0] = nowDate + ' 00:00:00'
+            // this.daterangeRecordTime[1] = nowDate + ' 23:59:59'
             this.getList();
             this.getTreeselect()
             this.getTreeMonitorInfo()
@@ -416,6 +434,14 @@
             /** 查询物联网实时数据列表 */
             getList() {
                 this.loading = true;
+                if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
+                    this.queryParams.params['beginCollectTime'] = this.daterangeCollectTime[0]
+                    this.queryParams.params['endCollectTime'] = this.daterangeCollectTime[1]
+                }
+                if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
+                    this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0]
+                    this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1]
+                }
                 listRecordIOTInstant(this.queryParams).then(response => {
                     this.recordIOTInstantList = response.rows;
                     this.total = response.total;
@@ -454,7 +480,26 @@
             },
             /** 重置按钮操作 */
             resetQuery() {
-                this.resetForm("queryForm");
+                this.daterangeCollectTime = [];
+                this.daterangeRecordTime = [];
+                this.queryParams = {
+                    params:{},
+                    pageNum: 1,
+                    pageSize: 10,
+                    monitorId: null,
+                    monitorName: null,
+                    collectTime: null,
+                    tempreture: null,
+                    humidity: null,
+                    illuminance: null,
+                    noise: null,
+                    concentration: null,
+                    recodeTime: null,
+                    alarmType: null,
+                    confirmPersonID: null,
+                    confirmTime: null,
+                    confirmFlag: null
+                },
                 this.handleQuery();
             },
             /** 查询计量设备信息下拉树结构 */