diff --git a/yanzhu-bigscreen/src/api/detail.js b/yanzhu-bigscreen/src/api/detail.js index 9c5a2c4b..0f11fa1e 100644 --- a/yanzhu-bigscreen/src/api/detail.js +++ b/yanzhu-bigscreen/src/api/detail.js @@ -33,6 +33,14 @@ const attendanceUbiDataList = (data) => { params: data, }); }; + +const photographyList = (proId) => { + return request({ + url: "/manage/photography/finaList/"+proId, + method: "get" + }); +}; + const updateItemState = (it) => { let dt0 = +$dt($dt(new Date()).format("YYYY-MM-DD")); //当时时间 let dt1 = it.planStartDate ? +$dt(it.planStartDate) : 0; //计划开始 @@ -182,6 +190,7 @@ export default { groupByCraftTypeByAttendance, subdeptsUsersList, attendanceUbiDataList, + photographyList, milestoneList, costOutputSelectYearAndMonth }; diff --git a/yanzhu-bigscreen/src/views/projectDetail.vue b/yanzhu-bigscreen/src/views/projectDetail.vue index 161a998d..1c6a4f10 100644 --- a/yanzhu-bigscreen/src/views/projectDetail.vue +++ b/yanzhu-bigscreen/src/views/projectDetail.vue @@ -1,1597 +1,1656 @@ - \ No newline at end of file + diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPhotography.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPhotography.java new file mode 100644 index 00000000..04ca36f2 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPhotography.java @@ -0,0 +1,193 @@ +package com.yanzhu.manage.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yanzhu.common.core.annotation.Excel; +import com.yanzhu.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 项目延时摄影对象 pro_photography + * + * @author yanzhu + * @date 2025-03-30 + */ +public class ProPhotography extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 公司ID */ + private Long comId; + + /** 单位名称 */ + @Excel(name = "单位名称") + private String comName; + + /** 项目ID */ + private Long projectId; + + /** 项目名称 */ + @Excel(name = "项目名称") + private String projectName; + + /** 图片路径 */ + @Excel(name = "图片路径") + private String imageUrl; + + /** 视频路径 */ + @Excel(name = "视频路径") + private String videoUrl; + + /** 视频日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "视频日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date videoDate; + + /** 状态 */ + @Excel(name = "状态") + private Long state; + + /** 是否有效 */ + @Excel(name = "是否有效") + private Long isDel; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date createDate; + + /** 修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date updateDate; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setComId(Long comId) + { + this.comId = comId; + } + + public Long getComId() + { + return comId; + } + public void setProjectId(Long projectId) + { + this.projectId = projectId; + } + + public Long getProjectId() + { + return projectId; + } + public void setImageUrl(String imageUrl) + { + this.imageUrl = imageUrl; + } + + public String getImageUrl() + { + return imageUrl; + } + public void setVideoUrl(String videoUrl) + { + this.videoUrl = videoUrl; + } + + public String getVideoUrl() + { + return videoUrl; + } + public void setVideoDate(Date videoDate) + { + this.videoDate = videoDate; + } + + public Date getVideoDate() + { + return videoDate; + } + public void setState(Long state) + { + this.state = state; + } + + public Long getState() + { + return state; + } + public void setIsDel(Long isDel) + { + this.isDel = isDel; + } + + public Long getIsDel() + { + return isDel; + } + public void setCreateDate(Date createDate) + { + this.createDate = createDate; + } + + public Date getCreateDate() + { + return createDate; + } + public void setUpdateDate(Date updateDate) + { + this.updateDate = updateDate; + } + + public Date getUpdateDate() + { + return updateDate; + } + + public String getComName() { + return comName; + } + + public void setComName(String comName) { + this.comName = comName; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("comId", getComId()) + .append("projectId", getProjectId()) + .append("imageUrl", getImageUrl()) + .append("videoUrl", getVideoUrl()) + .append("videoDate", getVideoDate()) + .append("state", getState()) + .append("remark", getRemark()) + .append("isDel", getIsDel()) + .append("createBy", getCreateBy()) + .append("createDate", getCreateDate()) + .append("updateBy", getUpdateBy()) + .append("updateDate", getUpdateDate()) + .toString(); + } +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPhotographyMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPhotographyMapper.java new file mode 100644 index 00000000..ec013cbf --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPhotographyMapper.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.mapper; + +import java.util.List; +import com.yanzhu.manage.domain.ProPhotography; + +/** + * 项目延时摄影Mapper接口 + * + * @author yanzhu + * @date 2025-03-30 + */ +public interface ProPhotographyMapper +{ + /** + * 查询项目延时摄影 + * + * @param id 项目延时摄影主键 + * @return 项目延时摄影 + */ + public ProPhotography selectProPhotographyById(Long id); + + /** + * 查询项目延时摄影列表 + * + * @param proPhotography 项目延时摄影 + * @return 项目延时摄影集合 + */ + public List selectProPhotographyList(ProPhotography proPhotography); + + /** + * 新增项目延时摄影 + * + * @param proPhotography 项目延时摄影 + * @return 结果 + */ + public int insertProPhotography(ProPhotography proPhotography); + + /** + * 修改项目延时摄影 + * + * @param proPhotography 项目延时摄影 + * @return 结果 + */ + public int updateProPhotography(ProPhotography proPhotography); + + /** + * 删除项目延时摄影 + * + * @param id 项目延时摄影主键 + * @return 结果 + */ + public int deleteProPhotographyById(Long id); + + /** + * 批量删除项目延时摄影 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteProPhotographyByIds(Long[] ids); +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPhotographyMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPhotographyMapper.xml new file mode 100644 index 00000000..42552756 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPhotographyMapper.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + select pp.id, pp.com_id, sd.dept_name as com_name, pp.project_id, pi.project_name, pp.image_url, pp.video_url, pp.video_date, pp.state, pp.remark, pp.is_del, pp.create_by, pp.create_date, pp.update_by, pp.update_date from pro_photography pp + left join pro_project_info pi on pi.id = pp.project_id + left join sys_dept sd on sd.dept_id = pp.com_id + + + + + + + + insert into pro_photography + + com_id, + project_id, + image_url, + video_url, + video_date, + state, + remark, + is_del, + create_by, + create_date, + update_by, + update_date, + + + #{comId}, + #{projectId}, + #{imageUrl}, + #{videoUrl}, + #{videoDate}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createDate}, + #{updateBy}, + #{updateDate}, + + + + + update pro_photography + + com_id = #{comId}, + project_id = #{projectId}, + image_url = #{imageUrl}, + video_url = #{videoUrl}, + video_date = #{videoDate}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_date = #{createDate}, + update_by = #{updateBy}, + update_date = #{updateDate}, + + where id = #{id} + + + + update pro_photography set is_del=2 where id = #{id} + + + + update pro_photography set is_del=2 where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPhotographyController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPhotographyController.java new file mode 100644 index 00000000..3d280112 --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPhotographyController.java @@ -0,0 +1,112 @@ +package com.yanzhu.manage.controller; + +import com.yanzhu.common.core.utils.poi.ExcelUtil; +import com.yanzhu.common.core.web.controller.BaseController; +import com.yanzhu.common.core.web.domain.AjaxResult; +import com.yanzhu.common.core.web.page.TableDataInfo; +import com.yanzhu.common.log.annotation.Log; +import com.yanzhu.common.log.enums.BusinessType; +import com.yanzhu.common.security.annotation.RequiresPermissions; +import com.yanzhu.manage.domain.ProPhotography; +import com.yanzhu.manage.service.IProPhotographyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 项目延时摄影Controller + * + * @author yanzhu + * @date 2025-03-30 + */ +@RestController +@RequestMapping("/photography") +public class ProPhotographyController extends BaseController +{ + @Autowired + private IProPhotographyService proPhotographyService; + + /** + * 查询项目延时摄影列表 + */ + @RequiresPermissions("manage:photography:list") + @GetMapping("/list") + public TableDataInfo list(ProPhotography proPhotography) + { + startPage(); + List list = proPhotographyService.selectProPhotographyList(proPhotography); + return getDataTable(list); + } + + /** + * 导出项目延时摄影列表 + */ + @RequiresPermissions("manage:photography:export") + @Log(title = "项目延时摄影", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ProPhotography proPhotography) + { + List list = proPhotographyService.selectProPhotographyList(proPhotography); + ExcelUtil util = new ExcelUtil(ProPhotography.class); + util.exportExcel(response, list, "项目延时摄影数据"); + } + + /** + * 获取项目延时摄影详细信息 + */ + @RequiresPermissions("manage:photography:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(proPhotographyService.selectProPhotographyById(id)); + } + + /** + * 新增项目延时摄影 + */ + @RequiresPermissions("manage:photography:add") + @Log(title = "项目延时摄影", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ProPhotography proPhotography) + { + return toAjax(proPhotographyService.insertProPhotography(proPhotography)); + } + + /** + * 修改项目延时摄影 + */ + @RequiresPermissions("manage:photography:edit") + @Log(title = "项目延时摄影", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ProPhotography proPhotography) + { + return toAjax(proPhotographyService.updateProPhotography(proPhotography)); + } + + /** + * 删除项目延时摄影 + */ + @RequiresPermissions("manage:photography:remove") + @Log(title = "项目延时摄影", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(proPhotographyService.deleteProPhotographyByIds(ids)); + } + + /** + * 查询项目延时摄影 + */ + @GetMapping("/finaList/{proId}") + public AjaxResult finaList(@PathVariable("proId") Long proId) + { + ProPhotography query = new ProPhotography(); + query.setProjectId(proId); + query.setState(0L); + List list = proPhotographyService.selectProPhotographyList(query); + return success(list); + } + +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProPhotographyService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProPhotographyService.java new file mode 100644 index 00000000..0523494d --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProPhotographyService.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.service; + +import java.util.List; +import com.yanzhu.manage.domain.ProPhotography; + +/** + * 项目延时摄影Service接口 + * + * @author yanzhu + * @date 2025-03-30 + */ +public interface IProPhotographyService +{ + /** + * 查询项目延时摄影 + * + * @param id 项目延时摄影主键 + * @return 项目延时摄影 + */ + public ProPhotography selectProPhotographyById(Long id); + + /** + * 查询项目延时摄影列表 + * + * @param proPhotography 项目延时摄影 + * @return 项目延时摄影集合 + */ + public List selectProPhotographyList(ProPhotography proPhotography); + + /** + * 新增项目延时摄影 + * + * @param proPhotography 项目延时摄影 + * @return 结果 + */ + public int insertProPhotography(ProPhotography proPhotography); + + /** + * 修改项目延时摄影 + * + * @param proPhotography 项目延时摄影 + * @return 结果 + */ + public int updateProPhotography(ProPhotography proPhotography); + + /** + * 批量删除项目延时摄影 + * + * @param ids 需要删除的项目延时摄影主键集合 + * @return 结果 + */ + public int deleteProPhotographyByIds(Long[] ids); + + /** + * 删除项目延时摄影信息 + * + * @param id 项目延时摄影主键 + * @return 结果 + */ + public int deleteProPhotographyById(Long id); +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPhotographyServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPhotographyServiceImpl.java new file mode 100644 index 00000000..2ca1928e --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPhotographyServiceImpl.java @@ -0,0 +1,97 @@ +package com.yanzhu.manage.service.impl; + +import java.util.List; + +import com.yanzhu.common.security.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.yanzhu.manage.mapper.ProPhotographyMapper; +import com.yanzhu.manage.domain.ProPhotography; +import com.yanzhu.manage.service.IProPhotographyService; + +/** + * 项目延时摄影Service业务层处理 + * + * @author yanzhu + * @date 2025-03-30 + */ +@Service +public class ProPhotographyServiceImpl implements IProPhotographyService +{ + @Autowired + private ProPhotographyMapper proPhotographyMapper; + + /** + * 查询项目延时摄影 + * + * @param id 项目延时摄影主键 + * @return 项目延时摄影 + */ + @Override + public ProPhotography selectProPhotographyById(Long id) + { + return proPhotographyMapper.selectProPhotographyById(id); + } + + /** + * 查询项目延时摄影列表 + * + * @param proPhotography 项目延时摄影 + * @return 项目延时摄影 + */ + @Override + public List selectProPhotographyList(ProPhotography proPhotography) + { + return proPhotographyMapper.selectProPhotographyList(proPhotography); + } + + /** + * 新增项目延时摄影 + * + * @param proPhotography 项目延时摄影 + * @return 结果 + */ + @Override + public int insertProPhotography(ProPhotography proPhotography) + { + proPhotography.setCreateBy(SecurityUtils.getUsername()); + return proPhotographyMapper.insertProPhotography(proPhotography); + } + + /** + * 修改项目延时摄影 + * + * @param proPhotography 项目延时摄影 + * @return 结果 + */ + @Override + public int updateProPhotography(ProPhotography proPhotography) + { + proPhotography.setUpdateBy(SecurityUtils.getUsername()); + return proPhotographyMapper.updateProPhotography(proPhotography); + } + + /** + * 批量删除项目延时摄影 + * + * @param ids 需要删除的项目延时摄影主键 + * @return 结果 + */ + @Override + public int deleteProPhotographyByIds(Long[] ids) + { + return proPhotographyMapper.deleteProPhotographyByIds(ids); + } + + /** + * 删除项目延时摄影信息 + * + * @param id 项目延时摄影主键 + * @return 结果 + */ + @Override + public int deleteProPhotographyById(Long id) + { + return proPhotographyMapper.deleteProPhotographyById(id); + } +} diff --git a/yanzhu-ui-app/miniprogram/pages/project_more/index.js b/yanzhu-ui-app/miniprogram/pages/project_more/index.js index 86fb4d4c..14789d8e 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_more/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_more/index.js @@ -81,10 +81,16 @@ Page({ }, goMenu: function (event) { + let _url = event.currentTarget.dataset.url; + if(!_url){ + app.toast("正在建设中...") + return false; + } wx.setStorageSync('nav-menu', "xmgl"); wx.redirectTo({ - url: event.currentTarget.dataset.url + url: _url }) + //跳转到其它小程序 //wx.navigateToMiniProgram({ // appId: 'wx7c39a25db91228f7', // path: 'pages/tabbar/order-new/index?type=0' diff --git a/yanzhu-ui-app/miniprogram/pages/project_quality/index.js b/yanzhu-ui-app/miniprogram/pages/project_quality/index.js index 217962a7..a32bd076 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_quality/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_quality/index.js @@ -126,13 +126,15 @@ Page({ }, goMenu: function (event) { + let _url = event.currentTarget.dataset.url; + if (!_url) { + app.toast("正在建设中...") + return false; + } + wx.setStorageSync('nav-menu', "zlgl"); wx.redirectTo({ - url: event.currentTarget.dataset.url + url: _url }) - //wx.navigateToMiniProgram({ - // appId: 'wx7c39a25db91228f7', - // path: 'pages/tabbar/order-new/index?type=0' - //}) }, // 底部导航 diff --git a/yanzhu-ui-app/miniprogram/pages/project_safety/index.js b/yanzhu-ui-app/miniprogram/pages/project_safety/index.js index 04cf79d9..57a66a8a 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_safety/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_safety/index.js @@ -29,25 +29,25 @@ Page({ zlglDB: 0, todoDB: 0, checkList: [{ - id:1, + id: 1, name: "日常巡检问题", rate: 0, //整改率 total: 0, //问题总数 number: 0, //检查次数 - },{ - id:2, + }, { + id: 2, name: "周检隐患问题", rate: 0, //整改率 total: 0, //问题总数 number: 0, //检查次数 - },{ - id:3, + }, { + id: 3, name: "月检隐患问题", rate: 0, //整改率 total: 0, //问题总数 number: 0, //检查次数 - },{ - id:4, + }, { + id: 4, name: "专项检查问题", rate: 0, //整改率 total: 0, //问题总数 @@ -125,13 +125,15 @@ Page({ }, goMenu: function (event) { + let _url = event.currentTarget.dataset.url; + if (!_url) { + app.toast("正在建设中...") + return false; + } + wx.setStorageSync('nav-menu', "aqgl"); wx.redirectTo({ - url: event.currentTarget.dataset.url + url: _url }) - //wx.navigateToMiniProgram({ - // appId: 'wx7c39a25db91228f7', - // path: 'pages/tabbar/order-new/index?type=0' - //}) }, // 底部导航 diff --git a/yanzhu-ui-app/miniprogram/pages/project_subgroups/info/index.js b/yanzhu-ui-app/miniprogram/pages/project_subgroups/info/index.js index 83898194..a4a110ea 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_subgroups/info/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_subgroups/info/index.js @@ -1,5 +1,6 @@ import { - getToken + getToken, + getUserInfo } from '../../../utils/auth' import { updateGroupLeader, @@ -23,6 +24,7 @@ Page({ text: '班组入场' }], form: {}, + editFlag:false, isChange: false, leaderUserList: [] }, @@ -36,6 +38,10 @@ Page({ url: '../../../login/login', }) } + const proUserInfo = getUserInfo(); + this.setData({ + editFlag: proUserInfo.projectUserInfo.subDeptType=='1'?true:false + }); if (options && options.id) { //查询数据回填... this.initData(options.id); diff --git a/yanzhu-ui-app/miniprogram/pages/project_subgroups/info/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_subgroups/info/index.wxml index 87faa5ac..ed70476b 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_subgroups/info/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_subgroups/info/index.wxml @@ -131,9 +131,9 @@ 返回取消 - 变更组长 - 提交保存 - 班组离场 - 班组入场 + 变更组长 + 提交保存 + 班组离场 + 班组入场 \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_subgroups/list/index.js b/yanzhu-ui-app/miniprogram/pages/project_subgroups/list/index.js index cf694c5f..a09d45e7 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_subgroups/list/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_subgroups/list/index.js @@ -1,5 +1,6 @@ import { - getToken + getToken, + getUserInfo } from '../../../utils/auth' import { subgroupsList, @@ -20,7 +21,8 @@ Page({ listData: [], activeState: "0", yrcCount: 0, - ylcCount: 0 + ylcCount: 0, + userInfo:{} }, //项目切换 返回值 @@ -41,8 +43,10 @@ Page({ url: '../../../login/login', }) } + const proUserInfo = getUserInfo(); this.setData({ - addFlag: true, + addFlag: proUserInfo.projectUserInfo.subDeptType=='1'?true:false, + userInfo: proUserInfo.projectUserInfo, initData: { id: app.globalData.useProjectId, text: app.globalData.useProjectName, @@ -53,8 +57,8 @@ Page({ total: 0 }); //获取数据列表 - this.getListData(); - this.getListCount(); + this.getListData(proUserInfo.projectUserInfo); + this.getListCount(proUserInfo.projectUserInfo); }, /** @@ -91,8 +95,11 @@ Page({ /** * 查询数据列表 */ - getListData() { + getListData(_userInfo) { let params = "pageNum=" + this.data.pageNum + "&pageSize=" + this.data.pageSize + "&projectId=" + app.globalData.useProjectId + "&useStatus=" + this.data.activeState + "&activeTags=finished"; + if(_userInfo.subDeptType && _userInfo.subDeptType!='1'){ + params += "&subDeptId="+_userInfo.subDeptId; + } subgroupsList(params).then(res => { if (res.code == 200) { this.setData({ @@ -106,8 +113,11 @@ Page({ /** * 统计数据列表 */ - getListCount() { + getListCount(_userInfo) { let params = "pageNum=" + this.data.pageNum + "&pageSize=" + this.data.pageSize + "&projectId=" + app.globalData.useProjectId + "&activeTags=finished"; + if(_userInfo.subDeptType && _userInfo.subDeptType!='1'){ + params += "&subDeptId="+_userInfo.subDeptId; + } subgroupsCount(params).then(res => { if (res.code == 200) { let _yrc = 0, @@ -144,7 +154,7 @@ Page({ pageSize: 1000, listData: [], }); - this.getListData(); + this.getListData(this.data.userInfo); }, /** @@ -177,7 +187,7 @@ Page({ this.setData({ pageNum: this.data.pageNum + 1 }); - this.getListData(); + this.getListData(this.data.userInfo); } else { console.log("已经到底了，没有数据可加载！！！"); } diff --git a/yanzhu-ui-app/miniprogram/pages/project_subgroups/list/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_subgroups/list/index.wxml index 0fcca295..41879ceb 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_subgroups/list/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_subgroups/list/index.wxml @@ -33,7 +33,7 @@ - 修改 + 修改 diff --git a/yanzhu-ui-app/miniprogram/pages/project_subusers/info/index.js b/yanzhu-ui-app/miniprogram/pages/project_subusers/info/index.js index a1569b16..983d7a91 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_subusers/info/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_subusers/info/index.js @@ -1,6 +1,7 @@ import config from '../../../config' import { - getToken + getToken, + getUserInfo } from '../../../utils/auth' import { editSubUsersPhone, @@ -24,6 +25,7 @@ Page({ }], form: {}, newUserPhone:"", + editFlag:false, isChange: false, imgBaseUrl: config.baseImgUrl }, @@ -37,6 +39,10 @@ Page({ url: '../../../login/login', }) } + const proUserInfo = getUserInfo(); + this.setData({ + editFlag: proUserInfo.projectUserInfo.subDeptType=='1'?true:false + }); if (options && options.id) { //查询数据回填... this.initData(options.id); diff --git a/yanzhu-ui-app/miniprogram/pages/project_subusers/info/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_subusers/info/index.wxml index 6364b7b2..8573622a 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_subusers/info/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_subusers/info/index.wxml @@ -236,9 +236,9 @@ 返回取消 - 变更电话 - 提交保存 - 人员离场 - 人员入场 + 变更电话 + 提交保存 + 人员离场 + 人员入场 \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_subusers/list/index.js b/yanzhu-ui-app/miniprogram/pages/project_subusers/list/index.js index 97a2ca4b..9bbed202 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_subusers/list/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_subusers/list/index.js @@ -1,5 +1,6 @@ import { - getToken + getToken, + getUserInfo } from '../../../utils/auth' import { subusersList, @@ -22,6 +23,7 @@ Page({ yrcCount: 0, ylcCount: 0, activeName: "", + userInfo:{} }, //项目切换 返回值 @@ -42,8 +44,10 @@ Page({ url: '../../../login/login', }) } + const proUserInfo = getUserInfo(); this.setData({ - addFlag: true, + addFlag: proUserInfo.projectUserInfo.subDeptType=='1'?true:false, + userInfo: proUserInfo.projectUserInfo, initData: { id: app.globalData.useProjectId, text: app.globalData.useProjectName, @@ -54,8 +58,8 @@ Page({ total: 0 }); //获取数据列表 - this.getListData(); - this.getListCount(); + this.getListData(proUserInfo.projectUserInfo); + this.getListCount(proUserInfo.projectUserInfo); }, /** @@ -99,8 +103,11 @@ Page({ /** * 查询数据列表 */ - getListData() { + getListData(_userInfo) { let params = "pageNum=" + this.data.pageNum + "&pageSize=" + this.data.pageSize + "&projectId=" + app.globalData.useProjectId + "&useStatus=" + this.data.activeState + "&activeTags=finished&searchValue=subUsers"; + if(_userInfo.subDeptType && _userInfo.subDeptType!='1'){ + params += "&subDeptId="+_userInfo.subDeptId; + } subusersList(params).then(res => { if (res.code == 200) { this.setData({ @@ -114,8 +121,11 @@ Page({ /** * 统计数据列表 */ - getListCount() { + getListCount(_userInfo) { let params = "pageNum=" + this.data.pageNum + "&pageSize=" + this.data.pageSize + "&projectId=" + app.globalData.useProjectId + "&activeTags=finished&searchValue=subUsers"; + if(_userInfo.subDeptType && _userInfo.subDeptType!='1'){ + params += "&subDeptId="+_userInfo.subDeptId; + } subusersCount(params).then(res => { if (res.code == 200) { let _yrc = 0, @@ -152,7 +162,7 @@ Page({ pageSize: 10000, listData: [], }); - this.getListData(); + this.getListData(this.data.userInfo); }, /** @@ -185,7 +195,7 @@ Page({ this.setData({ pageNum: this.data.pageNum + 1 }); - this.getListData(); + this.getListData(this.data.userInfo); } else { console.log("已经到底了，没有数据可加载！！！"); } diff --git a/yanzhu-ui-app/miniprogram/pages/project_subusers/list/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_subusers/list/index.wxml index 280e61d3..0dd394b0 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_subusers/list/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_subusers/list/index.wxml @@ -35,7 +35,7 @@ - + 修改 diff --git a/yanzhu-ui-vue3/src/api/manage/photography.js b/yanzhu-ui-vue3/src/api/manage/photography.js new file mode 100644 index 00000000..a6a8ef7e --- /dev/null +++ b/yanzhu-ui-vue3/src/api/manage/photography.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询项目延时摄影列表 +export function listPhotography(query) { + return request({ + url: '/manage/photography/list', + method: 'get', + params: query + }) +} + +// 查询项目延时摄影详细 +export function getPhotography(id) { + return request({ + url: '/manage/photography/' + id, + method: 'get' + }) +} + +// 新增项目延时摄影 +export function addPhotography(data) { + return request({ + url: '/manage/photography', + method: 'post', + data: data + }) +} + +// 修改项目延时摄影 +export function updatePhotography(data) { + return request({ + url: '/manage/photography', + method: 'put', + data: data + }) +} + +// 删除项目延时摄影 +export function delPhotography(id) { + return request({ + url: '/manage/photography/' + id, + method: 'delete' + }) +} diff --git a/yanzhu-ui-vue3/src/views/manage/photography/index.vue b/yanzhu-ui-vue3/src/views/manage/photography/index.vue new file mode 100644 index 00000000..aea6d888 --- /dev/null +++ b/yanzhu-ui-vue3/src/views/manage/photography/index.vue @@ -0,0 +1,385 @@ + + +