From f6cc1ecbf85d4b4ed3e8421651ab039aafd72817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Mon, 28 Apr 2025 00:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yanzhu/manage/mapper/ProPlanMapper.java | 14 ++ .../manage/mapper/ProPlanScheduleMapper.java | 2 +- .../resources/mapper/manage/ProPlanMapper.xml | 29 ++++ .../mapper/manage/ProPlanScheduleMapper.xml | 2 +- .../manage/controller/ProPlanController.java | 23 +++ .../controller/ProPlanScheduleController.java | 7 +- .../service/IProPlanScheduleService.java | 4 +- .../manage/service/IProPlanService.java | 14 ++ .../impl/ProPlanScheduleServiceImpl.java | 10 +- .../service/impl/ProPlanServiceImpl.java | 31 +++- yanzhu-ui-app/miniprogram/api/project.js | 9 + yanzhu-ui-app/miniprogram/app.json | 4 +- .../miniprogram/pages/project_info/index.js | 9 +- .../miniprogram/pages/project_list/index.wxml | 72 ++++---- .../miniprogram/pages/project_more/index.js | 27 ++- .../pages/project_quality/index.js | 9 +- .../miniprogram/pages/project_safety/index.js | 9 +- .../pages/project_schedule/add/index.js | 66 ++++++++ .../pages/project_schedule/add/index.json | 3 + .../pages/project_schedule/add/index.wxml | 2 + .../pages/project_schedule/add/index.wxss | 1 + .../pages/project_schedule/list/index.js | 160 ++++++++++++++++++ .../pages/project_schedule/list/index.json | 7 + .../pages/project_schedule/list/index.wxml | 97 +++++++++++ .../pages/project_schedule/list/index.wxss | 1 + yanzhu-ui-vue3/src/api/manage/plan.js | 20 ++- yanzhu-ui-vue3/src/api/manage/schedule.js | 4 +- .../src/views/manage/schedule/index.vue | 80 +++++++-- 28 files changed, 622 insertions(+), 94 deletions(-) create mode 100644 yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.js create mode 100644 yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.json create mode 100644 yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.wxml create mode 100644 yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.wxss create mode 100644 yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.js create mode 100644 yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.json create mode 100644 yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.wxml create mode 100644 yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.wxss diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanMapper.java index 48ac3729..3b0fdc28 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanMapper.java @@ -116,4 +116,18 @@ public interface ProPlanMapper * @return */ public ProPlan findOnlyPlan(ProPlan proPlan); + + /** + * 查询计划数据 + * @param proPlan + * @return + */ + public List findPlanDatas(ProPlan proPlan); + + /** + * 递归获取计划信息 + * @param proPlan + * @return + */ + public ProPlan findRecursionPlan(ProPlan proPlan); } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanScheduleMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanScheduleMapper.java index 037367af..db783725 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanScheduleMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanScheduleMapper.java @@ -64,5 +64,5 @@ public interface ProPlanScheduleMapper * @param taskId * @return */ - public ProPlanSchedule findPreviousScheduleByTaskId(Long taskId); + public ProPlanSchedule findPreviousScheduleByPlanId(Long taskId); } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml index 39f3cf4f..4300f740 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml @@ -251,4 +251,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by id limit 1 + + + + \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanScheduleMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanScheduleMapper.xml index 43fbf75d..9de6bfa7 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanScheduleMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanScheduleMapper.xml @@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where pps.plan_id = #{taskId} and pps.is_del = 0 order by pps.id desc limit 1 diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java index 003f674a..9d19a1ec 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java @@ -215,4 +215,27 @@ public class ProPlanController extends BaseController ProPlan proPlan = proPlanService.findOnlyPlan(planQuery); return success(proPlan); } + + /** + * 获取计划管理详细信息 + */ + @GetMapping(value = "/findPlanDatas/{proId}") + public AjaxResult findPlanDatas(@PathVariable("proId") Long proId) + { + ProPlan planQuery = new ProPlan(); + planQuery.setProjectId(proId); + List proPlans = proPlanService.findPlanDatas(planQuery); + return success(proPlans); + } + + /** + * 递归获取计划信息 + */ + @GetMapping(value = "/findRecursionPlan/{planId}") + public AjaxResult findRecursionPlan(@PathVariable("planId") Long planId){ + ProPlan plan = proPlanService.selectProPlanById(planId); + ProPlan parents = proPlanService.findRecursionPlan(plan); + plan.setTaskName(parents.getTaskName()); + return success(plan); + } } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanScheduleController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanScheduleController.java index 53e1db5c..625c6f7f 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanScheduleController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanScheduleController.java @@ -99,9 +99,10 @@ public class ProPlanScheduleController extends BaseController /** * 获取项目进度详细信息 */ - @GetMapping(value = "/findPreviousSchedule/{taskId}") - public AjaxResult findPreviousSchedule(@PathVariable("taskId") Long taskId) + @GetMapping(value = "/findPreviousSchedule/{planId}") + public AjaxResult findPreviousSchedule(@PathVariable("planId") Long planId) { - return success(proPlanScheduleService.findPreviousScheduleByTaskId(taskId)); + return success(proPlanScheduleService.findPreviousScheduleByPlanId(planId)); } + } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProPlanScheduleService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProPlanScheduleService.java index 48ff49bf..70202d70 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProPlanScheduleService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProPlanScheduleService.java @@ -61,8 +61,8 @@ public interface IProPlanScheduleService /** * 查询上次任务计划 - * @param taskId + * @param planId 计划主键 * @return */ - public ProPlanSchedule findPreviousScheduleByTaskId(Long taskId); + public ProPlanSchedule findPreviousScheduleByPlanId(Long planId); } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProPlanService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProPlanService.java index 5b684437..97246791 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProPlanService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProPlanService.java @@ -78,4 +78,18 @@ public interface IProPlanService * @return */ public ProPlan findOnlyPlan(ProPlan proPlan); + + /** + * 查询计划数据 + * @param proPlan + * @return + */ + public List findPlanDatas(ProPlan proPlan); + + /** + * 递归获取计划信息 + * @param proPlan 计划管理 + * @return + */ + public ProPlan findRecursionPlan(ProPlan proPlan); } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java index 10b4c2cf..9b629711 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java @@ -133,7 +133,7 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService for(Long id:ids){ ProPlanSchedule proPlanSchedule = proPlanScheduleMapper.selectProPlanScheduleById(id); ProPlan plan = proPlanMapper.selectProPlanById(proPlanSchedule.getPlanId()); - ProPlanSchedule Previous = proPlanScheduleMapper.findPreviousScheduleByTaskId(plan.getId()); + ProPlanSchedule Previous = proPlanScheduleMapper.findPreviousScheduleByPlanId(plan.getId()); if(Previous!=null){ plan.setScheduleNode(Previous.getSchedulePercent().toString()); }else{ @@ -159,7 +159,7 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService if(res>0){ ProPlanSchedule proPlanSchedule = proPlanScheduleMapper.selectProPlanScheduleById(id); ProPlan plan = proPlanMapper.selectProPlanById(proPlanSchedule.getPlanId()); - ProPlanSchedule Previous = proPlanScheduleMapper.findPreviousScheduleByTaskId(plan.getId()); + ProPlanSchedule Previous = proPlanScheduleMapper.findPreviousScheduleByPlanId(plan.getId()); if(Previous!=null){ plan.setScheduleNode(Previous.getSchedulePercent().toString()); }else{ @@ -354,12 +354,12 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService /** * 查询上次任务计划 - * @param taskId + * @param planId 计划主键 * @return */ @Override - public ProPlanSchedule findPreviousScheduleByTaskId(Long taskId){ - return proPlanScheduleMapper.findPreviousScheduleByTaskId(taskId); + public ProPlanSchedule findPreviousScheduleByPlanId(Long planId){ + return proPlanScheduleMapper.findPreviousScheduleByPlanId(planId); } } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanServiceImpl.java index be49a96d..c43b7133 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanServiceImpl.java @@ -169,7 +169,7 @@ public class ProPlanServiceImpl implements IProPlanService } /** - * 查询唯一计划 + * 递归查询唯一计划 * @return */ @Override @@ -181,4 +181,33 @@ public class ProPlanServiceImpl implements IProPlanService return proPlan; } } + + /** + * 查询计划数据 + * @param proPlan + * @return + */ + @Override + public List findPlanDatas(ProPlan proPlan){ + return proPlanMapper.findPlanDatas(proPlan); + } + + /** + * 递归获取计划信息 + * @param proPlan 计划信息 + * @return + */ + @Override + public ProPlan findRecursionPlan(ProPlan proPlan){ + if(proPlan.getTaskOutlineLevel()!=2){ + ProPlan planQuery = new ProPlan(); + planQuery.setTaskName(proPlan.getTaskName()); + planQuery.setProjectId(proPlan.getProjectId()); + planQuery.setTaskId(proPlan.getParentId()); + ProPlan plan = proPlanMapper.findRecursionPlan(planQuery); + return findRecursionPlan(plan); + }else{ + return proPlan; + } + } } diff --git a/yanzhu-ui-app/miniprogram/api/project.js b/yanzhu-ui-app/miniprogram/api/project.js index d85bccf8..6c330b06 100644 --- a/yanzhu-ui-app/miniprogram/api/project.js +++ b/yanzhu-ui-app/miniprogram/api/project.js @@ -273,3 +273,12 @@ export function editSubUsersPhone(data) { }) } +// 查询进度计划管理列表 +export function planScheduleList(query) { + return request({ + url: '/manage/schedule/list', + method: 'get', + params: query + }) +} + diff --git a/yanzhu-ui-app/miniprogram/app.json b/yanzhu-ui-app/miniprogram/app.json index be82e9ce..15467151 100644 --- a/yanzhu-ui-app/miniprogram/app.json +++ b/yanzhu-ui-app/miniprogram/app.json @@ -29,7 +29,9 @@ "pages/project_subusers/info/index", "pages/project_magusers/list/index", "pages/project_magusers/add/index", - "pages/project_magusers/info/index" + "pages/project_magusers/info/index", + "pages/project_schedule/list/index", + "pages/project_schedule/add/index" ], "usingComponents": { "van-row": "@vant/weapp/row", diff --git a/yanzhu-ui-app/miniprogram/pages/project_info/index.js b/yanzhu-ui-app/miniprogram/pages/project_info/index.js index 65645f07..29a8f5d9 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_info/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_info/index.js @@ -130,7 +130,7 @@ Page({ onLoad: function (options) { if (!getToken()) { wx.redirectTo({ - url: '../../login/login', + url: '../login/login', }) } wx.setStorageSync('nav-menu', "xmgk"); @@ -576,10 +576,9 @@ Page({ //跳转到进度管理 JDGL: function () { - app.toast("正在建设中"); - // wx.redirectTo({ - // url: '../../pageage/project_schedule/list/index' - // }) + wx.redirectTo({ + url: '../project_schedule/list/index' + }) }, //跳转到项目管理 diff --git a/yanzhu-ui-app/miniprogram/pages/project_list/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_list/index.wxml index 872b151e..bae5028a 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_list/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_list/index.wxml @@ -5,41 +5,41 @@ - - 总工程数（{{proCount}}） - + + 总工程数（{{proCount}}） + - - - - {{item.comName}} - - {{item.projectName}} - {{item.projectAddress}} - - - - 预警({{item.warningCount}}) - - - 预警({{item.warningCount}}) - - - 视频({{item.videoNum}}) - - - 视频({{item.videoNum}}) - - - 结构体({{item.monitoringCount}}) - - - 结构体({{item.monitoringCount}}) - - - - - - - + + + + {{item.comName}} + + {{item.projectName}} + {{item.projectAddress}} + + + + 预警({{item.warningCount}}) + + + 预警({{item.warningCount}}) + + + 视频({{item.videoNum}}) + + + 视频({{item.videoNum}}) + + + 结构体({{item.monitoringCount}}) + + + 结构体({{item.monitoringCount}}) + + + + + + + \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_more/index.js b/yanzhu-ui-app/miniprogram/pages/project_more/index.js index 14789d8e..bd141fd7 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_more/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_more/index.js @@ -46,7 +46,7 @@ Page({ onLoad: function (options) { if (!getToken()) { wx.redirectTo({ - url: '../../login/login', + url: '../login/login', }) } const proUserInfo = getUserInfo(); @@ -57,7 +57,7 @@ Page({ id: app.globalData.useProjectId, text: app.globalData.useProjectName, }, - active: proUserInfo.projectUserInfo.subDeptType=='1'?4:1, + active: proUserInfo.projectUserInfo.subDeptType == '1' ? 4 : 1, subDeptUserInfo: proUserInfo.projectUserInfo, }); //用户权限菜单 @@ -82,7 +82,7 @@ Page({ goMenu: function (event) { let _url = event.currentTarget.dataset.url; - if(!_url){ + if (!_url) { app.toast("正在建设中...") return false; } @@ -117,24 +117,23 @@ Page({ AQGL: function () { wx.setStorageSync('nav-menu', "aqgl"); wx.redirectTo({ - url:'../project_safety/index' - }) + url: '../project_safety/index' + }) }, //跳转到质量管理 ZLGL: function () { wx.setStorageSync('nav-menu', "zlgl"); wx.redirectTo({ - url:'../project_quality/index' - }) + url: '../project_quality/index' + }) }, //跳转到进度管理 JDGL: function () { - app.toast("正在建设中"); - // wx.redirectTo({ - // url:'../../pageage/project_schedule/list/index' - // }) + wx.redirectTo({ + url: '../project_schedule/list/index' + }) }, /** @@ -146,11 +145,11 @@ Page({ if (res.code == 200) { let proUserInfo = this.data.subDeptUserInfo; this.setData({ - todoDb: proUserInfo.subDeptType=="1"?(res.data.dwsh+res.data.rysh):res.data.todo, + todoDb: proUserInfo.subDeptType == "1" ? (res.data.dwsh + res.data.rysh) : res.data.todo, fbdwDB: res.data.dwsh, fbrtDB: res.data.rysh, - aqglDb: proUserInfo.subDeptType=="1"?res.data.aqgl:0, - zlglDb: proUserInfo.subDeptType=="1"?res.data.zlgl:0, + aqglDb: proUserInfo.subDeptType == "1" ? res.data.aqgl : 0, + zlglDb: proUserInfo.subDeptType == "1" ? res.data.zlgl : 0, aqyhDB: res.data.aqgl, zlyhDB: res.data.zlgl, }) diff --git a/yanzhu-ui-app/miniprogram/pages/project_quality/index.js b/yanzhu-ui-app/miniprogram/pages/project_quality/index.js index a32bd076..a57a596e 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_quality/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_quality/index.js @@ -71,7 +71,7 @@ Page({ onLoad: function (options) { if (!getToken()) { wx.redirectTo({ - url: '../../login/login', + url: '../login/login', }) } const proUserInfo = getUserInfo(); @@ -163,10 +163,9 @@ Page({ //跳转到进度管理 JDGL: function () { - app.toast("正在建设中"); - // wx.redirectTo({ - // url:'../../pageage/project_schedule/list/index' - // }) + wx.redirectTo({ + url: '../project_schedule/list/index' + }) }, //跳转到项目管理 diff --git a/yanzhu-ui-app/miniprogram/pages/project_safety/index.js b/yanzhu-ui-app/miniprogram/pages/project_safety/index.js index 57a66a8a..8606ebf6 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_safety/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_safety/index.js @@ -70,7 +70,7 @@ Page({ onLoad: function (options) { if (!getToken()) { wx.redirectTo({ - url: '../../login/login', + url: '../login/login', }) } const proUserInfo = getUserInfo(); @@ -162,10 +162,9 @@ Page({ //跳转到进度管理 JDGL: function () { - app.toast("正在建设中"); - // wx.redirectTo({ - // url:'../../pageage/project_schedule/list/index' - // }) + wx.redirectTo({ + url: '../project_schedule/list/index' + }) }, //跳转到项目管理 diff --git a/yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.js b/yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.js new file mode 100644 index 00000000..755b3b57 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.js @@ -0,0 +1,66 @@ +// pages/project_schedule/add/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.json b/yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.json new file mode 100644 index 00000000..3928faa4 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.wxml new file mode 100644 index 00000000..a0f1db7e --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.wxml @@ -0,0 +1,2 @@ + +pages/project_schedule/add/index.wxml \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.wxss b/yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.wxss new file mode 100644 index 00000000..6c21abd7 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_schedule/add/index.wxss @@ -0,0 +1 @@ +/* pages/project_schedule/add/index.wxss */ \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.js b/yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.js new file mode 100644 index 00000000..796a8126 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.js @@ -0,0 +1,160 @@ +import { + getToken, + getUserInfo +} from '../../../utils/auth' +import { + findMyTask +} from '../../../api/flowable' +import { + planScheduleList +} from '../../../api/project' +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + active: 3, + projectId: '', + projectName: '', + subDeptUserInfo: {}, + initData: {}, + aqglDb: 0, + zlyhDB: 0, + zlglDb: 0, + todoDB: 0, + pageNum: 1, + pageSize: 10, + total: 0, + listData: [] + }, + + + //项目切换 返回值 + onProjectSelect(e) { + let projectId = e.detail.id; + let projectName = e.detail.text; + app.globalData.useProjectId = projectId; + app.globalData.useProjectName = projectName; + this.onLoad(); + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + if (!getToken()) { + wx.redirectTo({ + url: '../../login/login', + }) + } + const proUserInfo = getUserInfo(); + this.setData({ + projectId: app.globalData.useProjectId, + projectName: app.globalData.useProjectName, + initData: { + id: app.globalData.useProjectId, + text: app.globalData.useProjectName, + }, + subDeptUserInfo: proUserInfo.projectUserInfo, + pageNum: 1, + pageSize: 10, + total: 0, + listData: [], + }); + this.awaitTask(); + this.getListData(); + }, + + /** + * 数据加载 + */ + getListData() { + let params = "pageNum=" + this.data.pageNum + "&pageSize=" + this.data.pageSize + "&projectId=" + app.globalData.useProjectId; + planScheduleList(params).then(res => { + if (res.code == 200) { + res.rows.forEach(item => { + item.mainImage = item.images.split(',')[0]; + }); + this.setData({ + total: res.total, + listData: this.data.listData.concat(res.rows) + }) + } + }); + }, + + /** + * 滚动加载 + */ + onScrollToLower() { + let nal = Math.ceil(this.data.total / this.data.pageSize); + if (this.data.pageNum < nal) { + this.setData({ + pageNum: this.data.pageNum + 1 + }); + this.getListData(); + } else { + console.log("已经到底了，没有数据可加载！！！"); + } + }, + + // 底部导航 + onChange(event) { + // event.detail 的值为当前选中项的索引 + this.setData({ + active: event.detail + }); + }, + + //跳转到项目概况 + XMGK: function () { + wx.setStorageSync('nav-menu', "xmgk"); + wx.redirectTo({ + url: '../project_info/index' + }) + }, + + //跳转到安全管理 + AQGL: function () { + wx.setStorageSync('nav-menu', "aqgl"); + wx.redirectTo({ + url: '../project_safety/index' + }) + }, + + //跳转到进度管理 + JDGL: function () { + wx.redirectTo({ + url: '../project_schedule/list/index' + }) + }, + + //跳转到项目管理 + XMGL: function () { + wx.setStorageSync('nav-menu', "xmgl"); + wx.redirectTo({ + url: '../project_more/index' + }) + }, + + /** + * 统计代办 + */ + awaitTask() { + let param = "proId=" + app.globalData.useProjectId; + findMyTask(param).then(res => { + if (res.code == 200) { + let proUserInfo = this.data.subDeptUserInfo; + this.setData({ + aqglDb: proUserInfo.subDeptType == "1" ? res.data.aqgl : 0, + zlyhDB: res.data.zlyl, + zlglDb: proUserInfo.subDeptType == "1" ? res.data.zlgl : 0, + todoDb: proUserInfo.subDeptType == "1" ? (res.data.dwsh + res.data.rysh) : res.data.todo + }) + } + }); + }, + +}) \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.json b/yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.json new file mode 100644 index 00000000..2dfb8746 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.json @@ -0,0 +1,7 @@ +{ + "usingComponents": { + "van-tabbar": "@vant/weapp/tabbar", + "van-tabbar-item": "@vant/weapp/tabbar-item" + }, + "navigationStyle": "custom" +} \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.wxml new file mode 100644 index 00000000..7c5c4bd1 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.wxml @@ -0,0 +1,97 @@ + + + + + + + + 返回 + + + + + + + 进度管理 + + + + + + + + + + + + + {{index < 10 ?'0'+(index+1):(index+1)}} + + + + + + + + + + 计划名称：{{item.taskName}} + 完成进度：{{item.schedulePercent}} % + 填报时间：{{item.createDate}} + + + + 进度描述：{{item.description}} + + + + + + + + 暂无数据 + + + + + + 新增 + + + + + + + + + + 项目概况 + + + + + + 安全管理 + {{aqglDB}} + + + + + + 质量管理 + {{zlglDB}} + + + + + + 进度管理 + + + + + + 项目管理 + {{todoDb}} + + \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.wxss b/yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.wxss new file mode 100644 index 00000000..91f08725 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pages/project_schedule/list/index.wxss @@ -0,0 +1 @@ +/* pages/project_schedule/list/index.wxss */ \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/api/manage/plan.js b/yanzhu-ui-vue3/src/api/manage/plan.js index 3cfb0d67..f902334c 100644 --- a/yanzhu-ui-vue3/src/api/manage/plan.js +++ b/yanzhu-ui-vue3/src/api/manage/plan.js @@ -43,10 +43,26 @@ export function delPlan(id) { }) } -// 查询项目进度 +// 查询计划管理 export function findOnlyPlan(proId) { return request({ url: '/manage/plan/findOnlyPlan/' + proId, method: 'get' }) -} \ No newline at end of file +} + +// 查询计划管理 +export function findPlanDatas(proId) { + return request({ + url: '/manage/plan/findPlanDatas/' + proId, + method: 'get' + }) +} + +// 递归查询计划 +export function findRecursionPlan(planId) { + return request({ + url: '/manage/plan/findRecursionPlan/' + planId, + method: 'get' + }) +} diff --git a/yanzhu-ui-vue3/src/api/manage/schedule.js b/yanzhu-ui-vue3/src/api/manage/schedule.js index 36f6070d..c99490ef 100644 --- a/yanzhu-ui-vue3/src/api/manage/schedule.js +++ b/yanzhu-ui-vue3/src/api/manage/schedule.js @@ -44,9 +44,9 @@ export function delSchedule(id) { } // 查询之前项目进度 -export function findPreviousSchedule(taskId) { +export function findPreviousSchedule(planId) { return request({ - url: '/manage/schedule/findPreviousSchedule/' + taskId, + url: '/manage/schedule/findPreviousSchedule/' + planId, method: 'get' }) } \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/manage/schedule/index.vue b/yanzhu-ui-vue3/src/views/manage/schedule/index.vue index 0f5c6712..44da4544 100644 --- a/yanzhu-ui-vue3/src/views/manage/schedule/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/schedule/index.vue @@ -127,6 +127,7 @@ {{ form.projectName }} - + + + + + + @@ -243,7 +268,7 @@