diff --git a/src/views/modules/shequzhili/Delivery/index.vue b/src/views/modules/shequzhili/Delivery/index.vue index 6e906b982..79854759f 100644 --- a/src/views/modules/shequzhili/Delivery/index.vue +++ b/src/views/modules/shequzhili/Delivery/index.vue @@ -128,11 +128,12 @@ --> - + 处理 - 派件 + 派件 审核 diff --git a/src/views/modules/shequzhili/analysis/css/index.scss b/src/views/modules/shequzhili/analysis/css/index.scss index c368df410..16a8e38a8 100644 --- a/src/views/modules/shequzhili/analysis/css/index.scss +++ b/src/views/modules/shequzhili/analysis/css/index.scss @@ -136,6 +136,7 @@ border-left: #777 solid 1px; color: #333333; text-align: center; margin-left: 5px; + white-space: nowrap; } .text1{ font-size: 16px; @@ -179,6 +180,7 @@ border-left: #777 solid 1px; color: #666666; text-align: center; margin-left: 5px; + white-space: nowrap; } .row_right { @@ -345,6 +347,7 @@ border-left: #777 solid 1px; color: #333333; text-align: center; margin-left: 5px; + white-space: nowrap; } .row_right { diff --git a/src/views/modules/shequzhili/analysis/index.vue b/src/views/modules/shequzhili/analysis/index.vue index bbc810ef0..b21a22bdb 100644 --- a/src/views/modules/shequzhili/analysis/index.vue +++ b/src/views/modules/shequzhili/analysis/index.vue @@ -104,9 +104,10 @@

事件类型统计

- + + > + + > + + > + + > + + > - - + --> + + + + + + + +

部门科室工单量统计

@@ -871,7 +890,8 @@ export default { } const { data, code, msg } = await requestPost(url, param); if (code === 0) { - this.tableList=this.flattenTree(data); + this.tableList=data + // this.tableList=this.flattenTree(data); console.log(this.tableList); console.log(this.tableList,"lksdjfklj s"); } else { @@ -894,15 +914,14 @@ export default { //获取前一个月的日期 getLastMonthRange() { const now = new Date(); - const firstDayOfCurrentMonth = new Date(now.getFullYear(), now.getMonth(), 1); - const lastDayOfLastMonth = new Date(firstDayOfCurrentMonth - 1); - const firstDayOfLastMonth = new Date(lastDayOfLastMonth.getFullYear(), lastDayOfLastMonth.getMonth(), 1); + const startOfYear = new Date(now.getFullYear(), 0, 1); // 当前年份的1月1日 + const endOfYear = new Date(now.getFullYear(), 11, 31); // 当前年份的12月31日 - firstDayOfLastMonth.setHours(0, 0, 0, 0); - lastDayOfLastMonth.setHours(23, 59, 59, 999); + startOfYear.setHours(0, 0, 0, 0); + endOfYear.setHours(23, 59, 59, 999); - this.formData.queryDateStart =this.formatDate1(firstDayOfLastMonth), - this.formData.queryDateEnd=this.formatDate1(lastDayOfLastMonth) + this.formData.queryDateStart =this.formatDate1(startOfYear), + this.formData.queryDateEnd=this.formatDate1(endOfYear) console.log(this.formData.queryDateEnd); }, //对部门进行统计 diff --git a/src/views/modules/shequzhili/event/cpts/process-form-complete.vue b/src/views/modules/shequzhili/event/cpts/process-form-complete.vue index 47fbf5ed3..464c51eaf 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-complete.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-complete.vue @@ -285,6 +285,20 @@ export default { contactFailureList: [{ label: '已接通', value: 1 }, { label: '未接通', value: 0 }], coordinateList: [{ label: '配合', value: 0 }, { label: '未配合', value: 1 }], examineList: [{ label: '合格', value: 0 }, { label: '不合格', value: 1 }], + satisfactionType : [ + { + label: '满意', + value: 'perfect' + }, + { + label: '基本满意', + value: 'good' + }, + { + label: '不满意', + value: 'bad' + } +], dataRule: { content: [ { required: true, message: "办理情况不能为空", trigger: "blur" }, @@ -354,6 +368,7 @@ export default { console.log(newVal,'bianle'); if(this.pageType === 'check'){ this.formData = newVal; + console.log(this.formData); if(this.formData.internalFile){ this.imgList = this.formData.internalFile.filter(item=>item.attachmentType==='image') this.audioList = this.formData.internalFile.filter(item=>item.attachmentType==='voice') diff --git a/src/views/modules/shequzhili/eventHandling/index.vue b/src/views/modules/shequzhili/eventHandling/index.vue index 20ea5ec73..9cef2ce64 100644 --- a/src/views/modules/shequzhili/eventHandling/index.vue +++ b/src/views/modules/shequzhili/eventHandling/index.vue @@ -116,13 +116,14 @@ - - +