前端的行为类型转换

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

@@ -48,16 +48,12 @@ public class TimeCalculationServiceImpl extends ServiceImpl<TimeCalculationMappe
         resultMap.put("date", todayDate);
         //时间占比 预先定义好长度为9的数组再向里面添加
         Integer[] timeArray = {0, 0, 0, 0, 0, 0, 0, 0, 0};
-        String[] stringArray = new String[9];
         for (TimeCalculation timeCalculation : timeCalculationMapper.selectList(new QueryWrapper<TimeCalculation>()
                 .eq("user_id", userId)
                 .eq("date", todayDate))) {
             timeArray[timeCalculation.getActionType()] += timeCalculation.getDuration();
         }
-        for(int i = 0; i <= 9; i++){
-            stringArray[i] = convertSecond(timeArray[i]);
-        }
-        resultMap.put("timeDistribution", stringArray);
+        resultMap.put("timeDistribution", timeArray);
         httpRespMsg.data = resultMap;
         return httpRespMsg;
     }
@@ -97,17 +93,21 @@ public class TimeCalculationServiceImpl extends ServiceImpl<TimeCalculationMappe
                 map.put("phone", userMap.get("phone"));
                 //然后根据日期和用户id获取到所有的记录 然后手动累加在一起
                 Long[] timeArray = {0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L};
+                String[] stringArray = new String[9];
                 for (Map<String, Object> dataMap : timeCalculationMapper
                         .getTodayStatistics((String) userMap.get("id"), date, companyId)) {
                     timeArray[(int) dataMap.get("type")] += (Long) dataMap.get("duration");
                 }
-                map.put("statistics", timeArray);
+                for (int i = 0; i < 9; i++) {
+                    stringArray[i] = convertSecond(timeArray[i]);
+                }
+                map.put("statistics", stringArray);
                 //最后是数组的和
                 Long sum = 0L;
                 for (Long singleNumber : timeArray) {
                     sum += singleNumber;
                 }
-                map.put("sum", sum);
+                map.put("sum", convertSecond(sum));
                 resultList.add(map);
             }
             httpRespMsg.data = resultList;
@@ -176,7 +176,7 @@ public class TimeCalculationServiceImpl extends ServiceImpl<TimeCalculationMappe
         time = time % 3600;
         minute = time / 60;
         second = minute % 60;
-        return hour + "时" + minute + "分" + second + "秒";
+        return hour + "小时" + minute + "分" + second + "秒";
     }
 
     private String convertSecond(Long time) {
@@ -185,6 +185,6 @@ public class TimeCalculationServiceImpl extends ServiceImpl<TimeCalculationMappe
         time = time % 3600;
         minute = time / 60;
         second = minute % 60;
-        return hour + "时" + minute + "分" + second + "秒";
+        return hour + "小时" + minute + "分" + second + "秒";
     }
 }

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

@@ -28,7 +28,7 @@
             <!-- pic_type 这里需要一个巨长的三目运算符 -->
             <!-- 0-编程，1-查资料，2-看文档，3-做设计，4-美工，5-运营，6-看小说，7-打游戏，8-听音乐 -->
             <!-- 现在基本都是null -->
-            <span>{{item.pic_type == null ? 0 : item.pic_type}}</span>
+            <span>{{converType(item.pic_type == null ? 0 : item.pic_type)}}</span>
             <div class="bottom clearfix">
               <el-link>
                 <i class="fa fa-circle"></i>
@@ -98,6 +98,31 @@ export default {
     },
     jumpTo(id) {
       this.$router.push("/desktop/" + id);
+    },
+    //类型枚举转换
+    converType(type) {
+      switch (type) {
+        case 0:
+          return "编程";
+        case 1:
+          return "查资料";
+        case 2:
+          return "看文档";
+        case 3:
+          return "做设计";
+        case 4:
+          return "美工";
+        case 5:
+          return "运营";
+        case 6:
+          return "看小说";
+        case 7:
+          return "打游戏";
+        case 8:
+          return "听音乐";
+        default:
+          return "未知";
+      }
     }
   },
   created() {

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

@@ -15,7 +15,9 @@
     >
       <el-table-column type="index" width="60"></el-table-column>
       <el-table-column prop="name" label="姓名" width="140" sortable></el-table-column>
-      <el-table-column prop="type" label="行为"></el-table-column>
+      <el-table-column label="行为">
+        <template slot-scope="scope">{{converType(scope.row.type)}}</template>
+      </el-table-column>
       <el-table-column prop="time" label="时间" width="180" sortable></el-table-column>
       <el-table-column prop="date" label="日期" width="180" sortable></el-table-column>
     </el-table>
@@ -87,6 +89,32 @@ export default {
     handleSizeChange(val) {
       this.size = val;
       this.getDevianceList();
+    },
+
+    //类型枚举转换
+    converType(type) {
+      switch (type) {
+        case 0:
+          return "编程";
+        case 1:
+          return "查资料";
+        case 2:
+          return "看文档";
+        case 3:
+          return "做设计";
+        case 4:
+          return "美工";
+        case 5:
+          return "运营";
+        case 6:
+          return "看小说";
+        case 7:
+          return "打游戏";
+        case 8:
+          return "听音乐";
+        default:
+          return "未知";
+      }
     }
   },
   created() {