Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/echartsData.js

@@ -144,7 +144,7 @@ export const fixedGrouping = {
     ],
     tabPicFileds: [
       { label: '方案设计', filed: '方案设计', title: '报价项目占比' },
-      { label: '研发部', filed: '研发部', title: '行政项目占比' },
+      // { label: '研发部', filed: '研发部', title: '行政项目占比' },
       { label: '研发部工艺调试', filed: '研发部工艺调试', title: '项目设计占比' }
     ],
     deptIds: '8754,8768',
@@ -157,7 +157,7 @@ export const fixedGrouping = {
       { label: '研发部BIM设计', filed: '研发部BIM设计' },
     ],
     tabPicFileds: [
-      { label: '研发部', filed: '研发部', title: 'BIM行政工时占比' },
+      // { label: '研发部', filed: '研发部', title: 'BIM行政工时占比' },
       { label: '研发部BIM设计', filed: '研发部BIM设计', title: 'BIM设计项目占比' }
     ],
     deptIds: '8757',
@@ -170,7 +170,7 @@ export const fixedGrouping = {
       { label: '研发部结构设计', filed: '研发部结构设计' },
     ],
     tabPicFileds: [
-      { label: '研发部', filed: '研发部', title: '研发行政工时占比' },
+      // { label: '研发部', filed: '研发部', title: '研发行政工时占比' },
       { label: '研发部结构设计', filed: '研发部结构设计', title: '结构设计项目占比' }
     ],
     deptIds: '8758,8769',
@@ -185,7 +185,7 @@ export const fixedGrouping = {
       { label: '研发部售后', filed: '研发部售后' },
     ],
     tabPicFileds: [
-      { label: '研发部', filed: '研发部', title: '电气行政工时占比' },
+      // { label: '研发部', filed: '研发部', title: '电气行政工时占比' },
       { label: '研发部电气设计', filed: '研发部电气设计', title: '电气设计项目占比' },
       { label: '研发部电气调试验收', filed: '研发部电气调试验收', title: '电气调试项目占比' }
     ],
@@ -203,7 +203,7 @@ export const fixedGrouping = {
       { label: '研发部运维', filed: '研发部运维' },
     ],
     tabPicFileds: [
-      { label: '研发部', filed: '研发部', title: '研发调试行政工时占比' },
+      // { label: '研发部', filed: '研发部', title: '研发调试行政工时占比' },
       { label: '研发部工艺调试验收', filed: '研发部工艺调试验收', title: '调试项目占比' },
       { label: '研发部售后', filed: '研发部售后', title: '售后项目占比' }
     ],
@@ -218,7 +218,7 @@ export const fixedGrouping = {
       { label: '生产部电气', filed: '生产部电气' },
     ],
     tabPicFileds: [
-      { label: '研发部', filed: '研发部', title: '生产部行政工时占比' },
+      // { label: '研发部', filed: '研发部', title: '生产部行政工时占比' },
       { label: '生产部车间,生产部电气', filed: '生产部车间,生产部电气', title: '生产项目占比' }
     ],
     deptIds: '8762,8760,8761,8737,7903',
@@ -240,7 +240,7 @@ export const fixedGrouping = {
       { label: '研发部运维', filed: '研发部运维' },
     ],
     tabPicFileds: [
-      { label: '工程部', filed: '工程部', title: '工程部行政工时占比' },
+      // { label: '工程部', filed: '工程部', title: '工程部行政工时占比' },
       { label: '工程部配合调试', filed: '工程部配合调试', title: '配合调试工时占比' },
       { label: '工程部售后', filed: '工程部售后', title: '售后占比' },
       { label: '工程部配合运维', filed: '工程部配合运维', title: '运维占比' },

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list.vue

@@ -915,7 +915,7 @@
                         }
                         this.listBackup = JSON.parse(JSON.stringify(res.data));
                         console.log(this.listBackup, "《====== 赋值")
-                        this.list = this.currentChangePage(10, 1, res.data);
+                        this.list = this.currentChangePage(this.reviewTableObj.reviewTableSize, 1, res.data);
                         let total = res.data.length || 0
                         this.reviewTableObj = {
                             reviewTableTotal: total,