update code

bin/run.bat

@@ -1,3 +1,4 @@
 start bin\run-auth.bat
 start bin\run-gateway.bat
 start bin\run-modules-system.bat
+start bin\run-modules-manage.bat

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;

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',
+    url: "/manage/proProjectInfo/findMyProjectList?pageNum=1&pageSize=100",
-      method: 'get'
+    method: "get",
-    })
+  });
+};
+
+const getProjectInfo=id=>{
+  return request({
+    url: "/manage/proProjectInfo/"+id,
+    method: "get",
+  });
 }
 
 export default {
-    findMyProjectList
+  findMyProjectList,
-}
+  getProjectInfo
+};

yanzhu-bigscreen/src/components/module/module-one-1-1.vue

@@ -1,8 +1,10 @@
 <template>
     <div class="screen-one-1-1">
         <div class="module-title"><span>{{ label || '' }}</span></div>
+        <div class="module-ctx">
             <slot></slot>
         </div>
+    </div>
 
 </template>
 

yanzhu-bigscreen/src/components/module/module-one-1-2.vue

@@ -1,8 +1,10 @@
 <template>
     <div class="screen-one-1-2">
         <div class="module-title"><span>{{ label || '' }}</span></div>
+        <div class="module-ctx">
             <slot></slot>
         </div>
+    </div>
 
 </template>
 

yanzhu-bigscreen/src/components/module/module-one-1-3.vue

@@ -1,8 +1,10 @@
 <template>
     <div class="screen-one-1-3">
         <div class="module-title"><span>{{ label || '' }}</span></div>
+        <div class="module-ctx">
             <slot></slot>
         </div>
+    </div>
 
 </template>
 

yanzhu-bigscreen/src/components/module/module-one-2-1.vue

@@ -1,8 +1,10 @@
 <template>
     <div class="screen-one-2-1">
         <div class="module-title"><span>{{ label || '' }}</span></div>
+        <div class="module-ctx">
             <slot></slot>
         </div>
+    </div>
 
 </template>
 

yanzhu-bigscreen/src/components/module/module-one-2-2.vue

@@ -1,8 +1,10 @@
 <template>
     <div class="screen-one-2-2">
         <div class="module-title"><span>{{ label || '' }}</span></div>
+        <div class="module-ctx">
             <slot></slot>
         </div>
+    </div>
 
 </template>
 

yanzhu-bigscreen/src/components/module/module-one-2-3.vue

@@ -1,8 +1,10 @@
 <template>
     <div class="screen-one-2-3">
         <div class="module-title"><span>{{ label || '' }}</span></div>
+        <div class="module-ctx">
             <slot></slot>
         </div>
