diff --git a/src/views/certificate/certificateManage/certificateLifespan/index.vue b/src/views/certificate/certificateManage/certificateLifespan/index.vue
index 82beabe..8372157 100644
--- a/src/views/certificate/certificateManage/certificateLifespan/index.vue
+++ b/src/views/certificate/certificateManage/certificateLifespan/index.vue
@@ -41,7 +41,7 @@
             plain
             icon="el-icon-download"
             size="mini"
-            @click="handleExport" 
+            @click="handleExport"
           >导出</el-button>
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -58,7 +58,6 @@
         <el-table-column label="证件编号" align="center" prop="certificateNo" :show-overflow-tooltip="true"/>
         <el-table-column label="有效期至" align="center" prop="issueLifespan" :show-overflow-tooltip="true"/>
         <el-table-column label="存证截止日期" align="center" prop="processDate" :show-overflow-tooltip="true"/>
-        <el-table-column label="实际取证日期" align="center" prop="realProcessDate" :show-overflow-tooltip="true"/>
         <el-table-column label="超期天数" align="center" prop="processGapDate" :show-overflow-tooltip="true">
           <template slot-scope="scope">
               <!-- <dict-tag :options="dict.type.dev_status" :value="scope.row.deviceState"/> -->
diff --git a/src/views/certificate/device/index.vue b/src/views/certificate/device/index.vue
index 2b86466..d1dc4e2 100644
--- a/src/views/certificate/device/index.vue
+++ b/src/views/certificate/device/index.vue
@@ -60,7 +60,7 @@
             </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="deviceNumber" :show-overflow-tooltip="true" width="120"/> 
+        <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"/> -->
@@ -74,7 +74,7 @@
             <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">
@@ -130,7 +130,7 @@
                             placeholder="选择单位"
                         />
                     </el-form-item>
-                </el-col>  
+                </el-col>
                 <el-col :span="12">
                     <el-form-item label="设备地址" prop="deviceAddr">
                         <el-input  v-model="baseForm.deviceAddr" placeholder="请输入安装地址" maxlength="30" clearable/>
@@ -139,13 +139,13 @@
             </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 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="设备Ip" prop="deviceIp">
-                        <el-input  v-model="baseForm.deviceIp" placeholder="请输入设备Ip" maxlength="30" clearable/>
+                    <el-form-item label="功能接口" prop="funImp">
+                    <el-input  v-model="baseForm.funImp" placeholder="请输入功能接口" maxlength="30" clearable/>
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -162,7 +162,7 @@
                 </el-col>
             </el-row>
             <el-row>
-                <el-col :span="12">         
+                <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>
@@ -180,7 +180,7 @@
                     </el-form-item>
                 </el-col>
             </el-row>
-        </el-form> 
+        </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
@@ -262,7 +262,7 @@
                     deviceType: [
                         { required: true, message: "设备类型不能为空", trigger: "blur" }
                     ],
-                    deviceNumber: [
+                    funImp: [
                         { required: true, message: "设备编号不能为空", trigger: "blur" }
                     ],
                     deviceName: [