From 6a106e73f01dd500bb4d2ecb426f08e99216c092 Mon Sep 17 00:00:00 2001
From: shaowenhao <3121640096@qq.com>
Date: Sat, 25 Nov 2023 19:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=BD=A6=E8=BE=86=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=AE=A1=E7=90=86=E5=89=8D=E5=8F=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/allCar/catMessage.vue | 134 +++++++++++++++++---------------
 1 file changed, 70 insertions(+), 64 deletions(-)

diff --git a/src/views/allCar/catMessage.vue b/src/views/allCar/catMessage.vue
index 87d26ab..1421194 100644
--- a/src/views/allCar/catMessage.vue
+++ b/src/views/allCar/catMessage.vue
@@ -1,80 +1,81 @@
 <template>
-  <el-table :data="tableData" style="width: 100%">
+  <div>
+    <el-form ref="from" :model="from" status-icon class="demo-ruleForm">
+      <el-form-item label="车辆VIN" prop="pass">
+        <el-input v-model="from.carVinId" type="text" autocomplete="off" />
+      </el-form-item>
 
-    <el-table-column label="车辆VIN" width="180">
-      <template slot-scope="scope">
-        <el-popover trigger="hover" placement="top">
+      <el-form-item label="车辆类型" prop="pass">
+        <el-input v-model="from.carTypeId" type="text" autocomplete="off" />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
+        <el-button @click="resetForm('ruleForm')">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="tableData" style="width: 100%">
+
+      <el-table-column label="车辆VIN" width="180">
+        <template slot-scope="scope">
           <el-tag size="medium">{{ scope.row.carVinId }}</el-tag>
-        </el-popover>
-      </template>
-    </el-table-column>
+        </template>
+      </el-table-column>
 
-    <el-table-column label="车辆VIN" width="180">
-      <template slot-scope="scope">
-        <el-popover trigger="hover" placement="top">
+      <el-table-column label="车辆类型" width="180">
+        <template slot-scope="scope">
           <el-tag size="medium">{{ scope.row.carTypeId }}</el-tag>
-        </el-popover>
-      </template>
-    </el-table-column>
+        </template>
+      </el-table-column>
 
-    <el-table-column label="车辆类型" width="180">
-      <template slot-scope="scope">
-        <el-popover trigger="hover" placement="top">
+      <el-table-column label="电子围栏ID" width="180">
+        <template slot-scope="scope">
           <el-tag size="medium">{{ scope.row.fenceId }}</el-tag>
-        </el-popover>
-      </template>
-    </el-table-column>
+        </template>
+      </el-table-column>
 
-    <el-table-column label="车辆状态" width="180">
-      <template slot-scope="scope">
-        <el-popover trigger="hover" placement="top">
+      <el-table-column label="车辆状态" width="180">
+        <template slot-scope="scope">
           <el-tag size="medium">{{ scope.row.status }}</el-tag>
-        </el-popover>
-      </template>
-    </el-table-column>
+        </template>
+      </el-table-column>
 
-    <el-table-column label="电子围栏" width="180">
-      <template slot-scope="scope">
-        <el-popover trigger="hover" placement="top">
+      <el-table-column label="电池厂商" width="180">
+        <template slot-scope="scope">
           <el-tag size="medium">{{ scope.row.batteryManufacturer }}</el-tag>
-        </el-popover>
-      </template>
-    </el-table-column>
+        </template>
+      </el-table-column>
 
-    <el-table-column label="电池厂商" width="180">
-      <template slot-scope="scope">
-        <el-popover trigger="hover" placement="top">
+      <el-table-column label="电机厂商" width="180">
+        <template slot-scope="scope">
           <el-tag size="medium">{{ scope.row.motorManufacturer }}</el-tag>
-        </el-popover>
-      </template>
-    </el-table-column>
+        </template>
+      </el-table-column>
 
-    <el-table-column label="电机厂商" width="180">
-      <template slot-scope="scope">
-        <el-popover trigger="hover" placement="top">
+      <el-table-column label="电机编号" width="180">
+        <template slot-scope="scope">
           <el-tag size="medium">{{ scope.row.motorNumber }}</el-tag>
-        </el-popover>
-      </template>
-    </el-table-column>
+        </template>
+      </el-table-column>
 
-    <el-table-column label="电机编号" width="180">
-      <template slot-scope="scope">
-        <el-popover trigger="hover" placement="top">
+      <el-table-column label="电池编号" width="180">
+        <template slot-scope="scope">
           <el-tag size="medium">{{ scope.row.batteryNumber }}</el-tag>
-        </el-popover>
-      </template>
-    </el-table-column>
+        </template>
+      </el-table-column>
 
-    <el-table-column label="操作">
-      <template slot-scope="scope">
-        <el-button size="mini" @click="handleShi(scope.$index , scope.row)">实时轨迹</el-button>
-        <!--        修改车辆信息-->
-        <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">修改</el-button>
-        <!--        删除车辆信息-->
-        <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
-      </template>
-    </el-table-column>
-  </el-table>
+      <el-table-column label="操作">
+        <template slot-scope="scope">
+          <el-button size="mini" @click="handleShi(scope.$index , scope.row)">实时轨迹</el-button>
+          <!--        修改车辆信息-->
+          <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">修改</el-button>
+          <!--        删除车辆信息-->
+          <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+  </div>
 </template>
 
 <script>
@@ -97,7 +98,10 @@ export default {
     return {
       list: null,
       listLoading: true,
-      from: {},
+      from: {
+        carVinId: null,
+        carTypeId: null
+      },
       tableData: []
     }
   },
@@ -108,11 +112,8 @@ export default {
     fetchData: function() {
       this.listLoading = true
       carList().then(response => {
-        this.tableData = response.data
-        alert(11111)
+        this.tableData = response.data.data
         console.log(2222222222222222)
-        console.log(response.data)
-        console.log(this.tableData)
         this.listLoading = false
       })
     },
@@ -125,3 +126,8 @@ export default {
   }
 }
 </script>
+<style>
+ .el-input{
+   width: 200px;
+ }
+</style>