From 93a45e19ca4631f512ea53c119a789af506d2986 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 19 Feb 2024 18:12:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/i18n/langs/cn/highModulus.js       |  1 +
 .../projectFront/highModulus/pointManage.vue  | 38 +++++++++----------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/assets/i18n/langs/cn/highModulus.js b/src/assets/i18n/langs/cn/highModulus.js
index ca095b3a..9bc70f2f 100644
--- a/src/assets/i18n/langs/cn/highModulus.js
+++ b/src/assets/i18n/langs/cn/highModulus.js
@@ -79,5 +79,6 @@ export default {
     alarmType:['电量（%）','X轴（°）',' Y轴（°）','压力（kN）','沉降（mm）'],
     alarmStateArr:['正常','预警','报警'],
     deviceTypeArr:['倾角','压力','沉降'],
+    monitorTypeArr:['立杆轴力','水平位移','模板沉降','立杆倾斜','地基沉降'],
     editSuccessMsg: '编辑成功！'
 }
\ No newline at end of file
diff --git a/src/views/projectFront/highModulus/pointManage.vue b/src/views/projectFront/highModulus/pointManage.vue
index bf61d683..f04fafda 100644
--- a/src/views/projectFront/highModulus/pointManage.vue
+++ b/src/views/projectFront/highModulus/pointManage.vue
@@ -250,34 +250,34 @@
           }}</el-button>
         </div>
         <el-table :data="realTimeList" class="tables">
-          <!-- 电量 -->
+          <!-- 立杆轴力 -->
           <el-table-column
-            prop="electricPower"
-            :label="$t('message.highModulus.electricQuantity') + '(%)'"
+            prop="poleAxialForce"
+            label="立杆轴力(N)"
           >
           </el-table-column>
-          <!-- X轴 -->
+          <!-- 水平位移 -->
           <el-table-column
-            prop="angleXAxis"
-            :label="$t('message.highModulus.Xaxis') + '(°)'"
+            prop="horizontalDisplacement"
+            label="水平位移(mm)"
           >
           </el-table-column>
-          <!-- Y轴 -->
+          <!-- 模板沉降 -->
           <el-table-column
-            prop="angleYAxis"
-            :label="$t('message.highModulus.Yaxis') + '(°)'"
+            prop="formworkSettlement"
+            label="模板沉降(mm)"
           >
           </el-table-column>
-          <!-- 压力 -->
+          <!-- 立杆倾斜 -->
           <el-table-column
-            prop="pressure"
-            :label="$t('message.highModulus.pressure') + '(kN)'"
+            prop="poleTilt"
+            label="立杆倾斜(°)"
           >
           </el-table-column>
-          <!-- 沉降 -->
+          <!-- 地基沉降 -->
           <el-table-column
-            prop="subside"
-            :label="$t('message.highModulus.settling') + '(mm)'"
+            prop="foundationSettlement"
+            label="立杆倾斜(mm)"
           >
           </el-table-column>
           <!-- 测量时间 -->
@@ -366,7 +366,7 @@
               >
                 <el-option
                   v-for="(item, index) in $t(
-                    'message.highModulus.deviceTypeArr'
+                    'message.highModulus.monitorTypeArr'
                   )"
                   :key="index"
                   :value="index + 1"
@@ -374,7 +374,7 @@
                 ></el-option>
               </el-select>
               <span v-else>{{
-                $t('message.highModulus.deviceTypeArr')[
+                $t('message.highModulus.monitorTypeArr')[
                   scope.row.deviceType - 1
                 ]
               }}</span>
@@ -522,7 +522,7 @@ export default {
       dialogDev: false,
       devList: [],
       devOpType: 1, //1：添加  2：编辑  3：详细
-      deviceTypeArr: ['倾角', '压力', '沉降'],
+      deviceTypeArr: ['倾角', '压力', '沉降2'],
       cancelList: [] // 取消的数据数组
     }
   },
@@ -569,7 +569,7 @@ export default {
       })
     },
     formatType(row) {
-      return this.$t('message.highModulus.alarmType')[row.type - 1]
+      return this.$t('message.highModulus.monitorTypeArr')[row.type - 1]
     },
     addFn() {
       this.isAdd = true