时长

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/TimeCalculationServiceImpl.java

@@ -103,18 +103,17 @@ public class TimeCalculationServiceImpl extends ServiceImpl<TimeCalculationMappe
                         .getTodayStatistics((String) userMap.get("id"), date, companyId)) {
                     timeArray[(int) dataMap.get("type") + 1] += (Long) dataMap.get("duration");
                 }
-                Long[] resultArray = new Long[7];
-                //编程 上网 文档 设计 运营 娱乐 其他
+                Long[] resultArray = new Long[6];
+                //编程 上网 文档 设计 娱乐 其他
                 resultArray[0] = timeArray[1];
                 resultArray[1] = timeArray[2];
                 resultArray[2] = timeArray[3];
                 resultArray[3] = timeArray[4] + timeArray[5];
-                resultArray[4] = timeArray[6];
-                resultArray[5] = timeArray[7] + timeArray[8] + timeArray[9];
-                resultArray[6] = timeArray[0];
-                //将后端的9中行为类型分门别类转换为前端的5种并转换为字符串格式
-                String[] stringArray = new String[7];
-                for (int i = 0; i < 7; i++) {
+                resultArray[4] = timeArray[7] + timeArray[8] + timeArray[9];
+                resultArray[5] = timeArray[0];
+                //将后端的9中行为类型分门别类转换为前端的6种并转换为字符串格式
+                String[] stringArray = new String[6];
+                for (int i = 0; i < 6; i++) {
                     stringArray[i] = convertSecond(resultArray[i]);
                 }
                 map.put("statistics", stringArray);

fhKeeper/formulahousekeeper/timesheet/src/views/desktop/detail.vue

@@ -156,12 +156,12 @@ export default {
             "上网",
             "文档",
             "设计",
-            "美工",
+            // "美工",
             // "运营",
             "看小说",
             "影视娱乐",
-            "听音乐",
-            "其他"
+            // "听音乐",
+            "其他工作"
           ]
         },
         toolbox: {
@@ -184,16 +184,13 @@ export default {
             radius: [30, 110],
             roseType: "area",
             data: [
-              { value: (this.timeList[1]/3600).toFixed(2), name: "编程" },
-              { value: (this.timeList[2]/3600).toFixed(2), name: "上网" },
-              { value: (this.timeList[3]/3600).toFixed(2), name: "文档" },
-              { value: (this.timeList[4]/3600).toFixed(2), name: "设计" },
-              { value: (this.timeList[5]/3600).toFixed(2), name: "美工" },
-            //   { value: (this.timeList[6]/3600).toFixed(2), name: "运营" },
-              { value: (this.timeList[6]/3600).toFixed(2), name: "看小说" },
-              { value: (this.timeList[7]/3600).toFixed(2), name: "影视娱乐" },
-              { value: (this.timeList[8]/3600).toFixed(2), name: "听音乐" },
-              { value: (this.timeList[0]/3600).toFixed(2), name: "其他" }
+              { value: (this.timeList[1] / 3600).toFixed(2), name: "编程" },
+              { value: (this.timeList[2] / 3600).toFixed(2), name: "上网" },
+              { value: (this.timeList[3] / 3600).toFixed(2), name: "文档" },
+              { value: (this.timeList[4] / 3600).toFixed(2), name: "设计" },
+              { value: (this.timeList[7] / 3600).toFixed(2), name: "看小说" },
+              { value: (this.timeList[8] / 3600).toFixed(2), name: "影视娱乐" },
+              { value: (this.timeList[0] / 3600).toFixed(2), name: "其他工作" }
             ]
           }
         ]
@@ -209,7 +206,7 @@ export default {
     converType(type) {
       switch (type) {
         case 0:
-          return "其他";
+          return "其他工作";
         case 1:
           return "编程";
         case 2:

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

@@ -34,11 +34,10 @@
       <el-table-column prop="phone" label="手机" width="120"></el-table-column>
       <el-table-column prop="statistics[0]" label="编程" sortable></el-table-column>
       <el-table-column prop="statistics[1]" label="上网" sortable></el-table-column>
-      <el-table-column prop="statistics[5]" label="文档" sortable></el-table-column>
+      <el-table-column prop="statistics[2]" label="文档" sortable></el-table-column>
       <el-table-column prop="statistics[3]" label="设计" sortable></el-table-column>
-      <!-- <el-table-column prop="statistics[4]" label="运营" sortable></el-table-column> -->
-      <el-table-column prop="statistics[5]" label="娱乐" sortable></el-table-column>
-      <el-table-column prop="statistics[6]" label="其他" sortable></el-table-column>
+      <el-table-column prop="statistics[4]" label="娱乐" sortable></el-table-column>
+      <el-table-column prop="statistics[5]" label="其他工作" sortable></el-table-column>
       <el-table-column prop="sum" label="总时长" sortable></el-table-column>
     </el-table>