Merge pull request 'fix() : 优化代码' (#1) from dev.car into master

Reviewed-on: #1

src/api/car/car.js

@@ -42,12 +42,3 @@ export function delCar(id) {
     method: 'delete'
   })
 }
-// 查询所有车辆类型
-export function getSysType() {
-  return request({
-    url: '/car/sysType/list' ,
-    method: 'get'
-  })
-}
-
-

src/api/car/message/template.js

@@ -34,11 +34,3 @@ export function addValue(data) {
     data: data
   })
 }
-// 根据报文模版类型Id查询数据
-export function findByTemplateValue(id) {
-  return request({
-    url: 'car/messageValue/templateId/'+id,
-    method: 'POST'
-
-  })
-}

src/views/car/car/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="82px">
       <el-form-item label="车辆VIN码" prop="carVin">
         <el-input
           v-model="queryParams.carVin"
@@ -82,13 +82,9 @@
       <el-table-column label="自增主键" align="center" prop="id" />
       <el-table-column label="车辆VIN码" align="center" prop="carVin" />
       <el-table-column label="车辆车牌号" align="center" prop="carPlate" />
-      <el-table-column label="车辆品牌;" align="center" prop="carBrand" />
+      <el-table-column label="车辆品牌" align="center" prop="carBrand" />
       <el-table-column label="车辆型号" align="center" prop="carModel" />
       <el-table-column label="车辆车型" align="center" prop="carType" />
-      <el-table-column label="车辆电机厂商" align="center" prop="carMotorManufacturer" />
-      <el-table-column label="电机型号" align="center" prop="carMotorModel" />
-      <el-table-column label="车辆电池厂商" align="center" prop="carBatteryManufacturer" />
-      <el-table-column label="电池型号" align="center" prop="carBatteryModel" />
       <el-table-column label="围栏组编码" align="center" prop="groupCode" />
       <el-table-column label="启用状态" align="center" prop="state" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -107,12 +103,17 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['car:car:remove']"
           >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-s-order"
+            @click="handleAddStrategy(scope.row)"
+          >详细信息</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-plus"
             @click="handleAddStrategy(scope.row)"
-            v-hasPermi="['car:car:add']"
           >添加策略信息</el-button>
         </template>
       </el-table-column>
@@ -128,24 +129,21 @@
 
     <!-- 添加或修改车辆基础信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="82px">
         <el-form-item label="车辆VIN码" prop="carVin">
           <el-input v-model="form.carVin" placeholder="请输入车辆VIN码" />
         </el-form-item>
         <el-form-item label="车辆车牌号" prop="carPlate">
           <el-input v-model="form.carPlate" placeholder="请输入车辆车牌号" />
         </el-form-item>
-        <el-form-item label="车辆电机厂商" prop="carMotorManufacturer">
+        <el-form-item label="车辆品牌" prop="carBrand">
-          <el-input v-model="form.carMotorManufacturer" placeholder="请输入车辆电机厂商" />
+          <el-input v-model="form.carBrand" placeholder="请输入车辆品牌" />
         </el-form-item>
-        <el-form-item label="电机型号" prop="carMotorModel">
+        <el-form-item label="车辆型号" prop="carModel">
-          <el-input v-model="form.carMotorModel" placeholder="请输入电机型号" />
+          <el-input v-model="form.carModel" placeholder="请输入车辆型号" />
         </el-form-item>
-        <el-form-item label="车辆电池厂商" prop="carBatteryManufacturer">
+        <el-form-item label="车辆车型" prop="carType">
-          <el-input v-model="form.carBatteryManufacturer" placeholder="请输入车辆电池厂商" />
+          <el-input v-model="form.carType" placeholder="请输入车辆车型" />
-        </el-form-item>
-        <el-form-item label="电池型号" prop="carBatteryModel">
-          <el-input v-model="form.carBatteryModel" placeholder="请输入电池型号" />
         </el-form-item>
         <el-form-item label="围栏组编码" prop="groupCode">
           <el-input v-model="form.groupCode" placeholder="请输入围栏组编码" />
@@ -169,7 +167,11 @@
           <el-form-item label="车辆类型id" prop="carTypeId">
             <el-input v-model="formList.carTypeId" placeholder="请输入车辆类型id" />
           </el-form-item>
+         <el-form-item label="策略名称" prop="strategyName">
+           <el-input v-model="formList.strategyName" placeholder="请输入策略名称" />
+         </el-form-item>
         <el-form-item label="报文模版id" prop="msgId">
+<!--          <el-input v-model="formList.msgId" placeholder="请输入报文模版id" />-->
           <el-select v-model="formList.msgId" placeholder="请选择报文模版id">
             <el-option
               v-for="item in templateList"
@@ -179,9 +181,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-         <el-form-item label="策略名称" prop="strategyName">
-           <el-input v-model="formList.strategyName" placeholder="请输入策略名称" />
-         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitAddForm">确 定</el-button>
@@ -267,12 +266,6 @@ export default {
         carBrand: null,
         carModel: null,
         carType: null,
-        carLastJoinTime: null,
-        carLastOfflineTime: null,
-        carMotorManufacturer: null,
-        carMotorModel: null,
-        carBatteryManufacturer: null,
-        carBatteryModel: null,
         groupCode: null,
         state: null,
         createBy: null,
@@ -281,7 +274,6 @@ export default {
         updateTime: null,
         remark: null
       };
-
       this.resetForm("form");
     },
     //初始化
@@ -327,9 +319,7 @@ export default {
       templateList().then(response => {
         this.templateList = response.data;
         console.log(this.templateList);
-
       });
-
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -379,7 +369,6 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-
     /** 导出按钮操作 */
     handleExport() {
       this.download('car/car/export', {