From 2c770d2db42eb807a56a450684849229e52591a0 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Wed, 30 Apr 2025 16:18:32 +0800
Subject: [PATCH] =?UTF-8?q?refactor(ems):=20=E4=BC=98=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改为记录时间查询框，调整日期选择器的显示和使用
- 统一排序方式，使用 objId 进行排序
---
 .../ems/record/recordIOTInstant/index.vue     | 26 +++++++++----------
 .../record/recordVibrationInstant/index.vue   |  8 +++---
 .../ems/report/currentIOTCurve/index.vue      | 16 ++++++------
 .../report/currentVibrationCurve/index.vue    | 16 ++++++------
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/views/ems/record/recordIOTInstant/index.vue b/src/views/ems/record/recordIOTInstant/index.vue
index dc02abe..1ab58ea 100644
--- a/src/views/ems/record/recordIOTInstant/index.vue
+++ b/src/views/ems/record/recordIOTInstant/index.vue
@@ -28,15 +28,15 @@
             </el-col>
             <el-col :span="19" :xs="24">
                 <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-                    <el-form-item label="计量设备编号" prop="monitorId">
+<!--                    <el-form-item label="计量设备编号" prop="monitorId">
                         <el-input
                                 v-model="queryParams.monitorId"
                                 placeholder="请输入计量设备编号"
                                 clearable
                                 @keyup.enter.native="handleQuery"
                         />
-                    </el-form-item>
-                    <el-form-item label="采集时间">
+                    </el-form-item>-->
+<!--                    <el-form-item label="采集时间">
                         <el-date-picker
                             v-model="daterangeCollectTime"
                             style="width: 340px"
@@ -46,7 +46,7 @@
                             start-placeholder="开始时间"
                             end-placeholder="结束时间"
                         ></el-date-picker>
-                    </el-form-item>
+                    </el-form-item>-->
                     <!-- <el-form-item label="温度" prop="tempreture">
                         <el-input
                                 v-model="queryParams.tempreture"
@@ -220,9 +220,9 @@
                         </template>
                     </el-table-column>
                 </el-table>
-            </el-col> 
+            </el-col>
         </el-row>
-        
+
 
         <pagination
                 v-show="total>0"
@@ -301,12 +301,12 @@
 </template>
 
 <script>
-    import { 
-        listRecordIOTInstant, 
-        getRecordIOTInstant, 
-        delRecordIOTInstant, 
-        addRecordIOTInstant, 
-        updateRecordIOTInstant } 
+    import {
+        listRecordIOTInstant,
+        getRecordIOTInstant,
+        delRecordIOTInstant,
+        addRecordIOTInstant,
+        updateRecordIOTInstant }
         from "@/api/ems/record/recordIOTInstant";
     import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
     import Treeselect from '@riophae/vue-treeselect'
@@ -397,7 +397,7 @@
             // 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();
diff --git a/src/views/ems/record/recordVibrationInstant/index.vue b/src/views/ems/record/recordVibrationInstant/index.vue
index 229189a..446e214 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,15 +51,15 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间">
             </el-date-picker>
-          </el-form-item>
-          <el-form-item label="振动传感器编号" prop="sensorId">
+          </el-form-item>-->
+<!--          <el-form-item label="振动传感器编号" prop="sensorId">
             <el-input
               v-model="queryParams.sensorId"
               placeholder="请输入振动传感器编号"
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item>-->
           <!--                        <el-form-item label="速度(mm/s)" prop="speed">
                                       <el-input
                                               v-model="queryParams.speed"
diff --git a/src/views/ems/report/currentIOTCurve/index.vue b/src/views/ems/report/currentIOTCurve/index.vue
index 9354a88..ede0f64 100644
--- a/src/views/ems/report/currentIOTCurve/index.vue
+++ b/src/views/ems/report/currentIOTCurve/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"
@@ -95,7 +95,7 @@ export default {
       //计量设备信息
       baseMonitorInfoList: [],
       // 采集方式时间范围
-      daterangeCollectTime: [],
+      daterangeRecordTime: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -163,8 +163,8 @@ export default {
   },
   created() {
     const nowDate = 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.getTreeselect()
     this.getList()
   },
@@ -190,9 +190,9 @@ export default {
     getList() {
       this.loading = true
       this.queryParams.params = {}
-      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]
       }
       console.log(this.monitorInfoOptions)
       this.getChart()
diff --git a/src/views/ems/report/currentVibrationCurve/index.vue b/src/views/ems/report/currentVibrationCurve/index.vue
index ea0aba3..f5ded44 100644
--- a/src/views/ems/report/currentVibrationCurve/index.vue
+++ b/src/views/ems/report/currentVibrationCurve/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"
@@ -95,7 +95,7 @@ export default {
       //计量设备信息
       baseMonitorInfoList: [],
       // 采集方式时间范围
-      daterangeCollectTime: [],
+      daterangeRecordTime: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -153,8 +153,8 @@ export default {
   },
   created() {
     const nowDate = 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.getTreeselect()
     this.getList()
   },
@@ -180,9 +180,9 @@ export default {
     getList() {
       this.loading = true
       this.queryParams.params = {}
-      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]
       }
       // 将monitorCode改为sensorId
       if (this.queryParams.sensorId !== null) {