From b1dd43dbac5d5e17f828937e99719a2ad35d11bf Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Mon, 28 Oct 2024 11:05:42 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/bottomOne.vue | 2 +- src/views/dashboard/bottomTwo.vue | 61 +++++++++++++------ src/views/exceptionHandle/errorForm/index.vue | 11 ++-- src/views/process/outApply/index.vue | 40 ++++++++---- src/views/process/restApply/index.vue | 48 +++++++++------ src/views/report/attReport/index.vue | 2 +- src/views/report/dayReport/index.vue | 4 +- src/views/setting/rules/index.vue | 12 ++-- 8 files changed, 121 insertions(+), 59 deletions(-) diff --git a/src/views/dashboard/bottomOne.vue b/src/views/dashboard/bottomOne.vue index a130b61..30a5956 100644 --- a/src/views/dashboard/bottomOne.vue +++ b/src/views/dashboard/bottomOne.vue @@ -2,7 +2,7 @@
-
当月异常统计
+
组织架构
当月异常统计
-
+
@@ -23,12 +23,12 @@ export default { // required: true, type: Object, default:{ - addressErrorNum:'0', - earlyNum:'0', - einErrorNum:'0', - lateNum:'0', - leaveNum:'0', - skippingNum:'0' + addressErrorNum:0, + earlyNum:0, + einErrorNum:0, + lateNum:0, + leaveNum:0, + skippingNum:0 } }, @@ -40,34 +40,61 @@ export default { barYData:[22, 18, 11, 23, 29, 33] } }, + watch: { + pageData: { + handler() { + this.getInitData() + }, + immediate: true + } + }, created() { }, mounted() { - this.$nextTick(() => { - this.getInitData() - }) + this.getInitData() }, methods: { getInitData(){ - console.log(this.pageData) - this.barYData=[this.pageData.lateNum,this.pageData.earlyNum,this.pageData.skippingNum,this.pageData.leaveNum,this.pageData.addressErrorNum,this.pageData.einErrorNum] - this.initChart() + setTimeout(()=>{ + this.barYData=[Number(this.pageData.lateNum),Number(this.pageData.earlyNum),Number(this.pageData.skippingNum),Number(this.pageData.leaveNum),Number(this.pageData.addressErrorNum),Number(this.pageData.einErrorNum)] + console.log(this.barYData) + this.initChart() + },500) + }, initChart(){ this.pieCharts = echarts.init(document.getElementById('barBox')) var option = { + grid: { + left: '5%', + right: '5%', + bottom: '5%', + top: '5%', + containLabel: true, + }, xAxis: { data: ['迟到', '早退', '旷工', '请假', '打卡地异常', '出入异常'] }, yAxis: {}, series: [{ type: 'bar', - data:this.barYData + data:this.barYData, + itemStyle:{ + color:"#157DF3" + } }] }; - - this.pieCharts.setOption(option) + this.pieCharts.setOption(option) + // 监听柱状图的点击事件 + this.pieCharts.on('click', function (params) { + // 控制台输出点击的数据的信息 + console.log(params); + // 在这里添加你的点击事件逻辑 + // 例如：弹窗显示点击的数据的详细信息 + // alert('你点击的是：' + params.name); + }); + }, toggleDialog(v) { this.$emit('openDialog', { order: v }) @@ -98,7 +125,7 @@ export default { } .chart-box{ width: 100%; - height: 400px; + height: 450px; } diff --git a/src/views/exceptionHandle/errorForm/index.vue b/src/views/exceptionHandle/errorForm/index.vue index 9ba62a6..1445416 100644 --- a/src/views/exceptionHandle/errorForm/index.vue +++ b/src/views/exceptionHandle/errorForm/index.vue @@ -226,7 +226,7 @@ name:undefined, orgName: undefined, }, - + leaveType:'', queryRecord: { pageNum: 1, pageSize: 10, @@ -248,8 +248,8 @@ ], }, pickerOptions: { - disabledDate: this.disabledDate, - }, + disabledDate: this.disabledDate, + }, }; }, computed: { @@ -418,12 +418,14 @@ if(this.title=='轮休未审批记录'){ getDetailExceptionRest(this.addDateRange(this.queryRecord, this.dateRange)).then(response => { this.tableDataRecord = response.rows; + this.leaveType="轮休" this.totalTwo = response.total; this.loadingTwo = false; }); }else if(this.title=='外出办事未审批记录'){ getDetailExceptionOut(this.addDateRange(this.queryRecord, this.dateRange)).then(response => { this.tableDataRecord = response.rows; + this.leaveType="外出办事" this.totalTwo = response.total; this.loadingTwo = false; }); @@ -452,7 +454,8 @@ /** 提交按钮 */ submitForm() { this.form.orgId = this.queryRecord.orgId; - this.form.title = '轮休外出办事异常数据'; + this.form.title = this.leaveType+'异常数据'; + this.form.leaveType=this.leaveType console.log(this.form) this.$refs["form"].validate(valid => { if (valid) { diff --git a/src/views/process/outApply/index.vue b/src/views/process/outApply/index.vue index 5e7d361..d31f897 100644 --- a/src/views/process/outApply/index.vue +++ b/src/views/process/outApply/index.vue @@ -144,14 +144,18 @@ - + - + + + + + - + - + + + + + - + - + @@ -277,9 +285,15 @@ export default { leaveStartDate: [ { required: true, message: "外出开始时间不能为空", trigger: "blur" } ], + leaveStartInterval: [ + { required: true, message: "不能为空", trigger: "change" } + ], leaveEndDate: [ { required: true, message: "外出结束时间不能为空", trigger: "blur" } ], + leaveEndInterval: [ + { required: true, message: "不能为空", trigger: "change" } + ], leaveDuration: [ { required: true, message: "外出时长不能为空", trigger: "blur" } ], @@ -353,10 +367,10 @@ export default { userName:this.userInfo.name, orgId: undefined, leaveStartDate: undefined, - leaveStartInterval:'1', + leaveStartInterval:undefined, leaveEndDate: undefined, - leaveEndInterval:'1', - leaveDuration:0.5, + leaveEndInterval:undefined, + leaveDuration:undefined, leaveType:"外出办事", examineStatus:"0", leaveReason:undefined, diff --git a/src/views/process/restApply/index.vue b/src/views/process/restApply/index.vue index 85be3e7..22161d2 100644 --- a/src/views/process/restApply/index.vue +++ b/src/views/process/restApply/index.vue @@ -147,14 +147,18 @@ - - + + + v-model="form.leaveStartDate" :clearable="false" :disabled="isView" + type="date" value-format="yyyy-MM-dd" style="width: 100%;" @change="handleDateChange" + placeholder="外出开始时间" :pickerOptions="startPickerOptions"> - + + + + + - - + + + v-model="form.leaveEndDate" :clearable="false" :disabled="isView" + type="date" value-format="yyyy-MM-dd" style="width: 100%;" @change="handleDateChange" + placeholder="外出结束时间" :pickerOptions="endPickerOptions"> - + + + + + - + - + @@ -268,9 +276,15 @@ leaveStartDate: [ { required: true, message: "轮休开始时间不能为空", trigger: "blur" } ], + leaveStartInterval: [ + { required: true, message: "不能为空", trigger: "change" } + ], leaveEndDate: [ { required: true, message: "轮休结束时间不能为空", trigger: "blur" } ], + leaveEndInterval: [ + { required: true, message: "不能为空", trigger: "change" } + ], leaveDuration: [ { required: true, message: "轮休时长不能为空", trigger: "blur" } ], @@ -344,10 +358,10 @@ userName:this.userInfo.name, orgId: undefined, leaveStartDate: undefined, - leaveStartInterval:'1', + leaveStartInterval:undefined, leaveEndDate: undefined, - leaveEndInterval:'1', - leaveDuration:0.5, + leaveEndInterval:undefined, + leaveDuration:undefined, leaveType:"轮休", examineStatus:"0", leaveReason:undefined, diff --git a/src/views/report/attReport/index.vue b/src/views/report/attReport/index.vue index 274df1e..dcf7f14 100644 --- a/src/views/report/attReport/index.vue +++ b/src/views/report/attReport/index.vue @@ -122,7 +122,7 @@