+    </div>
 
 </template>
 

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

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(() => {

yanzhu-bigscreen/src/views/projectDetail.vue

@@ -3,7 +3,108 @@
 
         <el-col :span="6" class="h100">
             <module-one-1-1 label="项目概况">
+                <div class="glr-title">{{ selProject?.projectName||'' }}</div>
+                <div class="dept-info-list">
+                    <el-col :span="12" class="dept-item">
+                        <div class="dept-title">建设单位</div>
+                        <div v-if="deptType1==null" class="dept-nodata">
+                                暂无数据
+                        </div>
+                        <div class="dept-info" v-else>                           
+                            <img class="dept-img" src="images/company_3.png"/>
+                            <div class="dept-row">
+                                <div class="dept-name"> {{ deptType1.deptName }}</div>
+                                <div class="dept-leader-phone">
+                                    <span class="dept-leader">{{deptType1.leader}}</span>
+                                    <span class="dept-phone">{{deptType1.phone}}</span>
+                                </div>
+                            </div>
+                        </div>                
+                    </el-col>
+                    <el-col :span="12" class="dept-item">
+                        <div class="dept-title">设计单位</div>
+                        <div v-if="deptType2==null" class="dept-nodata">
+                                暂无数据
+                        </div>
+                        <div class="dept-info" v-else>                           
+                            <img class="dept-img" src="images/company_2.png"/>
+                            <div class="dept-row">
+                                <div class="dept-name"> {{ deptType2.deptName }}</div>
+                                <div class="dept-leader-phone">
+                                    <span class="dept-leader">{{deptType2.leader}}</span>
+                                    <span class="dept-phone">{{deptType2.phone}}</span>
+                                </div>
+                            </div>
+                        </div>                    
+                    </el-col>
+                    <el-col :span="12" class="dept-item">
+                        <div class="dept-title">总包单位</div>
+                        <div v-if="deptType3.deptName==null" class="dept-nodata">
+                                暂无数据
+                        </div>
+                        <div class="dept-info" v-else>                           
+                            <img class="dept-img" src="images/company_3.png"/>
+                            <div class="dept-row">
+                                <div class="dept-name"> {{ deptType3.deptName }}</div>
+                                <div class="dept-leader-phone">
+                                    <span class="dept-leader">{{deptType3.leader}}</span>
+                                    <span class="dept-phone">{{deptType3.phone}}</span>
+                                </div>
+                            </div>
+                        </div>                    
+                    </el-col>
+                    <el-col :span="12" class="dept-item">
+                        <div class="dept-title">监理单位</div>
+                        <div v-if="deptType4==null" class="dept-nodata">
+                                暂无数据
+                        </div>
+                        <div class="dept-info" v-else>                           
+                            <img class="dept-img" src="images/company_11.png"/>
+                            <div class="dept-row">
+                                <div class="dept-name"> {{ deptType4.deptName }}</div>
+                                <div class="dept-leader-phone">
+                                    <span class="dept-leader">{{deptType4.leader}}</span>
+                                    <span class="dept-phone">{{deptType4.phone}}</span>
+                                </div>
+                            </div>
+                        </div>                    
+                    </el-col>
 
+                    <el-col :span="12" class="dept-item">
+                        <div class="dept-title">检测单位</div>
+                        <div v-if="deptType5==null" class="dept-nodata">
+                                暂无数据
+                        </div>
+                        <div class="dept-info" v-else>                           
+                            <img class="dept-img" src="images/company_12.png"/>
+                            <div class="dept-row">
+                                <div class="dept-name"> {{ deptType5.deptName }}</div>
+                                <div class="dept-leader-phone">
+                                    <span class="dept-leader">{{deptType5.leader}}</span>
+                                    <span class="dept-phone">{{deptType5.phone}}</span>
+                                </div>
+                            </div>
+                        </div>                    
+                    </el-col>
+
+                    <el-col :span="12" class="dept-item">
+                        <div class="dept-title">勘察单位</div>
+                        <div v-if="deptType6==null" class="dept-nodata">
+                                暂无数据
+                        </div>
+                        <div class="dept-info" v-else>                           
+                            <img class="dept-img" src="images/company_10.png"/>
+                            <div class="dept-row">
+                                <div class="dept-name"> {{ deptType6.deptName }}</div>
+                                <div class="dept-leader-phone">
+                                    <span class="dept-leader">{{deptType6.leader}}</span>
+                                    <span class="dept-phone">{{deptType6.phone}}</span>
+                                </div>
+                            </div>
+                        </div>                    
+                    </el-col>
+
+                </div>
             </module-one-1-1>
             <module-one-1-1 label="项目概况">
 
@@ -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("勘察单位");
+            });
+        }
     }
 }
 </script>

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;
     }

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="comId"    column="com_id"    />
         <result property="comName"    column="com_name"    />
         <result property="disDeptId"    column="dis_dept_id"    />
+        <result property="disDeptName"  column="dis_dept_name" />
         <result property="projectName"    column="project_name"    />
         <result property="projectCode"    column="project_code"    />
         <result property="simpleName"    column="simple_name"    />
@@ -116,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectProProjectInfoById" parameterType="Long" resultMap="ProProjectInfoResult">
-        select pi.id, pi.com_id, sd.dept_name as com_name, pi.dis_dept_id, pi.project_name,
+        select pi.id, pi.com_id, sd.dept_name as com_name, pi.dis_dept_id,sd2.dept_name dis_dept_name, pi.project_name,
                pi.project_code, pi.simple_name, pi.project_type, pi.project_level, pi.project_regional, pi.project_package, pi.project_address, pi.project_nature,
                pi.tech_leader,pi.tech_leader_phone,pi.province,pi.city,pi.district,
                pi.licence_number, pi.project_person, pi.project_person_phone, pi.longitude, pi.latitude, pi.project_time_limit, pi.total_investment,
@@ -127,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                ps.id ps_id,ps.org_name ps_org_name,ps.org_logo ps_org_logo,ps.org_image ps_org_image,ps.org_video ps_org_video,ps.org_plane ps_org_plane
         from pro_project_info pi
                  left join sys_dept sd on sd.dept_id = pi.com_id
+                 left join sys_dept sd2 on sd2.dept_id = pi.dis_dept_id
             left join pro_project_info_depts pd on pi.id=pd.project_id
             left join pro_project_info_setting ps on pi.id=ps.project_id
         where pi.id = #{id}