diff --git a/bin/run.bat b/bin/run.bat index dd01cd34..46eeb40b 100644 --- a/bin/run.bat +++ b/bin/run.bat @@ -1,3 +1,4 @@ start bin\run-auth.bat start bin\run-gateway.bat -start bin\run-modules-system.bat \ No newline at end of file +start bin\run-modules-system.bat +start bin\run-modules-manage.bat \ No newline at end of file diff --git a/yanzhu-bigscreen/public/css/largeScreenStyle.css b/yanzhu-bigscreen/public/css/largeScreenStyle.css index 93b1c3c7..e7be59c9 100644 --- a/yanzhu-bigscreen/public/css/largeScreenStyle.css +++ b/yanzhu-bigscreen/public/css/largeScreenStyle.css @@ -106,6 +106,10 @@ body{ { background-image: url("../images/one/banner.png"); } +.module-ctx{ + padding:12px; + height: calc(100% - 48px); +} .scroll::-webkit-scrollbar { width: 8px; height: 8px; diff --git a/yanzhu-bigscreen/src/api/project.js b/yanzhu-bigscreen/src/api/project.js index 62ef07ae..97b78fd4 100644 --- a/yanzhu-bigscreen/src/api/project.js +++ b/yanzhu-bigscreen/src/api/project.js @@ -1,12 +1,20 @@ -import request from '@/utils/request' +import request from "@/utils/request"; -const findMyProjectList=()=> { - return request({ - url: '/manage/proProjectInfo/findMyProjectList?pageNum=1&pageSize=100', - method: 'get' - }) - } +const findMyProjectList = () => { + return request({ + url: "/manage/proProjectInfo/findMyProjectList?pageNum=1&pageSize=100", + method: "get", + }); +}; -export default{ - findMyProjectList -} \ No newline at end of file +const getProjectInfo=id=>{ + return request({ + url: "/manage/proProjectInfo/"+id, + method: "get", + }); +} + +export default { + findMyProjectList, + getProjectInfo +}; diff --git a/yanzhu-bigscreen/src/components/module/module-one-1-1.vue b/yanzhu-bigscreen/src/components/module/module-one-1-1.vue index b66ed96f..9c54adbc 100644 --- a/yanzhu-bigscreen/src/components/module/module-one-1-1.vue +++ b/yanzhu-bigscreen/src/components/module/module-one-1-1.vue @@ -1,7 +1,9 @@ diff --git a/yanzhu-bigscreen/src/components/module/module-one-1-2.vue b/yanzhu-bigscreen/src/components/module/module-one-1-2.vue index 470cf759..79ce04b9 100644 --- a/yanzhu-bigscreen/src/components/module/module-one-1-2.vue +++ b/yanzhu-bigscreen/src/components/module/module-one-1-2.vue @@ -1,7 +1,9 @@ diff --git a/yanzhu-bigscreen/src/components/module/module-one-1-3.vue b/yanzhu-bigscreen/src/components/module/module-one-1-3.vue index b3509d2e..422685dc 100644 --- a/yanzhu-bigscreen/src/components/module/module-one-1-3.vue +++ b/yanzhu-bigscreen/src/components/module/module-one-1-3.vue @@ -1,7 +1,9 @@ diff --git a/yanzhu-bigscreen/src/components/module/module-one-2-1.vue b/yanzhu-bigscreen/src/components/module/module-one-2-1.vue index 195e616a..cc7f4568 100644 --- a/yanzhu-bigscreen/src/components/module/module-one-2-1.vue +++ b/yanzhu-bigscreen/src/components/module/module-one-2-1.vue @@ -1,7 +1,9 @@ diff --git a/yanzhu-bigscreen/src/components/module/module-one-2-2.vue b/yanzhu-bigscreen/src/components/module/module-one-2-2.vue index 7422daf5..7aba850e 100644 --- a/yanzhu-bigscreen/src/components/module/module-one-2-2.vue +++ b/yanzhu-bigscreen/src/components/module/module-one-2-2.vue @@ -1,7 +1,9 @@ diff --git a/yanzhu-bigscreen/src/components/module/module-one-2-3.vue b/yanzhu-bigscreen/src/components/module/module-one-2-3.vue index bf9591bd..3465549a 100644 --- a/yanzhu-bigscreen/src/components/module/module-one-2-3.vue +++ b/yanzhu-bigscreen/src/components/module/module-one-2-3.vue @@ -1,7 +1,9 @@ diff --git a/yanzhu-bigscreen/src/permission.js b/yanzhu-bigscreen/src/permission.js index 7add7775..0d81befa 100644 --- a/yanzhu-bigscreen/src/permission.js +++ b/yanzhu-bigscreen/src/permission.js @@ -20,7 +20,7 @@ router.beforeEach((to, from, next) => { NProgress.done() } else { if (store.getters.roles.length === 0) { - isRelogin.show = true + isRelogin.show = false // 判断当前用户是否已拉取完user_info信息 store.dispatch('GetInfo').then(() => { isRelogin.show = false diff --git a/yanzhu-bigscreen/src/utils/request.js b/yanzhu-bigscreen/src/utils/request.js index c6b40884..28652525 100644 --- a/yanzhu-bigscreen/src/utils/request.js +++ b/yanzhu-bigscreen/src/utils/request.js @@ -76,6 +76,7 @@ service.interceptors.response.use(res => { return res.data } if (code === 401) { + debugger if (!isRelogin.show) { isRelogin.show = true; MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { diff --git a/yanzhu-bigscreen/src/views/projectDetail.vue b/yanzhu-bigscreen/src/views/projectDetail.vue index d237368a..797926bb 100644 --- a/yanzhu-bigscreen/src/views/projectDetail.vue +++ b/yanzhu-bigscreen/src/views/projectDetail.vue @@ -3,7 +3,108 @@ +
{{ selProject?.projectName||'' }}
+
+ +
建设单位
+
+ 暂无数据 +
+
+ +
+
{{ deptType1.deptName }}
+
+ {{deptType1.leader}} + {{deptType1.phone}} +
+
+
+ + +
设计单位
+
+ 暂无数据 +
+
+ +
+
{{ deptType2.deptName }}
+
+ {{deptType2.leader}} + {{deptType2.phone}} +
+
+
+ + +
总包单位
+
+ 暂无数据 +
+
+ +
+
{{ deptType3.deptName }}
+
+ {{deptType3.leader}} + {{deptType3.phone}} +
+
+
+ + +
监理单位
+
+ 暂无数据 +
+
+ +
+
{{ deptType4.deptName }}
+
+ {{deptType4.leader}} + {{deptType4.phone}} +
+
+
+ + +
检测单位
+
+ 暂无数据 +
+
+ +
+
{{ deptType5.deptName }}
+
+ {{deptType5.leader}} + {{deptType5.phone}} +
+
+
+ + + +
勘察单位
+
+ 暂无数据 +
+
+ +
+
{{ deptType6.deptName }}
+
+ {{deptType6.leader}} + {{deptType6.phone}} +
+
+
+ + +
@@ -36,14 +137,46 @@ export default { data() { return { - selProject:null + selProject:null, + prjInfo:{}, + deptType1:[],//建设单位 + deptType2:[],//设计单位 + deptType3:[],//总包单位 + deptType4:[],//监理单位 + deptType5:[],//检测单位 + deptType6:[],//勘察单位 } }, mounted() { this.$store.dispatch('ChangeNav', 2); this.$bus.$on('projectChange', prj => { this.selProject=prj; + this.init(); }); + this.selProject=this.$store.getters.selProject; + this.init(); + }, + methods:{ + init(){ + if(!this.selProject){ + return; + } + this.$api.project.getProjectInfo(this.selProject.id).then(d=>{ + this.prjInfo=d.data||{}; + let tmps=this.prjInfo.projectDeptsList||[]; + const func=(t)=>{ + let objs=tmps.filter(it=>it.deptType==t); + return objs.length>0?objs[0]:null; + }; + + this.deptType1=func('建设单位'); + this.deptType2=func('设计单位'); + this.deptType3={deptName:this.prjInfo.disDeptName,leader:this.prjInfo.projectPerson,phone:this.prjInfo.projectPersonPhone}; + this.deptType4=func("监理单位"); + this.deptType5=func("检测单位"); + this.deptType6=func("勘察单位"); + }); + } } } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfo.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfo.java index a0210d6c..2f6764f6 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfo.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfo.java @@ -32,6 +32,7 @@ public class ProProjectInfo extends BaseEntity @Excel(name = "显示部门") private Long disDeptId; + /** 项目名称 */ @Excel(name = "项目名称") private String projectName; @@ -98,6 +99,16 @@ public class ProProjectInfo extends BaseEntity @Excel(name = "区县") private String district; + private String disDeptName; + + public String getDisDeptName() { + return disDeptName; + } + + public void setDisDeptName(String disDeptName) { + this.disDeptName = disDeptName; + } + public String getTechLeader() { return techLeader; } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml index de4a86f9..75437765 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -116,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"