diff --git a/config/dev.env.js b/config/dev.env.js
index 6227232..9c9c594 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11631"'
+  // BASE_API: '"http://111.198.10.15:11631"'
   // BASE_API: '"http://192.168.5.220:20311"'
+  BASE_API: '"http://111.198.10.15:12405"'
 })

diff --git a/config/dev.env.js b/config/dev.env.js
index 6227232..9c9c594 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11631"'
+  // BASE_API: '"http://111.198.10.15:11631"'
   // BASE_API: '"http://192.168.5.220:20311"'
+  BASE_API: '"http://111.198.10.15:12405"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2c3f8be..f2fa1f8 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,7 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://192.168.5.220:20311"'
+  // BASE_API: '"http://192.168.5.220:20311"'
   // BASE_API: '"http://111.198.10.15:11631"'
+  BASE_API: '"http://111.198.10.15:12405"'
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index 6227232..9c9c594 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11631"'
+  // BASE_API: '"http://111.198.10.15:11631"'
   // BASE_API: '"http://192.168.5.220:20311"'
+  BASE_API: '"http://111.198.10.15:12405"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2c3f8be..f2fa1f8 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,7 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://192.168.5.220:20311"'
+  // BASE_API: '"http://192.168.5.220:20311"'
   // BASE_API: '"http://111.198.10.15:11631"'
+  BASE_API: '"http://111.198.10.15:12405"'
 }
diff --git a/src/api/car.js b/src/api/car.js
index fc55938..952a015 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -21,6 +21,18 @@
   })
 }
 
