提交

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java

@@ -106,12 +106,12 @@ public class ProPlanController extends BaseController
             Project prj=new Project(file.getInputStream());
             List<ProPlan> proPlans=new ArrayList<>();
             tasksToPlans(prj.getRootTask().getChildren(),proPlans);
-            System.out.println("prj.getRootTask().getChildren().size()===>"+ prj.getRootTask().getChildren().size());
+            //System.out.println("prj.getRootTask().getChildren().size()===>"+ prj.getRootTask().getChildren().size());
             for(ProPlan proPlan:proPlans){
                 proPlan.setComid(compId);
                 proPlan.setProjectId(projectId);
             }
-            System.out.println("proPlanService.addTasks(proPlans)==>"+proPlans.size());
+            //System.out.println("proPlanService.addTasks(proPlans)==>"+proPlans.size());
             proPlanService.addTasks(proPlans);
         } catch (Exception e) {
             e.printStackTrace();

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java

@@ -3,6 +3,7 @@ package com.yanzhu.manage.service.impl;
 import com.yanzhu.common.core.context.SecurityContextHolder;
 import com.yanzhu.common.core.text.Convert;
 import com.yanzhu.common.core.utils.DateUtils;
+import com.yanzhu.common.security.utils.SecurityUtils;
 import com.yanzhu.manage.domain.ProPlan;
 import com.yanzhu.manage.domain.ProPlanSchedule;
 import com.yanzhu.manage.mapper.ProPlanMapper;
@@ -51,6 +52,10 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService
     @Override
     public List<ProPlanSchedule> selectProPlanScheduleList(ProPlanSchedule proPlanSchedule)
     {
+        if(proPlanSchedule.getProjectId()==null){
+            //proPlanSchedule.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            proPlanSchedule.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return proPlanScheduleMapper.selectProPlanScheduleList(proPlanSchedule);
     }
 

yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue

@@ -253,13 +253,13 @@
               </el-col>
               <el-col :span="8" class="fitem-no-width">
                 <el-form-item label="计划开工时间" prop="scheduledStartTime">
-                  <el-date-picker v-model="form.scheduledStartTime" type="date" placeholder="请选择计划开工时间"
+                  <el-date-picker v-model="form.scheduledStartTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择计划开工时间"
                     style="width:100%" />
                 </el-form-item>
               </el-col>
               <el-col :span="8" class="fitem-no-width">
                 <el-form-item label="计划完工时间" prop="plannedCompletionTime">
-                  <el-date-picker v-model="form.plannedCompletionTime" type="date" placeholder="请选择计划完工时间"
+                  <el-date-picker v-model="form.plannedCompletionTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择计划完工时间"
                     style="width:100%" />
                 </el-form-item>
               </el-col>
@@ -276,13 +276,13 @@
               </el-col>
               <el-col :span="8" class="fitem-no-width">
                 <el-form-item label="实际开工时间" prop="actualOperatingTime">
-                  <el-date-picker v-model="form.actualOperatingTime" type="date" placeholder="请选择实际开工时间"
+                  <el-date-picker v-model="form.actualOperatingTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择实际开工时间"
                     style="width:100%" />
                 </el-form-item>
               </el-col>
               <el-col :span="8" class="fitem-no-width">
                 <el-form-item label="实际完工时间" prop="actualCompletionTime">
-                  <el-date-picker v-model="form.actualCompletionTime" type="date" placeholder="请选择实际完工时间"
+                  <el-date-picker v-model="form.actualCompletionTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择实际完工时间"
                     style="width:100%" />
                 </el-form-item>
               </el-col>

yanzhu-ui-vue3/src/views/manage/schedule/index.vue

@@ -236,7 +236,6 @@
           v-if="form.schedulePercent == 100"
         >
           <el-date-picker
-            clearable
             v-model="form.finishDate"
             type="date"
             value-format="YYYY-MM-DD"

yanzhu-ui-vue3/src/views/manage/videoMonitor/index.vue

@@ -173,7 +173,6 @@ const { queryParams, form, rules } = toRefs(data)
 function getList() {
     loading.value = true
     queryParams.value.projectId = userStore.currentPrjId
-    queryParams.value.comId = userStore.currentComId
     listVideoMonitor(queryParams.value).then((response) => {
         videoMonitorList.value = response.rows
         total.value = response.total

yanzhu-ui-vue3/vite.config.js

@@ -39,7 +39,8 @@ export default defineConfig(({ mode, command }) => {
         },
         // https://cn.vitejs.dev/config/#server-proxy
         "/dev-api": {
-          target: "http://localhost:8080",
+          //target: "http://localhost:8080",
+          target: "http://62.234.3.186/prod-api/",
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, ""),
         },