From e85236479d1af98c96828f2ace356d3d09ae3a82 Mon Sep 17 00:00:00 2001
From: zangch <zangch@mesnac.com>
Date: Tue, 8 Oct 2024 13:24:53 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=8C=AF=E5=8A=A8=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E6=95=B0=E6=8D=AEbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ems/record/recordVibrationInstant.js  | 12 +++----
 .../record/recordVibrationInstant/index.vue   | 34 +++++++++----------
 .../report/currentVibrationCurve/index.vue    |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/api/ems/record/recordVibrationInstant.js b/src/api/ems/record/recordVibrationInstant.js
index 25212e7..a046686 100644
--- a/src/api/ems/record/recordVibrationInstant.js
+++ b/src/api/ems/record/recordVibrationInstant.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询震动实时数据列表
+// 查询振动实时数据列表
 export function listRecordVibrationInstant(query) {
   return request({
     url: '/ems/record/recordVibrationInstant/list',
@@ -9,7 +9,7 @@ export function listRecordVibrationInstant(query) {
   })
 }
 
-// 查询震动实时数据详细
+// 查询振动实时数据详细
 export function getRecordVibrationInstant(objId) {
   return request({
     url: '/ems/record/recordVibrationInstant/' + objId,
@@ -17,7 +17,7 @@ export function getRecordVibrationInstant(objId) {
   })
 }
 
-// 新增震动实时数据
+// 新增振动实时数据
 export function addRecordVibrationInstant(data) {
   return request({
     url: '/ems/record/recordVibrationInstant',
@@ -26,7 +26,7 @@ export function addRecordVibrationInstant(data) {
   })
 }
 
-// 修改震动实时数据
+// 修改振动实时数据
 export function updateRecordVibrationInstant(data) {
   return request({
     url: '/ems/record/recordVibrationInstant',
@@ -35,7 +35,7 @@ export function updateRecordVibrationInstant(data) {
   })
 }
 
-// 删除震动实时数据
+// 删除振动实时数据
 export function delRecordVibrationInstant(objId) {
   return request({
     url: '/ems/record/recordVibrationInstant/' + objId,
@@ -43,7 +43,7 @@ export function delRecordVibrationInstant(objId) {
   })
 }
 
-// 查询震动实时数据（曲线）
+// 查询振动实时数据（曲线）
 export function vibrationInstantList(query) {
   return request({
     url: '/ems/record/recordVibrationInstant/vibrationInstantList',
diff --git a/src/views/ems/record/recordVibrationInstant/index.vue b/src/views/ems/record/recordVibrationInstant/index.vue
index 9301054..229189a 100644
--- a/src/views/ems/record/recordVibrationInstant/index.vue
+++ b/src/views/ems/record/recordVibrationInstant/index.vue
@@ -52,10 +52,10 @@
               end-placeholder="结束时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="震动传感器编号" prop="sensorId">
+          <el-form-item label="振动传感器编号" prop="sensorId">
             <el-input
               v-model="queryParams.sensorId"
-              placeholder="请输入震动传感器编号"
+              placeholder="请输入振动传感器编号"
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -173,8 +173,8 @@
               <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="震动传感器编号" align="center" prop="sensorId" v-if="columns[2].visible"/>
-          <el-table-column label="震动传感器名称" align="center" prop="monitorName" v-if="columns[3].visible"/>
+          <el-table-column label="振动传感器编号" align="center" prop="sensorId" v-if="columns[2].visible"/>
+          <el-table-column label="振动传感器名称" align="center" prop="monitorName" v-if="columns[3].visible"/>
           <el-table-column label="速度(mm/s)" align="center" prop="speed" v-if="columns[4].visible"/>
           <el-table-column label="位移(um)" align="center" prop="displacement" v-if="columns[5].visible"/>
           <el-table-column label="加速度(g)" align="center" prop="acceleration" v-if="columns[6].visible"/>
@@ -219,7 +219,7 @@
     />
 
 
-    <!-- 添加或修改震动实时数据对话框 -->
+    <!-- 添加或修改振动实时数据对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <!--                                <el-form-item label="采集时间" prop="collectTime">
@@ -238,8 +238,8 @@
             placeholder="请选择采集时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="震动传感器编号" prop="sensorId">
-          <el-input v-model="form.sensorId" placeholder="请输入震动传感器编号" />
+        <el-form-item label="振动传感器编号" prop="sensorId">
+          <el-input v-model="form.sensorId" placeholder="请输入振动传感器编号" />
         </el-form-item>
         <el-form-item label="速度(mm/s)" prop="speed">
           <el-input v-model="form.speed" placeholder="请输入速度(mm/s)" />
@@ -312,7 +312,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 震动实时数据表格数据
+      // 振动实时数据表格数据
       recordVibrationInstantList: [],
       // 弹出层标题
       title: "",
@@ -345,7 +345,7 @@ export default {
       // 表单校验
       rules: {
         sensorId: [
-          {required: true, message: "震动传感器编号不能为空", trigger: "blur"}
+          {required: true, message: "振动传感器编号不能为空", trigger: "blur"}
         ],
         recodeTime: [
           {required: true, message: "记录时间不能为空", trigger: "blur"}
@@ -357,8 +357,8 @@ export default {
       columns: [
         { key: 0, label: `主键标识`, visible: true },
         { key: 1, label: `采集时间`, visible: true },
-        { key: 2, label: `震动传感器编号`, visible: true },
-        { key: 3, label: `震动传感器名称`, visible: true },
+        { key: 2, label: `振动传感器编号`, visible: true },
+        { key: 3, label: `振动传感器名称`, visible: true },
         { key: 4, label: `速度(mm/s)`, visible: true },
         { key: 5, label: `位移(um)`, visible: true },
         { key: 6, label: `加速度(g)`, visible: true },
@@ -370,9 +370,9 @@ export default {
   },
   created() {
     this.getList();
-    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+/*    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
     this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
-    this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
+    this.daterangeCollectTime[1] = nowDate + ' 23:59:59'*/
     this.getTreeselect()
     this.getTreeMonitorInfo()
     this.getList()
@@ -397,7 +397,7 @@ export default {
       })
     },
 
-    /** 查询震动实时数据列表 */
+    /** 查询振动实时数据列表 */
     getList() {
       this.loading = true;
       this.queryParams.params = {};
@@ -460,7 +460,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加震动实时数据";
+      this.title = "添加振动实时数据";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -469,7 +469,7 @@ export default {
       getRecordVibrationInstant(objId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改震动实时数据";
+        this.title = "修改振动实时数据";
       });
     },
     /** 提交按钮 */
@@ -495,7 +495,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const objIds = row.objId || this.ids;
-      this.$modal.confirm('是否确认删除震动实时数据编号为"' + objIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除振动实时数据编号为"' + objIds + '"的数据项？').then(function() {
         return delRecordVibrationInstant(objIds);
       }).then(() => {
         this.getList();
diff --git a/src/views/ems/report/currentVibrationCurve/index.vue b/src/views/ems/report/currentVibrationCurve/index.vue
index 75c1c3d..ea0aba3 100644
--- a/src/views/ems/report/currentVibrationCurve/index.vue
+++ b/src/views/ems/report/currentVibrationCurve/index.vue
@@ -255,7 +255,7 @@ export default {
       this.handleQuery()
     },
 
-    /** 震动曲线 */
+    /** 振动曲线 */
     async getChart() {
       if (this.queryParams.sensorId == null) {
         return