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

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

@@ -3,10 +3,11 @@ package com.management.platform.controller;
 
 import com.management.platform.service.CompanyService;
 import com.management.platform.util.HttpRespMsg;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  *  前端控制器
@@ -18,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/company")
 public class CompanyController {
-    @Autowired
+    @Resource
     private CompanyService companyService;
     @RequestMapping("/dataMigration")
     public HttpRespMsg dataMigration(Integer oldCompanyId,Integer targetCompanyId){

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

@@ -79,13 +79,13 @@ public class PermissionController {
     }
 
     @RequestMapping("/getAuthority")
-    public HttpRespMsg getAuthority(@RequestParam Integer role, @RequestParam Integer companyId) {
-        return permissionService.getAuthority(role, companyId);
+    public HttpRespMsg getAuthority(@RequestParam Integer role, @RequestParam Integer companyId,HttpServletRequest request) {
+        return permissionService.getAuthority(role, companyId,request);
     }
 
     @RequestMapping("/exportData")
-    public HttpRespMsg exportData(@RequestParam Integer role, @RequestParam Integer companyId){
-        return permissionService.exportData(role,companyId);
+    public HttpRespMsg exportData(@RequestParam Integer role, @RequestParam Integer companyId,HttpServletRequest request){
+        return permissionService.exportData(role,companyId,request);
     }
 
     @RequestMapping("/switchAuthority")

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

@@ -194,6 +194,10 @@ public class ReportExtraDegreeController {
                         (pro.getAssociateDegreeNames().equals(degree.getName()) || pro.getAssociateDegreeNames().startsWith(degree.getName()+",")
                             || pro.getAssociateDegreeNames().contains(","+degree.getName()+",")
                             || pro.getAssociateDegreeNames().endsWith(","+degree.getName()))).map(Project::getProjectName).collect(Collectors.joining(",")));
+                degree.setProjectNum((int) allProjects.stream().filter(pro->pro.getAssociateDegreeNames() != null &&
+                        (pro.getAssociateDegreeNames().equals(degree.getName()) || pro.getAssociateDegreeNames().startsWith(degree.getName()+",")
+                                || pro.getAssociateDegreeNames().contains(","+degree.getName()+",")
+                                || pro.getAssociateDegreeNames().endsWith(","+degree.getName()))).count());
             }
         }
 

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

@@ -695,7 +695,7 @@ public class TaskController {
      * @return
      */
     @RequestMapping("/listByPage")
-    public HttpRespMsg listByPage(Integer status, Integer viewId, Integer pageIndex, Integer pageSize) {
+    public HttpRespMsg listByPage(Integer status, Integer viewId, Integer pageIndex, Integer pageSize,Integer type) {
         HttpRespMsg msg = new HttpRespMsg();
         String userId = request.getHeader("Token");
         QueryWrapper<Task> queryWrapper = new QueryWrapper<>();
@@ -709,6 +709,9 @@ public class TaskController {
             //我创建的任务
             queryWrapper.eq("creater_id", userId);
         }
+        if(type!=null){
+            queryWrapper.eq("task_type",type);
+        }
 //        else if (viewId == 3) {
 //            //今天的任务
 //            queryWrapper.eq("end_date", LocalDate.now());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ReportExtraDegree.java

@@ -1,14 +1,15 @@
 package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
@@ -42,6 +43,9 @@ public class ReportExtraDegree extends Model<ReportExtraDegree> {
     @TableField(exist = false)
     private String projects;
 
+    @TableField(exist = false)
+    private Integer projectNum;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -27,7 +27,7 @@ public interface PermissionService extends IService<Permission> {
 
     HttpRespMsg deleteRole(Integer id);
 
-    HttpRespMsg getAuthority(Integer role, Integer companyId);
+    HttpRespMsg getAuthority(Integer role, Integer companyId,HttpServletRequest request);
 
     HttpRespMsg switchAuthority(Integer role, Integer id);
 
@@ -35,5 +35,5 @@ public interface PermissionService extends IService<Permission> {
 
     HttpRespMsg setDefaultRole(Integer id, Integer companyId);
 
-    HttpRespMsg exportData(Integer role, Integer companyId);
+    HttpRespMsg exportData(Integer role, Integer companyId,HttpServletRequest request);
 }

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

@@ -151,86 +151,99 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
     }
 
     @Override
-    public HttpRespMsg getAuthority(Integer role, Integer companyId) {
+    public HttpRespMsg getAuthority(Integer role, Integer companyId,HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
-
+        User user = userMapper.selectById(request.getHeader("token"));
         //角色赋有的module
         List<Integer> modelIds = sysRoleModuleMapper.selectList(new QueryWrapper<SysRoleModule>().eq("role_id", role)).stream().map(sr -> sr.getModuleId()).collect(Collectors.toList());
-
         //全部模块，
         Company company = companyMapper.selectById(companyId);
         TimeType timeType = timeTypeMapper.selectById(companyId);
         //按照公司开通的模块进行匹配
-        QueryWrapper<SysModule> queryWrapper = new QueryWrapper<SysModule>().eq("package_time", 1);
-        if (company.getPackageProject() == 1) {
-            queryWrapper.or().eq("package_project", 1);
-        }
-        if (company.getPackageOa() == 1) {
-            queryWrapper.or().eq("package_oa", 1);
-        }
-        if (company.getPackageExpense() == 1) {
-            queryWrapper.or().eq("package_expense", 1);
-        }
-        if (company.getPackageCustomer() == 1) {
-            queryWrapper.or().eq("package_customer", 1);
-        }
-        if (company.getPackageEngineering() == 1) {
-            queryWrapper.or().eq("package_engineering", 1);
-        }
-        if (company.getPackageContract() == 1) {
-            queryWrapper.or().eq("package_contract", 1);
-        }
-        if (company.getPackageEtimecard()== 1) {
-            queryWrapper.or().eq("package_etimecard", 1);
-        }
-        if (company.getPackageFinance() == 1) {
-            queryWrapper.or().eq("package_finance", 1);
-        }
-        if (timeType.getReportWorkflow() == 1) {
-            queryWrapper.or().eq("report_workflow", 1);
-        }
-        if (timeType.getNeedDeptAudit() == 1) {
-            queryWrapper.or().eq("need_dept_audit", 1);
+        QueryWrapper<SysModule> queryWrapper = new QueryWrapper<SysModule>().and(wrapper->{
+            wrapper.eq("package_time", 1);
+            if (company.getPackageProject() == 1) {
+                wrapper.or().eq("package_project", 1);
+            }
+            if (company.getPackageOa() == 1) {
+                wrapper.or().eq("package_oa", 1);
+            }
+            if (company.getPackageExpense() == 1) {
+                wrapper.or().eq("package_expense", 1);
+            }
+            if (company.getPackageCustomer() == 1) {
+                wrapper.or().eq("package_customer", 1);
+            }
+            if (company.getPackageEngineering() == 1) {
+                wrapper.or().eq("package_engineering", 1);
+            }
+            if (company.getPackageContract() == 1) {
+                wrapper.or().eq("package_contract", 1);
+            }
+            if (company.getPackageEtimecard()== 1) {
+                wrapper.or().eq("package_etimecard", 1);
+            }
+            if (company.getPackageFinance() == 1) {
+                wrapper.or().eq("package_finance", 1);
+            }
+            if (timeType.getReportWorkflow() == 1) {
+                wrapper.or().eq("report_workflow", 1);
+            }
+            if (timeType.getNeedDeptAudit() == 1) {
+                wrapper.or().eq("need_dept_audit", 1);
+            }
+            return wrapper;
+        });
+        List<SysRoleModule> sysRoleModuleList = sysRoleModuleMapper.selectList(new QueryWrapper<SysRoleModule>().eq("role_id", user.getRoleId()));
+        List<Integer> moduleIds = sysRoleModuleList.stream().map(sm -> sm.getModuleId()).collect(Collectors.toList());
+        if(!user.getRoleName().equals("超级管理员")){
+            queryWrapper.and(wrapper->wrapper.in("id",moduleIds));
         }
         queryWrapper.orderByAsc("orderitem");
-
         List<SysModule> moduleList = sysModuleMapper.selectList(queryWrapper);
         //组装层级关系，默认只有两级
         List<SysModule> menuList = new ArrayList<>();
-        QueryWrapper<SysFunction> functionQueryWrapper = new QueryWrapper<SysFunction>().eq("package_time", 1);
-        if (company.getPackageProject() == 1) {
-            functionQueryWrapper.or().eq("package_project", 1);
-        }
-        if (company.getPackageOa() == 1) {
-            functionQueryWrapper.or().eq("package_oa", 1);
-        }
-        if (company.getPackageExpense() == 1) {
-            functionQueryWrapper.or().eq("package_expense", 1);
-        }
-        if (company.getPackageCustomer() == 1) {
-            functionQueryWrapper.or().eq("package_customer", 1);
-        }
-        if (company.getPackageEngineering() == 1) {
-            functionQueryWrapper.or().eq("package_engineering", 1);
-        }
-        if (company.getPackageContract() == 1) {
-            functionQueryWrapper.or().eq("package_contract", 1);
-        }
-        if (company.getPackageEtimecard()== 1) {
-            functionQueryWrapper.or().eq("package_etimecard", 1);
-        }
-        if (company.getPackageFinance() == 1) {
-            functionQueryWrapper.or().eq("package_finance", 1);
-        }
-        if (timeType.getSyncCorpwxTime() == 1) {
-            functionQueryWrapper.or().eq("sync_corpwx_time", 1);
-        }
-        //开通财务审核功能的
-        if (timeType.getFinanceAudit() == 1) {
-            functionQueryWrapper.or().eq("finance_audit", 1);
+        QueryWrapper<SysFunction> functionQueryWrapper = new QueryWrapper<SysFunction>().and(wrapper->{
+            wrapper.eq("package_time", 1);
+            if (company.getPackageProject() == 1) {
+                wrapper.or().eq("package_project", 1);
+            }
+            if (company.getPackageOa() == 1) {
+                wrapper.or().eq("package_oa", 1);
+            }
+            if (company.getPackageExpense() == 1) {
+                wrapper.or().eq("package_expense", 1);
+            }
+            if (company.getPackageCustomer() == 1) {
+                wrapper.or().eq("package_customer", 1);
+            }
+            if (company.getPackageEngineering() == 1) {
+                wrapper.or().eq("package_engineering", 1);
+            }
+            if (company.getPackageContract() == 1) {
+                wrapper.or().eq("package_contract", 1);
+            }
+            if (company.getPackageEtimecard()== 1) {
+                wrapper.or().eq("package_etimecard", 1);
+            }
+            if (company.getPackageFinance() == 1) {
+                wrapper.or().eq("package_finance", 1);
+            }
+            if (timeType.getSyncCorpwxTime() == 1) {
+                wrapper.or().eq("sync_corpwx_time", 1);
+            }
+            //开通财务审核功能的
+            if (timeType.getFinanceAudit() == 1) {
+                wrapper.or().eq("finance_audit", 1);
+            }
+            return wrapper;
+        });
+        List<SysRoleFunction> sysRoleFunctionList = sysRoleFunctionMapper.selectList(new QueryWrapper<SysRoleFunction>().eq("role_id", user.getRoleId()));
+        List<Integer> functionIds = sysRoleFunctionList.stream().map(sf -> sf.getFunctionId()).collect(Collectors.toList());
+        if(!user.getRoleName().equals("超级管理员")){
+            functionQueryWrapper.and(funWrapper->funWrapper.in("id",functionIds));
         }
         functionQueryWrapper.orderByAsc("seq");
-
         List<SysFunction> functionList = sysFunctionMapper.selectList(functionQueryWrapper);
         //勾选上角色选中的功能
         List<SysRoleFunction> roleFunctionList = sysRoleFunctionMapper.selectList(new QueryWrapper<SysRoleFunction>().eq("role_id", role));
@@ -341,8 +354,8 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
     }
 
     @Override
-    public HttpRespMsg exportData(Integer role, Integer companyId) {
-        HttpRespMsg msg = getAuthority(role, companyId);
+    public HttpRespMsg exportData(Integer role, Integer companyId,HttpServletRequest request) {
+        HttpRespMsg msg = getAuthority(role, companyId,request);
         SysRole roleItem = sysRoleMapper.selectById(role);
         List<SysModule> menuList= (List<SysModule>) msg.data;
         HSSFWorkbook wb=new HSSFWorkbook();

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

@@ -1660,20 +1660,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             user.put("id", u.getId());
             user.put("name", u.getName());
             user.put("departmentId", u.getDepartmentId());
-            List<Map<String, Object>> mapList = reportNameByDate.stream().filter(r -> r.get("id").equals(u.getId())).collect(Collectors.toList());
             Optional<Map<String, Object>> first = reportNameByDate.stream().filter(r -> r.get("id").equals(u.getId())).findFirst();
-            BigDecimal bigDecimal=new BigDecimal(0);
-            for (Map<String, Object> map : mapList) {
-                bigDecimal=bigDecimal.add(BigDecimal.valueOf((Double) map.get("workingTime")));
-            }
-            boolean b = reportNameByDate.stream().anyMatch(r -> r.get("state").equals(1));
-            if (b) {
-                user.put("state",1);
-                user.put("workingTime",bigDecimal);
-            }
-            if(first.isPresent()&&!b){
-                user.put("state",first.get().get("state"));
-                user.put("workingTime",bigDecimal);
+
+            if (first.isPresent()) {
+                user.put("state", first.get().get("state"));
+                user.put("workingTime", first.get().get("workingTime"));
             }
             userMapList.add(user);
         }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -388,7 +388,7 @@
         <if test="leaderId != null and leaderId != ''">
             AND (a.project_auditor_id = #{leaderId} or project.incharger_id = #{leaderId})
         </if>
-        group by a.creator_id,a.id
+        group by a.creator_id
     </select>
 
     <!--根据日期,部门，指定人员获取报告上传人-->

fhKeeper/formulahousekeeper/timesheet/src/views/centerManage/centerManage.vue

@@ -21,7 +21,10 @@
                     {{scope.$index + 1}}
                 </template>
             </el-table-column>
-            <el-table-column prop="name" label="名称" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="name" label="名称" width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="projectNum" label="相关项目数量" width="160">
+                <template slot-scope="scope">{{scope.row.projectNum + '个'}}</template>
+            </el-table-column>
             <el-table-column prop="projects" label="相关项目" min-width="180" show-overflow-tooltip></el-table-column>
             <el-table-column label="操作" width="170">
                 <template slot-scope="scope" >

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

@@ -262,7 +262,7 @@
                     <el-input v-model="addForm.name" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目名称" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="项目描述" prop="projectDesc">
-                    <el-input v-model="addForm.projectDesc" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目描述" clearable maxlength="50" show-word-limit></el-input>
+                    <el-input v-model="addForm.projectDesc" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目描述" clearable maxlength="200" show-word-limit></el-input>
                 </el-form-item>
                 <el-form-item label="项目类型" prop="isPublic">
                     <el-select v-model="addForm.isPublic" style="width:32%;" @change="selectPublic" :disabled="!permissions.projectManagement && addForm.creatorId != user.id">

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

@@ -21,11 +21,29 @@
                 <!-- <el-form-item style="float:right;">
                     <el-link type="primary" :underline="false" @click="handleAdd(-1,null)">新增任务</el-link>
                 </el-form-item> -->
+
+                <div style="margin-left: 40px;display: inline-block">
+                <el-form-item label="类型">
+                </el-form-item>
+                </div>
+                <el-form-item >
+                    <div style="margin-left: 8px">
+                    <!-- <el-input style="float:left;" v-model="keyword" class="input-with-select" placeholder="请输入项目名称关键字" clearable="true"> -->
+                        <el-select v-model="typeField" style="width:120px;"  slot="prepend" placeholder="请选择">
+                            <el-option label="任务" value="0" @click.native="hiddens()"></el-option>
+                            <el-option label="里程碑" value="1" @click.native="hiddens()"></el-option>
+                            <el-option label="风险" value="2" @click.native="hiddens()"></el-option>
+                        </el-select>
+                        <!-- <el-button slot="append" @click="searchList" icon="el-icon-search"></el-button> -->
+                    <!-- </el-input> -->
+                    </div>
+                </el-form-item>
             </el-form>
         </el-col>
         <div style="display: flex;width: 100%;">
             <div class="classification">
                 <div>
+                    <p :class="idx == 0 ? 'on' : ''" @click="switchs(0)" v-if="permissions.projectView || permissions.projectManagement">全部任务</p>
                     <p :class="idx == 1 ? 'on' : ''" @click="switchs(1)">我执行的</p>
                     <p :class="idx == 2 ? 'on' : ''" @click="switchs(2)">我创建的</p>
                 </div>
@@ -163,7 +181,7 @@
 
 
         <!-- 新增子项目弹出框 -->
-        <el-dialog title="新增/修改子项目" v-if="addSubProject" :visible.sync="addSubProject" :close-on-click-modal="false" customClass="customWidth" width="500px">
+        <!-- <el-dialog title="新增/修改子项目" v-if="addSubProject" :visible.sync="addSubProject" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <el-form ref="form2" :model="addForm" :rules="rules" label-width="100px">
                 <el-form-item label="项目名称" prop="name">
                     <el-input v-model="addForm.name" placeholder="请输入项目名称" clearable></el-input>
@@ -173,7 +191,7 @@
                 <el-button @click.native="addSubProject = false">取消</el-button>
                 <el-button type="primary" @click="submitInsertSubProject" :loading="addLoading">提交456</el-button>
             </div>
-        </el-dialog>
+        </el-dialog> -->
 
         <!-- 任务详情信息弹出框 -->
         <el-dialog :class="addForm.id==null?'':'jm'" :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" 
@@ -633,9 +651,11 @@ import { error } from 'dingtalk-jsapi';
         },
         data() {
             return {
+                typeField: '0',
                 searchField: '0',
                 keyword:null,
                 user: JSON.parse(sessionStorage.getItem("user")),
+                permissions: JSON.parse(sessionStorage.getItem("permissions")),
                 userDetailVisible: false,
                 userDetail:{},
                 date: new Date(),
@@ -926,6 +946,7 @@ import { error } from 'dingtalk-jsapi';
                     viewId: this.idx,
                     pageIndex: this.page,
                     pageSize: this.size,
+                    type: this.typeField
                 },
                 res => {
                     this.listLoading = false;

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

@@ -1536,7 +1536,6 @@
             },
 
             filterNode(value, data) {
-                // console.log(value, data, '搜索')
                 if (!value) return true;
                 return data.label.indexOf(value) !== -1;
             },
@@ -1589,7 +1588,6 @@
             addUpload(data) {
                 // var zhi = data.fileName.split('.')[0]
                 // var sss = zhi + '.xlsx'
-                // console.log(sss, data)
                 // return
                 var filePath = '/upload/' + data.serverName;
                 const a = document.createElement('a'); // 创建a标签
@@ -1815,7 +1813,6 @@
                 },
                 res => {
                     if (res.code == "ok") {
-                        // console.log("维度",res.data);
                         this.yonghuUser = res.data
                     } 
                 },
@@ -1953,7 +1950,6 @@
                     }
                     
                 }
-                // console.log('domain',quanbu);
             },
             iptChang() {
                 var sl = this.workForm.domains
@@ -2062,7 +2058,6 @@
     },
 
     handleClick(t,e){
-    //   console.log("tabname",t.name);
       if (t.name == "first") {
         this.showMonthWorkTime()
       }else{
@@ -2071,7 +2066,6 @@
     },
     //导出员工每日填报工时数
     exportMembWorkHours() {   
-    //   console.log("exportMembWorkHours",this.WorktimeDatepickValue);
       this.http.post(
         "/report/exportUserDailyWorkTime",
         {
@@ -2082,7 +2076,6 @@
         (res) => {
           if (res.code == "ok") {
             let url = res.data;
-            // console.log(res);
             this.downloadByA("人员每日工时统计.xls", url);
           }
         },
@@ -2106,9 +2099,7 @@
         (res) => {
           if (res.code == "ok") {
             let url = res.data;
-            // console.log(res.data);
             this.downloadByA("人员每日工时统计.xls", url);
-            // console.log(url);
           }
         },
         (error) => {
@@ -2121,7 +2112,6 @@
     },
 
     downloadByA(name, url) {
-    //   console.log(name,url);
       const a = document.createElement("a"); // 创建a标签
       a.setAttribute("download", name); // download属性
       a.setAttribute("href", url); // href链接
@@ -2612,7 +2602,7 @@
                 if(!domain.projectId){
                     return;
                 }
-                console.log('projectId===',domain.projectId);
+                // console.log('projectId===',domain.projectId);
                 domain.projectName = this.fillProjectList.filter(p=>p.id == domain.projectId)[0].projectName;
                 this.http.post('/sub-project/list',{
                     projectId: domain.projectId
@@ -2750,7 +2740,7 @@
             },
 
             getGroupStages(domain, index) {
-                console.log(domain);
+                // console.log(domain);
                 if(!domain.groupId){
                     domain.projectAuditorId = ''
                     domain.stages = []
@@ -3068,9 +3058,6 @@
                     this.unFillList = this.getUserMembListFromDeptList(list, 0);
                     this.fillList = this.getUserMembListFromDeptList(list, 1)
                 } 
-                // console.log(this.depData.isUser)
-                // console.log(this.depData.membCount)
-                // console.log(this.depData)
             },
             theValues(id, item) {
                 for(var i in item) {
@@ -3139,7 +3126,7 @@
                         //设置员工到部门下面
                         this.setUserToDept(list);
                         this.data = list;
-                        console.log('data',this.data);
+                        // console.log('data',this.data);
                         this.expandDate = [this.data[1].id]
                         this.allData = list;
                         
@@ -3451,8 +3438,9 @@
                     this.listLoading = false;
                     if (res.code == "ok") {
                         this.reportList = res.data;
-                        document.querySelector("#day"+this.choseDay).scrollIntoView(true);
-                        // this.dealWith()
+                        if(document.querySelector("#day"+this.choseDay)){
+                            document.querySelector("#day"+this.choseDay).scrollIntoView(true);
+                        }
                     } else {
                         this.$message({
                             message: res.msg,
@@ -3483,20 +3471,15 @@
             //     }
             // },
             // getDealWith(item, tx, wtx, arr) {
-            //     // console.log(item,12345)
             //     for(var i in item) {
             //         if(item[i].children) {
             //             this.getDealWith(item[i].children, tx, wtx, arr)
             //         } else {
-            //             console.log(arr.indexOf(item[i].id))
-            //             console.log(arr)
-            //             console.log(item[i].id)
             //             if(arr.indexOf(item[i].id) != '-1') {
             //                 tx = +tx + 1
             //             }
             //         }
             //     }
-            //     console.log(tx, '看看值')
             // },
             //导出员工工时统计
             exportUserTime() {
@@ -3936,7 +3919,7 @@
                 }
                 
                 this.zhoRqi = [stat, end]
-                console.log('date',currentDate,this.zhoRqi);
+                // console.log('date',currentDate,this.zhoRqi);
                 this.zhoRqis()
                 // this.jiazai()
             },
@@ -4028,8 +4011,7 @@
                 }
                 this.zhoRqi[1] = this.dateChange(1, this.zhoRqi[1])
                 
-                // console.log(this.zhoRqi[1]);
-                // console.log(this.zhoRqi[1])
+
                 var obj = {}
                 obj.zhoDataTime = this.zhoRqi[1]
                 obj.he = 0
@@ -4251,8 +4233,6 @@
             zhoAdd() {
                 var zhi = this.zhoData
                 var ll = 0
-                // console.log(this.reportTimeType.type)
-                // console.log(this.reportTimeType.multiWorktime)
                 if(this.reportTimeType.type == 2) {
                     for(var i in zhi) {
                         this.dateAr = []
@@ -4962,7 +4942,7 @@
                                         type: "error"
                                     });
                                 } else if (this.workForm.domains[i].taskGroups.length > 0 && !this.workForm.domains[i].groupId) {
-                                    console.log(this.workForm.domains[i]);
+                                    // console.log(this.workForm.domains[i]);
                                     this.$message({
                                         message: "请选择["+this.workForm.domains[i].projectName+"]项目的任务分组",
                                         type: "error"