diff --git a/src/views/iceWeather/weather/index.vue b/src/views/iceWeather/weather/index.vue
index 312a8df..5d22fbf 100644
--- a/src/views/iceWeather/weather/index.vue
+++ b/src/views/iceWeather/weather/index.vue
@@ -239,6 +239,7 @@
                     v-model="formdata.starttime"
                     type="date"
                     placeholder="开始日期"
+                    timestamp
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -249,6 +250,7 @@
                     type="date"
                     placeholder="结束日期"
                     class="ml10"
+                    timestamp
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -509,7 +511,8 @@ export default {
       page: 1, // 当前页数
       pageSize: 20, // 每页数量
       total: 0, //总条数
-
+      savedStartTime: null,
+      savedEndTime: null,
       paramsData: "",
       childpage: 1, // 当前页数
       childpageSize: 20, // 每页数量
@@ -529,6 +532,18 @@ export default {
         that.onSubmit(); // 触发事件
       }
     };
+    this.$set(
+      this.formdata,
+      "starttime",
+      new Date(new Date().toLocaleDateString()).getTime()
+    );
+    const currentDate = new Date(); // 获取当前时间
+    currentDate.setHours(23); // 设置小时为23
+    currentDate.setMinutes(59); // 设置分钟为59
+    currentDate.setSeconds(59); // 设置秒数为59
+    this.$set(this.formdata, "endtime", currentDate.getTime());
+    console.log(this.formdata.starttime);
+    console.log(this.formdata.endtime);
   },
   watch: {
     endtime(newVal) {
@@ -685,17 +700,8 @@ export default {
     //点击查看更多历史数据
     moreDataClick(row) {
       this.childFlag = true;
+
       console.log(row);
-      this.$set(
-        this.formdata,
-        "starttime",
-        new Date(new Date().toLocaleDateString()).getTime()
-      );
-      const currentDate = new Date(); // 获取当前时间
-      currentDate.setHours(23); // 设置小时为23
-      currentDate.setMinutes(59); // 设置分钟为59
-      currentDate.setSeconds(59); // 设置秒数为59
-      this.$set(this.formdata, "endtime", currentDate.getTime());
 
       this.childParma = row;
       this.getchildWeatherData(row);
@@ -703,6 +709,8 @@ export default {
 
     //查询时间
     onSubmit() {
+      console.log(this.formdata.starttime);
+      console.log(this.formdata.endtime);
       this.getchildWeatherData(this.childParma);
     },
     //采集数据
diff --git a/src/views/reportData/equipmentStatus/index.vue b/src/views/reportData/equipmentStatus/index.vue
index 5cb96fb..fef783e 100644
--- a/src/views/reportData/equipmentStatus/index.vue
+++ b/src/views/reportData/equipmentStatus/index.vue
@@ -296,15 +296,16 @@
         </el-table-column>
 
         <el-table-column
-          prop="lastGps.updatetime"
+          prop="positions.updateTime"
           label="最新GPS位置采集时间"
           min-width="140"
         >
         </el-table-column>
-        <el-table-column prop="lastGps.radius" label="半径"> </el-table-column>
-        <el-table-column prop="lastGps.latitude" label="维度">
+        <el-table-column prop="positions.radius" label="半径">
         </el-table-column>
-        <el-table-column prop="lastGps.longitude" label="经度">
+        <el-table-column prop="positions.latitude" label="维度">
+        </el-table-column>
+        <el-table-column prop="positions.longitude" label="经度">
         </el-table-column>
       </el-table>
       <div class="pageNation">
@@ -472,7 +473,7 @@ export default {
       console.log(this.formdata);
       this.termLoading = true;
       let params = {
-        dataFlag: "GPSOCB", //全要
+        dataFlag: "PSOCB", //全要
         start: this.formdata.starttime / 1000,
         end: this.formdata.endtime / 1000,
         pageNum: this.page,
diff --git a/src/views/system/globalTools/components/termsReset.vue b/src/views/system/globalTools/components/termsReset.vue
index ddeeb48..d42ec33 100644
--- a/src/views/system/globalTools/components/termsReset.vue
+++ b/src/views/system/globalTools/components/termsReset.vue
@@ -2,7 +2,7 @@
   <div class="termsBox">
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>批量下发重置</span>
+        <span>批量下发重启</span>
       </div>
       <div class="deviceList">
         <div class="searchBox">