diff --git a/config/dev.env.js b/config/dev.env.js index 095ba33..6227232 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://192.168.5.220:20311"' BASE_API: '"http://111.198.10.15:11631"' // BASE_API: '"http://192.168.5.220:20311"' }) diff --git a/config/dev.env.js b/config/dev.env.js index 095ba33..6227232 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://192.168.5.220:20311"' BASE_API: '"http://111.198.10.15:11631"' // BASE_API: '"http://192.168.5.220:20311"' }) diff --git a/config/prod.env.js b/config/prod.env.js index ccbc615..2c3f8be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://192.168.5.220:20311"' - BASE_API: '"http://111.198.10.15:11631"' + BASE_API: '"http://192.168.5.220:20311"' + // BASE_API: '"http://111.198.10.15:11631"' } diff --git a/config/dev.env.js b/config/dev.env.js index 095ba33..6227232 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://192.168.5.220:20311"' BASE_API: '"http://111.198.10.15:11631"' // BASE_API: '"http://192.168.5.220:20311"' }) diff --git a/config/prod.env.js b/config/prod.env.js index ccbc615..2c3f8be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://192.168.5.220:20311"' - BASE_API: '"http://111.198.10.15:11631"' + BASE_API: '"http://192.168.5.220:20311"' + // BASE_API: '"http://111.198.10.15:11631"' } diff --git a/src/api/alarm.js b/src/api/alarm.js index c1bbe3e..2966273 100644 --- a/src/api/alarm.js +++ b/src/api/alarm.js @@ -16,6 +16,15 @@ } }) } +export function getAlarmContent(areaTypeId) { + return request({ + url: '/alarm/getAlarmContentByAreaType', + method: 'get', + params:{ + areaType: areaTypeId + } + }) +} // 查询历史报警记录 export function getAlarmList(params) { diff --git a/config/dev.env.js b/config/dev.env.js index 095ba33..6227232 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://192.168.5.220:20311"' BASE_API: '"http://111.198.10.15:11631"' // BASE_API: '"http://192.168.5.220:20311"' }) diff --git a/config/prod.env.js b/config/prod.env.js index ccbc615..2c3f8be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://192.168.5.220:20311"' - BASE_API: '"http://111.198.10.15:11631"' + BASE_API: '"http://192.168.5.220:20311"' + // BASE_API: '"http://111.198.10.15:11631"' } diff --git a/src/api/alarm.js b/src/api/alarm.js index c1bbe3e..2966273 100644 --- a/src/api/alarm.js +++ b/src/api/alarm.js @@ -16,6 +16,15 @@ } }) } +export function getAlarmContent(areaTypeId) { + return request({ + url: '/alarm/getAlarmContentByAreaType', + method: 'get', + params:{ + areaType: areaTypeId + } + }) +} // 查询历史报警记录 export function getAlarmList(params) { diff --git a/src/api/allDict.js b/src/api/allDict.js index e7f9bc8..fa7173d 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -11,6 +11,20 @@ }) } +export function getStaffTypeList(params) { + return request({ + url: '/dict/code/staffType', + method: 'get', + params + }) +} +export function getCarCardTypeList(params) { + return request({ + url: '/dict/code/carCardType ', + method: 'get', + params + }) +} export function getCarProperty(params) { return request({ url: '/dict/code/carProperty', diff --git a/config/dev.env.js b/config/dev.env.js index 095ba33..6227232 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://192.168.5.220:20311"' BASE_API: '"http://111.198.10.15:11631"' // BASE_API: '"http://192.168.5.220:20311"' }) diff --git a/config/prod.env.js b/config/prod.env.js index ccbc615..2c3f8be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://192.168.5.220:20311"' - BASE_API: '"http://111.198.10.15:11631"' + BASE_API: '"http://192.168.5.220:20311"' + // BASE_API: '"http://111.198.10.15:11631"' } diff --git a/src/api/alarm.js b/src/api/alarm.js index c1bbe3e..2966273 100644 --- a/src/api/alarm.js +++ b/src/api/alarm.js @@ -16,6 +16,15 @@ } }) } +export function getAlarmContent(areaTypeId) { + return request({ + url: '/alarm/getAlarmContentByAreaType', + method: 'get', + params:{ + areaType: areaTypeId + } + }) +} // 查询历史报警记录 export function getAlarmList(params) { diff --git a/src/api/allDict.js b/src/api/allDict.js index e7f9bc8..fa7173d 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -11,6 +11,20 @@ }) } +export function getStaffTypeList(params) { + return request({ + url: '/dict/code/staffType', + method: 'get', + params + }) +} +export function getCarCardTypeList(params) { + return request({ + url: '/dict/code/carCardType ', + method: 'get', + params + }) +} export function getCarProperty(params) { return request({ url: '/dict/code/carProperty', diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index d7f558c..93d28d5 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index 095ba33..6227232 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://192.168.5.220:20311"' BASE_API: '"http://111.198.10.15:11631"' // BASE_API: '"http://192.168.5.220:20311"' }) diff --git a/config/prod.env.js b/config/prod.env.js index ccbc615..2c3f8be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://192.168.5.220:20311"' - BASE_API: '"http://111.198.10.15:11631"' + BASE_API: '"http://192.168.5.220:20311"' + // BASE_API: '"http://111.198.10.15:11631"' } diff --git a/src/api/alarm.js b/src/api/alarm.js index c1bbe3e..2966273 100644 --- a/src/api/alarm.js +++ b/src/api/alarm.js @@ -16,6 +16,15 @@ } }) } +export function getAlarmContent(areaTypeId) { + return request({ + url: '/alarm/getAlarmContentByAreaType', + method: 'get', + params:{ + areaType: areaTypeId + } + }) +} // 查询历史报警记录 export function getAlarmList(params) { diff --git a/src/api/allDict.js b/src/api/allDict.js index e7f9bc8..fa7173d 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -11,6 +11,20 @@ }) } +export function getStaffTypeList(params) { + return request({ + url: '/dict/code/staffType', + method: 'get', + params + }) +} +export function getCarCardTypeList(params) { + return request({ + url: '/dict/code/carCardType ', + method: 'get', + params + }) +} export function getCarProperty(params) { return request({ url: '/dict/code/carProperty', diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index d7f558c..93d28d5 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2956a74..0fdd2d8 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -96,7 +96,7 @@ import { getAlarmList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmDetail from '@/views/alarm/alarmDetail' @@ -244,7 +244,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/config/dev.env.js b/config/dev.env.js index 095ba33..6227232 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://192.168.5.220:20311"' BASE_API: '"http://111.198.10.15:11631"' // BASE_API: '"http://192.168.5.220:20311"' }) diff --git a/config/prod.env.js b/config/prod.env.js index ccbc615..2c3f8be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://192.168.5.220:20311"' - BASE_API: '"http://111.198.10.15:11631"' + BASE_API: '"http://192.168.5.220:20311"' + // BASE_API: '"http://111.198.10.15:11631"' } diff --git a/src/api/alarm.js b/src/api/alarm.js index c1bbe3e..2966273 100644 --- a/src/api/alarm.js +++ b/src/api/alarm.js @@ -16,6 +16,15 @@ } }) } +export function getAlarmContent(areaTypeId) { + return request({ + url: '/alarm/getAlarmContentByAreaType', + method: 'get', + params:{ + areaType: areaTypeId + } + }) +} // 查询历史报警记录 export function getAlarmList(params) { diff --git a/src/api/allDict.js b/src/api/allDict.js index e7f9bc8..fa7173d 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -11,6 +11,20 @@ }) } +export function getStaffTypeList(params) { + return request({ + url: '/dict/code/staffType', + method: 'get', + params + }) +} +export function getCarCardTypeList(params) { + return request({ + url: '/dict/code/carCardType ', + method: 'get', + params + }) +} export function getCarProperty(params) { return request({ url: '/dict/code/carProperty', diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index d7f558c..93d28d5 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2956a74..0fdd2d8 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -96,7 +96,7 @@ import { getAlarmList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmDetail from '@/views/alarm/alarmDetail' @@ -244,7 +244,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 1b5efe8..3c053ea 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -97,7 +97,7 @@ import { getAlarmNowList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmCancel from '@/views/alarm/alarmCancel' @@ -237,7 +237,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/config/dev.env.js b/config/dev.env.js index 095ba33..6227232 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://192.168.5.220:20311"' BASE_API: '"http://111.198.10.15:11631"' // BASE_API: '"http://192.168.5.220:20311"' }) diff --git a/config/prod.env.js b/config/prod.env.js index ccbc615..2c3f8be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://192.168.5.220:20311"' - BASE_API: '"http://111.198.10.15:11631"' + BASE_API: '"http://192.168.5.220:20311"' + // BASE_API: '"http://111.198.10.15:11631"' } diff --git a/src/api/alarm.js b/src/api/alarm.js index c1bbe3e..2966273 100644 --- a/src/api/alarm.js +++ b/src/api/alarm.js @@ -16,6 +16,15 @@ } }) } +export function getAlarmContent(areaTypeId) { + return request({ + url: '/alarm/getAlarmContentByAreaType', + method: 'get', + params:{ + areaType: areaTypeId + } + }) +} // 查询历史报警记录 export function getAlarmList(params) { diff --git a/src/api/allDict.js b/src/api/allDict.js index e7f9bc8..fa7173d 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -11,6 +11,20 @@ }) } +export function getStaffTypeList(params) { + return request({ + url: '/dict/code/staffType', + method: 'get', + params + }) +} +export function getCarCardTypeList(params) { + return request({ + url: '/dict/code/carCardType ', + method: 'get', + params + }) +} export function getCarProperty(params) { return request({ url: '/dict/code/carProperty', diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index d7f558c..93d28d5 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2956a74..0fdd2d8 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -96,7 +96,7 @@ import { getAlarmList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmDetail from '@/views/alarm/alarmDetail' @@ -244,7 +244,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 1b5efe8..3c053ea 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -97,7 +97,7 @@ import { getAlarmNowList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmCancel from '@/views/alarm/alarmCancel' @@ -237,7 +237,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index 5f54c93..afdeae8 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -9,6 +9,17 @@ + + + + + + + + + + + {{ item.name }} @@ -16,8 +27,7 @@ - - + @@ -27,7 +37,7 @@ - + @@ -43,6 +53,11 @@ + + + + + @@ -66,6 +81,7 @@ import { addCar, editCar } from '@/api/car' import { phoneValidator, plateValidator } from '@/utils/validate' import { getDeptTreeList } from '@/api/dept' +import { getCarCardTypeList } from '@/api/allDict' export default { name: 'CarAdd', components: { DeptSelect }, @@ -80,6 +96,8 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', + carCardType: '', remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -97,6 +115,7 @@ carProperties: [], // 车辆性质字典值 staffList: [], // 车主人员列表 deptList: [], + carTypeList: [], isEditMode: false, // 是否编辑模式 isDetailMode: false, // 是否详情模式 btnLoading: true // 保存按钮是否不允许点击 @@ -109,6 +128,7 @@ resetOwner(){ if(this.dataForm.property!=='2'){ this.dataForm.ownerId = '' + this.dataForm.deptid = '' // this.dataForm.phone = '' } }, @@ -128,6 +148,7 @@ this.resetForm() this.isEditMode = false this.isDetailMode = false + this.dataForm.property = '1' this.$nextTick(() => { this.$refs['dataForm'].clearValidate() }) @@ -142,6 +163,7 @@ deptid: row.deptid, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, remark: row.remark } getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { @@ -158,6 +180,8 @@ property: row.property, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, + deptid: row.deptid, remark: row.remark, deptName: row.deptName, ownerName: row.ownerName @@ -177,6 +201,7 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', // 车主联系电话 remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -197,6 +222,9 @@ this.staffList = response.data console.log(response) }) + getCarCardTypeList().then(response => { + this.carTypeList = response.data + }) }, getStaffList(){ this.dataForm.ownerId = '' @@ -214,9 +242,11 @@ } }) this.dataForm.phone = selectedStaff[0].phone + this.dataForm.phone2 = selectedStaff[0].phone2 this.dataForm.deptid = selectedStaff[0].deptid } else { this.dataForm.phone = '' + this.dataForm.phone2 = '' } }, // 保存数据 diff --git a/config/dev.env.js b/config/dev.env.js index 095ba33..6227232 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://192.168.5.220:20311"' BASE_API: '"http://111.198.10.15:11631"' // BASE_API: '"http://192.168.5.220:20311"' }) diff --git a/config/prod.env.js b/config/prod.env.js index ccbc615..2c3f8be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://192.168.5.220:20311"' - BASE_API: '"http://111.198.10.15:11631"' + BASE_API: '"http://192.168.5.220:20311"' + // BASE_API: '"http://111.198.10.15:11631"' } diff --git a/src/api/alarm.js b/src/api/alarm.js index c1bbe3e..2966273 100644 --- a/src/api/alarm.js +++ b/src/api/alarm.js @@ -16,6 +16,15 @@ } }) } +export function getAlarmContent(areaTypeId) { + return request({ + url: '/alarm/getAlarmContentByAreaType', + method: 'get', + params:{ + areaType: areaTypeId + } + }) +} // 查询历史报警记录 export function getAlarmList(params) { diff --git a/src/api/allDict.js b/src/api/allDict.js index e7f9bc8..fa7173d 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -11,6 +11,20 @@ }) } +export function getStaffTypeList(params) { + return request({ + url: '/dict/code/staffType', + method: 'get', + params + }) +} +export function getCarCardTypeList(params) { + return request({ + url: '/dict/code/carCardType ', + method: 'get', + params + }) +} export function getCarProperty(params) { return request({ url: '/dict/code/carProperty', diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index d7f558c..93d28d5 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2956a74..0fdd2d8 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -96,7 +96,7 @@ import { getAlarmList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmDetail from '@/views/alarm/alarmDetail' @@ -244,7 +244,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 1b5efe8..3c053ea 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -97,7 +97,7 @@ import { getAlarmNowList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmCancel from '@/views/alarm/alarmCancel' @@ -237,7 +237,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index 5f54c93..afdeae8 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -9,6 +9,17 @@ + + + + + + + + + + + {{ item.name }} @@ -16,8 +27,7 @@ - - + @@ -27,7 +37,7 @@ - + @@ -43,6 +53,11 @@ + + + + + @@ -66,6 +81,7 @@ import { addCar, editCar } from '@/api/car' import { phoneValidator, plateValidator } from '@/utils/validate' import { getDeptTreeList } from '@/api/dept' +import { getCarCardTypeList } from '@/api/allDict' export default { name: 'CarAdd', components: { DeptSelect }, @@ -80,6 +96,8 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', + carCardType: '', remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -97,6 +115,7 @@ carProperties: [], // 车辆性质字典值 staffList: [], // 车主人员列表 deptList: [], + carTypeList: [], isEditMode: false, // 是否编辑模式 isDetailMode: false, // 是否详情模式 btnLoading: true // 保存按钮是否不允许点击 @@ -109,6 +128,7 @@ resetOwner(){ if(this.dataForm.property!=='2'){ this.dataForm.ownerId = '' + this.dataForm.deptid = '' // this.dataForm.phone = '' } }, @@ -128,6 +148,7 @@ this.resetForm() this.isEditMode = false this.isDetailMode = false + this.dataForm.property = '1' this.$nextTick(() => { this.$refs['dataForm'].clearValidate() }) @@ -142,6 +163,7 @@ deptid: row.deptid, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, remark: row.remark } getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { @@ -158,6 +180,8 @@ property: row.property, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, + deptid: row.deptid, remark: row.remark, deptName: row.deptName, ownerName: row.ownerName @@ -177,6 +201,7 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', // 车主联系电话 remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -197,6 +222,9 @@ this.staffList = response.data console.log(response) }) + getCarCardTypeList().then(response => { + this.carTypeList = response.data + }) }, getStaffList(){ this.dataForm.ownerId = '' @@ -214,9 +242,11 @@ } }) this.dataForm.phone = selectedStaff[0].phone + this.dataForm.phone2 = selectedStaff[0].phone2 this.dataForm.deptid = selectedStaff[0].deptid } else { this.dataForm.phone = '' + this.dataForm.phone2 = '' } }, // 保存数据 diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index 4ff07ab..e7223de 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -103,17 +103,29 @@ { text: '车辆性质', value: 'propertyStr', + align: 'center', + width: 140 + }, + { + text: '车证种类', + value: 'carCardTypeName', align: 'center' }, { text: '车主姓名', value: 'ownerName', - align: 'center' + align: 'center', + width: 140 }, { text: '车主联系电话', value: 'phone', align: 'center' + }, + { + text: '备用电话', + value: 'phone2', + align: 'center' } ], // 显示列 list: [], // 列表数据 diff --git a/config/dev.env.js b/config/dev.env.js index 095ba33..6227232 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://192.168.5.220:20311"' BASE_API: '"http://111.198.10.15:11631"' // BASE_API: '"http://192.168.5.220:20311"' }) diff --git a/config/prod.env.js b/config/prod.env.js index ccbc615..2c3f8be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://192.168.5.220:20311"' - BASE_API: '"http://111.198.10.15:11631"' + BASE_API: '"http://192.168.5.220:20311"' + // BASE_API: '"http://111.198.10.15:11631"' } diff --git a/src/api/alarm.js b/src/api/alarm.js index c1bbe3e..2966273 100644 --- a/src/api/alarm.js +++ b/src/api/alarm.js @@ -16,6 +16,15 @@ } }) } +export function getAlarmContent(areaTypeId) { + return request({ + url: '/alarm/getAlarmContentByAreaType', + method: 'get', + params:{ + areaType: areaTypeId + } + }) +} // 查询历史报警记录 export function getAlarmList(params) { diff --git a/src/api/allDict.js b/src/api/allDict.js index e7f9bc8..fa7173d 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -11,6 +11,20 @@ }) } +export function getStaffTypeList(params) { + return request({ + url: '/dict/code/staffType', + method: 'get', + params + }) +} +export function getCarCardTypeList(params) { + return request({ + url: '/dict/code/carCardType ', + method: 'get', + params + }) +} export function getCarProperty(params) { return request({ url: '/dict/code/carProperty', diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index d7f558c..93d28d5 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2956a74..0fdd2d8 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -96,7 +96,7 @@ import { getAlarmList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmDetail from '@/views/alarm/alarmDetail' @@ -244,7 +244,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 1b5efe8..3c053ea 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -97,7 +97,7 @@ import { getAlarmNowList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmCancel from '@/views/alarm/alarmCancel' @@ -237,7 +237,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index 5f54c93..afdeae8 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -9,6 +9,17 @@ + + + + + + + + + + + {{ item.name }} @@ -16,8 +27,7 @@ - - + @@ -27,7 +37,7 @@ - + @@ -43,6 +53,11 @@ + + + + + @@ -66,6 +81,7 @@ import { addCar, editCar } from '@/api/car' import { phoneValidator, plateValidator } from '@/utils/validate' import { getDeptTreeList } from '@/api/dept' +import { getCarCardTypeList } from '@/api/allDict' export default { name: 'CarAdd', components: { DeptSelect }, @@ -80,6 +96,8 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', + carCardType: '', remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -97,6 +115,7 @@ carProperties: [], // 车辆性质字典值 staffList: [], // 车主人员列表 deptList: [], + carTypeList: [], isEditMode: false, // 是否编辑模式 isDetailMode: false, // 是否详情模式 btnLoading: true // 保存按钮是否不允许点击 @@ -109,6 +128,7 @@ resetOwner(){ if(this.dataForm.property!=='2'){ this.dataForm.ownerId = '' + this.dataForm.deptid = '' // this.dataForm.phone = '' } }, @@ -128,6 +148,7 @@ this.resetForm() this.isEditMode = false this.isDetailMode = false + this.dataForm.property = '1' this.$nextTick(() => { this.$refs['dataForm'].clearValidate() }) @@ -142,6 +163,7 @@ deptid: row.deptid, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, remark: row.remark } getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { @@ -158,6 +180,8 @@ property: row.property, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, + deptid: row.deptid, remark: row.remark, deptName: row.deptName, ownerName: row.ownerName @@ -177,6 +201,7 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', // 车主联系电话 remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -197,6 +222,9 @@ this.staffList = response.data console.log(response) }) + getCarCardTypeList().then(response => { + this.carTypeList = response.data + }) }, getStaffList(){ this.dataForm.ownerId = '' @@ -214,9 +242,11 @@ } }) this.dataForm.phone = selectedStaff[0].phone + this.dataForm.phone2 = selectedStaff[0].phone2 this.dataForm.deptid = selectedStaff[0].deptid } else { this.dataForm.phone = '' + this.dataForm.phone2 = '' } }, // 保存数据 diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index 4ff07ab..e7223de 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -103,17 +103,29 @@ { text: '车辆性质', value: 'propertyStr', + align: 'center', + width: 140 + }, + { + text: '车证种类', + value: 'carCardTypeName', align: 'center' }, { text: '车主姓名', value: 'ownerName', - align: 'center' + align: 'center', + width: 140 }, { text: '车主联系电话', value: 'phone', align: 'center' + }, + { + text: '备用电话', + value: 'phone2', + align: 'center' } ], // 显示列 list: [], // 列表数据 diff --git a/src/views/ctrl/index.vue b/src/views/ctrl/index.vue index 29923af..50e0535 100644 --- a/src/views/ctrl/index.vue +++ b/src/views/ctrl/index.vue @@ -169,7 +169,7 @@ border-radius: 16px; background-color: #FFFFFF; box-shadow: 1px 1px 5px #999; - height: 37vh; + height: 40vh; } #today-visitor { diff --git a/config/dev.env.js b/config/dev.env.js index 095ba33..6227232 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://192.168.5.220:20311"' BASE_API: '"http://111.198.10.15:11631"' // BASE_API: '"http://192.168.5.220:20311"' }) diff --git a/config/prod.env.js b/config/prod.env.js index ccbc615..2c3f8be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://192.168.5.220:20311"' - BASE_API: '"http://111.198.10.15:11631"' + BASE_API: '"http://192.168.5.220:20311"' + // BASE_API: '"http://111.198.10.15:11631"' } diff --git a/src/api/alarm.js b/src/api/alarm.js index c1bbe3e..2966273 100644 --- a/src/api/alarm.js +++ b/src/api/alarm.js @@ -16,6 +16,15 @@ } }) } +export function getAlarmContent(areaTypeId) { + return request({ + url: '/alarm/getAlarmContentByAreaType', + method: 'get', + params:{ + areaType: areaTypeId + } + }) +} // 查询历史报警记录 export function getAlarmList(params) { diff --git a/src/api/allDict.js b/src/api/allDict.js index e7f9bc8..fa7173d 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -11,6 +11,20 @@ }) } +export function getStaffTypeList(params) { + return request({ + url: '/dict/code/staffType', + method: 'get', + params + }) +} +export function getCarCardTypeList(params) { + return request({ + url: '/dict/code/carCardType ', + method: 'get', + params + }) +} export function getCarProperty(params) { return request({ url: '/dict/code/carProperty', diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index d7f558c..93d28d5 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2956a74..0fdd2d8 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -96,7 +96,7 @@ import { getAlarmList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmDetail from '@/views/alarm/alarmDetail' @@ -244,7 +244,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 1b5efe8..3c053ea 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -97,7 +97,7 @@ import { getAlarmNowList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmCancel from '@/views/alarm/alarmCancel' @@ -237,7 +237,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index 5f54c93..afdeae8 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -9,6 +9,17 @@ + + + + + + + + + + + {{ item.name }} @@ -16,8 +27,7 @@ - - + @@ -27,7 +37,7 @@ - + @@ -43,6 +53,11 @@ + + + + + @@ -66,6 +81,7 @@ import { addCar, editCar } from '@/api/car' import { phoneValidator, plateValidator } from '@/utils/validate' import { getDeptTreeList } from '@/api/dept' +import { getCarCardTypeList } from '@/api/allDict' export default { name: 'CarAdd', components: { DeptSelect }, @@ -80,6 +96,8 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', + carCardType: '', remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -97,6 +115,7 @@ carProperties: [], // 车辆性质字典值 staffList: [], // 车主人员列表 deptList: [], + carTypeList: [], isEditMode: false, // 是否编辑模式 isDetailMode: false, // 是否详情模式 btnLoading: true // 保存按钮是否不允许点击 @@ -109,6 +128,7 @@ resetOwner(){ if(this.dataForm.property!=='2'){ this.dataForm.ownerId = '' + this.dataForm.deptid = '' // this.dataForm.phone = '' } }, @@ -128,6 +148,7 @@ this.resetForm() this.isEditMode = false this.isDetailMode = false + this.dataForm.property = '1' this.$nextTick(() => { this.$refs['dataForm'].clearValidate() }) @@ -142,6 +163,7 @@ deptid: row.deptid, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, remark: row.remark } getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { @@ -158,6 +180,8 @@ property: row.property, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, + deptid: row.deptid, remark: row.remark, deptName: row.deptName, ownerName: row.ownerName @@ -177,6 +201,7 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', // 车主联系电话 remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -197,6 +222,9 @@ this.staffList = response.data console.log(response) }) + getCarCardTypeList().then(response => { + this.carTypeList = response.data + }) }, getStaffList(){ this.dataForm.ownerId = '' @@ -214,9 +242,11 @@ } }) this.dataForm.phone = selectedStaff[0].phone + this.dataForm.phone2 = selectedStaff[0].phone2 this.dataForm.deptid = selectedStaff[0].deptid } else { this.dataForm.phone = '' + this.dataForm.phone2 = '' } }, // 保存数据 diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index 4ff07ab..e7223de 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -103,17 +103,29 @@ { text: '车辆性质', value: 'propertyStr', + align: 'center', + width: 140 + }, + { + text: '车证种类', + value: 'carCardTypeName', align: 'center' }, { text: '车主姓名', value: 'ownerName', - align: 'center' + align: 'center', + width: 140 }, { text: '车主联系电话', value: 'phone', align: 'center' + }, + { + text: '备用电话', + value: 'phone2', + align: 'center' } ], // 显示列 list: [], // 列表数据 diff --git a/src/views/ctrl/index.vue b/src/views/ctrl/index.vue index 29923af..50e0535 100644 --- a/src/views/ctrl/index.vue +++ b/src/views/ctrl/index.vue @@ -169,7 +169,7 @@ border-radius: 16px; background-color: #FFFFFF; box-shadow: 1px 1px 5px #999; - height: 37vh; + height: 40vh; } #today-visitor { diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index 49ed928..b3f5a8f 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -111,48 +111,48 @@
智能球形 - - - - 标准半球 - + + + + + @@ -361,6 +361,7 @@ isMain: true, showType: false, dialogVisible: false, + showFenceIcon: true, wsPath: process.env.BASE_API+'/websocket/', title: getProject().title, bgImageSrc: tg_main, @@ -388,7 +389,7 @@ height: 789 }, // 屏幕窗口尺寸 imgUrl: require('../../assets/overview_images/icons/icon-camera-point.png'), - btnNum: 8, + btnNum: 7, cameraTypeNum: 6, btnwidth: 210, halfLeft: 0, @@ -776,6 +777,7 @@ // 选择设备类型 selectDevByType(type, event) { // 遍历所有的设备类型 + this.showFenceIcon = false const devTypes = document.querySelectorAll('.dev-icon') for (let i = 0; i < devTypes.length; i++) { if (devTypes[i].className.indexOf('dev-type-selected') > -1) { @@ -798,6 +800,7 @@ } if (type === 'all') { if(this.bgImageSrc===tg_main){ + this.showFenceIcon = true this.devListParams.deviceTypes = '4,5,8,9,10,11,12,7' }else if(this.bgImageSrc===tg_4_5){ this.devListParams.deviceTypes = '4' @@ -814,6 +817,7 @@ return } else if (type === 'fence') { + this.showFenceIcon = true this.devListParams.deviceTypes = fenceTypes.toString() this.checkDevType[2] = true } else if (type === 'temperature') { @@ -1035,9 +1039,10 @@ if (index === 'tg_main') { this.bgImageSrc = tg_main this.isMain = true + this.showFenceIcon = true // this.devListParams.picture = '1' this.imgSizeOriginal = { width: 2245, height: 1586 } - this.btnNum = 8 + this.btnNum = 7 this.cameraTypeNum = 6 this.showFence = true // 显示电子围栏 this.showTemp = false // 隐藏温湿度设备 diff --git a/config/dev.env.js b/config/dev.env.js index 095ba33..6227232 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://192.168.5.220:20311"' BASE_API: '"http://111.198.10.15:11631"' // BASE_API: '"http://192.168.5.220:20311"' }) diff --git a/config/prod.env.js b/config/prod.env.js index ccbc615..2c3f8be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://192.168.5.220:20311"' - BASE_API: '"http://111.198.10.15:11631"' + BASE_API: '"http://192.168.5.220:20311"' + // BASE_API: '"http://111.198.10.15:11631"' } diff --git a/src/api/alarm.js b/src/api/alarm.js index c1bbe3e..2966273 100644 --- a/src/api/alarm.js +++ b/src/api/alarm.js @@ -16,6 +16,15 @@ } }) } +export function getAlarmContent(areaTypeId) { + return request({ + url: '/alarm/getAlarmContentByAreaType', + method: 'get', + params:{ + areaType: areaTypeId + } + }) +} // 查询历史报警记录 export function getAlarmList(params) { diff --git a/src/api/allDict.js b/src/api/allDict.js index e7f9bc8..fa7173d 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -11,6 +11,20 @@ }) } +export function getStaffTypeList(params) { + return request({ + url: '/dict/code/staffType', + method: 'get', + params + }) +} +export function getCarCardTypeList(params) { + return request({ + url: '/dict/code/carCardType ', + method: 'get', + params + }) +} export function getCarProperty(params) { return request({ url: '/dict/code/carProperty', diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index d7f558c..93d28d5 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2956a74..0fdd2d8 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -96,7 +96,7 @@ import { getAlarmList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmDetail from '@/views/alarm/alarmDetail' @@ -244,7 +244,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 1b5efe8..3c053ea 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -97,7 +97,7 @@ import { getAlarmNowList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmCancel from '@/views/alarm/alarmCancel' @@ -237,7 +237,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index 5f54c93..afdeae8 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -9,6 +9,17 @@ + + + + + + + + + + + {{ item.name }} @@ -16,8 +27,7 @@ - - + @@ -27,7 +37,7 @@ - + @@ -43,6 +53,11 @@ + + + + + @@ -66,6 +81,7 @@ import { addCar, editCar } from '@/api/car' import { phoneValidator, plateValidator } from '@/utils/validate' import { getDeptTreeList } from '@/api/dept' +import { getCarCardTypeList } from '@/api/allDict' export default { name: 'CarAdd', components: { DeptSelect }, @@ -80,6 +96,8 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', + carCardType: '', remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -97,6 +115,7 @@ carProperties: [], // 车辆性质字典值 staffList: [], // 车主人员列表 deptList: [], + carTypeList: [], isEditMode: false, // 是否编辑模式 isDetailMode: false, // 是否详情模式 btnLoading: true // 保存按钮是否不允许点击 @@ -109,6 +128,7 @@ resetOwner(){ if(this.dataForm.property!=='2'){ this.dataForm.ownerId = '' + this.dataForm.deptid = '' // this.dataForm.phone = '' } }, @@ -128,6 +148,7 @@ this.resetForm() this.isEditMode = false this.isDetailMode = false + this.dataForm.property = '1' this.$nextTick(() => { this.$refs['dataForm'].clearValidate() }) @@ -142,6 +163,7 @@ deptid: row.deptid, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, remark: row.remark } getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { @@ -158,6 +180,8 @@ property: row.property, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, + deptid: row.deptid, remark: row.remark, deptName: row.deptName, ownerName: row.ownerName @@ -177,6 +201,7 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', // 车主联系电话 remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -197,6 +222,9 @@ this.staffList = response.data console.log(response) }) + getCarCardTypeList().then(response => { + this.carTypeList = response.data + }) }, getStaffList(){ this.dataForm.ownerId = '' @@ -214,9 +242,11 @@ } }) this.dataForm.phone = selectedStaff[0].phone + this.dataForm.phone2 = selectedStaff[0].phone2 this.dataForm.deptid = selectedStaff[0].deptid } else { this.dataForm.phone = '' + this.dataForm.phone2 = '' } }, // 保存数据 diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index 4ff07ab..e7223de 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -103,17 +103,29 @@ { text: '车辆性质', value: 'propertyStr', + align: 'center', + width: 140 + }, + { + text: '车证种类', + value: 'carCardTypeName', align: 'center' }, { text: '车主姓名', value: 'ownerName', - align: 'center' + align: 'center', + width: 140 }, { text: '车主联系电话', value: 'phone', align: 'center' + }, + { + text: '备用电话', + value: 'phone2', + align: 'center' } ], // 显示列 list: [], // 列表数据 diff --git a/src/views/ctrl/index.vue b/src/views/ctrl/index.vue index 29923af..50e0535 100644 --- a/src/views/ctrl/index.vue +++ b/src/views/ctrl/index.vue @@ -169,7 +169,7 @@ border-radius: 16px; background-color: #FFFFFF; box-shadow: 1px 1px 5px #999; - height: 37vh; + height: 40vh; } #today-visitor { diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index 49ed928..b3f5a8f 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -111,48 +111,48 @@
智能球形 - - - - 标准半球 - + + + + + @@ -361,6 +361,7 @@ isMain: true, showType: false, dialogVisible: false, + showFenceIcon: true, wsPath: process.env.BASE_API+'/websocket/', title: getProject().title, bgImageSrc: tg_main, @@ -388,7 +389,7 @@ height: 789 }, // 屏幕窗口尺寸 imgUrl: require('../../assets/overview_images/icons/icon-camera-point.png'), - btnNum: 8, + btnNum: 7, cameraTypeNum: 6, btnwidth: 210, halfLeft: 0, @@ -776,6 +777,7 @@ // 选择设备类型 selectDevByType(type, event) { // 遍历所有的设备类型 + this.showFenceIcon = false const devTypes = document.querySelectorAll('.dev-icon') for (let i = 0; i < devTypes.length; i++) { if (devTypes[i].className.indexOf('dev-type-selected') > -1) { @@ -798,6 +800,7 @@ } if (type === 'all') { if(this.bgImageSrc===tg_main){ + this.showFenceIcon = true this.devListParams.deviceTypes = '4,5,8,9,10,11,12,7' }else if(this.bgImageSrc===tg_4_5){ this.devListParams.deviceTypes = '4' @@ -814,6 +817,7 @@ return } else if (type === 'fence') { + this.showFenceIcon = true this.devListParams.deviceTypes = fenceTypes.toString() this.checkDevType[2] = true } else if (type === 'temperature') { @@ -1035,9 +1039,10 @@ if (index === 'tg_main') { this.bgImageSrc = tg_main this.isMain = true + this.showFenceIcon = true // this.devListParams.picture = '1' this.imgSizeOriginal = { width: 2245, height: 1586 } - this.btnNum = 8 + this.btnNum = 7 this.cameraTypeNum = 6 this.showFence = true // 显示电子围栏 this.showTemp = false // 隐藏温湿度设备 diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 63c9aac..f3c698c 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,6 +1,15 @@ @@ -103,6 +116,8 @@ pwdType: 'password', redirect: '/', showKaptcha: false, // 是否显示验证码 + titleUrl: require('../../assets/login_images/title.png'), // 背景图片 + iconUrl: require('../../assets/login_images/icon-title.png'), // 背景图片 bgUrl: require('../../assets/login_images/bg.png'), // 背景图片 leftUrl: require('../../assets/login_images/left.jpg')// 左边图片 } @@ -249,6 +264,19 @@ /*border-radius: 3px;*/ /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/ } + .left-box-div{ + /*height:385px;*/ + width:600px; + position:absolute; + overflow:hidden; + right:40%; + top:50%; + /*margin-left:300px;*/ + margin-top:-80px; + /*border:1px solid #889aa4;*/ + /*border-radius: 3px;*/ + /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/ + } .left-div{ width:60%; float:left; diff --git a/config/dev.env.js b/config/dev.env.js index 095ba33..6227232 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://192.168.5.220:20311"' BASE_API: '"http://111.198.10.15:11631"' // BASE_API: '"http://192.168.5.220:20311"' }) diff --git a/config/prod.env.js b/config/prod.env.js index ccbc615..2c3f8be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://192.168.5.220:20311"' - BASE_API: '"http://111.198.10.15:11631"' + BASE_API: '"http://192.168.5.220:20311"' + // BASE_API: '"http://111.198.10.15:11631"' } diff --git a/src/api/alarm.js b/src/api/alarm.js index c1bbe3e..2966273 100644 --- a/src/api/alarm.js +++ b/src/api/alarm.js @@ -16,6 +16,15 @@ } }) } +export function getAlarmContent(areaTypeId) { + return request({ + url: '/alarm/getAlarmContentByAreaType', + method: 'get', + params:{ + areaType: areaTypeId + } + }) +} // 查询历史报警记录 export function getAlarmList(params) { diff --git a/src/api/allDict.js b/src/api/allDict.js index e7f9bc8..fa7173d 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -11,6 +11,20 @@ }) } +export function getStaffTypeList(params) { + return request({ + url: '/dict/code/staffType', + method: 'get', + params + }) +} +export function getCarCardTypeList(params) { + return request({ + url: '/dict/code/carCardType ', + method: 'get', + params + }) +} export function getCarProperty(params) { return request({ url: '/dict/code/carProperty', diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index d7f558c..93d28d5 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2956a74..0fdd2d8 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -96,7 +96,7 @@ import { getAlarmList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmDetail from '@/views/alarm/alarmDetail' @@ -244,7 +244,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 1b5efe8..3c053ea 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -97,7 +97,7 @@ import { getAlarmNowList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmCancel from '@/views/alarm/alarmCancel' @@ -237,7 +237,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index 5f54c93..afdeae8 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -9,6 +9,17 @@ + + + + + + + + + + + {{ item.name }} @@ -16,8 +27,7 @@ - - + @@ -27,7 +37,7 @@ - + @@ -43,6 +53,11 @@ + + + + + @@ -66,6 +81,7 @@ import { addCar, editCar } from '@/api/car' import { phoneValidator, plateValidator } from '@/utils/validate' import { getDeptTreeList } from '@/api/dept' +import { getCarCardTypeList } from '@/api/allDict' export default { name: 'CarAdd', components: { DeptSelect }, @@ -80,6 +96,8 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', + carCardType: '', remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -97,6 +115,7 @@ carProperties: [], // 车辆性质字典值 staffList: [], // 车主人员列表 deptList: [], + carTypeList: [], isEditMode: false, // 是否编辑模式 isDetailMode: false, // 是否详情模式 btnLoading: true // 保存按钮是否不允许点击 @@ -109,6 +128,7 @@ resetOwner(){ if(this.dataForm.property!=='2'){ this.dataForm.ownerId = '' + this.dataForm.deptid = '' // this.dataForm.phone = '' } }, @@ -128,6 +148,7 @@ this.resetForm() this.isEditMode = false this.isDetailMode = false + this.dataForm.property = '1' this.$nextTick(() => { this.$refs['dataForm'].clearValidate() }) @@ -142,6 +163,7 @@ deptid: row.deptid, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, remark: row.remark } getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { @@ -158,6 +180,8 @@ property: row.property, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, + deptid: row.deptid, remark: row.remark, deptName: row.deptName, ownerName: row.ownerName @@ -177,6 +201,7 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', // 车主联系电话 remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -197,6 +222,9 @@ this.staffList = response.data console.log(response) }) + getCarCardTypeList().then(response => { + this.carTypeList = response.data + }) }, getStaffList(){ this.dataForm.ownerId = '' @@ -214,9 +242,11 @@ } }) this.dataForm.phone = selectedStaff[0].phone + this.dataForm.phone2 = selectedStaff[0].phone2 this.dataForm.deptid = selectedStaff[0].deptid } else { this.dataForm.phone = '' + this.dataForm.phone2 = '' } }, // 保存数据 diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index 4ff07ab..e7223de 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -103,17 +103,29 @@ { text: '车辆性质', value: 'propertyStr', + align: 'center', + width: 140 + }, + { + text: '车证种类', + value: 'carCardTypeName', align: 'center' }, { text: '车主姓名', value: 'ownerName', - align: 'center' + align: 'center', + width: 140 }, { text: '车主联系电话', value: 'phone', align: 'center' + }, + { + text: '备用电话', + value: 'phone2', + align: 'center' } ], // 显示列 list: [], // 列表数据 diff --git a/src/views/ctrl/index.vue b/src/views/ctrl/index.vue index 29923af..50e0535 100644 --- a/src/views/ctrl/index.vue +++ b/src/views/ctrl/index.vue @@ -169,7 +169,7 @@ border-radius: 16px; background-color: #FFFFFF; box-shadow: 1px 1px 5px #999; - height: 37vh; + height: 40vh; } #today-visitor { diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index 49ed928..b3f5a8f 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -111,48 +111,48 @@
智能球形 - - - - 标准半球 - + + + + + @@ -361,6 +361,7 @@ isMain: true, showType: false, dialogVisible: false, + showFenceIcon: true, wsPath: process.env.BASE_API+'/websocket/', title: getProject().title, bgImageSrc: tg_main, @@ -388,7 +389,7 @@ height: 789 }, // 屏幕窗口尺寸 imgUrl: require('../../assets/overview_images/icons/icon-camera-point.png'), - btnNum: 8, + btnNum: 7, cameraTypeNum: 6, btnwidth: 210, halfLeft: 0, @@ -776,6 +777,7 @@ // 选择设备类型 selectDevByType(type, event) { // 遍历所有的设备类型 + this.showFenceIcon = false const devTypes = document.querySelectorAll('.dev-icon') for (let i = 0; i < devTypes.length; i++) { if (devTypes[i].className.indexOf('dev-type-selected') > -1) { @@ -798,6 +800,7 @@ } if (type === 'all') { if(this.bgImageSrc===tg_main){ + this.showFenceIcon = true this.devListParams.deviceTypes = '4,5,8,9,10,11,12,7' }else if(this.bgImageSrc===tg_4_5){ this.devListParams.deviceTypes = '4' @@ -814,6 +817,7 @@ return } else if (type === 'fence') { + this.showFenceIcon = true this.devListParams.deviceTypes = fenceTypes.toString() this.checkDevType[2] = true } else if (type === 'temperature') { @@ -1035,9 +1039,10 @@ if (index === 'tg_main') { this.bgImageSrc = tg_main this.isMain = true + this.showFenceIcon = true // this.devListParams.picture = '1' this.imgSizeOriginal = { width: 2245, height: 1586 } - this.btnNum = 8 + this.btnNum = 7 this.cameraTypeNum = 6 this.showFence = true // 显示电子围栏 this.showTemp = false // 隐藏温湿度设备 diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 63c9aac..f3c698c 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,6 +1,15 @@ @@ -103,6 +116,8 @@ pwdType: 'password', redirect: '/', showKaptcha: false, // 是否显示验证码 + titleUrl: require('../../assets/login_images/title.png'), // 背景图片 + iconUrl: require('../../assets/login_images/icon-title.png'), // 背景图片 bgUrl: require('../../assets/login_images/bg.png'), // 背景图片 leftUrl: require('../../assets/login_images/left.jpg')// 左边图片 } @@ -249,6 +264,19 @@ /*border-radius: 3px;*/ /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/ } + .left-box-div{ + /*height:385px;*/ + width:600px; + position:absolute; + overflow:hidden; + right:40%; + top:50%; + /*margin-left:300px;*/ + margin-top:-80px; + /*border:1px solid #889aa4;*/ + /*border-radius: 3px;*/ + /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/ + } .left-div{ width:60%; float:left; diff --git a/src/views/overview/fenceIndex.vue b/src/views/overview/fenceIndex.vue index 62a35e8..28d6ea5 100644 --- a/src/views/overview/fenceIndex.vue +++ b/src/views/overview/fenceIndex.vue @@ -110,41 +110,49 @@
{ + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 1b5efe8..3c053ea 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -97,7 +97,7 @@ import { getAlarmNowList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmCancel from '@/views/alarm/alarmCancel' @@ -237,7 +237,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index 5f54c93..afdeae8 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -9,6 +9,17 @@ + + + + + + + + + + + {{ item.name }} @@ -16,8 +27,7 @@ - - + @@ -27,7 +37,7 @@ - + @@ -43,6 +53,11 @@ + + + + + @@ -66,6 +81,7 @@ import { addCar, editCar } from '@/api/car' import { phoneValidator, plateValidator } from '@/utils/validate' import { getDeptTreeList } from '@/api/dept' +import { getCarCardTypeList } from '@/api/allDict' export default { name: 'CarAdd', components: { DeptSelect }, @@ -80,6 +96,8 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', + carCardType: '', remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -97,6 +115,7 @@ carProperties: [], // 车辆性质字典值 staffList: [], // 车主人员列表 deptList: [], + carTypeList: [], isEditMode: false, // 是否编辑模式 isDetailMode: false, // 是否详情模式 btnLoading: true // 保存按钮是否不允许点击 @@ -109,6 +128,7 @@ resetOwner(){ if(this.dataForm.property!=='2'){ this.dataForm.ownerId = '' + this.dataForm.deptid = '' // this.dataForm.phone = '' } }, @@ -128,6 +148,7 @@ this.resetForm() this.isEditMode = false this.isDetailMode = false + this.dataForm.property = '1' this.$nextTick(() => { this.$refs['dataForm'].clearValidate() }) @@ -142,6 +163,7 @@ deptid: row.deptid, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, remark: row.remark } getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { @@ -158,6 +180,8 @@ property: row.property, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, + deptid: row.deptid, remark: row.remark, deptName: row.deptName, ownerName: row.ownerName @@ -177,6 +201,7 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', // 车主联系电话 remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -197,6 +222,9 @@ this.staffList = response.data console.log(response) }) + getCarCardTypeList().then(response => { + this.carTypeList = response.data + }) }, getStaffList(){ this.dataForm.ownerId = '' @@ -214,9 +242,11 @@ } }) this.dataForm.phone = selectedStaff[0].phone + this.dataForm.phone2 = selectedStaff[0].phone2 this.dataForm.deptid = selectedStaff[0].deptid } else { this.dataForm.phone = '' + this.dataForm.phone2 = '' } }, // 保存数据 diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index 4ff07ab..e7223de 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -103,17 +103,29 @@ { text: '车辆性质', value: 'propertyStr', + align: 'center', + width: 140 + }, + { + text: '车证种类', + value: 'carCardTypeName', align: 'center' }, { text: '车主姓名', value: 'ownerName', - align: 'center' + align: 'center', + width: 140 }, { text: '车主联系电话', value: 'phone', align: 'center' + }, + { + text: '备用电话', + value: 'phone2', + align: 'center' } ], // 显示列 list: [], // 列表数据 diff --git a/src/views/ctrl/index.vue b/src/views/ctrl/index.vue index 29923af..50e0535 100644 --- a/src/views/ctrl/index.vue +++ b/src/views/ctrl/index.vue @@ -169,7 +169,7 @@ border-radius: 16px; background-color: #FFFFFF; box-shadow: 1px 1px 5px #999; - height: 37vh; + height: 40vh; } #today-visitor { diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index 49ed928..b3f5a8f 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -111,48 +111,48 @@
智能球形 - - - - 标准半球 - + + + + + @@ -361,6 +361,7 @@ isMain: true, showType: false, dialogVisible: false, + showFenceIcon: true, wsPath: process.env.BASE_API+'/websocket/', title: getProject().title, bgImageSrc: tg_main, @@ -388,7 +389,7 @@ height: 789 }, // 屏幕窗口尺寸 imgUrl: require('../../assets/overview_images/icons/icon-camera-point.png'), - btnNum: 8, + btnNum: 7, cameraTypeNum: 6, btnwidth: 210, halfLeft: 0, @@ -776,6 +777,7 @@ // 选择设备类型 selectDevByType(type, event) { // 遍历所有的设备类型 + this.showFenceIcon = false const devTypes = document.querySelectorAll('.dev-icon') for (let i = 0; i < devTypes.length; i++) { if (devTypes[i].className.indexOf('dev-type-selected') > -1) { @@ -798,6 +800,7 @@ } if (type === 'all') { if(this.bgImageSrc===tg_main){ + this.showFenceIcon = true this.devListParams.deviceTypes = '4,5,8,9,10,11,12,7' }else if(this.bgImageSrc===tg_4_5){ this.devListParams.deviceTypes = '4' @@ -814,6 +817,7 @@ return } else if (type === 'fence') { + this.showFenceIcon = true this.devListParams.deviceTypes = fenceTypes.toString() this.checkDevType[2] = true } else if (type === 'temperature') { @@ -1035,9 +1039,10 @@ if (index === 'tg_main') { this.bgImageSrc = tg_main this.isMain = true + this.showFenceIcon = true // this.devListParams.picture = '1' this.imgSizeOriginal = { width: 2245, height: 1586 } - this.btnNum = 8 + this.btnNum = 7 this.cameraTypeNum = 6 this.showFence = true // 显示电子围栏 this.showTemp = false // 隐藏温湿度设备 diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 63c9aac..f3c698c 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,6 +1,15 @@ @@ -103,6 +116,8 @@ pwdType: 'password', redirect: '/', showKaptcha: false, // 是否显示验证码 + titleUrl: require('../../assets/login_images/title.png'), // 背景图片 + iconUrl: require('../../assets/login_images/icon-title.png'), // 背景图片 bgUrl: require('../../assets/login_images/bg.png'), // 背景图片 leftUrl: require('../../assets/login_images/left.jpg')// 左边图片 } @@ -249,6 +264,19 @@ /*border-radius: 3px;*/ /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/ } + .left-box-div{ + /*height:385px;*/ + width:600px; + position:absolute; + overflow:hidden; + right:40%; + top:50%; + /*margin-left:300px;*/ + margin-top:-80px; + /*border:1px solid #889aa4;*/ + /*border-radius: 3px;*/ + /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/ + } .left-div{ width:60%; float:left; diff --git a/src/views/overview/fenceIndex.vue b/src/views/overview/fenceIndex.vue index 62a35e8..28d6ea5 100644 --- a/src/views/overview/fenceIndex.vue +++ b/src/views/overview/fenceIndex.vue @@ -110,41 +110,49 @@
智能球形 - - - - 标准半球 - + + + + + @@ -437,9 +437,9 @@ // 设置footer部分居中显示 if (this.winSize.width >= 1920) { - this.footLeft = (this.winSize.width - 5 * 210) / 2 + this.footLeft = (this.winSize.width - 4 * 210) / 2 } else if (this.winSize.width >= 1366 && this.winSize.width < 1920) { - this.footLeft = (this.winSize.width - 5 * 155) / 2 + this.footLeft = (this.winSize.width - 4 * 155) / 2 } }, // 获取图像大小 diff --git a/config/dev.env.js b/config/dev.env.js index 095ba33..6227232 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,7 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://192.168.5.220:20311"' BASE_API: '"http://111.198.10.15:11631"' // BASE_API: '"http://192.168.5.220:20311"' }) diff --git a/config/prod.env.js b/config/prod.env.js index ccbc615..2c3f8be 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,6 +1,6 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - // BASE_API: '"http://192.168.5.220:20311"' - BASE_API: '"http://111.198.10.15:11631"' + BASE_API: '"http://192.168.5.220:20311"' + // BASE_API: '"http://111.198.10.15:11631"' } diff --git a/src/api/alarm.js b/src/api/alarm.js index c1bbe3e..2966273 100644 --- a/src/api/alarm.js +++ b/src/api/alarm.js @@ -16,6 +16,15 @@ } }) } +export function getAlarmContent(areaTypeId) { + return request({ + url: '/alarm/getAlarmContentByAreaType', + method: 'get', + params:{ + areaType: areaTypeId + } + }) +} // 查询历史报警记录 export function getAlarmList(params) { diff --git a/src/api/allDict.js b/src/api/allDict.js index e7f9bc8..fa7173d 100644 --- a/src/api/allDict.js +++ b/src/api/allDict.js @@ -11,6 +11,20 @@ }) } +export function getStaffTypeList(params) { + return request({ + url: '/dict/code/staffType', + method: 'get', + params + }) +} +export function getCarCardTypeList(params) { + return request({ + url: '/dict/code/carCardType ', + method: 'get', + params + }) +} export function getCarProperty(params) { return request({ url: '/dict/code/carProperty', diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png index d7f558c..93d28d5 100644 --- a/src/assets/login_images/bg.png +++ b/src/assets/login_images/bg.png Binary files differ diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue index 2956a74..0fdd2d8 100644 --- a/src/views/alarm/alarmList.vue +++ b/src/views/alarm/alarmList.vue @@ -96,7 +96,7 @@ import { getAlarmList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmDetail from '@/views/alarm/alarmDetail' @@ -244,7 +244,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue index 1b5efe8..3c053ea 100644 --- a/src/views/alarm/alarmNow.vue +++ b/src/views/alarm/alarmNow.vue @@ -97,7 +97,7 @@ import { getAlarmNowList } from '@/api/alarm' import { getRegion, getAreaTypeBySubSystem } from '@/api/area' import { getDetailDevice } from '@/api/device' -import { getAlarmContent } from '@/api/allDict' +import { getAlarmContent } from '@/api/alarm' import { formatToString } from '@/utils/calendarUtil' import DeviceDetail from '@/views/deviceManage/deviceDetail' import AlarmCancel from '@/views/alarm/alarmCancel' @@ -237,7 +237,7 @@ this.fetchData(false) }, fetchAlarmContentsData() { - getAlarmContent().then(response => { + getAlarmContent(getAreaTypeBySubSystem(this.$store.getters.currentSystem.code)).then(response => { this.alarmContents = response.data }) }, diff --git a/src/views/car/carAdd.vue b/src/views/car/carAdd.vue index 5f54c93..afdeae8 100644 --- a/src/views/car/carAdd.vue +++ b/src/views/car/carAdd.vue @@ -9,6 +9,17 @@ + + + + + + + + + + + {{ item.name }} @@ -16,8 +27,7 @@ - - + @@ -27,7 +37,7 @@ - + @@ -43,6 +53,11 @@ + + + + + @@ -66,6 +81,7 @@ import { addCar, editCar } from '@/api/car' import { phoneValidator, plateValidator } from '@/utils/validate' import { getDeptTreeList } from '@/api/dept' +import { getCarCardTypeList } from '@/api/allDict' export default { name: 'CarAdd', components: { DeptSelect }, @@ -80,6 +96,8 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', + carCardType: '', remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -97,6 +115,7 @@ carProperties: [], // 车辆性质字典值 staffList: [], // 车主人员列表 deptList: [], + carTypeList: [], isEditMode: false, // 是否编辑模式 isDetailMode: false, // 是否详情模式 btnLoading: true // 保存按钮是否不允许点击 @@ -109,6 +128,7 @@ resetOwner(){ if(this.dataForm.property!=='2'){ this.dataForm.ownerId = '' + this.dataForm.deptid = '' // this.dataForm.phone = '' } }, @@ -128,6 +148,7 @@ this.resetForm() this.isEditMode = false this.isDetailMode = false + this.dataForm.property = '1' this.$nextTick(() => { this.$refs['dataForm'].clearValidate() }) @@ -142,6 +163,7 @@ deptid: row.deptid, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, remark: row.remark } getStaffByDept({ deptId: this.dataForm.deptid }).then(response => { @@ -158,6 +180,8 @@ property: row.property, ownerId: row.ownerId, phone: row.phone, + phone2: row.phone2, + deptid: row.deptid, remark: row.remark, deptName: row.deptName, ownerName: row.ownerName @@ -177,6 +201,7 @@ deptid: '', // 所属部门 ownerId: '', // 车主 phone: '', // 车主联系电话 + phone2: '', // 车主联系电话 remark: '', // 备注 deptName: '', // 部门名称 ownerName: ''// 车主名 @@ -197,6 +222,9 @@ this.staffList = response.data console.log(response) }) + getCarCardTypeList().then(response => { + this.carTypeList = response.data + }) }, getStaffList(){ this.dataForm.ownerId = '' @@ -214,9 +242,11 @@ } }) this.dataForm.phone = selectedStaff[0].phone + this.dataForm.phone2 = selectedStaff[0].phone2 this.dataForm.deptid = selectedStaff[0].deptid } else { this.dataForm.phone = '' + this.dataForm.phone2 = '' } }, // 保存数据 diff --git a/src/views/car/carList.vue b/src/views/car/carList.vue index 4ff07ab..e7223de 100644 --- a/src/views/car/carList.vue +++ b/src/views/car/carList.vue @@ -103,17 +103,29 @@ { text: '车辆性质', value: 'propertyStr', + align: 'center', + width: 140 + }, + { + text: '车证种类', + value: 'carCardTypeName', align: 'center' }, { text: '车主姓名', value: 'ownerName', - align: 'center' + align: 'center', + width: 140 }, { text: '车主联系电话', value: 'phone', align: 'center' + }, + { + text: '备用电话', + value: 'phone2', + align: 'center' } ], // 显示列 list: [], // 列表数据 diff --git a/src/views/ctrl/index.vue b/src/views/ctrl/index.vue index 29923af..50e0535 100644 --- a/src/views/ctrl/index.vue +++ b/src/views/ctrl/index.vue @@ -169,7 +169,7 @@ border-radius: 16px; background-color: #FFFFFF; box-shadow: 1px 1px 5px #999; - height: 37vh; + height: 40vh; } #today-visitor { diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index 49ed928..b3f5a8f 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -111,48 +111,48 @@
智能球形 - - - - 标准半球 - + + + + + @@ -361,6 +361,7 @@ isMain: true, showType: false, dialogVisible: false, + showFenceIcon: true, wsPath: process.env.BASE_API+'/websocket/', title: getProject().title, bgImageSrc: tg_main, @@ -388,7 +389,7 @@ height: 789 }, // 屏幕窗口尺寸 imgUrl: require('../../assets/overview_images/icons/icon-camera-point.png'), - btnNum: 8, + btnNum: 7, cameraTypeNum: 6, btnwidth: 210, halfLeft: 0, @@ -776,6 +777,7 @@ // 选择设备类型 selectDevByType(type, event) { // 遍历所有的设备类型 + this.showFenceIcon = false const devTypes = document.querySelectorAll('.dev-icon') for (let i = 0; i < devTypes.length; i++) { if (devTypes[i].className.indexOf('dev-type-selected') > -1) { @@ -798,6 +800,7 @@ } if (type === 'all') { if(this.bgImageSrc===tg_main){ + this.showFenceIcon = true this.devListParams.deviceTypes = '4,5,8,9,10,11,12,7' }else if(this.bgImageSrc===tg_4_5){ this.devListParams.deviceTypes = '4' @@ -814,6 +817,7 @@ return } else if (type === 'fence') { + this.showFenceIcon = true this.devListParams.deviceTypes = fenceTypes.toString() this.checkDevType[2] = true } else if (type === 'temperature') { @@ -1035,9 +1039,10 @@ if (index === 'tg_main') { this.bgImageSrc = tg_main this.isMain = true + this.showFenceIcon = true // this.devListParams.picture = '1' this.imgSizeOriginal = { width: 2245, height: 1586 } - this.btnNum = 8 + this.btnNum = 7 this.cameraTypeNum = 6 this.showFence = true // 显示电子围栏 this.showTemp = false // 隐藏温湿度设备 diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 63c9aac..f3c698c 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,6 +1,15 @@ @@ -103,6 +116,8 @@ pwdType: 'password', redirect: '/', showKaptcha: false, // 是否显示验证码 + titleUrl: require('../../assets/login_images/title.png'), // 背景图片 + iconUrl: require('../../assets/login_images/icon-title.png'), // 背景图片 bgUrl: require('../../assets/login_images/bg.png'), // 背景图片 leftUrl: require('../../assets/login_images/left.jpg')// 左边图片 } @@ -249,6 +264,19 @@ /*border-radius: 3px;*/ /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/ } + .left-box-div{ + /*height:385px;*/ + width:600px; + position:absolute; + overflow:hidden; + right:40%; + top:50%; + /*margin-left:300px;*/ + margin-top:-80px; + /*border:1px solid #889aa4;*/ + /*border-radius: 3px;*/ + /*box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);*/ + } .left-div{ width:60%; float:left; diff --git a/src/views/overview/fenceIndex.vue b/src/views/overview/fenceIndex.vue index 62a35e8..28d6ea5 100644 --- a/src/views/overview/fenceIndex.vue +++ b/src/views/overview/fenceIndex.vue @@ -110,41 +110,49 @@
智能球形 - - - - 标准半球 - + + + + + @@ -437,9 +437,9 @@ // 设置footer部分居中显示 if (this.winSize.width >= 1920) { - this.footLeft = (this.winSize.width - 5 * 210) / 2 + this.footLeft = (this.winSize.width - 4 * 210) / 2 } else if (this.winSize.width >= 1366 && this.winSize.width < 1920) { - this.footLeft = (this.winSize.width - 5 * 155) / 2 + this.footLeft = (this.winSize.width - 4 * 155) / 2 } }, // 获取图像大小 diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 698cf37..95b7fe8 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -42,14 +42,28 @@ - - + + + + + + + + + + + + + + + + @@ -117,7 +131,7 @@ 读取身份证 - {{ btnCamera }} + {{ btnCamera }} @@ -126,13 +140,10 @@ 重置 - 注册虹膜 + + 注册虹膜 保存 - - - -
@@ -143,7 +154,7 @@