From 735d5bba5e9d0d8c6ac9ad5e1e62a431b4a79c9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Thu, 20 Jan 2022 13:16:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/vehicleMent/journal.vue | 20 ++++++++++----------
 src/views/vehicleMent/reader.vue  | 10 +++++++---
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/views/vehicleMent/journal.vue b/src/views/vehicleMent/journal.vue
index 47c7592..479b844 100644
--- a/src/views/vehicleMent/journal.vue
+++ b/src/views/vehicleMent/journal.vue
@@ -83,21 +83,21 @@
       <el-table-column label="卡片编号" align="center" prop="cardNumber" />
       <el-table-column label="汽车横坐标" align="center" prop="carAbscissa" />
       <el-table-column label="汽车纵坐标" align="center" prop="carOrdinate" />
-      <el-table-column label="拆除" align="center" prop="dismantle">
-        <template slot-scope="scope">
-          {{ scope.row.dismantle == 1 ? "是" : "否" }}
-        </template>
-      </el-table-column>
       <el-table-column label="低电压" align="center" prop="lowVoltage">
         <template slot-scope="scope">
           {{ scope.row.lowVoltage == 1 ? "是" : "否" }}
         </template>
       </el-table-column>
-      <el-table-column label="振动" align="center" prop="vibration">
-        <template slot-scope="scope">
-          {{ scope.row.vibration == 1 ? "是" : "否" }}
-        </template>
-      </el-table-column>
+      <el-table-column
+        label="与正北夹角"
+        align="center"
+        prop="northAngle"
+      ></el-table-column>
+      <el-table-column
+        label="距离"
+        align="center"
+        prop="distance"
+      ></el-table-column>
       <el-table-column
         label="记录时间"
         align="center"
diff --git a/src/views/vehicleMent/reader.vue b/src/views/vehicleMent/reader.vue
index c348a08..452b0fd 100644
--- a/src/views/vehicleMent/reader.vue
+++ b/src/views/vehicleMent/reader.vue
@@ -75,7 +75,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="数据编号" align="center" prop="id" />
+      <el-table-column label="设备地址" align="center" prop="id" />
       <el-table-column label="读卡器ip" align="center" prop="readerIp" />
       <el-table-column label="读卡器名称" align="center" prop="readerName" />
       <el-table-column label="读卡器端口" align="center" prop="readerPort" />
@@ -131,7 +131,11 @@
     <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="读卡器ip" prop="readerIp">
-          <el-input v-model="form.readerIp" placeholder="请输入读卡器ip" />
+          <el-input
+            v-model="form.readerIp"
+            placeholder="请输入读卡器ip"
+            :disabled="form.id ? true : false"
+          />
         </el-form-item>
         <el-form-item label="读卡器名称" prop="readerName">
           <el-input v-model="form.readerName" placeholder="请输入读卡器名称" />
@@ -310,7 +314,7 @@ export default {
     handleDelete(row) {
       const rowId = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除数据编号为"' + rowId + '"的数据项？')
+        .confirm('是否确认删除设备地址为"' + rowId + '"的数据项？')
         .then(function () {
           return readerCardDelete(rowId);
         })