diff --git a/src/views/ems/record/recordSteamInstant/index.vue b/src/views/ems/record/recordSteamInstant/index.vue
index b79114d..e67b5ef 100644
--- a/src/views/ems/record/recordSteamInstant/index.vue
+++ b/src/views/ems/record/recordSteamInstant/index.vue
@@ -49,7 +49,7 @@
               end-placeholder="结束时间"
             ></el-date-picker>
           </el-form-item>-->
-<!--          <el-form-item label="记录时间">
+          <el-form-item label="记录时间">
             <el-date-picker
               v-model="daterangeRecordTime"
               style="width: 340px"
@@ -59,9 +59,9 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
             ></el-date-picker>
-          </el-form-item>-->
+          </el-form-item>
 
-          <el-form-item label="记录日期范围">
+<!--          <el-form-item label="记录日期范围">
             <el-date-picker
               v-model="daterangeRecordTime"
               style="width: 340px"
@@ -82,7 +82,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
             ></el-time-picker>
-          </el-form-item>
+          </el-form-item>-->
 
 
           <el-form-item>
@@ -149,20 +149,20 @@
           <el-table-column label="自增标识" align="center" prop="objId" v-if="columns[0].visible"/>
           <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible"/>
 <!--          <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[12].visible"/>-->
-          <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
+<!--          <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
             </template>
-          </el-table-column>
-          <el-table-column label="瞬时流量（t/h）" align="center" prop="fluxFlow" v-if="columns[3].visible"/>
-          <el-table-column label="累计流量（t）" align="center" prop="steamFlow" v-if="columns[4].visible"/>
-          <el-table-column label="瞬时热量" align="center" prop="heatInstantValue" v-if="columns[5].visible"/>
-          <el-table-column label="累计热量" align="center" prop="heatTotalValue" v-if="columns[6].visible"/>
-          <el-table-column label="温度（℃）" align="center" prop="temperature" v-if="columns[7].visible"/>
-          <el-table-column label="压力（Mpa）" align="center" prop="press" v-if="columns[8].visible"/>
-          <el-table-column label="密度" align="center" prop="density" v-if="columns[9].visible"/>
-          <el-table-column label="压力差值" align="center" prop="differencePress" v-if="columns[10].visible"/>
-          <el-table-column label="记录时间" align="center" prop="recordTime" width="180" v-if="columns[11].visible">
+          </el-table-column>-->
+          <el-table-column label="瞬时流量（t/h）" align="center" prop="fluxFlow" v-if="columns[2].visible"/>
+          <el-table-column label="累计流量（t）" align="center" prop="steamFlow" v-if="columns[3].visible"/>
+          <el-table-column label="瞬时热量" align="center" prop="heatInstantValue" v-if="columns[4].visible"/>
+          <el-table-column label="累计热量" align="center" prop="heatTotalValue" v-if="columns[5].visible"/>
+          <el-table-column label="温度（℃）" align="center" prop="temperature" v-if="columns[6].visible"/>
+          <el-table-column label="压力（Mpa）" align="center" prop="press" v-if="columns[7].visible"/>
+          <el-table-column label="密度" align="center" prop="density" v-if="columns[8].visible"/>
+          <el-table-column label="压力差值" align="center" prop="differencePress" v-if="columns[9].visible"/>
+          <el-table-column label="记录时间" align="center" prop="recordTime" width="180" v-if="columns[10].visible">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
             </template>
