jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2025-03-31 22:35:57 +08:00
parent dd32355b98
commit 6d5be9402c
10 changed files with 260 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yanzhu-bigscreen/src/components/header.vue
View File

@ -218,6 +218,9 @@ export default {
case 6:
this.$router.push("/greenCarbon");
break;
case 501:
this.$router.push("/photography");
break;
}
},
doLogout() {

9
yanzhu-bigscreen/src/router/index.js
View File

@ -73,6 +73,15 @@ const routes = [
/* webpackChunkName: "safetyCheck" */ "../views/safety/towerCrane.vue"
),
},
{
path: "/photography",
name: "photography",
meta: { nav: 501 },
component: () =>
import(
/* webpackChunkName: "safetyCheck" */ "../views/schedule/photography.vue"
),
},
];
const router = new VueRouter({
mode: "hash",

47
yanzhu-bigscreen/src/views/projectDetail.vue
View File

@ -698,7 +698,7 @@ export default {
this.$api.detail
.photographyList(this.selProject.id)
.then((d) => {
this.photographyList = d.data||[];
this.photographyList = d.data;
});
},
loadCostOutput() {
@ -820,7 +820,52 @@ export default {
<style lang="less">
.project-detail {
color: #c2d5f6;
.photography-list {
width: calc(100% - 4px);
height: calc(100% - 26px);
padding-left: 1px;
.el-carousel {
height: 100%;
}
.photography-video {
width: 100%;
height: calc(100% - 30px);
}
.photography-list-title {
line-height: 20px;
text-align: center;
}
.photography-list-nodata {
background: rgba(255, 255, 255, 0.2);
width: 80%;
height: 80%;
margin-left: 10%;
margin-top: 6%;
display: flex;
align-items: center;
justify-content: center;
flex-flow: column;
.video-play {
width: 80px;
height: 80px;
display: inline-block;
background: rgba(0, 0, 0, 0.4);
line-height: 80px;
text-align: center;
border-radius: 40px;
margin-bottom: 12px;
}
.photography-list-no-title {
color: rgba(255, 255, 255, 0.2);
}
}
}
.dept-info-list {
height: calc(100% - 30px);
margin-top: 10px;

183
yanzhu-bigscreen/src/views/schedule/photography.vue 100644
View File

@ -0,0 +1,183 @@
<template>
<div class="project-photography main-page">
<el-col :span="6" class="h100">
<module-one-3-1 label="项目全景列表">
<div class="left-list scroll">
<template v-if="infoList && infoList.length > 0">
<div
v-for="(item, index) in infoList"
:key="index"
class="video-item"
@click.stop="playVideo(item)"
>
<span class="div-date">{{ item.videoDate }}</span>
<i
class="header-icon el-icon-camera-solid"
style="font-size: 24px; color: aqua"
></i>
</div>
</template>
<div v-else style="text-align: center" class="div-no-data">
<img src="images/nodata.png" style="width: 120px" />
<div style="text-align: center; font-size: 12px; color: #888">暂无数据</div>
</div>
</div>
</module-one-3-1>
</el-col>
<el-col :span="18" class="no-title">
<module-one-3-3 :notitle="true">
<template v-if="info">
<div class="right-title">
<span class="sp-title">{{ info.videoDate }}</span>
</div>
<video style="width: 98%;" controls>
<source :src="info.videoUrl" type="video/mp4" />
您的浏览器不支持Video标签。
</video>
</template>
<div v-else style="text-align: center" class="div-no-data">
<img src="images/nodata.png" style="width: 120px" />
<div style="text-align: center; font-size: 12px; color: #888">暂无数据</div>
</div>
</module-one-3-3>
</el-col>
</div>
</template>
<script>
export default {
data() {
return {
info: null,
activeNames: [],
infoList: {},
};
},
mounted() {
window.photography = this;
this.$store.dispatch("ChangeNav", 501);
this.$bus.$on("projectChange", (prj) => {
this.selProject = prj;
this.init();
});
this.selProject = this.$store.getters.selProject;
this.init();
},
methods: {
playVideo(it) {
this.info = null;
setTimeout(() => {
this.info = it;
}, 400);
},
init() {
if (!this.selProject) {
return;
}
this.$api.detail.photographyList(this.selProject.id).then((d) => {
if (d.data.length > 0) {
this.info = d.data[0];
} else {
this.info = null;
}
this.infoList = d.data;
});
},
},
};
</script>
<style lang="less">
.project-photography {
.div-no-data {
text-align: center;
height: 600px;
display: flex;
align-items: center;
justify-content: center;
}
.no-title {
.right-title {
height: 200px;
display: flex;
align-items: center;
justify-content: center;
}
.sp-title {
display: inline-block;
line-height: 72px;
padding: 0px 40px;
font-size: 40px;
background-size: 100% 100%;
background-image: url("../../assets/images/bgphoto.png");
}
video {
width: 100%;
height: calc(100% - 201px);
}
/deep/ .screen-one-3-3 {
background-image: none;
border: solid 1px #409eff5c;
.module-title {
display: none;
}
}
}
.left-list {
max-height: calc(100% - 40px);
overflow-y: auto;
&::-webkit-scrollbar {
width: 4px;
height: 4px;
}
}
/deep/ .screen-one-3-1 {
.el-collapse {
border: none;
margin-top: 4px;
.el-collapse-item {
}
.el-collapse-item__header {
background-color: #097fca2e;
color: #089fff;
border-bottom: dotted 1px #089fff77;
}
.el-collapse-item__content {
padding-bottom: 12px;
}
.el-collapse-item__wrap {
background-color: transparent;
border: none;
.img-item {
margin-top: 8px;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
color: #fff;
position: relative;
}
.video-item {
position: relative;
line-height: 30px;
display: flex;
align-items: center;
cursor: pointer;
border-bottom: solid 1px #089fff77;
.div-date {
width: calc(90% - 24px);
text-align: left;
bottom: 0px;
color: #089fff;
padding-left: 24px;
}
}
}
}
}
}
</style>

2
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/system/mapper/SysRoleMapper.java
View File

@ -73,7 +73,7 @@ public interface SysRoleMapper
* @param roleName 角色名称
* @return 角色信息
*/
public SysRole checkRoleNameUnique(String roleName);
public SysRole checkRoleNameUnique(@Param("roleName") String roleName, @Param("deptId") Long deptId);
/**
* 校验角色权限是否唯一

2
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysRoleMapper.xml
View File

@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleSysRoleDeptResult">
<include refid="selectRoleVo"/>
where r.role_name=#{roleName} and r.del_flag = '0' limit 1
where r.role_name=#{roleName} and rd.dept_id = #{deptId} and r.del_flag = '0' limit 1
</select>
<select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleSysRoleDeptResult">

7
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java
View File

@ -326,7 +326,12 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
subdeptsUser.setCraftType(CraftTypeEnums.GLRY.getCode());
subdeptsUser.setCraftPost(CraftPostEnums.WTDL.getCode());
subdeptsUser.setEduStatus(ShiFouEnums.FOU.getCodeStr());
subdeptsUser.setApproveStatus(ApproveStatus.passed.getCode());
if(isSign){
subdeptsUser.setUseStatus(UseStateEnums.IN.getCode());
subdeptsUser.setApproveStatus(ApproveStatus.passed.getCode());
}else{
subdeptsUser.setApproveStatus(ApproveStatus.await.getCode());
}
if(Objects.isNull(subdeptsUser.getSubStep()) || subdeptsUser.getSubStep()<1){
subdeptsUser.setSubStep(1L);
}

3
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysRoleController.java
View File

@ -129,7 +129,8 @@ public class SysRoleController extends BaseController
}
else if (!roleService.checkRoleKeyUnique(role))
{
return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
role.setRoleKey(role.getRoleKey()+"_"+role.getDeptId());
//return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
}
role.setUpdateBy(SecurityUtils.getUsername());
return toAjax(roleService.updateRole(role));

8
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysRoleServiceImpl.java
View File

@ -166,10 +166,12 @@ public class SysRoleServiceImpl implements ISysRoleService
public boolean checkRoleNameUnique(SysRole role)
{
Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName());
if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName(),role.getDeptId());
if (StringUtils.isNotNull(info))
{
return UserConstants.NOT_UNIQUE;
if(info.getRoleId().longValue() != roleId.longValue()){
return UserConstants.NOT_UNIQUE;
}
}
return UserConstants.UNIQUE;
}

7
yanzhu-ui-vue3/src/components/Process/panel/commonPanel.vue
View File

@ -121,7 +121,8 @@ function initDatas(){
}
initDatas();
console.log("bpmnFormData.proId==1>",bpmnFormData.value.proId);
bpmnFormData.value.proId = userStore.currentPrjId+'';
console.log("bpmnFormData.proId==2>",bpmnFormData.value.proId);
if(!bpmnFormData.value.proId){
bpmnFormData.value.proId = userStore.currentPrjId+'';
updateElementPro();
}
</script>