+
+export function batchImport(fileobj) {
+  const param = new FormData()
+  param.append('fs', fileobj)
+  return request({
+    url: '/car/imp',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function deleteCar(id) {
   return request({
     url: '/car/delete',

diff --git a/config/dev.env.js b/config/dev.env.js
index 6227232..9c9c594 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11631"'
+  // BASE_API: '"http://111.198.10.15:11631"'
   // BASE_API: '"http://192.168.5.220:20311"'
+  BASE_API: '"http://111.198.10.15:12405"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2c3f8be..f2fa1f8 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,7 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://192.168.5.220:20311"'
+  // BASE_API: '"http://192.168.5.220:20311"'
   // BASE_API: '"http://111.198.10.15:11631"'
+  BASE_API: '"http://111.198.10.15:12405"'
 }
diff --git a/src/api/car.js b/src/api/car.js
index fc55938..952a015 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -21,6 +21,18 @@
   })
 }
 
+
+export function batchImport(fileobj) {
+  const param = new FormData()
+  param.append('fs', fileobj)
+  return request({
+    url: '/car/imp',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function deleteCar(id) {
   return request({
     url: '/car/delete',
diff --git a/src/utils/validate.js b/src/utils/validate.js
index d651e43..b596d16 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -108,12 +108,28 @@
   const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
   if (value !== '') {
     if (reg.test(value) === false && reg1.test(value) === false) {
-      callback(new Error('请输入正确的联系电话'))
+      callback(new Error('请输入正确的电话'))
     } else {
       callback()
     }
   } else {
-    callback(new Error('联系电话不能为空'))
+    callback(new Error('电话不能为空'))
+  }
+}
+export const phoneValidatorCanNull = (rule, value, callback) => {
+  const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
+  if(value === undefined){
+    callback()
+  }
+  if (value !== '') {
+    if (reg.test(value) === false && reg1.test(value) === false) {
+      callback(new Error('请输入正确的电话'))
+    } else {
+      callback()
+    }
+  } else {
+    callback()
   }
 }
 

diff --git a/config/dev.env.js b/config/dev.env.js
index 6227232..9c9c594 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11631"'
+  // BASE_API: '"http://111.198.10.15:11631"'
   // BASE_API: '"http://192.168.5.220:20311"'
+  BASE_API: '"http://111.198.10.15:12405"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2c3f8be..f2fa1f8 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,7 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://192.168.5.220:20311"'
+  // BASE_API: '"http://192.168.5.220:20311"'
   // BASE_API: '"http://111.198.10.15:11631"'
+  BASE_API: '"http://111.198.10.15:12405"'
 }
diff --git a/src/api/car.js b/src/api/car.js
index fc55938..952a015 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -21,6 +21,18 @@
   })
 }
 
+
+export function batchImport(fileobj) {
+  const param = new FormData()
+  param.append('fs', fileobj)
+  return request({
+    url: '/car/imp',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function deleteCar(id) {
   return request({
     url: '/car/delete',
diff --git a/src/utils/validate.js b/src/utils/validate.js
index d651e43..b596d16 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -108,12 +108,28 @@
   const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
   if (value !== '') {
     if (reg.test(value) === false && reg1.test(value) === false) {
-      callback(new Error('请输入正确的联系电话'))
+      callback(new Error('请输入正确的电话'))
     } else {
       callback()
     }
   } else {
-    callback(new Error('联系电话不能为空'))
+    callback(new Error('电话不能为空'))
+  }
+}
+export const phoneValidatorCanNull = (rule, value, callback) => {
+  const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
+  if(value === undefined){
+    callback()
+  }
+  if (value !== '') {
+    if (reg.test(value) === false && reg1.test(value) === false) {
+      callback(new Error('请输入正确的电话'))
+    } else {
+      callback()
+    }
+  } else {
+    callback()
   }
 }
 
diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue
index 703ec7d..53cb682 100644
--- a/src/views/area/defenceDetail.vue
+++ b/src/views/area/defenceDetail.vue
@@ -31,7 +31,7 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="20">
+      <el-row :gutter="20" v-show="dataForm.deviceList.length!==0">
         <el-col :span="24">
           <el-form-item label="设备绑定">
             <el-button v-for="item in dataForm.deviceList" :key="item.id" type="primary" plain @click="detailDevice(item.id)">{{ item.deviceTypeName }} - {{ item.devcode }}</el-button>

diff --git a/config/dev.env.js b/config/dev.env.js
index 6227232..9c9c594 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11631"'
+  // BASE_API: '"http://111.198.10.15:11631"'
   // BASE_API: '"http://192.168.5.220:20311"'
+  BASE_API: '"http://111.198.10.15:12405"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2c3f8be..f2fa1f8 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,7 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://192.168.5.220:20311"'
+  // BASE_API: '"http://192.168.5.220:20311"'
   // BASE_API: '"http://111.198.10.15:11631"'
+  BASE_API: '"http://111.198.10.15:12405"'
 }
diff --git a/src/api/car.js b/src/api/car.js
index fc55938..952a015 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -21,6 +21,18 @@
   })
 }
 
+
+export function batchImport(fileobj) {
+  const param = new FormData()
+  param.append('fs', fileobj)
+  return request({
+    url: '/car/imp',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function deleteCar(id) {
   return request({
     url: '/car/delete',
diff --git a/src/utils/validate.js b/src/utils/validate.js
index d651e43..b596d16 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -108,12 +108,28 @@
   const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
   if (value !== '') {
     if (reg.test(value) === false && reg1.test(value) === false) {
-      callback(new Error('请输入正确的联系电话'))
+      callback(new Error('请输入正确的电话'))
     } else {
       callback()
     }
   } else {
-    callback(new Error('联系电话不能为空'))
+    callback(new Error('电话不能为空'))
+  }
+}
+export const phoneValidatorCanNull = (rule, value, callback) => {
+  const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
+  if(value === undefined){
+    callback()
+  }
+  if (value !== '') {
+    if (reg.test(value) === false && reg1.test(value) === false) {
+      callback(new Error('请输入正确的电话'))
+    } else {
+      callback()
+    }
+  } else {
+    callback()
   }
 }
 
diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue
index 703ec7d..53cb682 100644
--- a/src/views/area/defenceDetail.vue
+++ b/src/views/area/defenceDetail.vue
@@ -31,7 +31,7 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="20">
+      <el-row :gutter="20" v-show="dataForm.deviceList.length!==0">
         <el-col :span="24">
           <el-form-item label="设备绑定">
             <el-button v-for="item in dataForm.deviceList" :key="item.id" type="primary" plain @click="detailDevice(item.id)">{{ item.deviceTypeName }} - {{ item.devcode }}</el-button>
diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue
index afdeae8..565a614 100644
--- a/src/views/car/carAdd.vue
+++ b/src/views/car/carAdd.vue
@@ -8,18 +8,16 @@
             <el-input v-model.trim="dataForm.plateNumber" :disabled="isDetailMode" :maxlength="8" clearable type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="车证种类">
-            <!--<span v-show="isDetailMode">{{ dataForm.deptName }}</span>-->
-            <el-select :disabled="isDetailMode" v-model="dataForm.carCardType" placeholder="请选择车证种类" filterable clearable>
-              <el-option v-for="item in carTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-            </el-select>
-            <!--<dept-select v-show="!isDetailMode" v-model="dataForm.deptid" :dept-show="true" :need-top="true" placeholder="所属组织" @change="fetchStaffList"/>-->
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="车证种类">
+            <el-radio-group :disabled="isDetailMode" v-model="dataForm.carCardType">
+              <el-radio v-for="item in carTypeList" :key="item.value" :label="item.value" >{{ item.name }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="车辆性质" prop="property">
             <el-radio-group v-model="dataForm.property" :disabled="isDetailMode" @change="resetOwner">
               <el-radio v-for="item in carProperties" :key="item.value" :label="item.value">{{ item.name }}</el-radio>
@@ -54,8 +52,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="备用电话">
-            <el-input v-model.trim="dataForm.phone2" :disabled="isDetailMode" type="text" placeholder="联系电话"/>
+          <el-form-item label="备用电话" prop="phone2">
+            <el-input v-model.trim="dataForm.phone2" :disabled="isDetailMode" type="text" placeholder="备用电话"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -63,7 +61,7 @@
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="dataForm.remark" :disabled="isDetailMode" type="text" />
+            <el-input v-model.trim="dataForm.remark" :disabled="isDetailMode" type="text" placeholder="备注"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -79,7 +77,7 @@
 import DeptSelect from '@/components/DeptSelect'
 import { getStaffByDept } from '@/api/staff'
 import { addCar, editCar } from '@/api/car'
-import { phoneValidator, plateValidator } from '@/utils/validate'
+import { phoneValidator, phoneValidatorCanNull, plateValidator } from '@/utils/validate'
 import { getDeptTreeList } from '@/api/dept'
 import { getCarCardTypeList } from '@/api/allDict'
 export default {
@@ -97,7 +95,7 @@
         ownerId: '', // 车主
         phone: '', // 车主联系电话
         phone2: '',
-        carCardType: '',
+        carCardType: '1',
         remark: '', // 备注
         deptName: '', // 部门名称
         ownerName: ''// 车主名
@@ -108,6 +106,7 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
+        phone2: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }],
         phone: [{ required: true, trigger: ['blur', 'change'], validator: phoneValidator }],
         plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }],
         ownerId: [{ required: true, trigger: ['blur', 'change'], message: '请选择车主' }]
@@ -164,6 +163,7 @@
           ownerId: row.ownerId,
           phone: row.phone,
           phone2: row.phone2,
+          carCardType: row.carCardType,
           remark: row.remark
         }
         getStaffByDept({ deptId: this.dataForm.deptid }).then(response => {
@@ -181,6 +181,7 @@
           ownerId: row.ownerId,
           phone: row.phone,
           phone2: row.phone2,
+          carCardType: row.carCardType,
           deptid: row.deptid,
           remark: row.remark,
           deptName: row.deptName,
@@ -202,6 +203,7 @@
         ownerId: '', // 车主
         phone: '', // 车主联系电话
         phone2: '', // 车主联系电话
+        carCardType: '1',
         remark: '', // 备注
         deptName: '', // 部门名称
         ownerName: ''// 车主名

diff --git a/config/dev.env.js b/config/dev.env.js
index 6227232..9c9c594 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11631"'
+  // BASE_API: '"http://111.198.10.15:11631"'
   // BASE_API: '"http://192.168.5.220:20311"'
+  BASE_API: '"http://111.198.10.15:12405"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2c3f8be..f2fa1f8 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,7 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://192.168.5.220:20311"'
+  // BASE_API: '"http://192.168.5.220:20311"'
   // BASE_API: '"http://111.198.10.15:11631"'
+  BASE_API: '"http://111.198.10.15:12405"'
 }
diff --git a/src/api/car.js b/src/api/car.js
index fc55938..952a015 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -21,6 +21,18 @@
   })
 }
 
+
+export function batchImport(fileobj) {
+  const param = new FormData()
+  param.append('fs', fileobj)
+  return request({
+    url: '/car/imp',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function deleteCar(id) {
   return request({
     url: '/car/delete',
diff --git a/src/utils/validate.js b/src/utils/validate.js
index d651e43..b596d16 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -108,12 +108,28 @@
   const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
   if (value !== '') {
     if (reg.test(value) === false && reg1.test(value) === false) {
-      callback(new Error('请输入正确的联系电话'))
+      callback(new Error('请输入正确的电话'))
     } else {
       callback()
     }
   } else {
-    callback(new Error('联系电话不能为空'))
+    callback(new Error('电话不能为空'))
+  }
+}
+export const phoneValidatorCanNull = (rule, value, callback) => {
+  const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
+  if(value === undefined){
+    callback()
+  }
+  if (value !== '') {
+    if (reg.test(value) === false && reg1.test(value) === false) {
+      callback(new Error('请输入正确的电话'))
+    } else {
+      callback()
+    }
+  } else {
+    callback()
   }
 }
 
diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue
index 703ec7d..53cb682 100644
--- a/src/views/area/defenceDetail.vue
+++ b/src/views/area/defenceDetail.vue
@@ -31,7 +31,7 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="20">
+      <el-row :gutter="20" v-show="dataForm.deviceList.length!==0">
         <el-col :span="24">
           <el-form-item label="设备绑定">
             <el-button v-for="item in dataForm.deviceList" :key="item.id" type="primary" plain @click="detailDevice(item.id)">{{ item.deviceTypeName }} - {{ item.devcode }}</el-button>
diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue
index afdeae8..565a614 100644
--- a/src/views/car/carAdd.vue
+++ b/src/views/car/carAdd.vue
@@ -8,18 +8,16 @@
             <el-input v-model.trim="dataForm.plateNumber" :disabled="isDetailMode" :maxlength="8" clearable type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="车证种类">
-            <!--<span v-show="isDetailMode">{{ dataForm.deptName }}</span>-->
-            <el-select :disabled="isDetailMode" v-model="dataForm.carCardType" placeholder="请选择车证种类" filterable clearable>
-              <el-option v-for="item in carTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-            </el-select>
-            <!--<dept-select v-show="!isDetailMode" v-model="dataForm.deptid" :dept-show="true" :need-top="true" placeholder="所属组织" @change="fetchStaffList"/>-->
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="车证种类">
+            <el-radio-group :disabled="isDetailMode" v-model="dataForm.carCardType">
+              <el-radio v-for="item in carTypeList" :key="item.value" :label="item.value" >{{ item.name }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="车辆性质" prop="property">
             <el-radio-group v-model="dataForm.property" :disabled="isDetailMode" @change="resetOwner">
               <el-radio v-for="item in carProperties" :key="item.value" :label="item.value">{{ item.name }}</el-radio>
@@ -54,8 +52,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="备用电话">
-            <el-input v-model.trim="dataForm.phone2" :disabled="isDetailMode" type="text" placeholder="联系电话"/>
+          <el-form-item label="备用电话" prop="phone2">
+            <el-input v-model.trim="dataForm.phone2" :disabled="isDetailMode" type="text" placeholder="备用电话"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -63,7 +61,7 @@
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="dataForm.remark" :disabled="isDetailMode" type="text" />
+            <el-input v-model.trim="dataForm.remark" :disabled="isDetailMode" type="text" placeholder="备注"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -79,7 +77,7 @@
 import DeptSelect from '@/components/DeptSelect'
 import { getStaffByDept } from '@/api/staff'
 import { addCar, editCar } from '@/api/car'
-import { phoneValidator, plateValidator } from '@/utils/validate'
+import { phoneValidator, phoneValidatorCanNull, plateValidator } from '@/utils/validate'
 import { getDeptTreeList } from '@/api/dept'
 import { getCarCardTypeList } from '@/api/allDict'
 export default {
@@ -97,7 +95,7 @@
         ownerId: '', // 车主
         phone: '', // 车主联系电话
         phone2: '',
-        carCardType: '',
+        carCardType: '1',
         remark: '', // 备注
         deptName: '', // 部门名称
         ownerName: ''// 车主名
@@ -108,6 +106,7 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
+        phone2: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }],
         phone: [{ required: true, trigger: ['blur', 'change'], validator: phoneValidator }],
         plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }],
         ownerId: [{ required: true, trigger: ['blur', 'change'], message: '请选择车主' }]
@@ -164,6 +163,7 @@
           ownerId: row.ownerId,
           phone: row.phone,
           phone2: row.phone2,
+          carCardType: row.carCardType,
           remark: row.remark
         }
         getStaffByDept({ deptId: this.dataForm.deptid }).then(response => {
@@ -181,6 +181,7 @@
           ownerId: row.ownerId,
           phone: row.phone,
           phone2: row.phone2,
+          carCardType: row.carCardType,
           deptid: row.deptid,
           remark: row.remark,
           deptName: row.deptName,
@@ -202,6 +203,7 @@
         ownerId: '', // 车主
         phone: '', // 车主联系电话
         phone2: '', // 车主联系电话
+        carCardType: '1',
         remark: '', // 备注
         deptName: '', // 部门名称
         ownerName: ''// 车主名
diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue
index e7223de..0371607 100644
--- a/src/views/car/carList.vue
+++ b/src/views/car/carList.vue
@@ -31,6 +31,18 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header" style="color: white"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
+          <download-template filename="carImpTemp.xlsx" class="edit_btn" btnname="模板下载"/>
+          <el-upload
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            class="edit_btn"
+            style=" display: inline;"
+            action="string"
+            accept=".xls,.xlsx">
+            <el-button size="small">批量导入</el-button>
+          </el-upload>
           <el-button class="edit_btn" size="small" @click="batchExport" :disabled="list.length===0">导出</el-button>
           <el-button v-if="hasPerm('/door/car/add')" class="edit_btn" size="small" @click="add">新增</el-button>
           <!--          <el-button v-if="hasPerm('/door/car/delete')" v-show="false" class="edit_btn" size="small" @click="batchDel">删除</el-button>-->
@@ -76,15 +88,16 @@
 
 <script>
 import CarAdd from '@/views/car/carAdd'
-import { getCarList, deleteCar } from '@/api/car'
+import { getCarList, deleteCar, batchImport } from '@/api/car'
 import { getCarProperty } from '@/api/allDict'
 import { carExport } from '@/api/batch'
-
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 export default {
   name: 'CarList',
-  components: { CarAdd },
+  components: { CarAdd, DownloadTemplate },
   data() {
     return {
+      fileList: [], // 批量导入
       listQuery: {
         keywords: '',
         property: '',
@@ -144,6 +157,38 @@
     this.fetchData() // 获取数据
   },
   methods: {
+    // 批量导入
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 批量导入上传请求
+      batchImport(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fileList = []
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(err => {
+        loading.close()
+        this.$message.error(err.message)
+      })
+      this.fileList = []
+    },
     batchExport() {
       // 全屏加载动画
       const loading = this.$loading({

diff --git a/config/dev.env.js b/config/dev.env.js
index 6227232..9c9c594 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11631"'
+  // BASE_API: '"http://111.198.10.15:11631"'
   // BASE_API: '"http://192.168.5.220:20311"'
+  BASE_API: '"http://111.198.10.15:12405"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2c3f8be..f2fa1f8 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,7 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://192.168.5.220:20311"'
+  // BASE_API: '"http://192.168.5.220:20311"'
   // BASE_API: '"http://111.198.10.15:11631"'
+  BASE_API: '"http://111.198.10.15:12405"'
 }
diff --git a/src/api/car.js b/src/api/car.js
index fc55938..952a015 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -21,6 +21,18 @@
   })
 }
 
+
+export function batchImport(fileobj) {
+  const param = new FormData()
+  param.append('fs', fileobj)
+  return request({
+    url: '/car/imp',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function deleteCar(id) {
   return request({
     url: '/car/delete',
diff --git a/src/utils/validate.js b/src/utils/validate.js
index d651e43..b596d16 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -108,12 +108,28 @@
   const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
   if (value !== '') {
     if (reg.test(value) === false && reg1.test(value) === false) {
-      callback(new Error('请输入正确的联系电话'))
+      callback(new Error('请输入正确的电话'))
     } else {
       callback()
     }
   } else {
-    callback(new Error('联系电话不能为空'))
+    callback(new Error('电话不能为空'))
+  }
+}
+export const phoneValidatorCanNull = (rule, value, callback) => {
+  const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
+  if(value === undefined){
+    callback()
+  }
+  if (value !== '') {
+    if (reg.test(value) === false && reg1.test(value) === false) {
+      callback(new Error('请输入正确的电话'))
+    } else {
+      callback()
+    }
+  } else {
+    callback()
   }
 }
 
diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue
index 703ec7d..53cb682 100644
--- a/src/views/area/defenceDetail.vue
+++ b/src/views/area/defenceDetail.vue
@@ -31,7 +31,7 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="20">
+      <el-row :gutter="20" v-show="dataForm.deviceList.length!==0">
         <el-col :span="24">
           <el-form-item label="设备绑定">
             <el-button v-for="item in dataForm.deviceList" :key="item.id" type="primary" plain @click="detailDevice(item.id)">{{ item.deviceTypeName }} - {{ item.devcode }}</el-button>
diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue
index afdeae8..565a614 100644
--- a/src/views/car/carAdd.vue
+++ b/src/views/car/carAdd.vue
@@ -8,18 +8,16 @@
             <el-input v-model.trim="dataForm.plateNumber" :disabled="isDetailMode" :maxlength="8" clearable type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="车证种类">
-            <!--<span v-show="isDetailMode">{{ dataForm.deptName }}</span>-->
-            <el-select :disabled="isDetailMode" v-model="dataForm.carCardType" placeholder="请选择车证种类" filterable clearable>
-              <el-option v-for="item in carTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-            </el-select>
-            <!--<dept-select v-show="!isDetailMode" v-model="dataForm.deptid" :dept-show="true" :need-top="true" placeholder="所属组织" @change="fetchStaffList"/>-->
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="车证种类">
+            <el-radio-group :disabled="isDetailMode" v-model="dataForm.carCardType">
+              <el-radio v-for="item in carTypeList" :key="item.value" :label="item.value" >{{ item.name }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="车辆性质" prop="property">
             <el-radio-group v-model="dataForm.property" :disabled="isDetailMode" @change="resetOwner">
               <el-radio v-for="item in carProperties" :key="item.value" :label="item.value">{{ item.name }}</el-radio>
@@ -54,8 +52,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="备用电话">
-            <el-input v-model.trim="dataForm.phone2" :disabled="isDetailMode" type="text" placeholder="联系电话"/>
+          <el-form-item label="备用电话" prop="phone2">
+            <el-input v-model.trim="dataForm.phone2" :disabled="isDetailMode" type="text" placeholder="备用电话"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -63,7 +61,7 @@
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="dataForm.remark" :disabled="isDetailMode" type="text" />
+            <el-input v-model.trim="dataForm.remark" :disabled="isDetailMode" type="text" placeholder="备注"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -79,7 +77,7 @@
 import DeptSelect from '@/components/DeptSelect'
 import { getStaffByDept } from '@/api/staff'
 import { addCar, editCar } from '@/api/car'
-import { phoneValidator, plateValidator } from '@/utils/validate'
+import { phoneValidator, phoneValidatorCanNull, plateValidator } from '@/utils/validate'
 import { getDeptTreeList } from '@/api/dept'
 import { getCarCardTypeList } from '@/api/allDict'
 export default {
@@ -97,7 +95,7 @@
         ownerId: '', // 车主
         phone: '', // 车主联系电话
         phone2: '',
-        carCardType: '',
+        carCardType: '1',
         remark: '', // 备注
         deptName: '', // 部门名称
         ownerName: ''// 车主名
@@ -108,6 +106,7 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
+        phone2: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }],
         phone: [{ required: true, trigger: ['blur', 'change'], validator: phoneValidator }],
         plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }],
         ownerId: [{ required: true, trigger: ['blur', 'change'], message: '请选择车主' }]
@@ -164,6 +163,7 @@
           ownerId: row.ownerId,
           phone: row.phone,
           phone2: row.phone2,
+          carCardType: row.carCardType,
           remark: row.remark
         }
         getStaffByDept({ deptId: this.dataForm.deptid }).then(response => {
@@ -181,6 +181,7 @@
           ownerId: row.ownerId,
           phone: row.phone,
           phone2: row.phone2,
+          carCardType: row.carCardType,
           deptid: row.deptid,
           remark: row.remark,
           deptName: row.deptName,
@@ -202,6 +203,7 @@
         ownerId: '', // 车主
         phone: '', // 车主联系电话
         phone2: '', // 车主联系电话
+        carCardType: '1',
         remark: '', // 备注
         deptName: '', // 部门名称
         ownerName: ''// 车主名
diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue
index e7223de..0371607 100644
--- a/src/views/car/carList.vue
+++ b/src/views/car/carList.vue
@@ -31,6 +31,18 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header" style="color: white"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
+          <download-template filename="carImpTemp.xlsx" class="edit_btn" btnname="模板下载"/>
+          <el-upload
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            class="edit_btn"
+            style=" display: inline;"
+            action="string"
+            accept=".xls,.xlsx">
+            <el-button size="small">批量导入</el-button>
+          </el-upload>
           <el-button class="edit_btn" size="small" @click="batchExport" :disabled="list.length===0">导出</el-button>
           <el-button v-if="hasPerm('/door/car/add')" class="edit_btn" size="small" @click="add">新增</el-button>
           <!--          <el-button v-if="hasPerm('/door/car/delete')" v-show="false" class="edit_btn" size="small" @click="batchDel">删除</el-button>-->
@@ -76,15 +88,16 @@
 
 <script>
 import CarAdd from '@/views/car/carAdd'
-import { getCarList, deleteCar } from '@/api/car'
+import { getCarList, deleteCar, batchImport } from '@/api/car'
 import { getCarProperty } from '@/api/allDict'
 import { carExport } from '@/api/batch'
-
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 export default {
   name: 'CarList',
-  components: { CarAdd },
+  components: { CarAdd, DownloadTemplate },
   data() {
     return {
+      fileList: [], // 批量导入
       listQuery: {
         keywords: '',
         property: '',
@@ -144,6 +157,38 @@
     this.fetchData() // 获取数据
   },
   methods: {
+    // 批量导入
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 批量导入上传请求
+      batchImport(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fileList = []
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(err => {
+        loading.close()
+        this.$message.error(err.message)
+      })
+      this.fileList = []
+    },
     batchExport() {
       // 全屏加载动画
       const loading = this.$loading({
diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue
index 95b7fe8..5c18a6d 100644
--- a/src/views/staff/staffAdd.vue
+++ b/src/views/staff/staffAdd.vue
@@ -39,7 +39,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="部门" prop="deptid">
-                <el-select v-model="personForm.deptid" placeholder="单位/部门" filterable clearable>
+                <el-select v-model="personForm.deptid" placeholder="部门" filterable clearable>
                   <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id"/>
                 </el-select>
               </el-form-item>
@@ -55,21 +55,22 @@
 
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="移动电话">
-                <el-input v-model.trim="personForm.phone" type="text" placeholder="非必填"/>
+              <el-form-item label="移动电话" prop="phone">
+                <el-input v-model.trim="personForm.phone" type="text" placeholder="移动电话"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="办公电话">
-                <el-input v-model.trim="personForm.officePhone" type="text" placeholder="非必填"/>
+              <el-form-item label="办公电话" prop="officePhone">
+                <el-input v-model.trim="personForm.officePhone" type="text" placeholder="办公电话"/>
               </el-form-item>
             </el-col>
           </el-row>
 
+
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="住址" prop="address">
-                <el-input v-model.trim="personForm.address" type="text" placeholder="非必填"/>
+                <el-input v-model.trim="personForm.address" type="text" placeholder="住址"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -160,6 +161,7 @@
 import { validateIDCard } from '@/utils/validate'
 import CaptureIris from './captureIris'
 import { getDeptTreeList } from '@/api/dept'
+import { phoneValidatorCanNull } from '@/utils/validate'
 export default {
   name: 'StaffAdd',
   components: { CaptureIris, DeptSelect },
@@ -205,9 +207,14 @@
       areas: [], // 重点区域复选框对应值
       keyAreaList: [], // 将来从接口中获取
       rules: {
+        phone: [{
+          required: false,
+          pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦
+          message: '请输入正确的移动电话',
+          trigger: ['blur'] }],
+        officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
-        staffType: [{ required: true, message: '人员类别必选', trigger: 'change' }],
         idCard: [{ required: true, trigger: ['blur', 'change'], validator: validateIDCard }]
       },
       labelPosition: 'right',

diff --git a/config/dev.env.js b/config/dev.env.js
index 6227232..9c9c594 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11631"'
+  // BASE_API: '"http://111.198.10.15:11631"'
   // BASE_API: '"http://192.168.5.220:20311"'
+  BASE_API: '"http://111.198.10.15:12405"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2c3f8be..f2fa1f8 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,7 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://192.168.5.220:20311"'
+  // BASE_API: '"http://192.168.5.220:20311"'
   // BASE_API: '"http://111.198.10.15:11631"'
+  BASE_API: '"http://111.198.10.15:12405"'
 }
diff --git a/src/api/car.js b/src/api/car.js
index fc55938..952a015 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -21,6 +21,18 @@
   })
 }
 
+
+export function batchImport(fileobj) {
+  const param = new FormData()
+  param.append('fs', fileobj)
+  return request({
+    url: '/car/imp',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function deleteCar(id) {
   return request({
     url: '/car/delete',
diff --git a/src/utils/validate.js b/src/utils/validate.js
index d651e43..b596d16 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -108,12 +108,28 @@
   const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
   if (value !== '') {
     if (reg.test(value) === false && reg1.test(value) === false) {
-      callback(new Error('请输入正确的联系电话'))
+      callback(new Error('请输入正确的电话'))
     } else {
       callback()
     }
   } else {
-    callback(new Error('联系电话不能为空'))
+    callback(new Error('电话不能为空'))
+  }
+}
+export const phoneValidatorCanNull = (rule, value, callback) => {
+  const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
+  if(value === undefined){
+    callback()
+  }
+  if (value !== '') {
+    if (reg.test(value) === false && reg1.test(value) === false) {
+      callback(new Error('请输入正确的电话'))
+    } else {
+      callback()
+    }
+  } else {
+    callback()
   }
 }
 
diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue
index 703ec7d..53cb682 100644
--- a/src/views/area/defenceDetail.vue
+++ b/src/views/area/defenceDetail.vue
@@ -31,7 +31,7 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="20">
+      <el-row :gutter="20" v-show="dataForm.deviceList.length!==0">
         <el-col :span="24">
           <el-form-item label="设备绑定">
             <el-button v-for="item in dataForm.deviceList" :key="item.id" type="primary" plain @click="detailDevice(item.id)">{{ item.deviceTypeName }} - {{ item.devcode }}</el-button>
diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue
index afdeae8..565a614 100644
--- a/src/views/car/carAdd.vue
+++ b/src/views/car/carAdd.vue
@@ -8,18 +8,16 @@
             <el-input v-model.trim="dataForm.plateNumber" :disabled="isDetailMode" :maxlength="8" clearable type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="车证种类">
-            <!--<span v-show="isDetailMode">{{ dataForm.deptName }}</span>-->
-            <el-select :disabled="isDetailMode" v-model="dataForm.carCardType" placeholder="请选择车证种类" filterable clearable>
-              <el-option v-for="item in carTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-            </el-select>
-            <!--<dept-select v-show="!isDetailMode" v-model="dataForm.deptid" :dept-show="true" :need-top="true" placeholder="所属组织" @change="fetchStaffList"/>-->
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="车证种类">
+            <el-radio-group :disabled="isDetailMode" v-model="dataForm.carCardType">
+              <el-radio v-for="item in carTypeList" :key="item.value" :label="item.value" >{{ item.name }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="车辆性质" prop="property">
             <el-radio-group v-model="dataForm.property" :disabled="isDetailMode" @change="resetOwner">
               <el-radio v-for="item in carProperties" :key="item.value" :label="item.value">{{ item.name }}</el-radio>
@@ -54,8 +52,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="备用电话">
-            <el-input v-model.trim="dataForm.phone2" :disabled="isDetailMode" type="text" placeholder="联系电话"/>
+          <el-form-item label="备用电话" prop="phone2">
+            <el-input v-model.trim="dataForm.phone2" :disabled="isDetailMode" type="text" placeholder="备用电话"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -63,7 +61,7 @@
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="dataForm.remark" :disabled="isDetailMode" type="text" />
+            <el-input v-model.trim="dataForm.remark" :disabled="isDetailMode" type="text" placeholder="备注"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -79,7 +77,7 @@
 import DeptSelect from '@/components/DeptSelect'
 import { getStaffByDept } from '@/api/staff'
 import { addCar, editCar } from '@/api/car'
-import { phoneValidator, plateValidator } from '@/utils/validate'
+import { phoneValidator, phoneValidatorCanNull, plateValidator } from '@/utils/validate'
 import { getDeptTreeList } from '@/api/dept'
 import { getCarCardTypeList } from '@/api/allDict'
 export default {
@@ -97,7 +95,7 @@
         ownerId: '', // 车主
         phone: '', // 车主联系电话
         phone2: '',
-        carCardType: '',
+        carCardType: '1',
         remark: '', // 备注
         deptName: '', // 部门名称
         ownerName: ''// 车主名
@@ -108,6 +106,7 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
+        phone2: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }],
         phone: [{ required: true, trigger: ['blur', 'change'], validator: phoneValidator }],
         plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }],
         ownerId: [{ required: true, trigger: ['blur', 'change'], message: '请选择车主' }]
@@ -164,6 +163,7 @@
           ownerId: row.ownerId,
           phone: row.phone,
           phone2: row.phone2,
+          carCardType: row.carCardType,
           remark: row.remark
         }
         getStaffByDept({ deptId: this.dataForm.deptid }).then(response => {
@@ -181,6 +181,7 @@
           ownerId: row.ownerId,
           phone: row.phone,
           phone2: row.phone2,
+          carCardType: row.carCardType,
           deptid: row.deptid,
           remark: row.remark,
           deptName: row.deptName,
@@ -202,6 +203,7 @@
         ownerId: '', // 车主
         phone: '', // 车主联系电话
         phone2: '', // 车主联系电话
+        carCardType: '1',
         remark: '', // 备注
         deptName: '', // 部门名称
         ownerName: ''// 车主名
diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue
index e7223de..0371607 100644
--- a/src/views/car/carList.vue
+++ b/src/views/car/carList.vue
@@ -31,6 +31,18 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header" style="color: white"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
+          <download-template filename="carImpTemp.xlsx" class="edit_btn" btnname="模板下载"/>
+          <el-upload
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            class="edit_btn"
+            style=" display: inline;"
+            action="string"
+            accept=".xls,.xlsx">
+            <el-button size="small">批量导入</el-button>
+          </el-upload>
           <el-button class="edit_btn" size="small" @click="batchExport" :disabled="list.length===0">导出</el-button>
           <el-button v-if="hasPerm('/door/car/add')" class="edit_btn" size="small" @click="add">新增</el-button>
           <!--          <el-button v-if="hasPerm('/door/car/delete')" v-show="false" class="edit_btn" size="small" @click="batchDel">删除</el-button>-->
@@ -76,15 +88,16 @@
 
 <script>
 import CarAdd from '@/views/car/carAdd'
-import { getCarList, deleteCar } from '@/api/car'
+import { getCarList, deleteCar, batchImport } from '@/api/car'
 import { getCarProperty } from '@/api/allDict'
 import { carExport } from '@/api/batch'
-
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 export default {
   name: 'CarList',
-  components: { CarAdd },
+  components: { CarAdd, DownloadTemplate },
   data() {
     return {
+      fileList: [], // 批量导入
       listQuery: {
         keywords: '',
         property: '',
@@ -144,6 +157,38 @@
     this.fetchData() // 获取数据
   },
   methods: {
+    // 批量导入
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 批量导入上传请求
+      batchImport(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fileList = []
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(err => {
+        loading.close()
+        this.$message.error(err.message)
+      })
+      this.fileList = []
+    },
     batchExport() {
       // 全屏加载动画
       const loading = this.$loading({
diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue
index 95b7fe8..5c18a6d 100644
--- a/src/views/staff/staffAdd.vue
+++ b/src/views/staff/staffAdd.vue
@@ -39,7 +39,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="部门" prop="deptid">
-                <el-select v-model="personForm.deptid" placeholder="单位/部门" filterable clearable>
+                <el-select v-model="personForm.deptid" placeholder="部门" filterable clearable>
                   <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id"/>
                 </el-select>
               </el-form-item>
@@ -55,21 +55,22 @@
 
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="移动电话">
-                <el-input v-model.trim="personForm.phone" type="text" placeholder="非必填"/>
+              <el-form-item label="移动电话" prop="phone">
+                <el-input v-model.trim="personForm.phone" type="text" placeholder="移动电话"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="办公电话">
-                <el-input v-model.trim="personForm.officePhone" type="text" placeholder="非必填"/>
+              <el-form-item label="办公电话" prop="officePhone">
+                <el-input v-model.trim="personForm.officePhone" type="text" placeholder="办公电话"/>
               </el-form-item>
             </el-col>
           </el-row>
 
+
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="住址" prop="address">
-                <el-input v-model.trim="personForm.address" type="text" placeholder="非必填"/>
+                <el-input v-model.trim="personForm.address" type="text" placeholder="住址"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -160,6 +161,7 @@
 import { validateIDCard } from '@/utils/validate'
 import CaptureIris from './captureIris'
 import { getDeptTreeList } from '@/api/dept'
+import { phoneValidatorCanNull } from '@/utils/validate'
 export default {
   name: 'StaffAdd',
   components: { CaptureIris, DeptSelect },
@@ -205,9 +207,14 @@
       areas: [], // 重点区域复选框对应值
       keyAreaList: [], // 将来从接口中获取
       rules: {
+        phone: [{
+          required: false,
+          pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦
+          message: '请输入正确的移动电话',
+          trigger: ['blur'] }],
+        officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
-        staffType: [{ required: true, message: '人员类别必选', trigger: 'change' }],
         idCard: [{ required: true, trigger: ['blur', 'change'], validator: validateIDCard }]
       },
       labelPosition: 'right',
diff --git a/src/views/staff/staffDetail.vue b/src/views/staff/staffDetail.vue
index d0716d8..2953355 100644
--- a/src/views/staff/staffDetail.vue
+++ b/src/views/staff/staffDetail.vue
@@ -29,12 +29,26 @@
           </el-row>
 
           <el-row :gutter="20">
+            <el-col :span="12" >
+              <el-form-item label="出生日期" prop="birthday">
+                <el-input v-model="dataForm.birthday" disabled type="text"/>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="性别">
                 <el-input v-model="dataForm.sex" disabled type="text"/>
                 <!--<span>{{ dataForm.sex }}</span>-->
               </el-form-item>
             </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="部门">
+                <el-input v-model="dataForm.deptName" disabled type="text"/>
+                <!--<span>{{ dataForm.deptName }}</span>-->
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="人员类别">
                 <el-input v-model="dataForm.staffTypeName" disabled type="text"/>
@@ -57,14 +71,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="所在部门">
-                <el-input v-model="dataForm.deptName" disabled type="text"/>
-                <!--<span>{{ dataForm.deptName }}</span>-->
-              </el-form-item>
-            </el-col>
-          </el-row>
 
           <el-row>
             <el-col :span="24">
@@ -177,7 +183,7 @@
               birthday: row.birthday,
               address: row.address,
               phone: row.phone,
-              officePhone: row.officePhone,
+              officePhone: response.data.officePhone,
               staffTypeName: row.staffTypeName,
               idCard: this.encrypIdCardNo(row.idCard),
               sex: row.sexStr,

diff --git a/config/dev.env.js b/config/dev.env.js
index 6227232..9c9c594 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11631"'
+  // BASE_API: '"http://111.198.10.15:11631"'
   // BASE_API: '"http://192.168.5.220:20311"'
+  BASE_API: '"http://111.198.10.15:12405"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2c3f8be..f2fa1f8 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,7 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://192.168.5.220:20311"'
+  // BASE_API: '"http://192.168.5.220:20311"'
   // BASE_API: '"http://111.198.10.15:11631"'
+  BASE_API: '"http://111.198.10.15:12405"'
 }
diff --git a/src/api/car.js b/src/api/car.js
index fc55938..952a015 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -21,6 +21,18 @@
   })
 }
 
+
+export function batchImport(fileobj) {
+  const param = new FormData()
+  param.append('fs', fileobj)
+  return request({
+    url: '/car/imp',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function deleteCar(id) {
   return request({
     url: '/car/delete',
diff --git a/src/utils/validate.js b/src/utils/validate.js
index d651e43..b596d16 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -108,12 +108,28 @@
   const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
   if (value !== '') {
     if (reg.test(value) === false && reg1.test(value) === false) {
-      callback(new Error('请输入正确的联系电话'))
+      callback(new Error('请输入正确的电话'))
     } else {
       callback()
     }
   } else {
-    callback(new Error('联系电话不能为空'))
+    callback(new Error('电话不能为空'))
+  }
+}
+export const phoneValidatorCanNull = (rule, value, callback) => {
+  const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
+  if(value === undefined){
+    callback()
+  }
+  if (value !== '') {
+    if (reg.test(value) === false && reg1.test(value) === false) {
+      callback(new Error('请输入正确的电话'))
+    } else {
+      callback()
+    }
+  } else {
+    callback()
   }
 }
 
diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue
index 703ec7d..53cb682 100644
--- a/src/views/area/defenceDetail.vue
+++ b/src/views/area/defenceDetail.vue
@@ -31,7 +31,7 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="20">
+      <el-row :gutter="20" v-show="dataForm.deviceList.length!==0">
         <el-col :span="24">
           <el-form-item label="设备绑定">
             <el-button v-for="item in dataForm.deviceList" :key="item.id" type="primary" plain @click="detailDevice(item.id)">{{ item.deviceTypeName }} - {{ item.devcode }}</el-button>
diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue
index afdeae8..565a614 100644
--- a/src/views/car/carAdd.vue
+++ b/src/views/car/carAdd.vue
@@ -8,18 +8,16 @@
             <el-input v-model.trim="dataForm.plateNumber" :disabled="isDetailMode" :maxlength="8" clearable type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="车证种类">
-            <!--<span v-show="isDetailMode">{{ dataForm.deptName }}</span>-->
-            <el-select :disabled="isDetailMode" v-model="dataForm.carCardType" placeholder="请选择车证种类" filterable clearable>
-              <el-option v-for="item in carTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-            </el-select>
-            <!--<dept-select v-show="!isDetailMode" v-model="dataForm.deptid" :dept-show="true" :need-top="true" placeholder="所属组织" @change="fetchStaffList"/>-->
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="车证种类">
+            <el-radio-group :disabled="isDetailMode" v-model="dataForm.carCardType">
+              <el-radio v-for="item in carTypeList" :key="item.value" :label="item.value" >{{ item.name }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="车辆性质" prop="property">
             <el-radio-group v-model="dataForm.property" :disabled="isDetailMode" @change="resetOwner">
               <el-radio v-for="item in carProperties" :key="item.value" :label="item.value">{{ item.name }}</el-radio>
@@ -54,8 +52,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="备用电话">
-            <el-input v-model.trim="dataForm.phone2" :disabled="isDetailMode" type="text" placeholder="联系电话"/>
+          <el-form-item label="备用电话" prop="phone2">
+            <el-input v-model.trim="dataForm.phone2" :disabled="isDetailMode" type="text" placeholder="备用电话"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -63,7 +61,7 @@
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="dataForm.remark" :disabled="isDetailMode" type="text" />
+            <el-input v-model.trim="dataForm.remark" :disabled="isDetailMode" type="text" placeholder="备注"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -79,7 +77,7 @@
 import DeptSelect from '@/components/DeptSelect'
 import { getStaffByDept } from '@/api/staff'
 import { addCar, editCar } from '@/api/car'
-import { phoneValidator, plateValidator } from '@/utils/validate'
+import { phoneValidator, phoneValidatorCanNull, plateValidator } from '@/utils/validate'
 import { getDeptTreeList } from '@/api/dept'
 import { getCarCardTypeList } from '@/api/allDict'
 export default {
@@ -97,7 +95,7 @@
         ownerId: '', // 车主
         phone: '', // 车主联系电话
         phone2: '',
-        carCardType: '',
+        carCardType: '1',
         remark: '', // 备注
         deptName: '', // 部门名称
         ownerName: ''// 车主名
@@ -108,6 +106,7 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
+        phone2: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }],
         phone: [{ required: true, trigger: ['blur', 'change'], validator: phoneValidator }],
         plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }],
         ownerId: [{ required: true, trigger: ['blur', 'change'], message: '请选择车主' }]
@@ -164,6 +163,7 @@
           ownerId: row.ownerId,
           phone: row.phone,
           phone2: row.phone2,
+          carCardType: row.carCardType,
           remark: row.remark
         }
         getStaffByDept({ deptId: this.dataForm.deptid }).then(response => {
@@ -181,6 +181,7 @@
           ownerId: row.ownerId,
           phone: row.phone,
           phone2: row.phone2,
+          carCardType: row.carCardType,
           deptid: row.deptid,
           remark: row.remark,
           deptName: row.deptName,
@@ -202,6 +203,7 @@
         ownerId: '', // 车主
         phone: '', // 车主联系电话
         phone2: '', // 车主联系电话
+        carCardType: '1',
         remark: '', // 备注
         deptName: '', // 部门名称
         ownerName: ''// 车主名
diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue
index e7223de..0371607 100644
--- a/src/views/car/carList.vue
+++ b/src/views/car/carList.vue
@@ -31,6 +31,18 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header" style="color: white"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
+          <download-template filename="carImpTemp.xlsx" class="edit_btn" btnname="模板下载"/>
+          <el-upload
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            class="edit_btn"
+            style=" display: inline;"
+            action="string"
+            accept=".xls,.xlsx">
+            <el-button size="small">批量导入</el-button>
+          </el-upload>
           <el-button class="edit_btn" size="small" @click="batchExport" :disabled="list.length===0">导出</el-button>
           <el-button v-if="hasPerm('/door/car/add')" class="edit_btn" size="small" @click="add">新增</el-button>
           <!--          <el-button v-if="hasPerm('/door/car/delete')" v-show="false" class="edit_btn" size="small" @click="batchDel">删除</el-button>-->
@@ -76,15 +88,16 @@
 
 <script>
 import CarAdd from '@/views/car/carAdd'
-import { getCarList, deleteCar } from '@/api/car'
+import { getCarList, deleteCar, batchImport } from '@/api/car'
 import { getCarProperty } from '@/api/allDict'
 import { carExport } from '@/api/batch'
-
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 export default {
   name: 'CarList',
-  components: { CarAdd },
+  components: { CarAdd, DownloadTemplate },
   data() {
     return {
+      fileList: [], // 批量导入
       listQuery: {
         keywords: '',
         property: '',
@@ -144,6 +157,38 @@
     this.fetchData() // 获取数据
   },
   methods: {
+    // 批量导入
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 批量导入上传请求
+      batchImport(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fileList = []
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(err => {
+        loading.close()
+        this.$message.error(err.message)
+      })
+      this.fileList = []
+    },
     batchExport() {
       // 全屏加载动画
       const loading = this.$loading({
diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue
index 95b7fe8..5c18a6d 100644
--- a/src/views/staff/staffAdd.vue
+++ b/src/views/staff/staffAdd.vue
@@ -39,7 +39,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="部门" prop="deptid">
-                <el-select v-model="personForm.deptid" placeholder="单位/部门" filterable clearable>
+                <el-select v-model="personForm.deptid" placeholder="部门" filterable clearable>
                   <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id"/>
                 </el-select>
               </el-form-item>
@@ -55,21 +55,22 @@
 
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="移动电话">
-                <el-input v-model.trim="personForm.phone" type="text" placeholder="非必填"/>
+              <el-form-item label="移动电话" prop="phone">
+                <el-input v-model.trim="personForm.phone" type="text" placeholder="移动电话"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="办公电话">
-                <el-input v-model.trim="personForm.officePhone" type="text" placeholder="非必填"/>
+              <el-form-item label="办公电话" prop="officePhone">
+                <el-input v-model.trim="personForm.officePhone" type="text" placeholder="办公电话"/>
               </el-form-item>
             </el-col>
           </el-row>
 
+
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="住址" prop="address">
-                <el-input v-model.trim="personForm.address" type="text" placeholder="非必填"/>
+                <el-input v-model.trim="personForm.address" type="text" placeholder="住址"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -160,6 +161,7 @@
 import { validateIDCard } from '@/utils/validate'
 import CaptureIris from './captureIris'
 import { getDeptTreeList } from '@/api/dept'
+import { phoneValidatorCanNull } from '@/utils/validate'
 export default {
   name: 'StaffAdd',
   components: { CaptureIris, DeptSelect },
@@ -205,9 +207,14 @@
       areas: [], // 重点区域复选框对应值
       keyAreaList: [], // 将来从接口中获取
       rules: {
+        phone: [{
+          required: false,
+          pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦
+          message: '请输入正确的移动电话',
+          trigger: ['blur'] }],
+        officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
-        staffType: [{ required: true, message: '人员类别必选', trigger: 'change' }],
         idCard: [{ required: true, trigger: ['blur', 'change'], validator: validateIDCard }]
       },
       labelPosition: 'right',
diff --git a/src/views/staff/staffDetail.vue b/src/views/staff/staffDetail.vue
index d0716d8..2953355 100644
--- a/src/views/staff/staffDetail.vue
+++ b/src/views/staff/staffDetail.vue
@@ -29,12 +29,26 @@
           </el-row>
 
           <el-row :gutter="20">
+            <el-col :span="12" >
+              <el-form-item label="出生日期" prop="birthday">
+                <el-input v-model="dataForm.birthday" disabled type="text"/>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="性别">
                 <el-input v-model="dataForm.sex" disabled type="text"/>
                 <!--<span>{{ dataForm.sex }}</span>-->
               </el-form-item>
             </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="部门">
+                <el-input v-model="dataForm.deptName" disabled type="text"/>
+                <!--<span>{{ dataForm.deptName }}</span>-->
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="人员类别">
                 <el-input v-model="dataForm.staffTypeName" disabled type="text"/>
@@ -57,14 +71,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="所在部门">
-                <el-input v-model="dataForm.deptName" disabled type="text"/>
-                <!--<span>{{ dataForm.deptName }}</span>-->
-              </el-form-item>
-            </el-col>
-          </el-row>
 
           <el-row>
             <el-col :span="24">
@@ -177,7 +183,7 @@
               birthday: row.birthday,
               address: row.address,
               phone: row.phone,
-              officePhone: row.officePhone,
+              officePhone: response.data.officePhone,
               staffTypeName: row.staffTypeName,
               idCard: this.encrypIdCardNo(row.idCard),
               sex: row.sexStr,
diff --git a/src/views/staff/staffEdit.vue b/src/views/staff/staffEdit.vue
index 6806b1f..642773a 100644
--- a/src/views/staff/staffEdit.vue
+++ b/src/views/staff/staffEdit.vue
@@ -38,7 +38,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="部门" prop="deptid">
-                <el-select v-model="personForm.deptid" placeholder="单位/部门" filterable clearable>
+                <el-select v-model="personForm.deptid" placeholder="部门" filterable clearable>
                   <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id"/>
                 </el-select>
                 <!--<dept-select v-model="personForm.deptid" :need-top="deptShowTop" :dept-show="true" placeholder="单位/部门"/>-->
@@ -55,13 +55,13 @@
 
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="移动电话">
-                <el-input v-model.trim="personForm.phone" type="text" placeholder="非必填"/>
+              <el-form-item label="移动电话" prop="phone">
+                <el-input v-model.trim="personForm.phone" type="text" placeholder="移动电话"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="办公电话">
-                <el-input v-model.trim="personForm.officePhone" type="text" placeholder="非必填"/>
+              <el-form-item label="办公电话" prop="officePhone">
+                <el-input v-model.trim="personForm.officePhone" type="text" placeholder="办公电话"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -69,7 +69,7 @@
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="住址" prop="address">
-                <el-input v-model.trim="personForm.address" type="text" placeholder="非必填"/>
+                <el-input v-model.trim="personForm.address" type="text" placeholder="住址"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -157,6 +157,7 @@
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import CaptureIris from './captureIris'
 import { getDeptTreeList } from '@/api/dept'
+import { phoneValidatorCanNull } from '@/utils/validate'
 export default {
   name: 'StaffEdit',
   components: { CaptureIris, DeptSelect },
@@ -215,6 +216,12 @@
       areas: [], // 重点区域复选框对应值
       keyAreaList: [],
       rules: {
+        phone: [{
+          required: false,
+          pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦
+          message: '请输入正确的移动电话',
+          trigger: ['blur', 'change'] }],
+        officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
         idCard: [{ required: true, trigger: ['blur', 'change'], validator: validateIDCard }]

diff --git a/config/dev.env.js b/config/dev.env.js
index 6227232..9c9c594 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,6 +6,7 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://111.198.10.15:11631"'
+  // BASE_API: '"http://111.198.10.15:11631"'
   // BASE_API: '"http://192.168.5.220:20311"'
+  BASE_API: '"http://111.198.10.15:12405"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 2c3f8be..f2fa1f8 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,7 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://192.168.5.220:20311"'
+  // BASE_API: '"http://192.168.5.220:20311"'
   // BASE_API: '"http://111.198.10.15:11631"'
+  BASE_API: '"http://111.198.10.15:12405"'
 }
diff --git a/src/api/car.js b/src/api/car.js
index fc55938..952a015 100644
--- a/src/api/car.js
+++ b/src/api/car.js
@@ -21,6 +21,18 @@
   })
 }
 
+
+export function batchImport(fileobj) {
+  const param = new FormData()
+  param.append('fs', fileobj)
+  return request({
+    url: '/car/imp',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
 export function deleteCar(id) {
   return request({
     url: '/car/delete',
diff --git a/src/utils/validate.js b/src/utils/validate.js
index d651e43..b596d16 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -108,12 +108,28 @@
   const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
   if (value !== '') {
     if (reg.test(value) === false && reg1.test(value) === false) {
-      callback(new Error('请输入正确的联系电话'))
+      callback(new Error('请输入正确的电话'))
     } else {
       callback()
     }
   } else {
-    callback(new Error('联系电话不能为空'))
+    callback(new Error('电话不能为空'))
+  }
+}
+export const phoneValidatorCanNull = (rule, value, callback) => {
+  const reg = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
+  const reg1 = /^((0\d{2,3})-)?(\d{7,8})$/
+  if(value === undefined){
+    callback()
+  }
+  if (value !== '') {
+    if (reg.test(value) === false && reg1.test(value) === false) {
+      callback(new Error('请输入正确的电话'))
+    } else {
+      callback()
+    }
+  } else {
+    callback()
   }
 }
 
diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue
index 703ec7d..53cb682 100644
--- a/src/views/area/defenceDetail.vue
+++ b/src/views/area/defenceDetail.vue
@@ -31,7 +31,7 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="20">
+      <el-row :gutter="20" v-show="dataForm.deviceList.length!==0">
         <el-col :span="24">
           <el-form-item label="设备绑定">
             <el-button v-for="item in dataForm.deviceList" :key="item.id" type="primary" plain @click="detailDevice(item.id)">{{ item.deviceTypeName }} - {{ item.devcode }}</el-button>
diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue
index afdeae8..565a614 100644
--- a/src/views/car/carAdd.vue
+++ b/src/views/car/carAdd.vue
@@ -8,18 +8,16 @@
             <el-input v-model.trim="dataForm.plateNumber" :disabled="isDetailMode" :maxlength="8" clearable type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="车证种类">
-            <!--<span v-show="isDetailMode">{{ dataForm.deptName }}</span>-->
-            <el-select :disabled="isDetailMode" v-model="dataForm.carCardType" placeholder="请选择车证种类" filterable clearable>
-              <el-option v-for="item in carTypeList" :key="item.value" :label="item.name" :value="item.value"/>
-            </el-select>
-            <!--<dept-select v-show="!isDetailMode" v-model="dataForm.deptid" :dept-show="true" :need-top="true" placeholder="所属组织" @change="fetchStaffList"/>-->
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="车证种类">
+            <el-radio-group :disabled="isDetailMode" v-model="dataForm.carCardType">
+              <el-radio v-for="item in carTypeList" :key="item.value" :label="item.value" >{{ item.name }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="车辆性质" prop="property">
             <el-radio-group v-model="dataForm.property" :disabled="isDetailMode" @change="resetOwner">
               <el-radio v-for="item in carProperties" :key="item.value" :label="item.value">{{ item.name }}</el-radio>
@@ -54,8 +52,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="备用电话">
-            <el-input v-model.trim="dataForm.phone2" :disabled="isDetailMode" type="text" placeholder="联系电话"/>
+          <el-form-item label="备用电话" prop="phone2">
+            <el-input v-model.trim="dataForm.phone2" :disabled="isDetailMode" type="text" placeholder="备用电话"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -63,7 +61,7 @@
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="dataForm.remark" :disabled="isDetailMode" type="text" />
+            <el-input v-model.trim="dataForm.remark" :disabled="isDetailMode" type="text" placeholder="备注"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -79,7 +77,7 @@
 import DeptSelect from '@/components/DeptSelect'
 import { getStaffByDept } from '@/api/staff'
 import { addCar, editCar } from '@/api/car'
-import { phoneValidator, plateValidator } from '@/utils/validate'
+import { phoneValidator, phoneValidatorCanNull, plateValidator } from '@/utils/validate'
 import { getDeptTreeList } from '@/api/dept'
 import { getCarCardTypeList } from '@/api/allDict'
 export default {
@@ -97,7 +95,7 @@
         ownerId: '', // 车主
         phone: '', // 车主联系电话
         phone2: '',
-        carCardType: '',
+        carCardType: '1',
         remark: '', // 备注
         deptName: '', // 部门名称
         ownerName: ''// 车主名
@@ -108,6 +106,7 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
+        phone2: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }],
         phone: [{ required: true, trigger: ['blur', 'change'], validator: phoneValidator }],
         plateNumber: [{ required: true, trigger: ['blur', 'change'], validator: plateValidator }],
         ownerId: [{ required: true, trigger: ['blur', 'change'], message: '请选择车主' }]
@@ -164,6 +163,7 @@
           ownerId: row.ownerId,
           phone: row.phone,
           phone2: row.phone2,
+          carCardType: row.carCardType,
           remark: row.remark
         }
         getStaffByDept({ deptId: this.dataForm.deptid }).then(response => {
@@ -181,6 +181,7 @@
           ownerId: row.ownerId,
           phone: row.phone,
           phone2: row.phone2,
+          carCardType: row.carCardType,
           deptid: row.deptid,
           remark: row.remark,
           deptName: row.deptName,
@@ -202,6 +203,7 @@
         ownerId: '', // 车主
         phone: '', // 车主联系电话
         phone2: '', // 车主联系电话
+        carCardType: '1',
         remark: '', // 备注
         deptName: '', // 部门名称
         ownerName: ''// 车主名
diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue
index e7223de..0371607 100644
--- a/src/views/car/carList.vue
+++ b/src/views/car/carList.vue
@@ -31,6 +31,18 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header" style="color: white"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
+          <download-template filename="carImpTemp.xlsx" class="edit_btn" btnname="模板下载"/>
+          <el-upload
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            class="edit_btn"
+            style=" display: inline;"
+            action="string"
+            accept=".xls,.xlsx">
+            <el-button size="small">批量导入</el-button>
+          </el-upload>
           <el-button class="edit_btn" size="small" @click="batchExport" :disabled="list.length===0">导出</el-button>
           <el-button v-if="hasPerm('/door/car/add')" class="edit_btn" size="small" @click="add">新增</el-button>
           <!--          <el-button v-if="hasPerm('/door/car/delete')" v-show="false" class="edit_btn" size="small" @click="batchDel">删除</el-button>-->
@@ -76,15 +88,16 @@
 
 <script>
 import CarAdd from '@/views/car/carAdd'
-import { getCarList, deleteCar } from '@/api/car'
+import { getCarList, deleteCar, batchImport } from '@/api/car'
 import { getCarProperty } from '@/api/allDict'
 import { carExport } from '@/api/batch'
-
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 export default {
   name: 'CarList',
-  components: { CarAdd },
+  components: { CarAdd, DownloadTemplate },
   data() {
     return {
+      fileList: [], // 批量导入
       listQuery: {
         keywords: '',
         property: '',
@@ -144,6 +157,38 @@
     this.fetchData() // 获取数据
   },
   methods: {
+    // 批量导入
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 批量导入上传请求
+      batchImport(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fileList = []
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(err => {
+        loading.close()
+        this.$message.error(err.message)
+      })
+      this.fileList = []
+    },
     batchExport() {
       // 全屏加载动画
       const loading = this.$loading({
diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue
index 95b7fe8..5c18a6d 100644
--- a/src/views/staff/staffAdd.vue
+++ b/src/views/staff/staffAdd.vue
@@ -39,7 +39,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="部门" prop="deptid">
-                <el-select v-model="personForm.deptid" placeholder="单位/部门" filterable clearable>
+                <el-select v-model="personForm.deptid" placeholder="部门" filterable clearable>
                   <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id"/>
                 </el-select>
               </el-form-item>
@@ -55,21 +55,22 @@
 
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="移动电话">
-                <el-input v-model.trim="personForm.phone" type="text" placeholder="非必填"/>
+              <el-form-item label="移动电话" prop="phone">
+                <el-input v-model.trim="personForm.phone" type="text" placeholder="移动电话"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="办公电话">
-                <el-input v-model.trim="personForm.officePhone" type="text" placeholder="非必填"/>
+              <el-form-item label="办公电话" prop="officePhone">
+                <el-input v-model.trim="personForm.officePhone" type="text" placeholder="办公电话"/>
               </el-form-item>
             </el-col>
           </el-row>
 
+
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="住址" prop="address">
-                <el-input v-model.trim="personForm.address" type="text" placeholder="非必填"/>
+                <el-input v-model.trim="personForm.address" type="text" placeholder="住址"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -160,6 +161,7 @@
 import { validateIDCard } from '@/utils/validate'
 import CaptureIris from './captureIris'
 import { getDeptTreeList } from '@/api/dept'
+import { phoneValidatorCanNull } from '@/utils/validate'
 export default {
   name: 'StaffAdd',
   components: { CaptureIris, DeptSelect },
@@ -205,9 +207,14 @@
       areas: [], // 重点区域复选框对应值
       keyAreaList: [], // 将来从接口中获取
       rules: {
+        phone: [{
+          required: false,
+          pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦
+          message: '请输入正确的移动电话',
+          trigger: ['blur'] }],
+        officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
-        staffType: [{ required: true, message: '人员类别必选', trigger: 'change' }],
         idCard: [{ required: true, trigger: ['blur', 'change'], validator: validateIDCard }]
       },
       labelPosition: 'right',
diff --git a/src/views/staff/staffDetail.vue b/src/views/staff/staffDetail.vue
index d0716d8..2953355 100644
--- a/src/views/staff/staffDetail.vue
+++ b/src/views/staff/staffDetail.vue
@@ -29,12 +29,26 @@
           </el-row>
 
           <el-row :gutter="20">
+            <el-col :span="12" >
+              <el-form-item label="出生日期" prop="birthday">
+                <el-input v-model="dataForm.birthday" disabled type="text"/>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="性别">
                 <el-input v-model="dataForm.sex" disabled type="text"/>
                 <!--<span>{{ dataForm.sex }}</span>-->
               </el-form-item>
             </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="部门">
+                <el-input v-model="dataForm.deptName" disabled type="text"/>
+                <!--<span>{{ dataForm.deptName }}</span>-->
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="人员类别">
                 <el-input v-model="dataForm.staffTypeName" disabled type="text"/>
@@ -57,14 +71,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="所在部门">
-                <el-input v-model="dataForm.deptName" disabled type="text"/>
-                <!--<span>{{ dataForm.deptName }}</span>-->
-              </el-form-item>
-            </el-col>
-          </el-row>
 
           <el-row>
             <el-col :span="24">
@@ -177,7 +183,7 @@
               birthday: row.birthday,
               address: row.address,
               phone: row.phone,
-              officePhone: row.officePhone,
+              officePhone: response.data.officePhone,
               staffTypeName: row.staffTypeName,
               idCard: this.encrypIdCardNo(row.idCard),
               sex: row.sexStr,
diff --git a/src/views/staff/staffEdit.vue b/src/views/staff/staffEdit.vue
index 6806b1f..642773a 100644
--- a/src/views/staff/staffEdit.vue
+++ b/src/views/staff/staffEdit.vue
@@ -38,7 +38,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="部门" prop="deptid">
-                <el-select v-model="personForm.deptid" placeholder="单位/部门" filterable clearable>
+                <el-select v-model="personForm.deptid" placeholder="部门" filterable clearable>
                   <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id"/>
                 </el-select>
                 <!--<dept-select v-model="personForm.deptid" :need-top="deptShowTop" :dept-show="true" placeholder="单位/部门"/>-->
@@ -55,13 +55,13 @@
 
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="移动电话">
-                <el-input v-model.trim="personForm.phone" type="text" placeholder="非必填"/>
+              <el-form-item label="移动电话" prop="phone">
+                <el-input v-model.trim="personForm.phone" type="text" placeholder="移动电话"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="办公电话">
-                <el-input v-model.trim="personForm.officePhone" type="text" placeholder="非必填"/>
+              <el-form-item label="办公电话" prop="officePhone">
+                <el-input v-model.trim="personForm.officePhone" type="text" placeholder="办公电话"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -69,7 +69,7 @@
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="住址" prop="address">
-                <el-input v-model.trim="personForm.address" type="text" placeholder="非必填"/>
+                <el-input v-model.trim="personForm.address" type="text" placeholder="住址"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -157,6 +157,7 @@
 import { getBirthdayByIdNO, getSexByIdNO } from '@/utils/dataAnalysis'
 import CaptureIris from './captureIris'
 import { getDeptTreeList } from '@/api/dept'
+import { phoneValidatorCanNull } from '@/utils/validate'
 export default {
   name: 'StaffEdit',
   components: { CaptureIris, DeptSelect },
@@ -215,6 +216,12 @@
       areas: [], // 重点区域复选框对应值
       keyAreaList: [],
       rules: {
+        phone: [{
+          required: false,
+          pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦
+          message: '请输入正确的移动电话',
+          trigger: ['blur', 'change'] }],
+        officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }],
         name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }],
         deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }],
         idCard: [{ required: true, trigger: ['blur', 'change'], validator: validateIDCard }]
diff --git a/static/webCtrl/nvr/demo-easy.html b/static/webCtrl/nvr/demo-easy.html
index a8107a0..7c4778a 100644
--- a/static/webCtrl/nvr/demo-easy.html
+++ b/static/webCtrl/nvr/demo-easy.html
@@ -61,16 +61,13 @@
   <script src="jquery-1.7.1.min.js"></script>
   <script src="codebase/webVideoCtrl.js"></script>
   <script>
-    function invockIframeMethod(msg) {
-      // 是用widow调用vue绑定的vueDefinedMyProp方法
-      window.parent['vueDefined'](msg);
-    }
+
     const oLiveView = {
       iProtocol: 1,            // protocol 1：http, 2:https
-      szIP: "192.168.1.65",    // protocol ip
+      szIP: "192.168.5.254",    // protocol ip
       szPort: "80",            // protocol port
       szUsername: "admin",     // device username
-      szPassword: "abcd1234", // device password
+      szPassword: "ht123456", // device password
       iStreamType: 1,          // stream 1：main stream  2：sub-stream  3：third stream  4：transcode stream
       iChannelID: 1,           // channel no
       bZeroChannel: false      // zero channel
@@ -123,9 +120,12 @@
       WebVideoCtrl.I_Login(oLiveView.szIP, oLiveView.iProtocol, oLiveView.szPort, oLiveView.szUsername, oLiveView.szPassword, {
         success: function (xmlDoc) {
           //startPlayReal(null);
+		   console.log('登录成功')
         },
         error: function () {
-          alert("登录设备失败");
+		var ec = WebVideoCtrl.I_GetLastError()
+		console.log(ec)
+          console.log("failed "+oLiveView.szIP+' '+oLiveView.iProtocol+' '+oLiveView.szPort+' '+oLiveView.szUsername+' '+oLiveView.szPassword);
         }
       });
     }
@@ -133,17 +133,25 @@
     // 开始预览
     function startPlayReal(obj) {
       clickStopPlayback();
-      WebVideoCtrl.I_ChangeWndNum(1);
+      if(  oLiveView.szIP !== obj.ip){
+        oLiveView.szIP = obj.ip;
+        oLiveView.szUsername = obj.username;
+        oLiveView.szPassword = obj.password;
+        // oLiveView.iChannelID = 1;
+        oLiveView.iChannelID = Number(obj.monitorPoint);
+        login();
+      }
+      //WebVideoCtrl.I_ChangeWndNum(1);
       if (null !== obj) {
         oLiveView.szIP = obj.ip;
         oLiveView.szUsername = obj.username;
         oLiveView.szPassword = obj.password;
-        oLiveView.iChannelID = 1;
-        // oLiveView.iChannelID = obj.channel;
+        // oLiveView.iChannelID = 1;
+        oLiveView.iChannelID = Number(obj.monitorPoint);
       }
       const szDeviceIdentify = oLiveView.szIP + "_" + oLiveView.szPort;
 
-      alert(szDeviceIdentify);
+      console.log(szDeviceIdentify);
       console.log(oLiveView);
 
       setTimeout(function () {
@@ -175,11 +183,12 @@
     }
 
     var g_iSearchTimes = 0
+	var startInit
     function search(iType, startTime, endTime) {
       var szDeviceIdentify = oLiveView.szIP,
-        iChannelID = parseInt(oLiveView.iChannelID, 10),
+        iChannelID = oLiveView.iChannelID ,
         // bZeroChannel = $("#channels option").eq($("#channels").get(0).selectedIndex).attr("bZero") == "true" ? true : false,
-        iStreamType = parseInt(oLiveView.iStreamType, 10),
+        iStreamType = oLiveView.iStreamType,
         szStartTime = startTime,
         szEndTime = endTime;
 
@@ -194,8 +203,8 @@
       if (0 == iType) {// 首次搜索
         //$("#searchlist").empty();
         g_iSearchTimes = 0;
+		startInit = startTime;
       }
-
       WebVideoCtrl.I_RecordSearch(szDeviceIdentify, iChannelID, szStartTime, szEndTime, {
         iStreamType: iStreamType,
         iSearchPos: g_iSearchTimes * 40,
@@ -263,18 +272,18 @@
               $("#downloadTd" + (i + g_iSearchTimes * 40)).data("playbackURI", szPlaybackURI);
             }
             //showOPInfo(szDeviceIdentify + " 搜索录像文件成功！");
-            invockIframeMethod("0搜索录像文件成功！");
-            clickStartPlayback(szStartTime, szEndTime);
+            //invockIframeMethod("0搜索录像文件成功！");
+            clickStartPlayback(startInit, szEndTime);
           } else if("NO MATCHES" === $(xmlDoc).find("responseStatusStrg").eq(0).text()) {
             setTimeout(function() {
               //showOPInfo(szDeviceIdentify + " 没有录像文件！");
-              invockIframeMethod("1没有录像文件！");
+              //invockIframeMethod("1没有录像文件！");
             }, 50);
           }
         },
         error: function (status, xmlDoc) {
           //showOPInfo(szDeviceIdentify + " 搜索录像文件失败！", status, xmlDoc);
-          invockIframeMethod("-1搜索录像文件失败！");
+          //invockIframeMethod("-1搜索录像文件失败！");
         }
       });
     };
@@ -337,7 +346,7 @@
             success: function () {
               szInfo = "0开始回放成功！";
               //showOPInfo(szDeviceIdentify + " " + szInfo);
-              invockIframeMethod(szInfo);
+              //invockIframeMethod(szInfo);
             },
             error: function (status, xmlDoc) {
               if (403 === status) {
@@ -346,7 +355,7 @@
                 szInfo = "-1开始回放失败！";
               }
               //showOPInfo(szDeviceIdentify + " " + szInfo);
-              invockIframeMethod(szInfo);
+              //invockIframeMethod(szInfo);
             }
           });
         }
@@ -372,7 +381,7 @@
           success: function () {
             szInfo = "停止回放成功！";
             //showOPInfo(oWndInfo.szDeviceIdentify + " " + szInfo);
-            invockIframeMethod(szInfo);
+            //invockIframeMethod(szInfo);
           },
           error: function () {
             szInfo = "停止回放失败！";