提交代码

src/api/index.js

@@ -11,6 +11,7 @@ import attendance from  './attendance/index'
 import insurance from './insurance/index'
 import journalism from './journalism/index'
 import buildNode from './buildNode'
+import projectChecking from './projectChecking/index'
 export default {
     project,
     dept,
@@ -24,5 +25,6 @@ export default {
     attendance,
     insurance,
     journalism,
-    buildNode
+    buildNode,
+    projectChecking
 }

src/api/projectChecking/index.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+const getProjectCheckingList=(deptId,projectId)=> {
+    return request({
+      url: `bgscreen/projectChecking/getProjectCheckingList?deptId=${deptId||0}&projectId=${projectId||0}`,
+      method: 'get'
+    })
+  }
+
+  const getProjectCheckingView=(deptId,projectId)=> {
+    return request({
+      url: `bgscreen/projectChecking/getProjectCheckingView?deptId=${deptId||0}&projectId=${projectId||0}`,
+      method: 'get'
+    })
+  }
+export default{
+    getProjectCheckingList,
+    getProjectCheckingView
+}

src/pages/index.vue

@@ -145,7 +145,7 @@
 
                     </el-col>
                     <el-col :span="6">
-                        <module-one-1-1 label="集团重点工作">
+                        <module-one-1-1 label="集团新闻">
                             <el-carousel>
                                 <el-carousel-item v-for="item in JournalismList" >
                                     <div style="height: 252px;" @click="handJournalism(item)">

src/pages/projectQuality.vue

@@ -129,7 +129,7 @@
                         </div>
                     </module-one-1-1>      
                     <module-one-1-1 label="机械设备管理">
-                     <div class="nav-info" style="padding:20px 20px 0px">
+                     <div class="nav-info" style="padding:20px 20px 10px">
                         <span class="nav-label">设备总数:</span>
                         <span class="nav-num">100</span>
                         <span class="nav-unit">台</span>
@@ -147,40 +147,41 @@
                     </module-one-1-1>                          
                 </el-col>
                 <el-col :span="6">
-                    <module-one-3-1 label="举牌验收">
+                    <module-one-3-1 label="举牌验收" class="scroll" style="overflow-y: scroll;">
                         <div class="nav-info" style="padding:20px 20px 0px">
                             <span>
                             <span class="nav-label">首次验收:</span>
-                            <span class="nav-num">42</span>
+                            <span class="nav-num">{{acceptanceDataView.sum}}</span>
                             <span class="nav-unit">次</span>
                             </span>
 
                             <span style="display: inline-block;margin-left: 100px;">
                                 <span class="nav-label">合格率:</span>
-                                <span class="nav-num">96</span>
+                                <span class="nav-num">{{acceptanceDataView.okSum}}</span>
                                 <span class="nav-unit">%</span>
                                 </span>
                          </div>
                          <div class="acceptance-item" v-for="(it,idx) in acceptanceData" :key="idx">
                             <div class="row-1">
-                                <div class="div-img"><img :src="it.img"></div>
+                                <div class="div-img"><img :src="getProfileImage(it.mainImage)"></div>
-                                <div class="div-text">
+                                <div class="div-text" style="width: 65%;">
                                     <div class="row-3">
-                                        <span class="sp-lbl">举牌验收</span>
+                                        <div v-if="it.checkResult=='1'" class="sp-lbl">验收合格</div>
-                                        <span class="sp-date">{{it.date}}</span>
+                                        <div v-if="it.checkResult=='2'" class="sp-err">验收不合格</div>
+                                        <div class="sp-date">{{it.checkingDate}}</div>
                                     </div>
                                     <div class="row-3">
                                         <span class="sp-label">项目:</span>
-                                        <span class="sp-text">{{it.name}}</span>
+                                        <span class="sp-text">{{it.projectName}}</span>
                                     </div>
                                     <div class="row-3">
                                         <span class="sp-label">区域:</span>
-                                        <span class="sp-text">{{it.area}}</span>
+                                        <span class="sp-text">{{it.checkWorkingPosition}}</span>
                                     </div>
                                 </div>
                             </div>
                             <div class="row-5">
-                                描述:{{it.detail}}
+                                验收描述:{{it.intro}}
                             </div>
                          </div>
                     </module-one-3-1>      
@@ -238,12 +239,11 @@ export default {
                     { name:'激光垂准仪', value:'1' },
                 ],
                 //举牌验收
-                acceptanceData:[
+                acceptanceDataView:{
-                    {name:'泾河新城荟锦坊二期项目',date:'2023-06-08 11:11:11',area:'基础施工',img:'./images/850.jpg', detail:'锚索验收12次,结果为合格'},
+                    sum:0,
-                    {name:'泾河新城荟锦坊二期项目',date:'2023-06-08 11:11:11',area:'基础施工',img:'./images/851.jpg',detail:'筏板钢筋验收15次,结果为合格'},
+                    okSum:100,
-                    {name:'泾河新城荟锦坊二期项目',date:'2023-06-08 11:11:11',area:'基础施工',img:'./images/852.jpg',detail:'墙柱钢筋验收6，复查结果不合格'},
+                },
-                    {name:'泾河新城荟锦坊二期项目',date:'2023-06-08 11:11:11',area:'基础施工',img:'./images/853.jpg',detail:'模板及脚手架验收5次，复查结果为合格'},
+                acceptanceData:[],
-                ],
                 summary:[],
                 summaryTotal:0,
                 summaryPrj:[],
@@ -318,6 +318,7 @@ export default {
                     })
                     this.elKey++;
                 });
