diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue new file mode 100644 index 0000000..12a37c9 --- /dev/null +++ b/src/views/deviceManage/deviceList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue new file mode 100644 index 0000000..12a37c9 --- /dev/null +++ b/src/views/deviceManage/deviceList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/views/layout/SinglePageLayout.vue b/src/views/layout/SinglePageLayout.vue index 08bb15b..c6c7838 100644 --- a/src/views/layout/SinglePageLayout.vue +++ b/src/views/layout/SinglePageLayout.vue @@ -45,7 +45,14 @@ z-index: 999; } .el-scrollbar{ - /*height: calc(100vh - 80px);*/ + /*height: calc(100vh + 17px);*/ height: 100vh; } + + diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue new file mode 100644 index 0000000..12a37c9 --- /dev/null +++ b/src/views/deviceManage/deviceList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/views/layout/SinglePageLayout.vue b/src/views/layout/SinglePageLayout.vue index 08bb15b..c6c7838 100644 --- a/src/views/layout/SinglePageLayout.vue +++ b/src/views/layout/SinglePageLayout.vue @@ -45,7 +45,14 @@ z-index: 999; } .el-scrollbar{ - /*height: calc(100vh - 80px);*/ + /*height: calc(100vh + 17px);*/ height: 100vh; } + + diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 42b8746..2480ed2 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -381,11 +381,11 @@ this.$router.push({ path: '/staff/list' }) }) } else { - this.$message.fail(response.message) + this.$message.error(response.message) this.btnLoading = false } }).catch(() => { - this.$message.fail('保存失败，服务器异常') + this.$message.error('保存失败，服务器异常') }) } else { // updatePerson(this.personForm).then(response => { diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue new file mode 100644 index 0000000..12a37c9 --- /dev/null +++ b/src/views/deviceManage/deviceList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/views/layout/SinglePageLayout.vue b/src/views/layout/SinglePageLayout.vue index 08bb15b..c6c7838 100644 --- a/src/views/layout/SinglePageLayout.vue +++ b/src/views/layout/SinglePageLayout.vue @@ -45,7 +45,14 @@ z-index: 999; } .el-scrollbar{ - /*height: calc(100vh - 80px);*/ + /*height: calc(100vh + 17px);*/ height: 100vh; } + + diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 42b8746..2480ed2 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -381,11 +381,11 @@ this.$router.push({ path: '/staff/list' }) }) } else { - this.$message.fail(response.message) + this.$message.error(response.message) this.btnLoading = false } }).catch(() => { - this.$message.fail('保存失败，服务器异常') + this.$message.error('保存失败，服务器异常') }) } else { // updatePerson(this.personForm).then(response => { diff --git a/static/images/dashboard/bg-control.jpg b/static/images/dashboard/bg-control.jpg new file mode 100644 index 0000000..e56d0fe --- /dev/null +++ b/static/images/dashboard/bg-control.jpg Binary files differ diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue new file mode 100644 index 0000000..12a37c9 --- /dev/null +++ b/src/views/deviceManage/deviceList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/views/layout/SinglePageLayout.vue b/src/views/layout/SinglePageLayout.vue index 08bb15b..c6c7838 100644 --- a/src/views/layout/SinglePageLayout.vue +++ b/src/views/layout/SinglePageLayout.vue @@ -45,7 +45,14 @@ z-index: 999; } .el-scrollbar{ - /*height: calc(100vh - 80px);*/ + /*height: calc(100vh + 17px);*/ height: 100vh; } + + diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 42b8746..2480ed2 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -381,11 +381,11 @@ this.$router.push({ path: '/staff/list' }) }) } else { - this.$message.fail(response.message) + this.$message.error(response.message) this.btnLoading = false } }).catch(() => { - this.$message.fail('保存失败，服务器异常') + this.$message.error('保存失败，服务器异常') }) } else { // updatePerson(this.personForm).then(response => { diff --git a/static/images/dashboard/bg-control.jpg b/static/images/dashboard/bg-control.jpg new file mode 100644 index 0000000..e56d0fe --- /dev/null +++ b/static/images/dashboard/bg-control.jpg Binary files differ diff --git a/static/images/dashboard/bg-defence.jpg b/static/images/dashboard/bg-defence.jpg new file mode 100644 index 0000000..645a0d1 --- /dev/null +++ b/static/images/dashboard/bg-defence.jpg Binary files differ diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue new file mode 100644 index 0000000..12a37c9 --- /dev/null +++ b/src/views/deviceManage/deviceList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/views/layout/SinglePageLayout.vue b/src/views/layout/SinglePageLayout.vue index 08bb15b..c6c7838 100644 --- a/src/views/layout/SinglePageLayout.vue +++ b/src/views/layout/SinglePageLayout.vue @@ -45,7 +45,14 @@ z-index: 999; } .el-scrollbar{ - /*height: calc(100vh - 80px);*/ + /*height: calc(100vh + 17px);*/ height: 100vh; } + + diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 42b8746..2480ed2 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -381,11 +381,11 @@ this.$router.push({ path: '/staff/list' }) }) } else { - this.$message.fail(response.message) + this.$message.error(response.message) this.btnLoading = false } }).catch(() => { - this.$message.fail('保存失败，服务器异常') + this.$message.error('保存失败，服务器异常') }) } else { // updatePerson(this.personForm).then(response => { diff --git a/static/images/dashboard/bg-control.jpg b/static/images/dashboard/bg-control.jpg new file mode 100644 index 0000000..e56d0fe --- /dev/null +++ b/static/images/dashboard/bg-control.jpg Binary files differ diff --git a/static/images/dashboard/bg-defence.jpg b/static/images/dashboard/bg-defence.jpg new file mode 100644 index 0000000..645a0d1 --- /dev/null +++ b/static/images/dashboard/bg-defence.jpg Binary files differ diff --git a/static/images/dashboard/bg-door.jpg b/static/images/dashboard/bg-door.jpg new file mode 100644 index 0000000..7dbaee0 --- /dev/null +++ b/static/images/dashboard/bg-door.jpg Binary files differ diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue new file mode 100644 index 0000000..12a37c9 --- /dev/null +++ b/src/views/deviceManage/deviceList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/views/layout/SinglePageLayout.vue b/src/views/layout/SinglePageLayout.vue index 08bb15b..c6c7838 100644 --- a/src/views/layout/SinglePageLayout.vue +++ b/src/views/layout/SinglePageLayout.vue @@ -45,7 +45,14 @@ z-index: 999; } .el-scrollbar{ - /*height: calc(100vh - 80px);*/ + /*height: calc(100vh + 17px);*/ height: 100vh; } + + diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 42b8746..2480ed2 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -381,11 +381,11 @@ this.$router.push({ path: '/staff/list' }) }) } else { - this.$message.fail(response.message) + this.$message.error(response.message) this.btnLoading = false } }).catch(() => { - this.$message.fail('保存失败，服务器异常') + this.$message.error('保存失败，服务器异常') }) } else { // updatePerson(this.personForm).then(response => { diff --git a/static/images/dashboard/bg-control.jpg b/static/images/dashboard/bg-control.jpg new file mode 100644 index 0000000..e56d0fe --- /dev/null +++ b/static/images/dashboard/bg-control.jpg Binary files differ diff --git a/static/images/dashboard/bg-defence.jpg b/static/images/dashboard/bg-defence.jpg new file mode 100644 index 0000000..645a0d1 --- /dev/null +++ b/static/images/dashboard/bg-defence.jpg Binary files differ diff --git a/static/images/dashboard/bg-door.jpg b/static/images/dashboard/bg-door.jpg new file mode 100644 index 0000000..7dbaee0 --- /dev/null +++ b/static/images/dashboard/bg-door.jpg Binary files differ diff --git a/static/images/dashboard/bg-key.jpg b/static/images/dashboard/bg-key.jpg new file mode 100644 index 0000000..7cfe5de --- /dev/null +++ b/static/images/dashboard/bg-key.jpg Binary files differ diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue new file mode 100644 index 0000000..12a37c9 --- /dev/null +++ b/src/views/deviceManage/deviceList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/views/layout/SinglePageLayout.vue b/src/views/layout/SinglePageLayout.vue index 08bb15b..c6c7838 100644 --- a/src/views/layout/SinglePageLayout.vue +++ b/src/views/layout/SinglePageLayout.vue @@ -45,7 +45,14 @@ z-index: 999; } .el-scrollbar{ - /*height: calc(100vh - 80px);*/ + /*height: calc(100vh + 17px);*/ height: 100vh; } + + diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 42b8746..2480ed2 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -381,11 +381,11 @@ this.$router.push({ path: '/staff/list' }) }) } else { - this.$message.fail(response.message) + this.$message.error(response.message) this.btnLoading = false } }).catch(() => { - this.$message.fail('保存失败，服务器异常') + this.$message.error('保存失败，服务器异常') }) } else { // updatePerson(this.personForm).then(response => { diff --git a/static/images/dashboard/bg-control.jpg b/static/images/dashboard/bg-control.jpg new file mode 100644 index 0000000..e56d0fe --- /dev/null +++ b/static/images/dashboard/bg-control.jpg Binary files differ diff --git a/static/images/dashboard/bg-defence.jpg b/static/images/dashboard/bg-defence.jpg new file mode 100644 index 0000000..645a0d1 --- /dev/null +++ b/static/images/dashboard/bg-defence.jpg Binary files differ diff --git a/static/images/dashboard/bg-door.jpg b/static/images/dashboard/bg-door.jpg new file mode 100644 index 0000000..7dbaee0 --- /dev/null +++ b/static/images/dashboard/bg-door.jpg Binary files differ diff --git a/static/images/dashboard/bg-key.jpg b/static/images/dashboard/bg-key.jpg new file mode 100644 index 0000000..7cfe5de --- /dev/null +++ b/static/images/dashboard/bg-key.jpg Binary files differ diff --git a/static/images/dashboard/bg-region.jpg b/static/images/dashboard/bg-region.jpg new file mode 100644 index 0000000..7a430a0 --- /dev/null +++ b/static/images/dashboard/bg-region.jpg Binary files differ diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue new file mode 100644 index 0000000..12a37c9 --- /dev/null +++ b/src/views/deviceManage/deviceList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/views/layout/SinglePageLayout.vue b/src/views/layout/SinglePageLayout.vue index 08bb15b..c6c7838 100644 --- a/src/views/layout/SinglePageLayout.vue +++ b/src/views/layout/SinglePageLayout.vue @@ -45,7 +45,14 @@ z-index: 999; } .el-scrollbar{ - /*height: calc(100vh - 80px);*/ + /*height: calc(100vh + 17px);*/ height: 100vh; } + + diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 42b8746..2480ed2 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -381,11 +381,11 @@ this.$router.push({ path: '/staff/list' }) }) } else { - this.$message.fail(response.message) + this.$message.error(response.message) this.btnLoading = false } }).catch(() => { - this.$message.fail('保存失败，服务器异常') + this.$message.error('保存失败，服务器异常') }) } else { // updatePerson(this.personForm).then(response => { diff --git a/static/images/dashboard/bg-control.jpg b/static/images/dashboard/bg-control.jpg new file mode 100644 index 0000000..e56d0fe --- /dev/null +++ b/static/images/dashboard/bg-control.jpg Binary files differ diff --git a/static/images/dashboard/bg-defence.jpg b/static/images/dashboard/bg-defence.jpg new file mode 100644 index 0000000..645a0d1 --- /dev/null +++ b/static/images/dashboard/bg-defence.jpg Binary files differ diff --git a/static/images/dashboard/bg-door.jpg b/static/images/dashboard/bg-door.jpg new file mode 100644 index 0000000..7dbaee0 --- /dev/null +++ b/static/images/dashboard/bg-door.jpg Binary files differ diff --git a/static/images/dashboard/bg-key.jpg b/static/images/dashboard/bg-key.jpg new file mode 100644 index 0000000..7cfe5de --- /dev/null +++ b/static/images/dashboard/bg-key.jpg Binary files differ diff --git a/static/images/dashboard/bg-region.jpg b/static/images/dashboard/bg-region.jpg new file mode 100644 index 0000000..7a430a0 --- /dev/null +++ b/static/images/dashboard/bg-region.jpg Binary files differ diff --git a/static/images/dashboard/exit-logo.png b/static/images/dashboard/exit-logo.png new file mode 100644 index 0000000..88064a0 --- /dev/null +++ b/static/images/dashboard/exit-logo.png Binary files differ diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue new file mode 100644 index 0000000..12a37c9 --- /dev/null +++ b/src/views/deviceManage/deviceList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/views/layout/SinglePageLayout.vue b/src/views/layout/SinglePageLayout.vue index 08bb15b..c6c7838 100644 --- a/src/views/layout/SinglePageLayout.vue +++ b/src/views/layout/SinglePageLayout.vue @@ -45,7 +45,14 @@ z-index: 999; } .el-scrollbar{ - /*height: calc(100vh - 80px);*/ + /*height: calc(100vh + 17px);*/ height: 100vh; } + + diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 42b8746..2480ed2 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -381,11 +381,11 @@ this.$router.push({ path: '/staff/list' }) }) } else { - this.$message.fail(response.message) + this.$message.error(response.message) this.btnLoading = false } }).catch(() => { - this.$message.fail('保存失败，服务器异常') + this.$message.error('保存失败，服务器异常') }) } else { // updatePerson(this.personForm).then(response => { diff --git a/static/images/dashboard/bg-control.jpg b/static/images/dashboard/bg-control.jpg new file mode 100644 index 0000000..e56d0fe --- /dev/null +++ b/static/images/dashboard/bg-control.jpg Binary files differ diff --git a/static/images/dashboard/bg-defence.jpg b/static/images/dashboard/bg-defence.jpg new file mode 100644 index 0000000..645a0d1 --- /dev/null +++ b/static/images/dashboard/bg-defence.jpg Binary files differ diff --git a/static/images/dashboard/bg-door.jpg b/static/images/dashboard/bg-door.jpg new file mode 100644 index 0000000..7dbaee0 --- /dev/null +++ b/static/images/dashboard/bg-door.jpg Binary files differ diff --git a/static/images/dashboard/bg-key.jpg b/static/images/dashboard/bg-key.jpg new file mode 100644 index 0000000..7cfe5de --- /dev/null +++ b/static/images/dashboard/bg-key.jpg Binary files differ diff --git a/static/images/dashboard/bg-region.jpg b/static/images/dashboard/bg-region.jpg new file mode 100644 index 0000000..7a430a0 --- /dev/null +++ b/static/images/dashboard/bg-region.jpg Binary files differ diff --git a/static/images/dashboard/exit-logo.png b/static/images/dashboard/exit-logo.png new file mode 100644 index 0000000..88064a0 --- /dev/null +++ b/static/images/dashboard/exit-logo.png Binary files differ diff --git a/static/images/dashboard/icon-control.png b/static/images/dashboard/icon-control.png new file mode 100644 index 0000000..14d7ea8 --- /dev/null +++ b/static/images/dashboard/icon-control.png Binary files differ diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue new file mode 100644 index 0000000..12a37c9 --- /dev/null +++ b/src/views/deviceManage/deviceList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/views/layout/SinglePageLayout.vue b/src/views/layout/SinglePageLayout.vue index 08bb15b..c6c7838 100644 --- a/src/views/layout/SinglePageLayout.vue +++ b/src/views/layout/SinglePageLayout.vue @@ -45,7 +45,14 @@ z-index: 999; } .el-scrollbar{ - /*height: calc(100vh - 80px);*/ + /*height: calc(100vh + 17px);*/ height: 100vh; } + + diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 42b8746..2480ed2 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -381,11 +381,11 @@ this.$router.push({ path: '/staff/list' }) }) } else { - this.$message.fail(response.message) + this.$message.error(response.message) this.btnLoading = false } }).catch(() => { - this.$message.fail('保存失败，服务器异常') + this.$message.error('保存失败，服务器异常') }) } else { // updatePerson(this.personForm).then(response => { diff --git a/static/images/dashboard/bg-control.jpg b/static/images/dashboard/bg-control.jpg new file mode 100644 index 0000000..e56d0fe --- /dev/null +++ b/static/images/dashboard/bg-control.jpg Binary files differ diff --git a/static/images/dashboard/bg-defence.jpg b/static/images/dashboard/bg-defence.jpg new file mode 100644 index 0000000..645a0d1 --- /dev/null +++ b/static/images/dashboard/bg-defence.jpg Binary files differ diff --git a/static/images/dashboard/bg-door.jpg b/static/images/dashboard/bg-door.jpg new file mode 100644 index 0000000..7dbaee0 --- /dev/null +++ b/static/images/dashboard/bg-door.jpg Binary files differ diff --git a/static/images/dashboard/bg-key.jpg b/static/images/dashboard/bg-key.jpg new file mode 100644 index 0000000..7cfe5de --- /dev/null +++ b/static/images/dashboard/bg-key.jpg Binary files differ diff --git a/static/images/dashboard/bg-region.jpg b/static/images/dashboard/bg-region.jpg new file mode 100644 index 0000000..7a430a0 --- /dev/null +++ b/static/images/dashboard/bg-region.jpg Binary files differ diff --git a/static/images/dashboard/exit-logo.png b/static/images/dashboard/exit-logo.png new file mode 100644 index 0000000..88064a0 --- /dev/null +++ b/static/images/dashboard/exit-logo.png Binary files differ diff --git a/static/images/dashboard/icon-control.png b/static/images/dashboard/icon-control.png new file mode 100644 index 0000000..14d7ea8 --- /dev/null +++ b/static/images/dashboard/icon-control.png Binary files differ diff --git a/static/images/dashboard/icon-defence.png b/static/images/dashboard/icon-defence.png new file mode 100644 index 0000000..8069376 --- /dev/null +++ b/static/images/dashboard/icon-defence.png Binary files differ diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue new file mode 100644 index 0000000..12a37c9 --- /dev/null +++ b/src/views/deviceManage/deviceList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/views/layout/SinglePageLayout.vue b/src/views/layout/SinglePageLayout.vue index 08bb15b..c6c7838 100644 --- a/src/views/layout/SinglePageLayout.vue +++ b/src/views/layout/SinglePageLayout.vue @@ -45,7 +45,14 @@ z-index: 999; } .el-scrollbar{ - /*height: calc(100vh - 80px);*/ + /*height: calc(100vh + 17px);*/ height: 100vh; } + + diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 42b8746..2480ed2 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -381,11 +381,11 @@ this.$router.push({ path: '/staff/list' }) }) } else { - this.$message.fail(response.message) + this.$message.error(response.message) this.btnLoading = false } }).catch(() => { - this.$message.fail('保存失败，服务器异常') + this.$message.error('保存失败，服务器异常') }) } else { // updatePerson(this.personForm).then(response => { diff --git a/static/images/dashboard/bg-control.jpg b/static/images/dashboard/bg-control.jpg new file mode 100644 index 0000000..e56d0fe --- /dev/null +++ b/static/images/dashboard/bg-control.jpg Binary files differ diff --git a/static/images/dashboard/bg-defence.jpg b/static/images/dashboard/bg-defence.jpg new file mode 100644 index 0000000..645a0d1 --- /dev/null +++ b/static/images/dashboard/bg-defence.jpg Binary files differ diff --git a/static/images/dashboard/bg-door.jpg b/static/images/dashboard/bg-door.jpg new file mode 100644 index 0000000..7dbaee0 --- /dev/null +++ b/static/images/dashboard/bg-door.jpg Binary files differ diff --git a/static/images/dashboard/bg-key.jpg b/static/images/dashboard/bg-key.jpg new file mode 100644 index 0000000..7cfe5de --- /dev/null +++ b/static/images/dashboard/bg-key.jpg Binary files differ diff --git a/static/images/dashboard/bg-region.jpg b/static/images/dashboard/bg-region.jpg new file mode 100644 index 0000000..7a430a0 --- /dev/null +++ b/static/images/dashboard/bg-region.jpg Binary files differ diff --git a/static/images/dashboard/exit-logo.png b/static/images/dashboard/exit-logo.png new file mode 100644 index 0000000..88064a0 --- /dev/null +++ b/static/images/dashboard/exit-logo.png Binary files differ diff --git a/static/images/dashboard/icon-control.png b/static/images/dashboard/icon-control.png new file mode 100644 index 0000000..14d7ea8 --- /dev/null +++ b/static/images/dashboard/icon-control.png Binary files differ diff --git a/static/images/dashboard/icon-defence.png b/static/images/dashboard/icon-defence.png new file mode 100644 index 0000000..8069376 --- /dev/null +++ b/static/images/dashboard/icon-defence.png Binary files differ diff --git a/static/images/dashboard/icon-door.png b/static/images/dashboard/icon-door.png new file mode 100644 index 0000000..b60d277 --- /dev/null +++ b/static/images/dashboard/icon-door.png Binary files differ diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue new file mode 100644 index 0000000..12a37c9 --- /dev/null +++ b/src/views/deviceManage/deviceList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/views/layout/SinglePageLayout.vue b/src/views/layout/SinglePageLayout.vue index 08bb15b..c6c7838 100644 --- a/src/views/layout/SinglePageLayout.vue +++ b/src/views/layout/SinglePageLayout.vue @@ -45,7 +45,14 @@ z-index: 999; } .el-scrollbar{ - /*height: calc(100vh - 80px);*/ + /*height: calc(100vh + 17px);*/ height: 100vh; } + + diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 42b8746..2480ed2 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -381,11 +381,11 @@ this.$router.push({ path: '/staff/list' }) }) } else { - this.$message.fail(response.message) + this.$message.error(response.message) this.btnLoading = false } }).catch(() => { - this.$message.fail('保存失败，服务器异常') + this.$message.error('保存失败，服务器异常') }) } else { // updatePerson(this.personForm).then(response => { diff --git a/static/images/dashboard/bg-control.jpg b/static/images/dashboard/bg-control.jpg new file mode 100644 index 0000000..e56d0fe --- /dev/null +++ b/static/images/dashboard/bg-control.jpg Binary files differ diff --git a/static/images/dashboard/bg-defence.jpg b/static/images/dashboard/bg-defence.jpg new file mode 100644 index 0000000..645a0d1 --- /dev/null +++ b/static/images/dashboard/bg-defence.jpg Binary files differ diff --git a/static/images/dashboard/bg-door.jpg b/static/images/dashboard/bg-door.jpg new file mode 100644 index 0000000..7dbaee0 --- /dev/null +++ b/static/images/dashboard/bg-door.jpg Binary files differ diff --git a/static/images/dashboard/bg-key.jpg b/static/images/dashboard/bg-key.jpg new file mode 100644 index 0000000..7cfe5de --- /dev/null +++ b/static/images/dashboard/bg-key.jpg Binary files differ diff --git a/static/images/dashboard/bg-region.jpg b/static/images/dashboard/bg-region.jpg new file mode 100644 index 0000000..7a430a0 --- /dev/null +++ b/static/images/dashboard/bg-region.jpg Binary files differ diff --git a/static/images/dashboard/exit-logo.png b/static/images/dashboard/exit-logo.png new file mode 100644 index 0000000..88064a0 --- /dev/null +++ b/static/images/dashboard/exit-logo.png Binary files differ diff --git a/static/images/dashboard/icon-control.png b/static/images/dashboard/icon-control.png new file mode 100644 index 0000000..14d7ea8 --- /dev/null +++ b/static/images/dashboard/icon-control.png Binary files differ diff --git a/static/images/dashboard/icon-defence.png b/static/images/dashboard/icon-defence.png new file mode 100644 index 0000000..8069376 --- /dev/null +++ b/static/images/dashboard/icon-defence.png Binary files differ diff --git a/static/images/dashboard/icon-door.png b/static/images/dashboard/icon-door.png new file mode 100644 index 0000000..b60d277 --- /dev/null +++ b/static/images/dashboard/icon-door.png Binary files differ diff --git a/static/images/dashboard/icon-key.png b/static/images/dashboard/icon-key.png new file mode 100644 index 0000000..6ab3f9f --- /dev/null +++ b/static/images/dashboard/icon-key.png Binary files differ diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue new file mode 100644 index 0000000..12a37c9 --- /dev/null +++ b/src/views/deviceManage/deviceList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/views/layout/SinglePageLayout.vue b/src/views/layout/SinglePageLayout.vue index 08bb15b..c6c7838 100644 --- a/src/views/layout/SinglePageLayout.vue +++ b/src/views/layout/SinglePageLayout.vue @@ -45,7 +45,14 @@ z-index: 999; } .el-scrollbar{ - /*height: calc(100vh - 80px);*/ + /*height: calc(100vh + 17px);*/ height: 100vh; } + + diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 42b8746..2480ed2 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -381,11 +381,11 @@ this.$router.push({ path: '/staff/list' }) }) } else { - this.$message.fail(response.message) + this.$message.error(response.message) this.btnLoading = false } }).catch(() => { - this.$message.fail('保存失败，服务器异常') + this.$message.error('保存失败，服务器异常') }) } else { // updatePerson(this.personForm).then(response => { diff --git a/static/images/dashboard/bg-control.jpg b/static/images/dashboard/bg-control.jpg new file mode 100644 index 0000000..e56d0fe --- /dev/null +++ b/static/images/dashboard/bg-control.jpg Binary files differ diff --git a/static/images/dashboard/bg-defence.jpg b/static/images/dashboard/bg-defence.jpg new file mode 100644 index 0000000..645a0d1 --- /dev/null +++ b/static/images/dashboard/bg-defence.jpg Binary files differ diff --git a/static/images/dashboard/bg-door.jpg b/static/images/dashboard/bg-door.jpg new file mode 100644 index 0000000..7dbaee0 --- /dev/null +++ b/static/images/dashboard/bg-door.jpg Binary files differ diff --git a/static/images/dashboard/bg-key.jpg b/static/images/dashboard/bg-key.jpg new file mode 100644 index 0000000..7cfe5de --- /dev/null +++ b/static/images/dashboard/bg-key.jpg Binary files differ diff --git a/static/images/dashboard/bg-region.jpg b/static/images/dashboard/bg-region.jpg new file mode 100644 index 0000000..7a430a0 --- /dev/null +++ b/static/images/dashboard/bg-region.jpg Binary files differ diff --git a/static/images/dashboard/exit-logo.png b/static/images/dashboard/exit-logo.png new file mode 100644 index 0000000..88064a0 --- /dev/null +++ b/static/images/dashboard/exit-logo.png Binary files differ diff --git a/static/images/dashboard/icon-control.png b/static/images/dashboard/icon-control.png new file mode 100644 index 0000000..14d7ea8 --- /dev/null +++ b/static/images/dashboard/icon-control.png Binary files differ diff --git a/static/images/dashboard/icon-defence.png b/static/images/dashboard/icon-defence.png new file mode 100644 index 0000000..8069376 --- /dev/null +++ b/static/images/dashboard/icon-defence.png Binary files differ diff --git a/static/images/dashboard/icon-door.png b/static/images/dashboard/icon-door.png new file mode 100644 index 0000000..b60d277 --- /dev/null +++ b/static/images/dashboard/icon-door.png Binary files differ diff --git a/static/images/dashboard/icon-key.png b/static/images/dashboard/icon-key.png new file mode 100644 index 0000000..6ab3f9f --- /dev/null +++ b/static/images/dashboard/icon-key.png Binary files differ diff --git a/static/images/dashboard/icon-region.png b/static/images/dashboard/icon-region.png new file mode 100644 index 0000000..900174d --- /dev/null +++ b/static/images/dashboard/icon-region.png Binary files differ diff --git a/src/api/allDict.js b/src/api/allDict.js index 9fb5020..389c2b2 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -19,14 +19,6 @@ }) } -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} // 人员类别 export function getPersonType(params) { return request({ @@ -35,41 +27,6 @@ params }) } -// 采集状态 -export function getCollectState(params) { - return request({ - url: '/dict/code/collectState', - method: 'get', - params - }) -} - -// 证件类型 -export function getCardType(params) { - return request({ - url: '/dict/code/cardType', - method: 'get', - params - }) -} - -// 采集报警原因列表 -export function getCollAlarmReason(params) { - return request({ - url: '/dict/code/collAlarmReason', - method: 'get', - params - }) -} - -// 识别报警列表 -export function getRecAlarmReason(params) { - return request({ - url: '/dict/code/recAlarmReason', - method: 'get', - params - }) -} // 设备类型 export function getDeviceType(params) { @@ -80,20 +37,18 @@ }) } -// 获取控制器类型字典值 -export function getControllerType(params) { +// 区域防卫状态 +export function getAreaStatus() { return request({ - url: 'dict/code/controllerType', - method: 'get', - params + url: '/dict/code/areaStatus', + method: 'get' }) } -// 获取灯杆类型字典值 -export function getLamppostType(params) { +// 区域类别 +export function getAreaType() { return request({ - url: 'dict/code/lamppostType', - method: 'get', - params + url: '/dict/code/areaType', + method: 'get' }) } diff --git a/src/api/area.js b/src/api/area.js index cbabec7..e8217a4 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -2,7 +2,6 @@ * 区域管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 区域查询 export function getAreaList(params) { @@ -67,51 +66,29 @@ }) } -// 查询道路 -export function getStreet(params) { +// 查询区域 +export function getRegion(params) { return request({ - url: 'busBaseStreet/listPage', + url: 'region/listPage', method: 'get', params: params }) } -// 不分页查询所有道路 -export function getAllStreet(params) { +export function detailRegion(id) { return request({ - url: 'busBaseStreet/list', + url: 'region/detail/' + id, method: 'get', - params: params - }) -} - -// 删除道路 -export function delStreets(ids) { - return request({ - url: 'busBaseStreet/batchDelete', - method: 'post', - params: { - busBaseStreetIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -// 添加道路 -export function addStreet(params) { +// 区域布防撤防 +export function updateDefence(params) { return request({ - url: 'busBaseStreet/add', - method: 'post', - params - }) -} - -// 编辑道路 -export function updateStreet(params) { - return request({ - url: 'busBaseStreet/update', + url: 'region/update', method: 'post', params }) diff --git a/src/api/base.js b/src/api/base.js deleted file mode 100644 index 8b59c9f..0000000 --- a/src/api/base.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * 基础管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 路灯类型查询 -export function getLampType(params) { - return request({ - url: 'busBaseLamptype/listPage', - method: 'get', - params - }) -} -// 不分页查询所有路灯类型 -export function getAllLampType(params) { - return request({ - url: 'busBaseLamptype/list', - method: 'get', - params - }) -} -// 删除路灯类型 -export function delLampType(ids) { - return request({ - url: 'busBaseLamptype/batchDelete', - method: 'post', - params: { - busBaseLamptypeIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 添加路灯类型 -export function addLampType(params) { - return request({ - url: 'busBaseLamptype/add', - method: 'post', - params - }) -} -// 编辑路灯类型 -export function updateLampType(params) { - return request({ - url: 'busBaseLamptype/update', - method: 'post', - params - }) -} diff --git a/src/api/check.js b/src/api/check.js deleted file mode 100644 index 1b32e3c..0000000 --- a/src/api/check.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * 虹膜采集相关接口 - */ -import request from '@/utils/request' -// import qs from 'qs' -// 查询人员识别列表 -export function getRecognitionRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员识别详情 -export function getRecognitionDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} -// 人员识别 -export function recognize(data) { - return request({ - url: 'recognition/recognize', - method: 'post', - data - }) -} -// 查询人员采集列表 -export function getCollectRecords(params) { - return request({ - url: '/recognition/records', - method: 'get', - params - }) -} -// 查询人员采集列表 -export function getCollectDetail(params) { - return request({ - url: '/recognition/recordDetail', - method: 'get', - params - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addCollectLog(data) { - return request({ - url: 'irisDataLog/add', - method: 'post', - data - }) -} - -// 新增采集日志基础信息（第一步提交） -export function addIrisData(data) { - return request({ - url: 'irisData/add', - method: 'post', - data - }) -} diff --git a/src/api/device.js b/src/api/device.js index 4799445..b3a3f84 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -4,343 +4,22 @@ import request from '@/utils/request' import qs from 'qs' -/** - * 控制器接口 - */ -// 控制器查询 -export function getContrllerList(params) { +// 分页查询设备列表 +export function getDeviceList(params) { return request({ - url: '/busDeviceController/listPage', - method: 'get', - params - }) -} -// 查询可绑定的控制器 -export function listNoBindController(params) { - return request({ - url: '/busDeviceController/listNoBind', - method: 'get', - params - }) -} -// 添加控制器 -export function addController(params) { - return request({ - url: '/busDeviceController/add', - method: 'post', - params - }) -} -// 编辑控制器 -export function editController(params) { - return request({ - url: '/busDeviceController/update', - method: 'post', - params - }) -} -// 批量删除控制器 -export function batchDelController(ids) { - return request({ - url: 'busDeviceController/batchDelete', - method: 'post', - params: { - busDeviceControllerIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入控制器 -export function batchImportController(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'busDeviceController/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出控制器 -export function batchExportController(params) { - return request({ - url: 'busDeviceController/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} - -/** - * 灯杆接口 - */ -// 灯杆查询 -export function getLamppostList(params) { - return request({ - url: '/busDeviceLamppost/listPage', - method: 'get', - params - }) -} -// 添加灯杆 -export function addLamppost(params) { - return request({ - url: '/busDeviceLamppost/add', - method: 'post', - params - }) -} -// 编辑灯杆 -export function editLamppost(params) { - return request({ - url: '/busDeviceLamppost/update', - method: 'post', - params - }) -} -// 删除灯杆 -export function delLamppost(params) { - return request({ - url: '/busDeviceLamppost/delete', - method: 'post', - params - }) -} -// 批量删除灯杆 -export function batchDelLamppost(ids) { - return request({ - url: 'busDeviceLamppost/batchDelete', - method: 'post', - params: { - busDeviceLamppostIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导入灯杆 -export function batchImportLamppost(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出灯杆 -export function batchExportLamppost(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 查询未绑定的路灯杆 -export function listNoBindLamppost(params) { - return request({ - url: 'busDeviceLamppost/listNoBind', + url: '/device/listPage', method: 'get', params }) } -/** - * 路灯接口 - */ -// 路灯查询 -export function getLampList(params) { +// 设备详情 +export function getDetailDevice(id) { return request({ - url: '/busDeviceLamp/listPage', + url: '/device/detail/' + id, method: 'get', - params - }) -} -// 添加路灯 -export function addLamp(params) { - return request({ - url: '/busDeviceLamp/add', - method: 'post', - params - }) -} -// 编辑路灯 -export function editLamp(params) { - return request({ - url: '/busDeviceLamp/update', - method: 'post', - params - }) -} -// 批量删除路灯 -export function batchDelLamp(ids) { - return request({ - url: 'busDeviceLamp/batchDelete', - method: 'post', - params: { - busDeviceLampIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' } }) } -/** - * 灯箱接口 - */ -// 灯箱查询 -export function getLampboxList(params) { - return request({ - url: '/busDeviceLampbox/listPage', - method: 'get', - params - }) -} -// 查询所有灯箱 -export function getAllLampboxList(params) { - return request({ - url: '/busDeviceLampbox/list', - method: 'get', - params - }) -} -// 添加灯箱 -export function addLampbox(params) { - return request({ - url: '/busDeviceLampbox/add', - method: 'post', - params - }) -} -// 编辑灯箱 -export function editLampbox(params) { - return request({ - url: '/busDeviceLampbox/update', - method: 'post', - params - }) -} -// 批量删除灯箱 -export function batchDelLampbox(ids) { - return request({ - url: '/busDeviceLampbox/batchDelete', - method: 'post', - params: { - busDeviceLampboxIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -/** - * 回路接口 - */ -// 回路查询 -export function getCircuitList(params) { - return request({ - url: '/busDeviceCircuit/listPage', - method: 'get', - params - }) -} -// 查询所有回路 -export function getAllCircuitList(params) { - return request({ - url: '/busDeviceCircuit/list', - method: 'get', - params - }) -} -// 添加回路 -export function addCircuit(params) { - return request({ - url: '/busDeviceCircuit/add', - method: 'post', - params - }) -} -// 编辑回路 -export function editCircuit(params) { - return request({ - url: '/busDeviceCircuit/update', - method: 'post', - params - }) -} -// 批量删除回路 -export function batchDelCircuit(ids) { - return request({ - url: '/busDeviceCircuit/batchDelete', - method: 'post', - params: { - busDeviceCircuitIds: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} - -// 设备查询 -export function getDeviceListAll(params) { - return request({ - url: 'device/listAll', - method: 'get', - params - }) -} -// 添加设备 -export function addDevice(params) { - return request({ - url: '/irisDevice/addIrisDevice', - method: 'post', - params - }) -} -// 修改设备 -export function updateDevice(params) { - return request({ - url: '/irisDevice/editIrisDevice', - method: 'post', - params - }) -} -// 删除设备 -export function delDevice(id) { - return request({ - url: '/irisDevice/deleteIrisDevice', - method: 'post', - params: { - id: id - } - }) -} -// 批量导入 -export function batchImportDevice(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'device/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} -// 批量导出 -export function batchExportDevice(params) { - return request({ - url: 'device/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} diff --git a/src/api/person.js b/src/api/person.js deleted file mode 100644 index 0082fd3..0000000 --- a/src/api/person.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * 人员管理接口 - */ -import request from '@/utils/request' -import qs from 'qs' - -// 查询员工照片 -export function getPersonPhoto(personId) { - return request({ - url: '/person/getPhoto', - method: 'get', - params: { - personId: personId - } - }) -} - -// 查询员工列表 -export function getPersonListAll(params) { - return request({ - url: '/person/list', - method: 'get', - params - }) -} - -// 查询员工列表 -export function getPersonList(params) { - return request({ - url: '/person/irisListPage', - method: 'get', - params - }) -} -// 查询访客列表 -export function getVisitorList(params) { - return request({ - url: '/person/visitorListPage', - method: 'get', - params - }) -} - -// 性别 -export function getSexType(params) { - return request({ - url: '/dict/code/sysSex', - method: 'get', - params - }) -} -// 业务类型 -export function getDutyType(params) { - return request({ - url: '/dict/code/dutyType', - method: 'get', - params - }) -} -// 民族 -export function getNationType(params) { - return request({ - url: '/dict/code/nationType', - method: 'get', - params - }) -} - - -// 人员详情 -export function personInfo(id) { - return request({ - url: '/person/detail/' + id, - method: 'get' - }) -} -// 修改人员 -export function updatePerson(data) { - return request({ - url: 'person/irisUpdate', - method: 'post', - data - }) -} -// 删除人员 -export function delPerson(ids) { - return request({ - url: 'person/batchIrisDelete', - method: 'post', - params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } - }) -} -// 批量导出 -export function batchExportPerson(params) { - return request({ - url: 'person/batchExport', - method: 'get', - timeout: 120000, - params, - responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob - }) -} -// 批量导入 -export function batchImportPerson(fileobj) { - const param = new FormData() - param.append('file', fileobj) - return request({ - url: 'person/batchImport', - method: 'post', - headers: { 'Content-Type': 'multipart/form-data' }, - data: param - }) -} - -export function saveIris(params) { - const formData = new FormData() - formData.append('image_zy0', params.image_zy0) - formData.append('image_zy1', params.image_zy1) - formData.append('image_yy0', params.image_yy0) - formData.append('image_yy1', params.image_zy0) - formData.append('personId', params.personId) - formData.append('idCardNo', params.idCardNo) - return request({ - url: 'irisData/add', - method: 'post', - headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, - data: formData - }) -} diff --git a/src/icons/svg/icon-area.svg b/src/icons/svg/icon-area.svg new file mode 100644 index 0000000..23f1b41 --- /dev/null +++ b/src/icons/svg/icon-area.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 819c610..ff091f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,14 @@ Vue.use(Router) /* Layout */ -import Layout from '../views/layout/Layout' +import Layout from '@/views/layout/Layout' +import SinglePageLayout from '@/views/layout/SinglePageLayout' import { systemRouters } from './modules/system' import { deviceRouters } from './modules/device' import { staffRouters } from './modules/staff' import { carRouters } from './modules/car' import { visitorRouters } from './modules/visitor' +import { areaRouters } from './modules/area' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * alwaysShow: true if set true, will always show the root menu, whatever its child routes length @@ -50,14 +52,14 @@ // 主页 { path: '/', - component: Layout, - redirect: 'dashboard', - name: 'Dashboard1', + component: SinglePageLayout, + redirect: 'portal', + name: 'Portal1', // hidden: true, children: [{ - path: 'dashboard', - name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + path: 'portal', + name: 'Portal', + component: () => import('@/views/dashboard/portal'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } @@ -76,6 +78,7 @@ ...staffRouters, ...carRouters, ...visitorRouters, + ...areaRouters, ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/area.js b/src/router/modules/area.js new file mode 100644 index 0000000..7b02617 --- /dev/null +++ b/src/router/modules/area.js @@ -0,0 +1,32 @@ +// 区域管理部分路由 +/* Layout */ +import Layout from '../../views/layout/Layout' + +export const areaRouters = [ + { + path: 'area', + component: Layout, + redirect: '/area', + name: 'Area', + alwaysShow: true, + meta: { + title: '区域管理', + icon: 'icon-area', // 图标 + permission: ['/area']// 权限名称 + }, + children: [ + { + path: '/area/list', + name: 'AreaList', + component: () => import('@/views/area/areaList'), + meta: { title: '区域列表', icon: '', permission: ['/area/list'], keepAlive: true } + }, + { + path: '/area/defenceList', + name: 'DefenceList', + component: () => import('@/views/area/defenceList'), + meta: { title: '车辆登记', icon: '', permission: ['/area/defenceList'], keepAlive: true } + } + ] + } +] diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 3571611..b020020 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -60,18 +60,6 @@ component: () => import('@/views/system/log/loginLog'), // Parent router-view name: 'LoginLog', meta: { title: '登录日志', permission: ['/loginLog'] } - }, - { - path: '/streetList', - component: () => import('@/views/base/street/streetList'), - name: 'StreetList', - meta: { title: '道路管理', permission: ['/streetList'] } - }, - { - path: '/lampTypeList', - component: () => import('@/views/base/lampType/lampTypeList'), - name: 'LampTypeList', - meta: { title: '路灯类型', permission: ['/lampTypeList'] } } ] } diff --git a/src/views/area/areaList.vue b/src/views/area/areaList.vue new file mode 100644 index 0000000..f31a3de --- /dev/null +++ b/src/views/area/areaList.vue @@ -0,0 +1,250 @@ + + + + + + diff --git a/src/views/area/defenceDetail.vue b/src/views/area/defenceDetail.vue new file mode 100644 index 0000000..e29a258 --- /dev/null +++ b/src/views/area/defenceDetail.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/area/defenceList.vue b/src/views/area/defenceList.vue new file mode 100644 index 0000000..9e16aa8 --- /dev/null +++ b/src/views/area/defenceList.vue @@ -0,0 +1,272 @@ + + + + + + diff --git a/src/views/dashboard/portal.vue b/src/views/dashboard/portal.vue new file mode 100644 index 0000000..c199a38 --- /dev/null +++ b/src/views/dashboard/portal.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/deviceManage/deviceDetail.vue b/src/views/deviceManage/deviceDetail.vue new file mode 100644 index 0000000..9896899 --- /dev/null +++ b/src/views/deviceManage/deviceDetail.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/deviceManage/deviceList.vue b/src/views/deviceManage/deviceList.vue new file mode 100644 index 0000000..12a37c9 --- /dev/null +++ b/src/views/deviceManage/deviceList.vue @@ -0,0 +1,269 @@ + + + + + + diff --git a/src/views/layout/SinglePageLayout.vue b/src/views/layout/SinglePageLayout.vue index 08bb15b..c6c7838 100644 --- a/src/views/layout/SinglePageLayout.vue +++ b/src/views/layout/SinglePageLayout.vue @@ -45,7 +45,14 @@ z-index: 999; } .el-scrollbar{ - /*height: calc(100vh - 80px);*/ + /*height: calc(100vh + 17px);*/ height: 100vh; } + + diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 42b8746..2480ed2 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -381,11 +381,11 @@ this.$router.push({ path: '/staff/list' }) }) } else { - this.$message.fail(response.message) + this.$message.error(response.message) this.btnLoading = false } }).catch(() => { - this.$message.fail('保存失败，服务器异常') + this.$message.error('保存失败，服务器异常') }) } else { // updatePerson(this.personForm).then(response => { diff --git a/static/images/dashboard/bg-control.jpg b/static/images/dashboard/bg-control.jpg new file mode 100644 index 0000000..e56d0fe --- /dev/null +++ b/static/images/dashboard/bg-control.jpg Binary files differ diff --git a/static/images/dashboard/bg-defence.jpg b/static/images/dashboard/bg-defence.jpg new file mode 100644 index 0000000..645a0d1 --- /dev/null +++ b/static/images/dashboard/bg-defence.jpg Binary files differ diff --git a/static/images/dashboard/bg-door.jpg b/static/images/dashboard/bg-door.jpg new file mode 100644 index 0000000..7dbaee0 --- /dev/null +++ b/static/images/dashboard/bg-door.jpg Binary files differ diff --git a/static/images/dashboard/bg-key.jpg b/static/images/dashboard/bg-key.jpg new file mode 100644 index 0000000..7cfe5de --- /dev/null +++ b/static/images/dashboard/bg-key.jpg Binary files differ diff --git a/static/images/dashboard/bg-region.jpg b/static/images/dashboard/bg-region.jpg new file mode 100644 index 0000000..7a430a0 --- /dev/null +++ b/static/images/dashboard/bg-region.jpg Binary files differ diff --git a/static/images/dashboard/exit-logo.png b/static/images/dashboard/exit-logo.png new file mode 100644 index 0000000..88064a0 --- /dev/null +++ b/static/images/dashboard/exit-logo.png Binary files differ diff --git a/static/images/dashboard/icon-control.png b/static/images/dashboard/icon-control.png new file mode 100644 index 0000000..14d7ea8 --- /dev/null +++ b/static/images/dashboard/icon-control.png Binary files differ diff --git a/static/images/dashboard/icon-defence.png b/static/images/dashboard/icon-defence.png new file mode 100644 index 0000000..8069376 --- /dev/null +++ b/static/images/dashboard/icon-defence.png Binary files differ diff --git a/static/images/dashboard/icon-door.png b/static/images/dashboard/icon-door.png new file mode 100644 index 0000000..b60d277 --- /dev/null +++ b/static/images/dashboard/icon-door.png Binary files differ diff --git a/static/images/dashboard/icon-key.png b/static/images/dashboard/icon-key.png new file mode 100644 index 0000000..6ab3f9f --- /dev/null +++ b/static/images/dashboard/icon-key.png Binary files differ diff --git a/static/images/dashboard/icon-region.png b/static/images/dashboard/icon-region.png new file mode 100644 index 0000000..900174d --- /dev/null +++ b/static/images/dashboard/icon-region.png Binary files differ diff --git a/static/images/dashboard/icon-title.png b/static/images/dashboard/icon-title.png new file mode 100644 index 0000000..bc7467f --- /dev/null +++ b/static/images/dashboard/icon-title.png Binary files differ