diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index b3f5a8f..e60f060 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -669,6 +669,7 @@ this.devList = [] this.fenceList = [] response.data.forEach(dev => { + console.log(dev.x,dev.y,dev.type) if (dev.x !== '' && dev.y !== '') { dev.imgUrl = require("../../assets/overview_images/icons/icon-camera-point.png") if(dev.type===10){ //球 diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index b3f5a8f..e60f060 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -669,6 +669,7 @@ this.devList = [] this.fenceList = [] response.data.forEach(dev => { + console.log(dev.x,dev.y,dev.type) if (dev.x !== '' && dev.y !== '') { dev.imgUrl = require("../../assets/overview_images/icons/icon-camera-point.png") if(dev.type===10){ //球 diff --git a/src/views/ctrl/statCharts/devAlarmCount.vue b/src/views/ctrl/statCharts/devAlarmCount.vue index 6b6939e..9675244 100644 --- a/src/views/ctrl/statCharts/devAlarmCount.vue +++ b/src/views/ctrl/statCharts/devAlarmCount.vue @@ -76,10 +76,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index b3f5a8f..e60f060 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -669,6 +669,7 @@ this.devList = [] this.fenceList = [] response.data.forEach(dev => { + console.log(dev.x,dev.y,dev.type) if (dev.x !== '' && dev.y !== '') { dev.imgUrl = require("../../assets/overview_images/icons/icon-camera-point.png") if(dev.type===10){ //球 diff --git a/src/views/ctrl/statCharts/devAlarmCount.vue b/src/views/ctrl/statCharts/devAlarmCount.vue index 6b6939e..9675244 100644 --- a/src/views/ctrl/statCharts/devAlarmCount.vue +++ b/src/views/ctrl/statCharts/devAlarmCount.vue @@ -76,10 +76,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue index d65ec69..08ce423 100644 --- a/src/views/ctrl/statCharts/inOutCount.vue +++ b/src/views/ctrl/statCharts/inOutCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index b3f5a8f..e60f060 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -669,6 +669,7 @@ this.devList = [] this.fenceList = [] response.data.forEach(dev => { + console.log(dev.x,dev.y,dev.type) if (dev.x !== '' && dev.y !== '') { dev.imgUrl = require("../../assets/overview_images/icons/icon-camera-point.png") if(dev.type===10){ //球 diff --git a/src/views/ctrl/statCharts/devAlarmCount.vue b/src/views/ctrl/statCharts/devAlarmCount.vue index 6b6939e..9675244 100644 --- a/src/views/ctrl/statCharts/devAlarmCount.vue +++ b/src/views/ctrl/statCharts/devAlarmCount.vue @@ -76,10 +76,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue index d65ec69..08ce423 100644 --- a/src/views/ctrl/statCharts/inOutCount.vue +++ b/src/views/ctrl/statCharts/inOutCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutDoorCount.vue b/src/views/ctrl/statCharts/inOutDoorCount.vue index 93f3458..daab42d 100644 --- a/src/views/ctrl/statCharts/inOutDoorCount.vue +++ b/src/views/ctrl/statCharts/inOutDoorCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index b3f5a8f..e60f060 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -669,6 +669,7 @@ this.devList = [] this.fenceList = [] response.data.forEach(dev => { + console.log(dev.x,dev.y,dev.type) if (dev.x !== '' && dev.y !== '') { dev.imgUrl = require("../../assets/overview_images/icons/icon-camera-point.png") if(dev.type===10){ //球 diff --git a/src/views/ctrl/statCharts/devAlarmCount.vue b/src/views/ctrl/statCharts/devAlarmCount.vue index 6b6939e..9675244 100644 --- a/src/views/ctrl/statCharts/devAlarmCount.vue +++ b/src/views/ctrl/statCharts/devAlarmCount.vue @@ -76,10 +76,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue index d65ec69..08ce423 100644 --- a/src/views/ctrl/statCharts/inOutCount.vue +++ b/src/views/ctrl/statCharts/inOutCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutDoorCount.vue b/src/views/ctrl/statCharts/inOutDoorCount.vue index 93f3458..daab42d 100644 --- a/src/views/ctrl/statCharts/inOutDoorCount.vue +++ b/src/views/ctrl/statCharts/inOutDoorCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 5c18a6d..902c565 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -209,7 +209,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -366,6 +366,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index b3f5a8f..e60f060 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -669,6 +669,7 @@ this.devList = [] this.fenceList = [] response.data.forEach(dev => { + console.log(dev.x,dev.y,dev.type) if (dev.x !== '' && dev.y !== '') { dev.imgUrl = require("../../assets/overview_images/icons/icon-camera-point.png") if(dev.type===10){ //球 diff --git a/src/views/ctrl/statCharts/devAlarmCount.vue b/src/views/ctrl/statCharts/devAlarmCount.vue index 6b6939e..9675244 100644 --- a/src/views/ctrl/statCharts/devAlarmCount.vue +++ b/src/views/ctrl/statCharts/devAlarmCount.vue @@ -76,10 +76,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue index d65ec69..08ce423 100644 --- a/src/views/ctrl/statCharts/inOutCount.vue +++ b/src/views/ctrl/statCharts/inOutCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutDoorCount.vue b/src/views/ctrl/statCharts/inOutDoorCount.vue index 93f3458..daab42d 100644 --- a/src/views/ctrl/statCharts/inOutDoorCount.vue +++ b/src/views/ctrl/statCharts/inOutDoorCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 5c18a6d..902c565 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -209,7 +209,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -366,6 +366,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/staff/staffEdit.vue b/src/views/staff/staffEdit.vue index 642773a..76d3461 100644 --- a/src/views/staff/staffEdit.vue +++ b/src/views/staff/staffEdit.vue @@ -218,7 +218,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur', 'change'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -328,6 +328,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index b3f5a8f..e60f060 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -669,6 +669,7 @@ this.devList = [] this.fenceList = [] response.data.forEach(dev => { + console.log(dev.x,dev.y,dev.type) if (dev.x !== '' && dev.y !== '') { dev.imgUrl = require("../../assets/overview_images/icons/icon-camera-point.png") if(dev.type===10){ //球 diff --git a/src/views/ctrl/statCharts/devAlarmCount.vue b/src/views/ctrl/statCharts/devAlarmCount.vue index 6b6939e..9675244 100644 --- a/src/views/ctrl/statCharts/devAlarmCount.vue +++ b/src/views/ctrl/statCharts/devAlarmCount.vue @@ -76,10 +76,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue index d65ec69..08ce423 100644 --- a/src/views/ctrl/statCharts/inOutCount.vue +++ b/src/views/ctrl/statCharts/inOutCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutDoorCount.vue b/src/views/ctrl/statCharts/inOutDoorCount.vue index 93f3458..daab42d 100644 --- a/src/views/ctrl/statCharts/inOutDoorCount.vue +++ b/src/views/ctrl/statCharts/inOutDoorCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 5c18a6d..902c565 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -209,7 +209,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -366,6 +366,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/staff/staffEdit.vue b/src/views/staff/staffEdit.vue index 642773a..76d3461 100644 --- a/src/views/staff/staffEdit.vue +++ b/src/views/staff/staffEdit.vue @@ -218,7 +218,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur', 'change'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -328,6 +328,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue index 96816be..2d168ad 100644 --- a/src/views/system/user/editUser.vue +++ b/src/views/system/user/editUser.vue @@ -181,7 +181,7 @@ trigger: ['blur', 'change'] }], phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的联系电话', trigger: ['blur', 'change'] }] }, // 前端校验规则 diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index b3f5a8f..e60f060 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -669,6 +669,7 @@ this.devList = [] this.fenceList = [] response.data.forEach(dev => { + console.log(dev.x,dev.y,dev.type) if (dev.x !== '' && dev.y !== '') { dev.imgUrl = require("../../assets/overview_images/icons/icon-camera-point.png") if(dev.type===10){ //球 diff --git a/src/views/ctrl/statCharts/devAlarmCount.vue b/src/views/ctrl/statCharts/devAlarmCount.vue index 6b6939e..9675244 100644 --- a/src/views/ctrl/statCharts/devAlarmCount.vue +++ b/src/views/ctrl/statCharts/devAlarmCount.vue @@ -76,10 +76,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue index d65ec69..08ce423 100644 --- a/src/views/ctrl/statCharts/inOutCount.vue +++ b/src/views/ctrl/statCharts/inOutCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutDoorCount.vue b/src/views/ctrl/statCharts/inOutDoorCount.vue index 93f3458..daab42d 100644 --- a/src/views/ctrl/statCharts/inOutDoorCount.vue +++ b/src/views/ctrl/statCharts/inOutDoorCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 5c18a6d..902c565 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -209,7 +209,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -366,6 +366,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/staff/staffEdit.vue b/src/views/staff/staffEdit.vue index 642773a..76d3461 100644 --- a/src/views/staff/staffEdit.vue +++ b/src/views/staff/staffEdit.vue @@ -218,7 +218,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur', 'change'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -328,6 +328,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue index 96816be..2d168ad 100644 --- a/src/views/system/user/editUser.vue +++ b/src/views/system/user/editUser.vue @@ -181,7 +181,7 @@ trigger: ['blur', 'change'] }], phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的联系电话', trigger: ['blur', 'change'] }] }, // 前端校验规则 diff --git a/src/views/visitor/visitorAdd.vue b/src/views/visitor/visitorAdd.vue index 782b0ec..2dc8ec4 100644 --- a/src/views/visitor/visitorAdd.vue +++ b/src/views/visitor/visitorAdd.vue @@ -277,10 +277,17 @@ }, del(idCard) { const that = this - this.dataForm.visitorBaseDTOList.forEach(function(item, index) { - if (item.idCard === idCard) { - that.dataForm.visitorBaseDTOList.splice(index, 1) - } + this.$confirm('是否确认删除?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitorBaseDTOList.forEach(function(item, index) { + if (item.idCard === idCard) { + that.dataForm.visitorBaseDTOList.splice(index, 1) + } + }) + }).catch(() => { }) }, // 保存数据 @@ -305,7 +312,7 @@ }) }).catch(() => { const code = this.$store.getters.currentSystem.code - this.$router.replace({ path: '/' + code + '/staff/list' }) + this.$router.replace({ path: '/' + code + '/visitor/list' }) }) } else { this.$message.error(response.message) diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index b3f5a8f..e60f060 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -669,6 +669,7 @@ this.devList = [] this.fenceList = [] response.data.forEach(dev => { + console.log(dev.x,dev.y,dev.type) if (dev.x !== '' && dev.y !== '') { dev.imgUrl = require("../../assets/overview_images/icons/icon-camera-point.png") if(dev.type===10){ //球 diff --git a/src/views/ctrl/statCharts/devAlarmCount.vue b/src/views/ctrl/statCharts/devAlarmCount.vue index 6b6939e..9675244 100644 --- a/src/views/ctrl/statCharts/devAlarmCount.vue +++ b/src/views/ctrl/statCharts/devAlarmCount.vue @@ -76,10 +76,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue index d65ec69..08ce423 100644 --- a/src/views/ctrl/statCharts/inOutCount.vue +++ b/src/views/ctrl/statCharts/inOutCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutDoorCount.vue b/src/views/ctrl/statCharts/inOutDoorCount.vue index 93f3458..daab42d 100644 --- a/src/views/ctrl/statCharts/inOutDoorCount.vue +++ b/src/views/ctrl/statCharts/inOutDoorCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 5c18a6d..902c565 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -209,7 +209,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -366,6 +366,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/staff/staffEdit.vue b/src/views/staff/staffEdit.vue index 642773a..76d3461 100644 --- a/src/views/staff/staffEdit.vue +++ b/src/views/staff/staffEdit.vue @@ -218,7 +218,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur', 'change'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -328,6 +328,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue index 96816be..2d168ad 100644 --- a/src/views/system/user/editUser.vue +++ b/src/views/system/user/editUser.vue @@ -181,7 +181,7 @@ trigger: ['blur', 'change'] }], phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的联系电话', trigger: ['blur', 'change'] }] }, // 前端校验规则 diff --git a/src/views/visitor/visitorAdd.vue b/src/views/visitor/visitorAdd.vue index 782b0ec..2dc8ec4 100644 --- a/src/views/visitor/visitorAdd.vue +++ b/src/views/visitor/visitorAdd.vue @@ -277,10 +277,17 @@ }, del(idCard) { const that = this - this.dataForm.visitorBaseDTOList.forEach(function(item, index) { - if (item.idCard === idCard) { - that.dataForm.visitorBaseDTOList.splice(index, 1) - } + this.$confirm('是否确认删除?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitorBaseDTOList.forEach(function(item, index) { + if (item.idCard === idCard) { + that.dataForm.visitorBaseDTOList.splice(index, 1) + } + }) + }).catch(() => { }) }, // 保存数据 @@ -305,7 +312,7 @@ }) }).catch(() => { const code = this.$store.getters.currentSystem.code - this.$router.replace({ path: '/' + code + '/staff/list' }) + this.$router.replace({ path: '/' + code + '/visitor/list' }) }) } else { this.$message.error(response.message) diff --git a/src/views/visitor/visitorAddCar.vue b/src/views/visitor/visitorAddCar.vue index 5a4d535..e92416a 100644 --- a/src/views/visitor/visitorAddCar.vue +++ b/src/views/visitor/visitorAddCar.vue @@ -318,31 +318,51 @@ this.$refs.checkin.initDialog('detail', this.dialogFormVisible, row) }, delCar(plateNumber) { - this.dataForm.visitCarDTOList = this.dataForm.visitCarDTOList.filter(car => { - return car.plateNumber !== plateNumber - }) + const that = this + this.$confirm('是否确认删除车辆?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitCarDTOList = that.dataForm.visitCarDTOList.filter(car => { + return car.plateNumber !== plateNumber + }) - // 删除车辆关联的所有人员 - this.dataForm.visitorBaseDTOList = this.dataForm.visitorBaseDTOList.filter(visitor => { - return visitor.plateNumber !== plateNumber + // 删除车辆关联的所有人员 + that.dataForm.visitorBaseDTOList = that.dataForm.visitorBaseDTOList.filter(visitor => { + return visitor.plateNumber !== plateNumber + }) + }).catch(() => { }) }, del(idCard) { - this.dataForm.visitorBaseDTOList = this.dataForm.visitorBaseDTOList.filter(visitor => { - return visitor.idCard !== idCard - }) + const that = this + this.$confirm('是否确认删除该人员?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitorBaseDTOList = that.dataForm.visitorBaseDTOList.filter(visitor => { + return visitor.idCard !== idCard + }) - // 如果是车主，则删除对应的车辆 - const carToDel = this.dataForm.visitCarDTOList.filter(car => { - return car.idCard === idCard + // 如果是车主，则删除对应的车辆 + const carToDel = that.dataForm.visitCarDTOList.filter(car => { + return car.idCard === idCard + }) + that.delCar(carToDel[0].plateNumber) + }).catch(() => { }) - this.delCar(carToDel[0].plateNumber) }, // 保存数据 saveData: function() { this.btnLoading = true this.$refs['dataForm'].validate((valid) => { + if(!valid){ + this.btnLoading = false + return + } if (this.dataForm.visitorBaseDTOList.length === 0) { this.$message.error('来访人员列表不能为空') } if (this.hasOneCar === false) { @@ -364,7 +384,7 @@ }) }).catch(() => { const code = this.$store.getters.currentSystem.code - this.$router.push({ path: '/' + code + '/staff/list' }) + this.$router.push({ path: '/' + code + '/visitor/list' }) }) } else { this.$message.error(response.message) diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index b3f5a8f..e60f060 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -669,6 +669,7 @@ this.devList = [] this.fenceList = [] response.data.forEach(dev => { + console.log(dev.x,dev.y,dev.type) if (dev.x !== '' && dev.y !== '') { dev.imgUrl = require("../../assets/overview_images/icons/icon-camera-point.png") if(dev.type===10){ //球 diff --git a/src/views/ctrl/statCharts/devAlarmCount.vue b/src/views/ctrl/statCharts/devAlarmCount.vue index 6b6939e..9675244 100644 --- a/src/views/ctrl/statCharts/devAlarmCount.vue +++ b/src/views/ctrl/statCharts/devAlarmCount.vue @@ -76,10 +76,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue index d65ec69..08ce423 100644 --- a/src/views/ctrl/statCharts/inOutCount.vue +++ b/src/views/ctrl/statCharts/inOutCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutDoorCount.vue b/src/views/ctrl/statCharts/inOutDoorCount.vue index 93f3458..daab42d 100644 --- a/src/views/ctrl/statCharts/inOutDoorCount.vue +++ b/src/views/ctrl/statCharts/inOutDoorCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 5c18a6d..902c565 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -209,7 +209,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -366,6 +366,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/staff/staffEdit.vue b/src/views/staff/staffEdit.vue index 642773a..76d3461 100644 --- a/src/views/staff/staffEdit.vue +++ b/src/views/staff/staffEdit.vue @@ -218,7 +218,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur', 'change'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -328,6 +328,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue index 96816be..2d168ad 100644 --- a/src/views/system/user/editUser.vue +++ b/src/views/system/user/editUser.vue @@ -181,7 +181,7 @@ trigger: ['blur', 'change'] }], phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的联系电话', trigger: ['blur', 'change'] }] }, // 前端校验规则 diff --git a/src/views/visitor/visitorAdd.vue b/src/views/visitor/visitorAdd.vue index 782b0ec..2dc8ec4 100644 --- a/src/views/visitor/visitorAdd.vue +++ b/src/views/visitor/visitorAdd.vue @@ -277,10 +277,17 @@ }, del(idCard) { const that = this - this.dataForm.visitorBaseDTOList.forEach(function(item, index) { - if (item.idCard === idCard) { - that.dataForm.visitorBaseDTOList.splice(index, 1) - } + this.$confirm('是否确认删除?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitorBaseDTOList.forEach(function(item, index) { + if (item.idCard === idCard) { + that.dataForm.visitorBaseDTOList.splice(index, 1) + } + }) + }).catch(() => { }) }, // 保存数据 @@ -305,7 +312,7 @@ }) }).catch(() => { const code = this.$store.getters.currentSystem.code - this.$router.replace({ path: '/' + code + '/staff/list' }) + this.$router.replace({ path: '/' + code + '/visitor/list' }) }) } else { this.$message.error(response.message) diff --git a/src/views/visitor/visitorAddCar.vue b/src/views/visitor/visitorAddCar.vue index 5a4d535..e92416a 100644 --- a/src/views/visitor/visitorAddCar.vue +++ b/src/views/visitor/visitorAddCar.vue @@ -318,31 +318,51 @@ this.$refs.checkin.initDialog('detail', this.dialogFormVisible, row) }, delCar(plateNumber) { - this.dataForm.visitCarDTOList = this.dataForm.visitCarDTOList.filter(car => { - return car.plateNumber !== plateNumber - }) + const that = this + this.$confirm('是否确认删除车辆?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitCarDTOList = that.dataForm.visitCarDTOList.filter(car => { + return car.plateNumber !== plateNumber + }) - // 删除车辆关联的所有人员 - this.dataForm.visitorBaseDTOList = this.dataForm.visitorBaseDTOList.filter(visitor => { - return visitor.plateNumber !== plateNumber + // 删除车辆关联的所有人员 + that.dataForm.visitorBaseDTOList = that.dataForm.visitorBaseDTOList.filter(visitor => { + return visitor.plateNumber !== plateNumber + }) + }).catch(() => { }) }, del(idCard) { - this.dataForm.visitorBaseDTOList = this.dataForm.visitorBaseDTOList.filter(visitor => { - return visitor.idCard !== idCard - }) + const that = this + this.$confirm('是否确认删除该人员?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitorBaseDTOList = that.dataForm.visitorBaseDTOList.filter(visitor => { + return visitor.idCard !== idCard + }) - // 如果是车主，则删除对应的车辆 - const carToDel = this.dataForm.visitCarDTOList.filter(car => { - return car.idCard === idCard + // 如果是车主，则删除对应的车辆 + const carToDel = that.dataForm.visitCarDTOList.filter(car => { + return car.idCard === idCard + }) + that.delCar(carToDel[0].plateNumber) + }).catch(() => { }) - this.delCar(carToDel[0].plateNumber) }, // 保存数据 saveData: function() { this.btnLoading = true this.$refs['dataForm'].validate((valid) => { + if(!valid){ + this.btnLoading = false + return + } if (this.dataForm.visitorBaseDTOList.length === 0) { this.$message.error('来访人员列表不能为空') } if (this.hasOneCar === false) { @@ -364,7 +384,7 @@ }) }).catch(() => { const code = this.$store.getters.currentSystem.code - this.$router.push({ path: '/' + code + '/staff/list' }) + this.$router.push({ path: '/' + code + '/visitor/list' }) }) } else { this.$message.error(response.message) diff --git a/src/views/visitor/visitorCarCheckIn.vue b/src/views/visitor/visitorCarCheckIn.vue index dbfe158..c0f7a01 100644 --- a/src/views/visitor/visitorCarCheckIn.vue +++ b/src/views/visitor/visitorCarCheckIn.vue @@ -182,6 +182,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.dataForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index b3f5a8f..e60f060 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -669,6 +669,7 @@ this.devList = [] this.fenceList = [] response.data.forEach(dev => { + console.log(dev.x,dev.y,dev.type) if (dev.x !== '' && dev.y !== '') { dev.imgUrl = require("../../assets/overview_images/icons/icon-camera-point.png") if(dev.type===10){ //球 diff --git a/src/views/ctrl/statCharts/devAlarmCount.vue b/src/views/ctrl/statCharts/devAlarmCount.vue index 6b6939e..9675244 100644 --- a/src/views/ctrl/statCharts/devAlarmCount.vue +++ b/src/views/ctrl/statCharts/devAlarmCount.vue @@ -76,10 +76,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue index d65ec69..08ce423 100644 --- a/src/views/ctrl/statCharts/inOutCount.vue +++ b/src/views/ctrl/statCharts/inOutCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutDoorCount.vue b/src/views/ctrl/statCharts/inOutDoorCount.vue index 93f3458..daab42d 100644 --- a/src/views/ctrl/statCharts/inOutDoorCount.vue +++ b/src/views/ctrl/statCharts/inOutDoorCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 5c18a6d..902c565 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -209,7 +209,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -366,6 +366,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/staff/staffEdit.vue b/src/views/staff/staffEdit.vue index 642773a..76d3461 100644 --- a/src/views/staff/staffEdit.vue +++ b/src/views/staff/staffEdit.vue @@ -218,7 +218,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur', 'change'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -328,6 +328,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue index 96816be..2d168ad 100644 --- a/src/views/system/user/editUser.vue +++ b/src/views/system/user/editUser.vue @@ -181,7 +181,7 @@ trigger: ['blur', 'change'] }], phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的联系电话', trigger: ['blur', 'change'] }] }, // 前端校验规则 diff --git a/src/views/visitor/visitorAdd.vue b/src/views/visitor/visitorAdd.vue index 782b0ec..2dc8ec4 100644 --- a/src/views/visitor/visitorAdd.vue +++ b/src/views/visitor/visitorAdd.vue @@ -277,10 +277,17 @@ }, del(idCard) { const that = this - this.dataForm.visitorBaseDTOList.forEach(function(item, index) { - if (item.idCard === idCard) { - that.dataForm.visitorBaseDTOList.splice(index, 1) - } + this.$confirm('是否确认删除?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitorBaseDTOList.forEach(function(item, index) { + if (item.idCard === idCard) { + that.dataForm.visitorBaseDTOList.splice(index, 1) + } + }) + }).catch(() => { }) }, // 保存数据 @@ -305,7 +312,7 @@ }) }).catch(() => { const code = this.$store.getters.currentSystem.code - this.$router.replace({ path: '/' + code + '/staff/list' }) + this.$router.replace({ path: '/' + code + '/visitor/list' }) }) } else { this.$message.error(response.message) diff --git a/src/views/visitor/visitorAddCar.vue b/src/views/visitor/visitorAddCar.vue index 5a4d535..e92416a 100644 --- a/src/views/visitor/visitorAddCar.vue +++ b/src/views/visitor/visitorAddCar.vue @@ -318,31 +318,51 @@ this.$refs.checkin.initDialog('detail', this.dialogFormVisible, row) }, delCar(plateNumber) { - this.dataForm.visitCarDTOList = this.dataForm.visitCarDTOList.filter(car => { - return car.plateNumber !== plateNumber - }) + const that = this + this.$confirm('是否确认删除车辆?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitCarDTOList = that.dataForm.visitCarDTOList.filter(car => { + return car.plateNumber !== plateNumber + }) - // 删除车辆关联的所有人员 - this.dataForm.visitorBaseDTOList = this.dataForm.visitorBaseDTOList.filter(visitor => { - return visitor.plateNumber !== plateNumber + // 删除车辆关联的所有人员 + that.dataForm.visitorBaseDTOList = that.dataForm.visitorBaseDTOList.filter(visitor => { + return visitor.plateNumber !== plateNumber + }) + }).catch(() => { }) }, del(idCard) { - this.dataForm.visitorBaseDTOList = this.dataForm.visitorBaseDTOList.filter(visitor => { - return visitor.idCard !== idCard - }) + const that = this + this.$confirm('是否确认删除该人员?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitorBaseDTOList = that.dataForm.visitorBaseDTOList.filter(visitor => { + return visitor.idCard !== idCard + }) - // 如果是车主，则删除对应的车辆 - const carToDel = this.dataForm.visitCarDTOList.filter(car => { - return car.idCard === idCard + // 如果是车主，则删除对应的车辆 + const carToDel = that.dataForm.visitCarDTOList.filter(car => { + return car.idCard === idCard + }) + that.delCar(carToDel[0].plateNumber) + }).catch(() => { }) - this.delCar(carToDel[0].plateNumber) }, // 保存数据 saveData: function() { this.btnLoading = true this.$refs['dataForm'].validate((valid) => { + if(!valid){ + this.btnLoading = false + return + } if (this.dataForm.visitorBaseDTOList.length === 0) { this.$message.error('来访人员列表不能为空') } if (this.hasOneCar === false) { @@ -364,7 +384,7 @@ }) }).catch(() => { const code = this.$store.getters.currentSystem.code - this.$router.push({ path: '/' + code + '/staff/list' }) + this.$router.push({ path: '/' + code + '/visitor/list' }) }) } else { this.$message.error(response.message) diff --git a/src/views/visitor/visitorCarCheckIn.vue b/src/views/visitor/visitorCarCheckIn.vue index dbfe158..c0f7a01 100644 --- a/src/views/visitor/visitorCarCheckIn.vue +++ b/src/views/visitor/visitorCarCheckIn.vue @@ -182,6 +182,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.dataForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/visitor/visitorCarTodayList.vue b/src/views/visitor/visitorCarTodayList.vue index 6d78a80..31c095b 100644 --- a/src/views/visitor/visitorCarTodayList.vue +++ b/src/views/visitor/visitorCarTodayList.vue @@ -44,9 +44,9 @@ @@ -189,7 +189,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `当日来访车辆.xlsx` // 下载后文件名 + downloadElement.download = `来访车辆列表.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index b3f5a8f..e60f060 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -669,6 +669,7 @@ this.devList = [] this.fenceList = [] response.data.forEach(dev => { + console.log(dev.x,dev.y,dev.type) if (dev.x !== '' && dev.y !== '') { dev.imgUrl = require("../../assets/overview_images/icons/icon-camera-point.png") if(dev.type===10){ //球 diff --git a/src/views/ctrl/statCharts/devAlarmCount.vue b/src/views/ctrl/statCharts/devAlarmCount.vue index 6b6939e..9675244 100644 --- a/src/views/ctrl/statCharts/devAlarmCount.vue +++ b/src/views/ctrl/statCharts/devAlarmCount.vue @@ -76,10 +76,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue index d65ec69..08ce423 100644 --- a/src/views/ctrl/statCharts/inOutCount.vue +++ b/src/views/ctrl/statCharts/inOutCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutDoorCount.vue b/src/views/ctrl/statCharts/inOutDoorCount.vue index 93f3458..daab42d 100644 --- a/src/views/ctrl/statCharts/inOutDoorCount.vue +++ b/src/views/ctrl/statCharts/inOutDoorCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 5c18a6d..902c565 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -209,7 +209,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -366,6 +366,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/staff/staffEdit.vue b/src/views/staff/staffEdit.vue index 642773a..76d3461 100644 --- a/src/views/staff/staffEdit.vue +++ b/src/views/staff/staffEdit.vue @@ -218,7 +218,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur', 'change'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -328,6 +328,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue index 96816be..2d168ad 100644 --- a/src/views/system/user/editUser.vue +++ b/src/views/system/user/editUser.vue @@ -181,7 +181,7 @@ trigger: ['blur', 'change'] }], phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的联系电话', trigger: ['blur', 'change'] }] }, // 前端校验规则 diff --git a/src/views/visitor/visitorAdd.vue b/src/views/visitor/visitorAdd.vue index 782b0ec..2dc8ec4 100644 --- a/src/views/visitor/visitorAdd.vue +++ b/src/views/visitor/visitorAdd.vue @@ -277,10 +277,17 @@ }, del(idCard) { const that = this - this.dataForm.visitorBaseDTOList.forEach(function(item, index) { - if (item.idCard === idCard) { - that.dataForm.visitorBaseDTOList.splice(index, 1) - } + this.$confirm('是否确认删除?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitorBaseDTOList.forEach(function(item, index) { + if (item.idCard === idCard) { + that.dataForm.visitorBaseDTOList.splice(index, 1) + } + }) + }).catch(() => { }) }, // 保存数据 @@ -305,7 +312,7 @@ }) }).catch(() => { const code = this.$store.getters.currentSystem.code - this.$router.replace({ path: '/' + code + '/staff/list' }) + this.$router.replace({ path: '/' + code + '/visitor/list' }) }) } else { this.$message.error(response.message) diff --git a/src/views/visitor/visitorAddCar.vue b/src/views/visitor/visitorAddCar.vue index 5a4d535..e92416a 100644 --- a/src/views/visitor/visitorAddCar.vue +++ b/src/views/visitor/visitorAddCar.vue @@ -318,31 +318,51 @@ this.$refs.checkin.initDialog('detail', this.dialogFormVisible, row) }, delCar(plateNumber) { - this.dataForm.visitCarDTOList = this.dataForm.visitCarDTOList.filter(car => { - return car.plateNumber !== plateNumber - }) + const that = this + this.$confirm('是否确认删除车辆?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitCarDTOList = that.dataForm.visitCarDTOList.filter(car => { + return car.plateNumber !== plateNumber + }) - // 删除车辆关联的所有人员 - this.dataForm.visitorBaseDTOList = this.dataForm.visitorBaseDTOList.filter(visitor => { - return visitor.plateNumber !== plateNumber + // 删除车辆关联的所有人员 + that.dataForm.visitorBaseDTOList = that.dataForm.visitorBaseDTOList.filter(visitor => { + return visitor.plateNumber !== plateNumber + }) + }).catch(() => { }) }, del(idCard) { - this.dataForm.visitorBaseDTOList = this.dataForm.visitorBaseDTOList.filter(visitor => { - return visitor.idCard !== idCard - }) + const that = this + this.$confirm('是否确认删除该人员?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitorBaseDTOList = that.dataForm.visitorBaseDTOList.filter(visitor => { + return visitor.idCard !== idCard + }) - // 如果是车主，则删除对应的车辆 - const carToDel = this.dataForm.visitCarDTOList.filter(car => { - return car.idCard === idCard + // 如果是车主，则删除对应的车辆 + const carToDel = that.dataForm.visitCarDTOList.filter(car => { + return car.idCard === idCard + }) + that.delCar(carToDel[0].plateNumber) + }).catch(() => { }) - this.delCar(carToDel[0].plateNumber) }, // 保存数据 saveData: function() { this.btnLoading = true this.$refs['dataForm'].validate((valid) => { + if(!valid){ + this.btnLoading = false + return + } if (this.dataForm.visitorBaseDTOList.length === 0) { this.$message.error('来访人员列表不能为空') } if (this.hasOneCar === false) { @@ -364,7 +384,7 @@ }) }).catch(() => { const code = this.$store.getters.currentSystem.code - this.$router.push({ path: '/' + code + '/staff/list' }) + this.$router.push({ path: '/' + code + '/visitor/list' }) }) } else { this.$message.error(response.message) diff --git a/src/views/visitor/visitorCarCheckIn.vue b/src/views/visitor/visitorCarCheckIn.vue index dbfe158..c0f7a01 100644 --- a/src/views/visitor/visitorCarCheckIn.vue +++ b/src/views/visitor/visitorCarCheckIn.vue @@ -182,6 +182,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.dataForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/visitor/visitorCarTodayList.vue b/src/views/visitor/visitorCarTodayList.vue index 6d78a80..31c095b 100644 --- a/src/views/visitor/visitorCarTodayList.vue +++ b/src/views/visitor/visitorCarTodayList.vue @@ -44,9 +44,9 @@ @@ -189,7 +189,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `当日来访车辆.xlsx` // 下载后文件名 + downloadElement.download = `来访车辆列表.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/visitor/visitorCheckIn.vue b/src/views/visitor/visitorCheckIn.vue index 20ee0c8..738136f 100644 --- a/src/views/visitor/visitorCheckIn.vue +++ b/src/views/visitor/visitorCheckIn.vue @@ -16,7 +16,7 @@ 读取身份证 - {{ btnCamera }} + {{ btnCamera }} @@ -56,7 +56,7 @@ - + 保 存 @@ -170,6 +170,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.dataForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/ctrl/overview.vue b/src/views/ctrl/overview.vue index b3f5a8f..e60f060 100644 --- a/src/views/ctrl/overview.vue +++ b/src/views/ctrl/overview.vue @@ -669,6 +669,7 @@ this.devList = [] this.fenceList = [] response.data.forEach(dev => { + console.log(dev.x,dev.y,dev.type) if (dev.x !== '' && dev.y !== '') { dev.imgUrl = require("../../assets/overview_images/icons/icon-camera-point.png") if(dev.type===10){ //球 diff --git a/src/views/ctrl/statCharts/devAlarmCount.vue b/src/views/ctrl/statCharts/devAlarmCount.vue index 6b6939e..9675244 100644 --- a/src/views/ctrl/statCharts/devAlarmCount.vue +++ b/src/views/ctrl/statCharts/devAlarmCount.vue @@ -76,10 +76,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutCount.vue b/src/views/ctrl/statCharts/inOutCount.vue index d65ec69..08ce423 100644 --- a/src/views/ctrl/statCharts/inOutCount.vue +++ b/src/views/ctrl/statCharts/inOutCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/ctrl/statCharts/inOutDoorCount.vue b/src/views/ctrl/statCharts/inOutDoorCount.vue index 93f3458..daab42d 100644 --- a/src/views/ctrl/statCharts/inOutDoorCount.vue +++ b/src/views/ctrl/statCharts/inOutDoorCount.vue @@ -82,10 +82,10 @@ picker.$emit('pick', [start, end]) } }], - disabledDate(time) { - const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) - return time.getTime() < oneMonthLater - } + // disabledDate(time) { + // const oneMonthLater = new Date(now.getTime() - (oneDayTime * 31)) + // return time.getTime() < oneMonthLater + // } } } }, diff --git a/src/views/staff/staffAdd.vue b/src/views/staff/staffAdd.vue index 5c18a6d..902c565 100644 --- a/src/views/staff/staffAdd.vue +++ b/src/views/staff/staffAdd.vue @@ -209,7 +209,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -366,6 +366,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/staff/staffEdit.vue b/src/views/staff/staffEdit.vue index 642773a..76d3461 100644 --- a/src/views/staff/staffEdit.vue +++ b/src/views/staff/staffEdit.vue @@ -218,7 +218,7 @@ rules: { phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的移动电话', trigger: ['blur', 'change'] }], officePhone: [{ required: false, trigger: ['blur'], validator: phoneValidatorCanNull }], @@ -328,6 +328,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.personForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue index 96816be..2d168ad 100644 --- a/src/views/system/user/editUser.vue +++ b/src/views/system/user/editUser.vue @@ -181,7 +181,7 @@ trigger: ['blur', 'change'] }], phone: [{ required: false, - pattern: /^1[34578]\d{9}$/, // 可以写正则表达式呦呦呦 + pattern: /^1[345678]\d{9}$/, // 可以写正则表达式呦呦呦 message: '请输入正确的联系电话', trigger: ['blur', 'change'] }] }, // 前端校验规则 diff --git a/src/views/visitor/visitorAdd.vue b/src/views/visitor/visitorAdd.vue index 782b0ec..2dc8ec4 100644 --- a/src/views/visitor/visitorAdd.vue +++ b/src/views/visitor/visitorAdd.vue @@ -277,10 +277,17 @@ }, del(idCard) { const that = this - this.dataForm.visitorBaseDTOList.forEach(function(item, index) { - if (item.idCard === idCard) { - that.dataForm.visitorBaseDTOList.splice(index, 1) - } + this.$confirm('是否确认删除?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitorBaseDTOList.forEach(function(item, index) { + if (item.idCard === idCard) { + that.dataForm.visitorBaseDTOList.splice(index, 1) + } + }) + }).catch(() => { }) }, // 保存数据 @@ -305,7 +312,7 @@ }) }).catch(() => { const code = this.$store.getters.currentSystem.code - this.$router.replace({ path: '/' + code + '/staff/list' }) + this.$router.replace({ path: '/' + code + '/visitor/list' }) }) } else { this.$message.error(response.message) diff --git a/src/views/visitor/visitorAddCar.vue b/src/views/visitor/visitorAddCar.vue index 5a4d535..e92416a 100644 --- a/src/views/visitor/visitorAddCar.vue +++ b/src/views/visitor/visitorAddCar.vue @@ -318,31 +318,51 @@ this.$refs.checkin.initDialog('detail', this.dialogFormVisible, row) }, delCar(plateNumber) { - this.dataForm.visitCarDTOList = this.dataForm.visitCarDTOList.filter(car => { - return car.plateNumber !== plateNumber - }) + const that = this + this.$confirm('是否确认删除车辆?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitCarDTOList = that.dataForm.visitCarDTOList.filter(car => { + return car.plateNumber !== plateNumber + }) - // 删除车辆关联的所有人员 - this.dataForm.visitorBaseDTOList = this.dataForm.visitorBaseDTOList.filter(visitor => { - return visitor.plateNumber !== plateNumber + // 删除车辆关联的所有人员 + that.dataForm.visitorBaseDTOList = that.dataForm.visitorBaseDTOList.filter(visitor => { + return visitor.plateNumber !== plateNumber + }) + }).catch(() => { }) }, del(idCard) { - this.dataForm.visitorBaseDTOList = this.dataForm.visitorBaseDTOList.filter(visitor => { - return visitor.idCard !== idCard - }) + const that = this + this.$confirm('是否确认删除该人员?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'info' + }).then(() => { + that.dataForm.visitorBaseDTOList = that.dataForm.visitorBaseDTOList.filter(visitor => { + return visitor.idCard !== idCard + }) - // 如果是车主，则删除对应的车辆 - const carToDel = this.dataForm.visitCarDTOList.filter(car => { - return car.idCard === idCard + // 如果是车主，则删除对应的车辆 + const carToDel = that.dataForm.visitCarDTOList.filter(car => { + return car.idCard === idCard + }) + that.delCar(carToDel[0].plateNumber) + }).catch(() => { }) - this.delCar(carToDel[0].plateNumber) }, // 保存数据 saveData: function() { this.btnLoading = true this.$refs['dataForm'].validate((valid) => { + if(!valid){ + this.btnLoading = false + return + } if (this.dataForm.visitorBaseDTOList.length === 0) { this.$message.error('来访人员列表不能为空') } if (this.hasOneCar === false) { @@ -364,7 +384,7 @@ }) }).catch(() => { const code = this.$store.getters.currentSystem.code - this.$router.push({ path: '/' + code + '/staff/list' }) + this.$router.push({ path: '/' + code + '/visitor/list' }) }) } else { this.$message.error(response.message) diff --git a/src/views/visitor/visitorCarCheckIn.vue b/src/views/visitor/visitorCarCheckIn.vue index dbfe158..c0f7a01 100644 --- a/src/views/visitor/visitorCarCheckIn.vue +++ b/src/views/visitor/visitorCarCheckIn.vue @@ -182,6 +182,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.dataForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/visitor/visitorCarTodayList.vue b/src/views/visitor/visitorCarTodayList.vue index 6d78a80..31c095b 100644 --- a/src/views/visitor/visitorCarTodayList.vue +++ b/src/views/visitor/visitorCarTodayList.vue @@ -44,9 +44,9 @@ @@ -189,7 +189,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `当日来访车辆.xlsx` // 下载后文件名 + downloadElement.download = `来访车辆列表.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素 diff --git a/src/views/visitor/visitorCheckIn.vue b/src/views/visitor/visitorCheckIn.vue index 20ee0c8..738136f 100644 --- a/src/views/visitor/visitorCheckIn.vue +++ b/src/views/visitor/visitorCheckIn.vue @@ -16,7 +16,7 @@ 读取身份证 - {{ btnCamera }} + {{ btnCamera }} @@ -56,7 +56,7 @@ - + 保 存 @@ -170,6 +170,7 @@ console.log(data) if (data !== '' && data.success === 'true') { that.photo = data.image.replace('bmp', 'png') + that.dataForm.photo = data.image.replace('bmp', 'png') } else { that.$message.warning('拍照失败') } diff --git a/src/views/visitor/visitorTodayList.vue b/src/views/visitor/visitorTodayList.vue index 4d42186..f7b3a2a 100644 --- a/src/views/visitor/visitorTodayList.vue +++ b/src/views/visitor/visitorTodayList.vue @@ -44,8 +44,8 @@ @@ -187,7 +187,7 @@ const downloadElement = document.createElement('a') const href = window.URL.createObjectURL(blob) // 创建下载的链接 downloadElement.href = href - downloadElement.download = `当日来访人员列表.xlsx` // 下载后文件名 + downloadElement.download = `来访人员列表.xlsx` // 下载后文件名 document.body.appendChild(downloadElement) downloadElement.click() // 点击下载 document.body.removeChild(downloadElement) // 下载完成移除元素