+                this.doProjectChecking();
             },     
             doMeasuredNav(n,t){
                 this.measuredNav=n;
@@ -328,8 +329,20 @@ export default {
                 this.safeText=t;
                 this.doDeptChane();
             },
+            //查询举牌验收
+            doProjectChecking(){
+                this.acceptanceData=[];
+                //举牌验收数据列表
+                this.$api.projectChecking.getProjectCheckingList(this.dept?.id||0,this.projectInfo?.id||0).then(d=>{
+                    this.acceptanceData=d.rows;
+                });
+                //举牌验收统计
+                this.$api.projectChecking.getProjectCheckingView(this.dept?.id||0,this.projectInfo?.id||0).then(d=>{
+                    this.acceptanceDataView.sum=d.data.sum;
+                    this.acceptanceDataView.okSum=d.data.okSum;
+                });
+            },
             init(){
-                
                 this.localStorage = JSON.parse(localStorage.getItem("data1"))
                 //设备概况点击事件定时器
                 this.overviewInterval = setInterval(this.overviewClick,5000);
@@ -340,7 +353,13 @@ export default {
                 //预警类型 定时器
                 this.warningTypeInterval = setInterval(this.automaticRollType,5000);
             },
-           
+            // 获取图片映射
+            getProfileImage(url) {
+                if (url) {
+                    return '/jhapi' + url + ".min.jpg";
+                }
+                return url;
+            },
         },
 };
 </script>
@@ -460,11 +479,10 @@ export default {
             margin-top: 10px;
         }
         .acceptance-item{
-            margin-top: 20px;
+            padding:12px;
-            padding:20px;
         }
         .acceptance-item .row-5{
-            margin-top:10px;
+            //margin-top:10px;
             line-height:30px;
             color: #C7DAFD;
         }
@@ -482,6 +500,7 @@ export default {
             overflow: hidden;
         }
         .acceptance-item .div-img img{
+            width: 125px;
             height: 90px;
         }
         .acceptance-item .sp-lbl{
@@ -489,11 +508,24 @@ export default {
             border:solid 1px #1D642C;
             color: #41AA20;
             padding:2px 8px;
+            float: left;
+            width: 35%;
+        }
+        .acceptance-item .sp-err{
+            background: #351717;
+            border: solid 1px #5a0303;
+            color: #bb2424;
+            padding: 2px 8px;
+            float: left;
+            width: 35%;
         }
         .acceptance-item .sp-date{
             font-size: 12px;
-            margin-left: 50px;
             color: #aaa;
+            float: left;
+            width: 58%;
+            line-height: 36px;
+            text-align: right;
         }
 }
 </style>

vue.config.js

@@ -16,7 +16,8 @@ module.exports = defineConfig({
         }
       },
       '/jhapi/profile':{
-        target: `http://62.234.3.186/jhapi/profile`,
+        //target: `http://62.234.3.186/jhapi/profile`,
+        target: `http://127.0.0.1:8090/jhapi/profile`,
         changeOrigin: true,
         pathRewrite: {
           ['^/jhapi/profile']:''