diff --git a/config/dev.env.js b/config/dev.env.js index 28507b9..22aea85 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://192.168.0.18:8095"' - // BASE_API: '"http://192.168.0.166:20005"' + BASE_API: '"http://127.0.0.1:8095"' + // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/config/dev.env.js b/config/dev.env.js index 28507b9..22aea85 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://192.168.0.18:8095"' - // BASE_API: '"http://192.168.0.166:20005"' + BASE_API: '"http://127.0.0.1:8095"' + // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index f0df672..e45ec35 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -8,7 +8,7 @@ return request({ url: 'makeReport/make', method: 'get', - timeout: 120000, + timeout: 180000, params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) @@ -27,6 +27,7 @@ return request({ url: 'report/list', method: 'get', + timeout: 180000, params }) } @@ -101,7 +102,7 @@ return request({ url: 'report/batchExport', method: 'get', - timeout: 120000, + timeout: 180000, params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) @@ -146,6 +147,7 @@ return request({ url: 'sync/syncAndGenerate', method: 'post', + timeout: 180000, params, paramsSerializer: params => { return qs.stringify(params, { indices: false }) diff --git a/config/dev.env.js b/config/dev.env.js index 28507b9..22aea85 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://192.168.0.18:8095"' - // BASE_API: '"http://192.168.0.166:20005"' + BASE_API: '"http://127.0.0.1:8095"' + // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index f0df672..e45ec35 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -8,7 +8,7 @@ return request({ url: 'makeReport/make', method: 'get', - timeout: 120000, + timeout: 180000, params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) @@ -27,6 +27,7 @@ return request({ url: 'report/list', method: 'get', + timeout: 180000, params }) } @@ -101,7 +102,7 @@ return request({ url: 'report/batchExport', method: 'get', - timeout: 120000, + timeout: 180000, params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) @@ -146,6 +147,7 @@ return request({ url: 'sync/syncAndGenerate', method: 'post', + timeout: 180000, params, paramsSerializer: params => { return qs.stringify(params, { indices: false }) diff --git a/src/router/index.js b/src/router/index.js index 733af54..57555ea 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -57,7 +57,7 @@ children: [{ path: 'dashboard', name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + component: () => import('@/views/dashboard/indexPro'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } diff --git a/config/dev.env.js b/config/dev.env.js index 28507b9..22aea85 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://192.168.0.18:8095"' - // BASE_API: '"http://192.168.0.166:20005"' + BASE_API: '"http://127.0.0.1:8095"' + // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index f0df672..e45ec35 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -8,7 +8,7 @@ return request({ url: 'makeReport/make', method: 'get', - timeout: 120000, + timeout: 180000, params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) @@ -27,6 +27,7 @@ return request({ url: 'report/list', method: 'get', + timeout: 180000, params }) } @@ -101,7 +102,7 @@ return request({ url: 'report/batchExport', method: 'get', - timeout: 120000, + timeout: 180000, params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) @@ -146,6 +147,7 @@ return request({ url: 'sync/syncAndGenerate', method: 'post', + timeout: 180000, params, paramsSerializer: params => { return qs.stringify(params, { indices: false }) diff --git a/src/router/index.js b/src/router/index.js index 733af54..57555ea 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -57,7 +57,7 @@ children: [{ path: 'dashboard', name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + component: () => import('@/views/dashboard/indexPro'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue index c474ee1..70c4173 100644 --- a/src/views/attendance/editRemarks.vue +++ b/src/views/attendance/editRemarks.vue @@ -64,20 +64,32 @@ - - - - - - - + placeholder="开始日期"/> + + + + + + + + + + + + + + @@ -146,6 +158,7 @@ endDate: '', breastfeedType: '', breastfeedBeginDate: '', + breastfeedEndDate: '', other: '', onBusiness: '' }, // 表单 @@ -155,6 +168,7 @@ remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }], beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }], breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }], + breastfeedEndDate: [{ required: true, message: '请选择哺乳假结束日期', trigger: ['blur'] }], breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }], other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }], endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }], @@ -234,6 +248,7 @@ this.remarksForm.beginDate = this.curDate this.remarksForm.endDate = this.curDate this.remarksForm.breastfeedBeginDate = this.curDate + this.remarksForm.breastfeedEndDate = '' this.$nextTick(() => { this.$refs['dataForm'].clearValidate() }) @@ -262,8 +277,17 @@ this.saveBtnDisabeld = true // 如果备注为哺乳假，则需要特别处理 if (this.remarksForm.remarks === '请假-哺乳假') { + var startDates = this.remarksForm.breastfeedBeginDate.split('-') + var endDates = this.remarksForm.breastfeedEndDate.split('-') + var startDate = new Date(startDates[0], startDates[1] - 1, startDates[2]) + var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2]) + if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) { + this.$message.error('哺乳假时间太长，请选择合理的起止日期') + return + }// 把相差的毫秒数 this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate + this.remarksForm.endDate = this.remarksForm.breastfeedEndDate } // 如果备注了其他原因 if (this.remarksForm.remarks === '其他原因') { diff --git a/config/dev.env.js b/config/dev.env.js index 28507b9..22aea85 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://192.168.0.18:8095"' - // BASE_API: '"http://192.168.0.166:20005"' + BASE_API: '"http://127.0.0.1:8095"' + // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index f0df672..e45ec35 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -8,7 +8,7 @@ return request({ url: 'makeReport/make', method: 'get', - timeout: 120000, + timeout: 180000, params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) @@ -27,6 +27,7 @@ return request({ url: 'report/list', method: 'get', + timeout: 180000, params }) } @@ -101,7 +102,7 @@ return request({ url: 'report/batchExport', method: 'get', - timeout: 120000, + timeout: 180000, params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) @@ -146,6 +147,7 @@ return request({ url: 'sync/syncAndGenerate', method: 'post', + timeout: 180000, params, paramsSerializer: params => { return qs.stringify(params, { indices: false }) diff --git a/src/router/index.js b/src/router/index.js index 733af54..57555ea 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -57,7 +57,7 @@ children: [{ path: 'dashboard', name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + component: () => import('@/views/dashboard/indexPro'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue index c474ee1..70c4173 100644 --- a/src/views/attendance/editRemarks.vue +++ b/src/views/attendance/editRemarks.vue @@ -64,20 +64,32 @@ - - - - - - - + placeholder="开始日期"/> + + + + + + + + + + + + + + @@ -146,6 +158,7 @@ endDate: '', breastfeedType: '', breastfeedBeginDate: '', + breastfeedEndDate: '', other: '', onBusiness: '' }, // 表单 @@ -155,6 +168,7 @@ remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }], beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }], breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }], + breastfeedEndDate: [{ required: true, message: '请选择哺乳假结束日期', trigger: ['blur'] }], breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }], other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }], endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }], @@ -234,6 +248,7 @@ this.remarksForm.beginDate = this.curDate this.remarksForm.endDate = this.curDate this.remarksForm.breastfeedBeginDate = this.curDate + this.remarksForm.breastfeedEndDate = '' this.$nextTick(() => { this.$refs['dataForm'].clearValidate() }) @@ -262,8 +277,17 @@ this.saveBtnDisabeld = true // 如果备注为哺乳假，则需要特别处理 if (this.remarksForm.remarks === '请假-哺乳假') { + var startDates = this.remarksForm.breastfeedBeginDate.split('-') + var endDates = this.remarksForm.breastfeedEndDate.split('-') + var startDate = new Date(startDates[0], startDates[1] - 1, startDates[2]) + var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2]) + if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) { + this.$message.error('哺乳假时间太长，请选择合理的起止日期') + return + }// 把相差的毫秒数 this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate + this.remarksForm.endDate = this.remarksForm.breastfeedEndDate } // 如果备注了其他原因 if (this.remarksForm.remarks === '其他原因') { diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue index 488197e..f0bc3c1 100644 --- a/src/views/dashboard/components/printAnalysis.vue +++ b/src/views/dashboard/components/printAnalysis.vue @@ -78,6 +78,9 @@ } printCountByDept(listQuery).then(response => { const data = response.data + this.legends.show = true + this.tooltip.show = true + this.chartSettings.label.normal.show = true if (data.length !== 0) { if (data.length === 1 && data[0].count === 0) { this.legends.show = false diff --git a/config/dev.env.js b/config/dev.env.js index 28507b9..22aea85 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://192.168.0.18:8095"' - // BASE_API: '"http://192.168.0.166:20005"' + BASE_API: '"http://127.0.0.1:8095"' + // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index f0df672..e45ec35 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -8,7 +8,7 @@ return request({ url: 'makeReport/make', method: 'get', - timeout: 120000, + timeout: 180000, params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) @@ -27,6 +27,7 @@ return request({ url: 'report/list', method: 'get', + timeout: 180000, params }) } @@ -101,7 +102,7 @@ return request({ url: 'report/batchExport', method: 'get', - timeout: 120000, + timeout: 180000, params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) @@ -146,6 +147,7 @@ return request({ url: 'sync/syncAndGenerate', method: 'post', + timeout: 180000, params, paramsSerializer: params => { return qs.stringify(params, { indices: false }) diff --git a/src/router/index.js b/src/router/index.js index 733af54..57555ea 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -57,7 +57,7 @@ children: [{ path: 'dashboard', name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + component: () => import('@/views/dashboard/indexPro'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue index c474ee1..70c4173 100644 --- a/src/views/attendance/editRemarks.vue +++ b/src/views/attendance/editRemarks.vue @@ -64,20 +64,32 @@ - - - - - - - + placeholder="开始日期"/> + + + + + + + + + + + + + + @@ -146,6 +158,7 @@ endDate: '', breastfeedType: '', breastfeedBeginDate: '', + breastfeedEndDate: '', other: '', onBusiness: '' }, // 表单 @@ -155,6 +168,7 @@ remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }], beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }], breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }], + breastfeedEndDate: [{ required: true, message: '请选择哺乳假结束日期', trigger: ['blur'] }], breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }], other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }], endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }], @@ -234,6 +248,7 @@ this.remarksForm.beginDate = this.curDate this.remarksForm.endDate = this.curDate this.remarksForm.breastfeedBeginDate = this.curDate + this.remarksForm.breastfeedEndDate = '' this.$nextTick(() => { this.$refs['dataForm'].clearValidate() }) @@ -262,8 +277,17 @@ this.saveBtnDisabeld = true // 如果备注为哺乳假，则需要特别处理 if (this.remarksForm.remarks === '请假-哺乳假') { + var startDates = this.remarksForm.breastfeedBeginDate.split('-') + var endDates = this.remarksForm.breastfeedEndDate.split('-') + var startDate = new Date(startDates[0], startDates[1] - 1, startDates[2]) + var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2]) + if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) { + this.$message.error('哺乳假时间太长，请选择合理的起止日期') + return + }// 把相差的毫秒数 this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate + this.remarksForm.endDate = this.remarksForm.breastfeedEndDate } // 如果备注了其他原因 if (this.remarksForm.remarks === '其他原因') { diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue index 488197e..f0bc3c1 100644 --- a/src/views/dashboard/components/printAnalysis.vue +++ b/src/views/dashboard/components/printAnalysis.vue @@ -78,6 +78,9 @@ } printCountByDept(listQuery).then(response => { const data = response.data + this.legends.show = true + this.tooltip.show = true + this.chartSettings.label.normal.show = true if (data.length !== 0) { if (data.length === 1 && data[0].count === 0) { this.legends.show = false diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue index 199ea5d..937d09a 100644 --- a/src/views/memberManage/addPerson.vue +++ b/src/views/memberManage/addPerson.vue @@ -462,7 +462,9 @@ } this.ws.onmessage = function(receiveMsg) { var data = JSON.parse(receiveMsg.data) - if (data !== '') { + if (data.message === 'fail') { + _this.$message.warning('读卡失败') + } else { _this.personForm.idCardNo = data.IdCardNo _this.personForm.name = data.Name // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' } @@ -480,8 +482,6 @@ } _this.personForm.ext.certificationUnit = data.Authority _this.personForm.ext.address = data.Address - } else { - _this.$message.warning('读卡失败') } _this.readIDCardDisabled = false } diff --git a/config/dev.env.js b/config/dev.env.js index 28507b9..22aea85 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://192.168.0.18:8095"' - // BASE_API: '"http://192.168.0.166:20005"' + BASE_API: '"http://127.0.0.1:8095"' + // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index f0df672..e45ec35 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -8,7 +8,7 @@ return request({ url: 'makeReport/make', method: 'get', - timeout: 120000, + timeout: 180000, params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) @@ -27,6 +27,7 @@ return request({ url: 'report/list', method: 'get', + timeout: 180000, params }) } @@ -101,7 +102,7 @@ return request({ url: 'report/batchExport', method: 'get', - timeout: 120000, + timeout: 180000, params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) @@ -146,6 +147,7 @@ return request({ url: 'sync/syncAndGenerate', method: 'post', + timeout: 180000, params, paramsSerializer: params => { return qs.stringify(params, { indices: false }) diff --git a/src/router/index.js b/src/router/index.js index 733af54..57555ea 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -57,7 +57,7 @@ children: [{ path: 'dashboard', name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + component: () => import('@/views/dashboard/indexPro'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue index c474ee1..70c4173 100644 --- a/src/views/attendance/editRemarks.vue +++ b/src/views/attendance/editRemarks.vue @@ -64,20 +64,32 @@ - - - - - - - + placeholder="开始日期"/> + + + + + + + + + + + + + + @@ -146,6 +158,7 @@ endDate: '', breastfeedType: '', breastfeedBeginDate: '', + breastfeedEndDate: '', other: '', onBusiness: '' }, // 表单 @@ -155,6 +168,7 @@ remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }], beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }], breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }], + breastfeedEndDate: [{ required: true, message: '请选择哺乳假结束日期', trigger: ['blur'] }], breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }], other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }], endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }], @@ -234,6 +248,7 @@ this.remarksForm.beginDate = this.curDate this.remarksForm.endDate = this.curDate this.remarksForm.breastfeedBeginDate = this.curDate + this.remarksForm.breastfeedEndDate = '' this.$nextTick(() => { this.$refs['dataForm'].clearValidate() }) @@ -262,8 +277,17 @@ this.saveBtnDisabeld = true // 如果备注为哺乳假，则需要特别处理 if (this.remarksForm.remarks === '请假-哺乳假') { + var startDates = this.remarksForm.breastfeedBeginDate.split('-') + var endDates = this.remarksForm.breastfeedEndDate.split('-') + var startDate = new Date(startDates[0], startDates[1] - 1, startDates[2]) + var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2]) + if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) { + this.$message.error('哺乳假时间太长，请选择合理的起止日期') + return + }// 把相差的毫秒数 this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate + this.remarksForm.endDate = this.remarksForm.breastfeedEndDate } // 如果备注了其他原因 if (this.remarksForm.remarks === '其他原因') { diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue index 488197e..f0bc3c1 100644 --- a/src/views/dashboard/components/printAnalysis.vue +++ b/src/views/dashboard/components/printAnalysis.vue @@ -78,6 +78,9 @@ } printCountByDept(listQuery).then(response => { const data = response.data + this.legends.show = true + this.tooltip.show = true + this.chartSettings.label.normal.show = true if (data.length !== 0) { if (data.length === 1 && data[0].count === 0) { this.legends.show = false diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue index 199ea5d..937d09a 100644 --- a/src/views/memberManage/addPerson.vue +++ b/src/views/memberManage/addPerson.vue @@ -462,7 +462,9 @@ } this.ws.onmessage = function(receiveMsg) { var data = JSON.parse(receiveMsg.data) - if (data !== '') { + if (data.message === 'fail') { + _this.$message.warning('读卡失败') + } else { _this.personForm.idCardNo = data.IdCardNo _this.personForm.name = data.Name // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' } @@ -480,8 +482,6 @@ } _this.personForm.ext.certificationUnit = data.Authority _this.personForm.ext.address = data.Address - } else { - _this.$message.warning('读卡失败') } _this.readIDCardDisabled = false } diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue index ee4bf9e..f5a2af9 100644 --- a/src/views/memberManage/addPersonIris.vue +++ b/src/views/memberManage/addPersonIris.vue @@ -501,8 +501,11 @@ this.ws.send('ReadIdCard') } this.ws.onmessage = function(receiveMsg) { + debugger var data = JSON.parse(receiveMsg.data) - if (data !== '') { + if (data.message === 'fail') { + _this.$message.warning('读卡失败') + } else { _this.personForm.idCardNo = data.IdCardNo _this.personForm.name = data.Name // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' } @@ -513,7 +516,6 @@ _this.personForm.nation = data.Nation var nationName = data.Nation for (var item of _this.nationList) { - debugger if (item.name === nationName) { _this.personForm.nation = item.value break @@ -521,8 +523,6 @@ } _this.personForm.ext.certificationUnit = data.Authority _this.personForm.ext.address = data.Address - } else { - _this.$message.warning('读卡失败') } _this.readIDCardDisabled = false } diff --git a/config/dev.env.js b/config/dev.env.js index 28507b9..22aea85 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,6 +7,6 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://111.198.10.15:11802"' - BASE_API: '"http://192.168.0.18:8095"' - // BASE_API: '"http://192.168.0.166:20005"' + BASE_API: '"http://127.0.0.1:8095"' + // BASE_API: '"http://192.168.0.166:8095"' }) diff --git a/src/api/attendance.js b/src/api/attendance.js index f0df672..e45ec35 100644 --- a/src/api/attendance.js +++ b/src/api/attendance.js @@ -8,7 +8,7 @@ return request({ url: 'makeReport/make', method: 'get', - timeout: 120000, + timeout: 180000, params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) @@ -27,6 +27,7 @@ return request({ url: 'report/list', method: 'get', + timeout: 180000, params }) } @@ -101,7 +102,7 @@ return request({ url: 'report/batchExport', method: 'get', - timeout: 120000, + timeout: 180000, params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) @@ -146,6 +147,7 @@ return request({ url: 'sync/syncAndGenerate', method: 'post', + timeout: 180000, params, paramsSerializer: params => { return qs.stringify(params, { indices: false }) diff --git a/src/router/index.js b/src/router/index.js index 733af54..57555ea 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -57,7 +57,7 @@ children: [{ path: 'dashboard', name: 'Dashboard', - component: () => import('@/views/dashboard/index'), + component: () => import('@/views/dashboard/indexPro'), meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } }] } diff --git a/src/views/attendance/editRemarks.vue b/src/views/attendance/editRemarks.vue index c474ee1..70c4173 100644 --- a/src/views/attendance/editRemarks.vue +++ b/src/views/attendance/editRemarks.vue @@ -64,20 +64,32 @@ - - - - - - - + placeholder="开始日期"/> + + + + + + + + + + + + + + @@ -146,6 +158,7 @@ endDate: '', breastfeedType: '', breastfeedBeginDate: '', + breastfeedEndDate: '', other: '', onBusiness: '' }, // 表单 @@ -155,6 +168,7 @@ remarks: [{ required: true, message: '备注信息不能为空', trigger: ['change'] }], beginDate: [{ required: true, message: '请选择开始日期', trigger: ['blur'] }], breastfeedBeginDate: [{ required: true, message: '请选择哺乳假开始日期', trigger: ['blur'] }], + breastfeedEndDate: [{ required: true, message: '请选择哺乳假结束日期', trigger: ['blur'] }], breastfeedType: [{ required: true, message: '请选择哺乳假类型', trigger: ['change'] }], other: [{ validator: validateOtherReason, required: true, trigger: ['blur'] }], endDate: [{ required: true, message: '请选择结束日期', trigger: ['blur'] }], @@ -234,6 +248,7 @@ this.remarksForm.beginDate = this.curDate this.remarksForm.endDate = this.curDate this.remarksForm.breastfeedBeginDate = this.curDate + this.remarksForm.breastfeedEndDate = '' this.$nextTick(() => { this.$refs['dataForm'].clearValidate() }) @@ -262,8 +277,17 @@ this.saveBtnDisabeld = true // 如果备注为哺乳假，则需要特别处理 if (this.remarksForm.remarks === '请假-哺乳假') { + var startDates = this.remarksForm.breastfeedBeginDate.split('-') + var endDates = this.remarksForm.breastfeedEndDate.split('-') + var startDate = new Date(startDates[0], startDates[1] - 1, startDates[2]) + var endDate = new Date(endDates[0], endDates[1] - 1, endDates[2]) + if (parseInt(Math.abs(endDate - startDate) / 1000 / 60 / 60 / 24) > (365 - 128)) { + this.$message.error('哺乳假时间太长，请选择合理的起止日期') + return + }// 把相差的毫秒数 this.remarksForm.remarks = this.remarksForm.remarks + this.remarksForm.breastfeedType this.remarksForm.beginDate = this.remarksForm.breastfeedBeginDate + this.remarksForm.endDate = this.remarksForm.breastfeedEndDate } // 如果备注了其他原因 if (this.remarksForm.remarks === '其他原因') { diff --git a/src/views/dashboard/components/printAnalysis.vue b/src/views/dashboard/components/printAnalysis.vue index 488197e..f0bc3c1 100644 --- a/src/views/dashboard/components/printAnalysis.vue +++ b/src/views/dashboard/components/printAnalysis.vue @@ -78,6 +78,9 @@ } printCountByDept(listQuery).then(response => { const data = response.data + this.legends.show = true + this.tooltip.show = true + this.chartSettings.label.normal.show = true if (data.length !== 0) { if (data.length === 1 && data[0].count === 0) { this.legends.show = false diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue index 199ea5d..937d09a 100644 --- a/src/views/memberManage/addPerson.vue +++ b/src/views/memberManage/addPerson.vue @@ -462,7 +462,9 @@ } this.ws.onmessage = function(receiveMsg) { var data = JSON.parse(receiveMsg.data) - if (data !== '') { + if (data.message === 'fail') { + _this.$message.warning('读卡失败') + } else { _this.personForm.idCardNo = data.IdCardNo _this.personForm.name = data.Name // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' } @@ -480,8 +482,6 @@ } _this.personForm.ext.certificationUnit = data.Authority _this.personForm.ext.address = data.Address - } else { - _this.$message.warning('读卡失败') } _this.readIDCardDisabled = false } diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue index ee4bf9e..f5a2af9 100644 --- a/src/views/memberManage/addPersonIris.vue +++ b/src/views/memberManage/addPersonIris.vue @@ -501,8 +501,11 @@ this.ws.send('ReadIdCard') } this.ws.onmessage = function(receiveMsg) { + debugger var data = JSON.parse(receiveMsg.data) - if (data !== '') { + if (data.message === 'fail') { + _this.$message.warning('读卡失败') + } else { _this.personForm.idCardNo = data.IdCardNo _this.personForm.name = data.Name // if (window.frames['iframeIDCard'].Sex === '2') { this.personForm.sex = '女' } else { this.personForm.sex = '男' } @@ -513,7 +516,6 @@ _this.personForm.nation = data.Nation var nationName = data.Nation for (var item of _this.nationList) { - debugger if (item.name === nationName) { _this.personForm.nation = item.value break @@ -521,8 +523,6 @@ } _this.personForm.ext.certificationUnit = data.Authority _this.personForm.ext.address = data.Address - } else { - _this.$message.warning('读卡失败') } _this.readIDCardDisabled = false } diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue index 77818ed..cd7e6a3 100644 --- a/src/views/memberManage/listStaff.vue +++ b/src/views/memberManage/listStaff.vue @@ -47,7 +47,7 @@ 导出记录 - 人员数据下发 + 删除 新增