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

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ImageProcessingController.java

@@ -27,7 +27,6 @@ public class ImageProcessingController {
      */
     @RequestMapping("/saveAndProcessImage")
     public HttpRespMsg pictureDetectionTask(ScreenshotVO screenshotvo) {
-        System.out.println(screenshotvo.getProcessList());
         return screenshotService.saveAndProcessImage(screenshotvo);
     }
 

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

@@ -122,8 +122,6 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
 
     @Override
     public HttpRespMsg saveAndProcessImage(ScreenshotVO screenshotvo) {
-        System.out.println("uid===" + screenshotvo.getUid());
-        System.out.println("path===" + path);
         Map<String, Object> fileMap = UploadFileToFileNameUtil.uploadFile(screenshotvo.getFile(), path);
         String filePath = (String)fileMap.get("sqlFilePath");
         Screenshot screenshot = new Screenshot();

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

@@ -37,7 +37,7 @@
             </el-image>
           </div>
           <div class="one_card_txt">
-            <span>{{converType(item.type)}}</span>
+            <span>{{converType(item.type+1)}}</span>
             <div class="bottom clearfix">
               <time class="time">{{item.time}}</time>
             </div>
@@ -153,14 +153,15 @@ export default {
           bottom: 20,
           data: [
             "编程",
-            "查资料",
-            "看文档",
-            "做设计",
+            "上网",
+            "文档",
+            "设计",
             "美工",
             "运营",
             "看小说",
-            "打游戏",
-            "听音乐"
+            "影视娱乐",
+            "听音乐",
+            "其他"
           ]
         },
         toolbox: {
@@ -178,22 +179,21 @@ export default {
         },
         series: [
           {
-            name: "面积模式",
+            name: "时长（单位：h）",
             type: "pie",
             radius: [30, 110],
             roseType: "area",
             data: [
-              { value: this.timeList[0], name: "其他" },
-              { value: this.timeList[1], name: "编程" },
-              { value: this.timeList[2], name: "上网" },
-              { value: this.timeList[3], name: "文档" },
-              { value: this.timeList[4], name: "设计" },
-              { value: this.timeList[5], name: "美工" },
-              { value: this.timeList[6], name: "运营" },
-              { value: this.timeList[7], name: "看小说" },
-              { value: this.timeList[8], name: "影视娱乐" },
-              { value: this.timeList[8], name: "听音乐" },
-              { value: this.timeList[9], 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[5]/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[9]/3600).toFixed(2), name: "听音乐" },
+              { value: (this.timeList[0]/3600).toFixed(2), name: "其他" }
             ]
           }
         ]

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

@@ -27,7 +27,7 @@
           </div>
           <div class="one_card_txt">
             <!-- null 0-编程，1-查资料，2-看文档，3-做设计，4-美工，5-运营，6-看小说，7-打游戏，8-听音乐 后续需要重新约定 -->
-            <span>{{converType(item.pic_type == null ? 0 : item.pic_type)}}</span>
+            <span>{{converType(item.pic_type == null ? 0 : item.pic_type+1)}}</span>
             <div class="bottom clearfix">
               <el-link>
                 <i class="fa fa-circle"></i>

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

@@ -16,7 +16,7 @@
       <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 label="行为">
-        <template slot-scope="scope">{{converType(scope.row.type)}}</template>
+        <template slot-scope="scope">{{converType(scope.row.type+1)}}</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>