diff --git a/src/views/certificate/device/index.vue b/src/views/certificate/device/index.vue
index b68df15..2b86466 100644
--- a/src/views/certificate/device/index.vue
+++ b/src/views/certificate/device/index.vue
@@ -51,7 +51,6 @@
             </template>
         </el-table-column>
         <el-table-column label="护照柜名称" align="center" prop="deviceName" :show-overflow-tooltip="true" width="180"/>
-        <el-table-column label="设备编号" align="center" prop="deviceNumber" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="护照柜类型" align="center" prop="deviceType" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope">
                 <!-- <dict-tag :options="dict.type.dev_status" :value="scope.row.deviceState"/> -->
@@ -60,7 +59,8 @@
                 <span v-if="scope.row.deviceType==3" >大型</span>
             </template>
         </el-table-column>
-        <el-table-column label="设备位置" align="center" prop="deviceAddr" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="设备地址" align="center" prop="deviceAddr" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="设备编号" align="center" prop="deviceNumber" :show-overflow-tooltip="true" width="120"/> 
         <el-table-column label="是否在线" align="center" prop="deviceState" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope">
                 <!-- <dict-tag :options="dict.type.dev_status" :value="scope.row.deviceState"/> -->
@@ -68,13 +68,13 @@
                 <span v-if="scope.row.onlineState==2" style="color: red;">离线</span>
             </template>
         </el-table-column>
-        <el-table-column label="总槽位数" align="center" prop="soltNum" :show-overflow-tooltip="true"/>
-        <el-table-column label="已使用槽位数" align="center" prop="soltUsedNum" :show-overflow-tooltip="true"/>
+        <el-table-column label="槽位数" align="center" prop="soltNum" :show-overflow-tooltip="true"/>
+        <el-table-column label="已存放数" align="center" prop="soltUsedNum" :show-overflow-tooltip="true"/>
         <el-table-column label="空余数" align="center" prop="" :show-overflow-tooltip="true">
             <template slot-scope="scope">
                 <span>{{Number(scope.row.soltNum)-Number(scope.row.soltUsedNum)}}</span>
             </template>
-        </el-table-column>
+        </el-table-column> 
         <el-table-column label="所属单位" align="center" prop="deptName" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
           <template slot-scope="scope">
@@ -103,78 +103,84 @@
 
       <!-- 添加或修改参数配置对话框 -->
       <el-dialog :title="title+'设备'" :visible.sync="open" width="700px" append-to-body>
-        <el-tabs v-model="activeName" @tab-click="handleTabClick">
-            <!-- 基础设置 -->
-            <el-tab-pane label="基础设置" name="baseSetting" style="height: 400px;">
-                <el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="80px">
-                    <el-col :span="12" v-if="baseForm.deptId !== 0">
-                      <el-form-item label="单位" prop="deptId" style="width: 100%;">
-                          <treeselect
-                              v-model="baseForm.deptId"
-                              :options="deptOptions"
-                              :normalizer="normalizer"
-                              placeholder="选择单位"
-                          />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                    <el-form-item label="类型" prop="deviceType">
+        <el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="100px" label-position="center">
+            <el-row>
+                <el-col :span="12">
+                    <el-form-item label="设备名称" prop="deviceName">
+                    <el-input  v-model="baseForm.deviceName" placeholder="请输入设备名称" maxlength="30" clearable/>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="护照柜类型" prop="deviceType">
                         <el-select v-model="baseForm.deviceType" placeholder="护照柜类型" clearable>
                             <el-option label="小型" value="1"/>
                             <el-option label="中型" value="2"/>
                             <el-option label="大型" value="3"/>
                         </el-select>
                     </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="设备编号" prop="deviceNumber">
-                        <el-input  v-model="baseForm.deviceNumber" placeholder="请输入设备编号" maxlength="30" clearable/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="设备名称" prop="deviceName">
-                        <el-input  v-model="baseForm.deviceName" placeholder="请输入设备名称" maxlength="30" clearable/>
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="12">
-                        <el-form-item label="设备Ip" prop="deviceIp">
-                            <el-input  v-model="baseForm.deviceIp" placeholder="请输入设备Ip" maxlength="30" clearable/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="设备Sn" prop="deviceSn">
-                            <el-input  v-model="baseForm.deviceSn" placeholder="请输入设备Sn" maxlength="30" clearable/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="设备key" prop="deviceKey">
-                            <el-input  v-model="baseForm.deviceKey" placeholder="请输入设备key" maxlength="30" clearable/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="安装地址" prop="deviceAddr">
-                            <el-input  v-model="baseForm.deviceAddr" placeholder="请输入安装地址" maxlength="30" clearable/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="设备Mac" prop="deviceMac">
-                            <el-input  v-model="baseForm.deviceMac" placeholder="请输入设备Mac" maxlength="30" clearable/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="网关" prop="deviceGateway">
-                            <el-input  v-model="baseForm.deviceGateway" placeholder="请输入网关" maxlength="30" clearable/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="密码" prop="devicePwd">
-                            <el-input  v-model="baseForm.devicePwd" placeholder="请输入密码" maxlength="30" clearable/>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-tab-pane>
-        </el-tabs>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="12" v-if="baseForm.deptId !== 0">
+                    <el-form-item label="单位" prop="deptId" style="width: 100%;">
+                        <treeselect
+                            v-model="baseForm.deptId"
+                            :options="deptOptions"
+                            :normalizer="normalizer"
+                            placeholder="选择单位"
+                        />
+                    </el-form-item>
+                </el-col>  
+                <el-col :span="12">
+                    <el-form-item label="设备地址" prop="deviceAddr">
+                        <el-input  v-model="baseForm.deviceAddr" placeholder="请输入安装地址" maxlength="30" clearable/>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="12">
+                    <el-form-item label="设备编号" prop="deviceNumber">
+                    <el-input  v-model="baseForm.deviceNumber" placeholder="请输入设备编号" maxlength="30" clearable/>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="设备Ip" prop="deviceIp">
+                        <el-input  v-model="baseForm.deviceIp" placeholder="请输入设备Ip" maxlength="30" clearable/>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="12">
+                    <el-form-item label="设备Sn" prop="deviceSn">
+                        <el-input  v-model="baseForm.deviceSn" placeholder="请输入设备Sn" maxlength="30" clearable/>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="设备key" prop="deviceKey">
+                        <el-input  v-model="baseForm.deviceKey" placeholder="请输入设备key" maxlength="30" clearable/>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="12">         
+                    <el-form-item label="设备Mac" prop="deviceMac">
+                        <el-input  v-model="baseForm.deviceMac" placeholder="请输入设备Mac" maxlength="30" clearable/>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="网关" prop="deviceGateway">
+                        <el-input  v-model="baseForm.deviceGateway" placeholder="请输入网关" maxlength="30" clearable/>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="12">
+                    <el-form-item label="密码" prop="devicePwd">
+                        <el-input  v-model="baseForm.devicePwd" placeholder="请输入密码" maxlength="30" clearable/>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form> 
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>