diff --git a/src/api/car/message/message.js b/src/api/car/message/message.js
index 4c26bb3e..7e25fddc 100644
--- a/src/api/car/message/message.js
+++ b/src/api/car/message/message.js
@@ -1,12 +1,5 @@
 import request from '@/utils/request'
 
-
-export function testMessage() {
-  return request({
-    url: '/car/messageInfo/test',
-    method: 'get'
-  })
-}
 // 查询车辆报文记录列表
 export function listMessage(query) {
   return request({
diff --git a/src/views/car/car/index.vue b/src/views/car/car/index.vue
index ac029350..1d461e7a 100644
--- a/src/views/car/car/index.vue
+++ b/src/views/car/car/index.vue
@@ -82,11 +82,42 @@
             icon="el-icon-set-up"
             @click="handleList(scope.row)"
             v-hasPermi="['car:car:remove']"
-          >查看报文</el-button>
+          >查看/关闭报文</el-button>
         </template>
       </el-table-column>
     </el-table>
 
+    <!-- 添加或修改车辆基础信息对话框 -->
+    <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-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="carBrand">
+          <el-input v-model="form.carBrand" placeholder="请输入车辆品牌" />
+        </el-form-item>
+        <el-form-item label="车辆型号" prop="carModel">
+          <el-input v-model="form.carModel" placeholder="请输入车辆型号" />
+        </el-form-item>
+        <el-form-item label="车辆车型" prop="carModel">
+          <el-input v-model="form.carType" placeholder="请输入车辆型号" />
+        </el-form-item>
+        <el-form-item label="启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中" prop="state">
+          <el-input v-model="form.state" placeholder="请输入启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -107,11 +138,7 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="车辆报文类型编码" align="center" prop="messageTypeCode" />
         <el-table-column label="报文字段" align="center" >
-          <template slot-scope="scope">
-            <span>
-              {{test.at(scope.$index)}}
-            </span>
-          </template>
+
         </el-table-column>
       </el-table>
     </el-tabs>
@@ -157,7 +184,6 @@ export default {
       ],
       activeTab: '',
       src:'/firm/map',
-      test:[],
       messageList: [],
       dialogTableVisible:false,
       // 遮罩层
@@ -193,6 +219,8 @@ export default {
       },
       messageParams: {
         modelCode: null,
+        carVin:null,
+        flag:null,
       },
       messageTypeArrly: [],
       // 表单参数
@@ -210,7 +238,6 @@ export default {
   },
   created() {
     this.getList();
-    this.messageTest();
   },
   mounted() {
     this.$store.dispatch('app/toggleSideBarHide',true);
@@ -222,27 +249,25 @@ export default {
       console.log(tab.name)
       this.srcs = tab.name
     },
-    gotoMessage(){
-      this.$router.push({ path: '/firm/car/message' });
-    },
     getMessageTypeList() {
       getMessageType(this.messageList.messageTypeCode).then(response => {
         this.messageTypeArrly = response.data;
       });
     },
-    messageTest(){
-      testMessage().then(res=>{
-        this.test = res.data;
-        console.log(this.test)
-      })
-    },
     handleList(row){
-      this.dialogTableVisible = true;
+      if(this.dialogTableVisible==null||this.dialogTableVisible==false){
+        this.dialogTableVisible = true;
+        this.messageParams.flag = true;
+      }else {
+        this.dialogTableVisible = false;
+        this.messageParams.flag = false;
+      }
       this.getMessageList(row)
     },
     getMessageList(row) {
       this.loading = true;
       this.messageParams.modelCode = row.carModel;
+      this.messageParams.carVin = row.carVin;
       listMessage(this.messageParams).then(response => {
         this.messageList = response.data;
         this.loading = false;
diff --git a/src/views/firm/firmInfo/index.vue b/src/views/firm/firmInfo/index.vue
index 0b456862..4c4c8b1c 100644
--- a/src/views/firm/firmInfo/index.vue
+++ b/src/views/firm/firmInfo/index.vue
@@ -89,6 +89,7 @@
           <dict-tag :options="dict.type.sys_firm_start" :value="scope.row.state"/>
         </template>
       </el-table-column>
+      <el-table-column label="会员等级" align="center" prop="memberId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -132,12 +133,6 @@
         <el-form-item label="企业logs" prop="firmLogs">
           <image-upload v-model="form.firmLogs"/>
         </el-form-item>
-        <el-form-item label="企业登录名" prop="firmUser">
-          <el-input v-model="form.userName" placeholder="请输入企业登录名" />
-        </el-form-item>
-        <el-form-item label="企业登录密码" prop="firmPassword">
-          <el-input v-model="form.password" placeholder="请输入企业登录密码" />
-        </el-form-item>
         <el-form-item label="启用状态" prop="state">
           <el-select v-model="form.state" placeholder="请选择启用状态">
             <el-option