diff --git a/src/views/system/agent/index.vue b/src/views/system/agent/index.vue
index 7ea43fd..3641358 100644
--- a/src/views/system/agent/index.vue
+++ b/src/views/system/agent/index.vue
@@ -11,7 +11,7 @@
       </el-form-item>
       <el-form-item label="城市" prop="cityName">
         <el-input
-          v-model="queryParams.cityId"
+          v-model="queryParams.cityName"
           placeholder="请输入城市名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -195,6 +195,7 @@ export default {
         dispatchFee: null,
         deliveryFee: null,
         cityId: null,
+        cityName: null,
         contact: null,
         phone: null,
         userid: null,
diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue
index 926ce7f..84ecbed 100644
--- a/src/views/system/device/index.vue
+++ b/src/views/system/device/index.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="MAC" prop="mac">
-        <el-input style="width: 120px"
-          v-model="queryParams.mac"
-          placeholder="请输入mac"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="MAC" prop="mac">-->
+<!--        <el-input style="width: 120px"-->
+<!--          v-model="queryParams.mac"-->
+<!--          placeholder="请输入mac"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="SN号" prop="sn">
         <el-input style="width: 120px"
           v-model="queryParams.sn"
@@ -187,7 +187,7 @@
               @sort-change="handleSortChange"
             class="el-table">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="MAC" align="center" prop="mac" v-if="columns[0].visible"/>
+<!--      <el-table-column label="MAC" align="center" prop="mac" v-if="columns[0].visible"/>-->
       <el-table-column label="SN" align="center" prop="sn" sortable="custom" :sort-orders="['descending', 'ascending']" v-if="columns[1].visible"/>
       <el-table-column label="车辆型号" align="center" prop="model" v-if="columns[2].visible"/>
       <el-table-column label="车牌号" align="center" prop="vehicleNum"  sortable="custom" :sort-orders="['descending', 'ascending']" v-if="columns[3].visible"/>