From 4e5e1091201cc11c0d99add26d95ba396778e239 Mon Sep 17 00:00:00 2001
From: shaowenhao <3121640096@qq.com>
Date: Thu, 30 Nov 2023 13:39:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=BF=AD=E4=BB=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/allCar/catMessage.vue | 42 +++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/views/allCar/catMessage.vue b/src/views/allCar/catMessage.vue
index d7f70d0..7e7034a 100644
--- a/src/views/allCar/catMessage.vue
+++ b/src/views/allCar/catMessage.vue
@@ -2,14 +2,14 @@
   <div>
     <el-form ref="from" :model="from" status-icon class="demo-ruleForm">
       车辆VIN: <el-input v-model="from.carVinId" placeholder="车辆VIN" />
-      车辆类型: <el-input v-model="from.carVinId" placeholder="车辆类型" />
-      电子围栏: <el-input v-model="from.carVinId" placeholder="电子围栏" />
-      车辆状态: <el-input v-model="from.carVinId" placeholder="车辆状态" />
+      车辆类型: <el-input v-model="from.carTypeId" placeholder="车辆类型" />
+      电子围栏: <el-input v-model="from.fenceId" placeholder="电子围栏" />
+      车辆状态: <el-input v-model="from.status" placeholder="车辆状态" />
       <br><br>
-      电机厂商: <el-input v-model="from.carVinId" placeholder="电机厂商" />
-      电池厂商: <el-input v-model="from.carVinId" placeholder="电池厂商" />
-      电机编号: <el-input v-model="from.carVinId" placeholder="电机编号" />
-      电池编号: <el-input v-model="from.carVinId" placeholder="电池编号" />
+      电机厂商: <el-input v-model="from.batteryManufacturer" placeholder="电机厂商" />
+      电池厂商: <el-input v-model="from.motorManufacturer" placeholder="电池厂商" />
+      电机编号: <el-input v-model="from.motorNumber" placeholder="电机编号" />
+      电池编号: <el-input v-model="from.batteryNumber" placeholder="电池编号" />
       <br><br>
       <el-form-item>
         <el-button type="primary" @click="submitForm">提交</el-button>
@@ -27,14 +27,14 @@
           </el-form-item>
           <el-form-item label="车辆类型" :label-width="formLabelWidth">
             <el-select v-model="form.carTypeId" placeholder="请选择车辆类型">
-              <el-option label="区域一" value="shanghai" />
-              <el-option label="区域二" value="beijing" />
+              <el-option label="1" value=1 />
+              <el-option label="2" value=2 />
             </el-select>
           </el-form-item>
           <el-form-item label="电子围栏" :label-width="formLabelWidth">
             <el-select v-model="form.fenceId" placeholder="请选择电子围栏">
-              <el-option label="区域一" value="shanghai" />
-              <el-option label="区域二" value="beijing" />
+              <el-option label="1" value=1 />
+              <el-option label="2" value=2 />
             </el-select>
           </el-form-item>
           <el-form-item label="电机厂商" :label-width="formLabelWidth">
@@ -64,14 +64,14 @@
           </el-form-item>
           <el-form-item label="车辆类型" :label-width="formLabelWidth">
             <el-select v-model="formHui.carTypeId" placeholder="请选择车辆类型">
-              <el-option label="区域一" value="shanghai" />
-              <el-option label="区域二" value="beijing" />
+              <el-option label="1" value="shanghai" />
+              <el-option label="2" value="beijing" />
             </el-select>
           </el-form-item>
           <el-form-item label="电子围栏" :label-width="formLabelWidth">
             <el-select v-model="formHui.fenceId" placeholder="请选择电子围栏">
-              <el-option label="区域一" value="shanghai" />
-              <el-option label="区域二" value="beijing" />
+              <el-option label="1" value="shanghai" />
+              <el-option label="2" value="beijing" />
             </el-select>
           </el-form-item>
           <el-form-item label="电机厂商" :label-width="formLabelWidth">
@@ -147,7 +147,10 @@
 
       <el-table-column label="操作">
         <template slot-scope="scope">
+          <!--          实时轨迹-->
           <el-button size="mini" @click="handleShi(scope.$index , scope.row.carVinId)">实时轨迹</el-button>
+          <!--          111111-->
+          <el-button size="mini" @click="handleShiGui(scope.$index , scope.row.carVinId)">1111</el-button>
           <!--        修改车辆信息-->
           <el-button size="mini" @click="handleEdit(scope.$index, scope.row.carVinId)">修改</el-button>
           <!--        删除车辆信息-->
@@ -222,6 +225,9 @@ export default {
         this.listLoading = false
       })
     },
+    handleShiGui() {
+      this.$router.push('/allCar/history')
+    },
     // 模糊查询提交 更新列表
     submitForm() {
       this.fetchData()
@@ -255,9 +261,9 @@ export default {
     },
     // 批量删除
     delListCar() {},
-    // 实时轨迹 跳转这个表
-    handleShi(carVinId) {
-      this.$router.push('src/views/allCar/operation.vue')
+    // 实时轨迹 跳转这个表 carVinId
+    handleShi() {
+      this.$router.push('/allCar/operation')
     },
     // 回显 修改
     handleEdit(carVinId) {