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

---
 src/api/carList/list.js         |  20 ++++-
 src/views/allCar/catMessage.vue | 126 ++++++++++++++++++++++++--------
 2 files changed, 112 insertions(+), 34 deletions(-)

diff --git a/src/api/carList/list.js b/src/api/carList/list.js
index ea9bf5e..30e8108 100644
--- a/src/api/carList/list.js
+++ b/src/api/carList/list.js
@@ -37,7 +37,7 @@ export function carUpd(data) {
 //删除车辆信息管理
 export function carDel(vinId){
   return request({
-    url:'carBase/car/delCar/' + vinId,
+    url:'carBase/car/delCar' + vinId,
     method:'get',
     vinId
   })
@@ -45,10 +45,26 @@ export function carDel(vinId){
 //导出车辆信息管理
 export function carExport(data){
   return request({
-    url:'carBase/car/export/',
+    url:'carBase/car/export',
     method:'post',
     data
   })
 }
+//获取电子围栏的下拉框
+export function getFenceList(data){
+  return request({
+    url:'carBase/car/fenceId',
+    method:'get',
+    data
+  })
+}
+//获取车辆类型的下拉框
+export function getCarType(data){
+  return request({
+    url:'carBase/car/carType',
+    method:'get',
+    data
+  })
+}
 
 
diff --git a/src/views/allCar/catMessage.vue b/src/views/allCar/catMessage.vue
index 7e7034a..c934656 100644
--- a/src/views/allCar/catMessage.vue
+++ b/src/views/allCar/catMessage.vue
@@ -22,31 +22,39 @@
       <!--1111111111111111111111111111111111添加弹窗1111111111111111111111111111-->
       <el-dialog title="添加车辆信息管理" :visible.sync="dialogFormVisible">
         <el-form :model="form">
-          <el-form-item label="车辆VIN" :label-width="formLabelWidth">
+          <el-form-item label="车辆VIN">
             <el-input v-model="form.carVinId" autocomplete="off" />
           </el-form-item>
-          <el-form-item label="车辆类型" :label-width="formLabelWidth">
-            <el-select v-model="form.carTypeId" placeholder="请选择车辆类型">
-              <el-option label="1" value=1 />
-              <el-option label="2" value=2 />
+          <el-form-item label="车辆类型">
+            <el-select v-model="form.carTypeId" clearable placeholder="请选择">
+              <el-option
+                v-for="item in carTypeList"
+                :key="item.id"
+                :label="item.carTypeName"
+                :value="item.id">
+              </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="电子围栏" :label-width="formLabelWidth">
-            <el-select v-model="form.fenceId" placeholder="请选择电子围栏">
-              <el-option label="1" value=1 />
-              <el-option label="2" value=2 />
-            </el-select>
+          <el-form-item label="电子围栏">
+            <el-select v-model="form.fenceId" clearable placeholder="请选择">
+              <el-option
+                v-for="item in fenceList"
+                :key="item.id"
+                :label="item.fenceName"
+                :value="item.id">
+              </el-option>
+              </el-select>
           </el-form-item>
-          <el-form-item label="电机厂商" :label-width="formLabelWidth">
+          <el-form-item label="电机厂商" >
             <el-input v-model="form.motorManufacturer" autocomplete="off" />
           </el-form-item>
-          <el-form-item label="电池厂商" :label-width="formLabelWidth">
+          <el-form-item label="电池厂商" >
             <el-input v-model="form.batteryManufacturer" autocomplete="off" />
           </el-form-item>
-          <el-form-item label="电机编号" :label-width="formLabelWidth">
+          <el-form-item label="电机编号" >
             <el-input v-model="form.motorNumber" autocomplete="off" />
           </el-form-item>
-          <el-form-item label="电池编号" :label-width="formLabelWidth">
+          <el-form-item label="电池编号" >
             <el-input v-model="form.batteryNumber" autocomplete="off" />
           </el-form-item>
         </el-form>
@@ -59,31 +67,39 @@
       <!--1111111111111111111111111111111111修改回显弹窗1111111111111111111111111111-->
       <el-dialog title="修改车辆信息管理" :visible.sync="dialogFormVisible1">
         <el-form :model="formHui">
-          <el-form-item label="车辆VIN" :label-width="formLabelWidth">
+          <el-form-item label="车辆VIN" >
             <el-input v-model="formHui.carVinId" autocomplete="off" />
           </el-form-item>
-          <el-form-item label="车辆类型" :label-width="formLabelWidth">
-            <el-select v-model="formHui.carTypeId" placeholder="请选择车辆类型">
-              <el-option label="1" value="shanghai" />
-              <el-option label="2" value="beijing" />
+          <el-form-item label="车辆类型">
+            <el-select v-model="form.carTypeId" clearable placeholder="请选择">
+              <el-option
+                v-for="item in carTypeList"
+                :key="item.id"
+                :label="item.carTypeName"
+                :value="item.id">
+              </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="电子围栏" :label-width="formLabelWidth">
-            <el-select v-model="formHui.fenceId" placeholder="请选择电子围栏">
-              <el-option label="1" value="shanghai" />
-              <el-option label="2" value="beijing" />
+          <el-form-item label="电子围栏">
+            <el-select v-model="form.fenceId" clearable placeholder="请选择">
+              <el-option
+                v-for="item in fenceList"
+                :key="item.id"
+                :label="item.fenceName"
+                :value="item.id">
+              </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="电机厂商" :label-width="formLabelWidth">
+          <el-form-item label="电机厂商" >
             <el-input v-model="formHui.motorManufacturer" autocomplete="off" />
           </el-form-item>
-          <el-form-item label="电池厂商" :label-width="formLabelWidth">
+          <el-form-item label="电池厂商" >
             <el-input v-model="formHui.batteryManufacturer" autocomplete="off" />
           </el-form-item>
-          <el-form-item label="电机编号" :label-width="formLabelWidth">
+          <el-form-item label="电机编号" >
             <el-input v-model="formHui.motorNumber" autocomplete="off" />
           </el-form-item>
-          <el-form-item label="电池编号" :label-width="formLabelWidth">
+          <el-form-item label="电池编号" >
             <el-input v-model="formHui.batteryNumber" autocomplete="off" />
           </el-form-item>
         </el-form>
@@ -103,13 +119,14 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="车辆类型" width="180">
+      <el-table-column label="车辆类型" width="180" prop="carTypeId">
+
         <template slot-scope="scope">
           <el-tag size="medium">{{ scope.row.carTypeId }}</el-tag>
         </template>
       </el-table-column>
 
-      <el-table-column label="电子围栏ID" width="180">
+      <el-table-column label="电子围栏ID" width="180" prop="fenceId">
         <template slot-scope="scope">
           <el-tag size="medium">{{ scope.row.fenceId }}</el-tag>
         </template>
@@ -164,7 +181,16 @@
 
 <script>
 
-import { carAdd, carDel, carExport, carHuiList, carList, carUpd } from '../../api/carList/list'
+import {
+  carAdd,
+  carDel,
+  carExport,
+  carHuiList,
+  carList,
+  carUpd,
+  getCarType,
+  getFenceList
+} from '../../api/carList/list'
 
 export default {
   name: 'CarList',
@@ -195,7 +221,9 @@ export default {
         motorManufacturer: '',
         batteryManufacturer: '',
         motorNumber: '',
-        batteryNumber: ''
+        batteryNumber: '',
+        fenceName: '',
+        carTypeName: ''
       },
       // 修改表单数据
       formHui: {
@@ -209,6 +237,8 @@ export default {
         batteryNumber: ''
       },
       tableData: [],
+      fenceList: [],
+      carTypeList: [],
       dialogFormVisible: false,
       dialogFormVisible1: false
     }
@@ -236,8 +266,10 @@ export default {
     resetForm() {
       this.fetchData()
     },
-    // 添加车辆管理信息数据
+    // 新增车辆管理信息数据
     addCar() {
+      this.getFenceList1()
+      this.getCarType1()
       this.dialogFormVisible = true
     },
     // 添加车辆确认
@@ -326,6 +358,36 @@ export default {
           })
         }
       })
+    },
+    // 电子围栏列表
+    getFenceList1() {
+      getFenceList().then(res => {
+        console.log(res)
+        if (res.code === 200) {
+          this.fenceList = res.data
+          console.log(this.fenceList + '2222222')
+        } else {
+          this.$message({
+            type: 'error',
+            message: '获取电子围栏列表失败'
+          })
+        }
+      })
+    },
+    // 获取车辆类型列表
+    getCarType1() {
+      getCarType().then(res => {
+        console.log(res)
+        if (res.code === 200) {
+          this.carTypeList = res.data
+          console.log(this.carTypeList + '1111111111111111111')
+        } else {
+          this.$message({
+            type: 'error',
+            message: '获取车辆类型列表失败'
+          })
+        }
+      })
     }
   }
 }