@@ -338,43 +338,49 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        objId: [
+/*        objId: [
           { required: true, message: '自增标识不能为空', trigger: 'blur' }
-        ]
+        ]*/
       },
       columns: [
         { key: 0, label: `自增标识`, visible: false },
         { key: 1, label: `计量设备编号`, visible: true },
-        { key: 2, label: `采集时间`, visible: true },
-        { key: 3, label: `瞬时流量（t/h）`, visible: true },
-        { key: 4, label: `累计流量（t）`, visible: true },
-        { key: 5, label: `瞬时热量`, visible: false },
-        { key: 6, label: `累计热量`, visible: false },
-        { key: 7, label: `温度（℃）`, visible: true },
-        { key: 8, label: `压力`, visible: true },
-        { key: 9, label: `密度`, visible: false },
-        { key: 10, label: `压力差值`, visible: false },
-        { key: 11, label: `记录时间`, visible: true },
-        { key: 12, label: `计量设备名称`, visible: true }
+/*        { key: 2, label: `采集时间`, visible: true },*/
+        { key: 2, label: `瞬时流量（t/h）`, visible: true },
+        { key: 3, label: `累计流量（t）`, visible: true },
+        { key: 4, label: `瞬时热量`, visible: false },
+        { key: 5, label: `累计热量`, visible: false },
+        { key: 6, label: `温度（℃）`, visible: true },
+        { key: 7, label: `压力`, visible: true },
+        { key: 8, label: `密度`, visible: false },
+        { key: 9, label: `压力差值`, visible: false },
+        { key: 10, label: `记录时间`, visible: true },
+        /*{ key: 12, label: `计量设备名称`, visible: true }*/
       ]
     }
   },
   created() {
-/*    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
-    this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
-    this.daterangeCollectTime[1] = nowDate + ' 23:59:59'*/
+    const nowDate = new Date();
+    const today = parseTime(new Date(), '{y}-{m}-{d}')
+    const lastDate = new Date();
+    lastDate.setDate(nowDate.getDate() - 1)
+    const yesterday = parseTime(lastDate, '{y}-{m}-{d}')
 
-    const today = new Date();
+    console.log(today,yesterday)
+    this.daterangeRecordTime[0] =  yesterday+ ' 08:00:00'
+    this.daterangeRecordTime[1] = today + ' 08:00:00'
+
+/*    const today = new Date();
     const yesterday = new Date(today);
     yesterday.setDate(today.getDate() - 1);
 
     //时间默认为8点
-    /*     this.timerangeRecordTime = ['08:30:00', '08:30:00']; */
+    /!*     this.timerangeRecordTime = ['08:30:00', '08:30:00']; *!/
     this.timerangeRecordTime[0] = '08:00:00';
     this.timerangeRecordTime[1] = '08:00:00';
 
     this.daterangeRecordTime[0] = parseTime(yesterday, '{y}-{m}-{d}') ;
-    this.daterangeRecordTime[1] = parseTime(today, '{y}-{m}-{d}') ;
+    this.daterangeRecordTime[1] = parseTime(today, '{y}-{m}-{d}') ;*/
 
 
     this.getTreeselect()
@@ -412,14 +418,19 @@ export default {
     getList() {
       this.loading = true
       this.queryParams.params = {}
-      if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
+/*      if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
         this.queryParams.params['beginCollectTime'] =this.daterangeCollectTime[0] + ' ' + this.timerangeRecordTime[0];
         this.queryParams.params['endCollectTime'] =this.daterangeCollectTime[1] + ' ' + this.timerangeRecordTime[1];
       }
       if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
         this.queryParams.params['beginRecordTime'] =this.daterangeRecordTime[0] + ' ' + this.timerangeRecordTime[0];
         this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1] + 'T' + this.timerangeRecordTime[1];
+      }*/
+      if (this.daterangeRecordTime != null && '' != this.daterangeRecordTime) {
+        this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0];
+        this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1] ;
       }
+
       listRecordSteamInstant(this.queryParams).then(response => {
         this.recordSteamInstantList = response.rows
         this.total = response.total
diff --git a/src/views/ems/record/recordVibrationInstant/index.vue b/src/views/ems/record/recordVibrationInstant/index.vue
index 9301054..97b554e 100644
--- a/src/views/ems/record/recordVibrationInstant/index.vue
+++ b/src/views/ems/record/recordVibrationInstant/index.vue
@@ -41,7 +41,7 @@
                                               end-placeholder="结束时间"
                                       ></el-date-picker>
                                   </el-form-item>-->
-          <el-form-item label="采集时间">
+<!--          <el-form-item label="采集时间">
             <el-date-picker
               v-model="daterangeCollectTime"
               style="width: 340px"
@@ -51,7 +51,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间">
             </el-date-picker>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item label="震动传感器编号" prop="sensorId">
             <el-input
               v-model="queryParams.sensorId"
diff --git a/src/views/ems/report/currentSteamCurve/index.vue b/src/views/ems/report/currentSteamCurve/index.vue
index 74cdf9f..1cd481b 100644
--- a/src/views/ems/report/currentSteamCurve/index.vue
+++ b/src/views/ems/report/currentSteamCurve/index.vue
@@ -39,10 +39,9 @@
           <!--              @keyup.enter.native="handleQuery"-->
           <!--            />-->
           <!--          </el-form-item>-->
-<!--
           <el-form-item label="采集时间">
             <el-date-picker
-              v-model="daterangeCollectTime"
+              v-model="daterangeRecordTime"
               style="width: 340px"
               value-format="yyyy-MM-dd HH:mm:ss"
               type="datetimerange"
@@ -51,9 +50,8 @@
               end-placeholder="结束时间"
             ></el-date-picker>
           </el-form-item>
--->
 
-          <el-form-item label="采集日期范围">
+<!--          <el-form-item label="采集日期范围">
             <el-date-picker
               v-model="daterangeCollectTime"
               style="width: 340px"
@@ -63,8 +61,8 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
             ></el-date-picker>
-          </el-form-item>
-          <el-form-item label="采集时间范围">
+          </el-form-item>-->
+<!--          <el-form-item label="记录时间范围">
             <el-time-picker
               v-model="timerangeRecordTime"
               style="width: 340px"
@@ -74,7 +72,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
             ></el-time-picker>
-          </el-form-item>
+          </el-form-item>-->
 
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -120,6 +118,8 @@ export default {
       baseMonitorInfoList: [],
       // 采集方式时间范围
       daterangeCollectTime: [],
+      //记录时间范围
+      daterangeRecordTime: [],
       //时间选择
       timerangeRecordTime:[],
       // 遮罩层
@@ -165,9 +165,9 @@ export default {
       },
       // 表单校验
       rules: {
-        objId: [
+/*        objId: [
           { required: true, message: '编号不能为空', trigger: 'blur' }
-        ]
+        ]*/
       },
       columns: [
         { key: 0, label: `自增标识`, visible: false },
@@ -188,15 +188,22 @@ export default {
   },
   created() {
 
-    const today = new Date();
-    const yesterday = new Date(today);
-    yesterday.setDate(today.getDate() - 1);
+    const nowDate = new Date();
+    const today = parseTime(new Date(), '{y}-{m}-{d}')
+    const lastDate = new Date();
+    lastDate.setDate(nowDate.getDate() - 1)
+    const yesterday = parseTime(lastDate, '{y}-{m}-{d}')
 
-    this.daterangeCollectTime[0] = parseTime(yesterday, '{y}-{m}-{d}') ;
+    console.log(today,yesterday)
+    this.daterangeRecordTime[0] =  yesterday+ ' 08:00:00'
+    this.daterangeRecordTime[1] = today + ' 08:00:00'
+
+/*    this.daterangeCollectTime[0] = parseTime(yesterday, '{y}-{m}-{d}') ;
     this.daterangeCollectTime[1] = parseTime(today, '{y}-{m}-{d}') ;
     //时间默认为8点
     this.timerangeRecordTime[0] = '08:00:00';
-    this.timerangeRecordTime[1] = '08:00:00';
+    this.timerangeRecordTime[1] = '08:00:00';*/
+
 
     this.getTreeselect()
     this.getTreeMonitorInfo()
@@ -224,10 +231,15 @@ export default {
     getList() {
       this.loading = true
       this.queryParams.params = {}
-      if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
+/*      if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
         this.queryParams.params['beginCollectTime'] =this.daterangeCollectTime[0] + ' ' + this.timerangeRecordTime[0];
         this.queryParams.params['endCollectTime'] =this.daterangeCollectTime[1] + ' ' + this.timerangeRecordTime[1];
+      }*/
+      if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
+        this.queryParams.params['beginRecordTime'] =this.daterangeRecordTime[0];
+        this.queryParams.params['endRecordTime'] =this.daterangeRecordTime[1];
       }
+
       this.getChart()
     },
 
@@ -430,7 +442,7 @@ export default {
            right: 0
          },
          xAxis: {
-           data: data.map(e => e.collectTime),
+           data: data.map(e => e.recordTime),
            axisLine: {
              show: true, //隐藏X轴轴线
              lineStyle: {
@@ -517,7 +529,7 @@ export default {
            right: 0
          },
          xAxis: {
-           data: data.map(e => e.collectTime),
+           data: data.map(e => e.recordTime),
            axisLine: {
              show: true, //隐藏X轴轴线
              lineStyle: {
diff --git a/src/views/ems/report/pointSteamCurve/index.vue b/src/views/ems/report/pointSteamCurve/index.vue
index 00e1f86..b327957 100644
--- a/src/views/ems/report/pointSteamCurve/index.vue
+++ b/src/views/ems/report/pointSteamCurve/index.vue
@@ -38,9 +38,9 @@
           <!--              @keyup.enter.native="handleQuery"-->
           <!--            />-->
           <!--          </el-form-item>-->
-<!--          <el-form-item label="记录时间">
+          <el-form-item label="记录时间">
             <el-date-picker
-              v-model="daterangeCollectTime"
+              v-model="daterangeRecordTime"
               style="width: 340px"
               value-format="yyyy-MM-dd HH:mm:ss"
               type="datetimerange"
@@ -48,9 +48,9 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
             ></el-date-picker>
-          </el-form-item>-->
+          </el-form-item>
 
-          <el-form-item label="采集日期范围">
+<!--          <el-form-item label="采集日期范围">
             <el-date-picker
               v-model="daterangeCollectTime"
               style="width: 340px"
@@ -71,7 +71,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
             ></el-time-picker>
-          </el-form-item>
+          </el-form-item>-->
 
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -116,7 +116,7 @@ export default {
       //计量设备信息
       baseMonitorInfoList: [],
       // 采集方式时间范围
-      daterangeCollectTime: [],
+      daterangeRecordTime: [],
       // 时间选择
       timerangeRecordTime: [],
       // 遮罩层
@@ -158,9 +158,9 @@ export default {
       },
       // 表单校验
       rules: {
-        objId: [
+/*        objId: [
           { required: true, message: '编号不能为空', trigger: 'blur' }
-        ]
+        ]*/
       },
       columns: [
         { key: 0, label: `主键标识`, visible: false },
@@ -181,16 +181,24 @@ export default {
   },
   created() {
 
-    const today = new Date();
-    const yesterday = new Date(today);
-    yesterday.setDate(today.getDate() - 1);
+    const nowDate = new Date();
+    const today = parseTime(new Date(), '{y}-{m}-{d}')
+    const lastDate = new Date();
+    lastDate.setDate(nowDate.getDate() - 1)
+    const yesterday = parseTime(lastDate, '{y}-{m}-{d}')
 
-    this.daterangeCollectTime[0] = parseTime(yesterday, '{y}-{m}-{d}') ;
-    this.daterangeCollectTime[1] = parseTime(today, '{y}-{m}-{d}') ;
+    console.log(today,yesterday)
+    this.daterangeRecordTime[0] =  yesterday+ ' 08:00:00'
+    this.daterangeRecordTime[1] = today + ' 08:00:00'
+
+/*    this.daterangeCollectTime[0] = parseTime(yesterday, '{y}-{m}-{d}') ;
+    this.daterangeCollectTime[1] = parseTime(today, '{y}-{m}-{d}') ;*/
     //时间默认为8点
     /*     this.timerangeRecordTime = ['08:30:00', '08:30:00']; */
-    this.timerangeRecordTime[0] = '08:00:00';
-    this.timerangeRecordTime[1] = '08:00:00';
+/*    this.timerangeRecordTime[0] = '08:00:00';
+    this.timerangeRecordTime[1] = '08:00:00';*/
+
+
 
     this.getTreeselect()
     this.getTreeMonitorInfo()
@@ -218,9 +226,13 @@ export default {
     getList() {
       this.loading = true
       this.queryParams.params = {}
-      if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
+/*      if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
         this.queryParams.params['beginRecordTime'] = this.daterangeCollectTime[0] + ' ' + this.timerangeRecordTime[0];
         this.queryParams.params['endRecordTime'] = this.daterangeCollectTime[1] + ' ' + this.timerangeRecordTime[1];
+      }*/
+      if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
+        this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0] ;
+        this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1] ;
       }
       this.getChart()
     },
diff --git a/src/views/ems/report/reportPointSteam/index.vue b/src/views/ems/report/reportPointSteam/index.vue
index 4ed3a50..5fce5e5 100644
--- a/src/views/ems/report/reportPointSteam/index.vue
+++ b/src/views/ems/report/reportPointSteam/index.vue
@@ -38,7 +38,7 @@
           <!--          @keyup.enter.native="handleQuery"-->
           <!--        />-->
           <!--      </el-form-item>-->
-<!--          <el-form-item label="开始时间">
+          <el-form-item label="开始时间">
             <el-date-picker
               v-model="daterangeBeginTime"
               style="width: 340px"
@@ -48,8 +48,8 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
             ></el-date-picker>
-          </el-form-item>-->
-          <el-form-item label="采集日期范围">
+          </el-form-item>
+<!--          <el-form-item label="采集日期范围">
             <el-date-picker
               v-model="daterangeBeginTime"
               style="width: 340px"
@@ -70,7 +70,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
             ></el-time-picker>
-          </el-form-item>
+          </el-form-item>-->
 
           <el-form-item label="修改标识" prop="updateFlag">
             <el-select v-model="queryParams.updateFlag" placeholder="请选择修改标识" clearable>
@@ -324,9 +324,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        objId: [
+/*        objId: [
           { required: true, message: '主键标识不能为空', trigger: 'blur' }
-        ]
+        ]*/
       },
       columns: [
         { key: 0, label: `主键标识`, visible: false },
@@ -346,15 +346,21 @@ export default {
     }
   },
   created() {
-    const today = new Date();
-    const yesterday = new Date(today);
-    yesterday.setDate(today.getDate() - 1);
+    const nowDate = new Date();
+    const today = parseTime(new Date(), '{y}-{m}-{d}')
+    const lastDate = new Date();
+    lastDate.setDate(nowDate.getDate() - 1)
+    const yesterday = parseTime(lastDate, '{y}-{m}-{d}')
+
     //时间默认为8点
-    /*     this.timerangeRecordTime = ['08:30:00', '08:30:00']; */
+    /*     this.timerangeRecordTime = ['08:30:00', '08:30:00']; *//*
     this.timerangeRecordTime[0] = '08:00:00';
     this.timerangeRecordTime[1] = '08:00:00';
     this.daterangeBeginTime[0] = parseTime(yesterday, '{y}-{m}-{d}') ;
-    this.daterangeBeginTime[1] = parseTime(today, '{y}-{m}-{d}') ;
+    this.daterangeBeginTime[1] = parseTime(today, '{y}-{m}-{d}') ;*/
+
+    this.daterangeBeginTime[0] = yesterday + ' 08:00:00'
+    this.daterangeBeginTime[1] = today + ' 08:00:00'
 
     this.getTreeselect()
     this.getList()
@@ -370,9 +376,13 @@ export default {
     getList() {
       this.loading = true
       this.queryParams.params = {}
-      if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
+/*      if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
         this.queryParams.params['beginBeginTime'] = this.daterangeBeginTime[0] + ' ' + this.timerangeRecordTime[0];
         this.queryParams.params['endBeginTime'] = this.daterangeBeginTime[1] + ' ' +  this.timerangeRecordTime[1];
+      }*/
+      if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime){
+        this.queryParams.params['beginBeginTime'] = this.daterangeBeginTime[0]
+        this.queryParams.params['endBeginTime'] = this.daterangeBeginTime[1]
       }
       listReportPointSteam(this.queryParams).then(response => {
         this.reportPointSteamList = response.rows