diff --git a/dist.zip b/dist.zip
index f6e52de8..e339351f 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/public/js/config.js b/public/js/config.js
index f6e76261..21e9d2ba 100644
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -1,7 +1,7 @@
-// var COMPANY = ''; //通用
+var COMPANY = ''; //通用
 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
 // var COMPANY='hezhan'; //合展-宿迁
-var COMPANY='nanchang'; //南昌地铁、衢州
+// var COMPANY='nanchang'; //南昌地铁、衢州
 // var COMPANY='longguang'; //龙光地产
 // var COMPANY='zhengwu'
 // var COMPANY='shenbai'; //沈白高铁
diff --git a/src/views/messageV2.vue b/src/views/messageV2.vue
index 05e8775c..0ef5c99a 100644
--- a/src/views/messageV2.vue
+++ b/src/views/messageV2.vue
@@ -129,62 +129,62 @@ export default {
       pageNo: 1,
       pageSize: 20,
       tableData: [],
-      options:[{
-        label: "防疫人员通知",
-        value: "2"
-      },{
-        label: "访客通知",
-        value: "16"
-      }],
       // options:[{
-      //   label: "高空火警",
-      //   value: "8"
-      // },{
-      //   label: "考勤提醒",
-      //   value: "1"
-      // },{
       //   label: "防疫人员通知",
       //   value: "2"
       // },{
-      //   label: "防疫车辆通知",
-      //   value: "3"
-      // },{
       //   label: "访客通知",
       //   value: "16"
-      // },{
-      //   label: "混凝土监测",
-      //   value: "4"
-      // },{
-      //   label: "卸料平台",
-      //   value: "5"
-      // },{
-      //   label: "配电箱",
-      //   value: "6"
-      // },{
-      //   label: "扬尘",
-      //   value: "7"
-      // },{
-      //   label: "标养室",
-      //   value: "9"
-      // },{
-      //   label: "安全检查",
-      //   value: "10"
-      // },{
-      //   label: "质量检查",
-      //   value: "11"
-      // },{
-      //   label: "塔吊",
-      //   value: "12"
-      // },{
-      //   label: "升降机",
-      //   value: "13"
-      // },{
-      //   label: "电表",
-      //   value: "14"
-      // },{
-      //   label: "水表",
-      //   value: "15"
       // }],
+      options:[{
+        label: "高空火警",
+        value: "8"
+      },{
+        label: "考勤提醒",
+        value: "1"
+      },{
+        label: "防疫人员通知",
+        value: "2"
+      },{
+        label: "防疫车辆通知",
+        value: "3"
+      },{
+        label: "访客通知",
+        value: "16"
+      },{
+        label: "混凝土监测",
+        value: "4"
+      },{
+        label: "卸料平台",
+        value: "5"
+      },{
+        label: "配电箱",
+        value: "6"
+      },{
+        label: "扬尘",
+        value: "7"
+      },{
+        label: "标养室",
+        value: "9"
+      },{
+        label: "安全检查",
+        value: "10"
+      },{
+        label: "质量检查",
+        value: "11"
+      },{
+        label: "塔吊",
+        value: "12"
+      },{
+        label: "升降机",
+        value: "13"
+      },{
+        label: "电表",
+        value: "14"
+      },{
+        label: "水表",
+        value: "15"
+      }],
     };
   },
   created() {
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/centerBottom.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/centerBottom.vue
index 5e134137..dbef0866 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/centerBottom.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/centerBottom.vue
@@ -1,14 +1,24 @@
 <template>
 <!-- 施工进度 -->
-<div class="container">
-    <div class="titleTxt">{{ title }}</div>
+<Card :title="title">
+  <div class="contents">
+    <div class="smallBox" v-for="(item,index) in inforData" :key="index">
+      <div class="left">
+        <!-- <img :src="item.image" alt=""/> -->
+      </div>
+      <p class="name">{{item.name}}</p>
+      <p class="type">{{item.type}}</p>
+      <p class="type">{{item.time}}</p>
+    </div>
 
-</div>
+  </div>
+</Card>
 </template>
 
 <script>
+import Card from '../components/Card.vue'
 export default {
-
+components: { Card },
   props: {
     title: {
       type: String,
@@ -17,7 +27,18 @@ export default {
   },
   data() {
     return {
-
+      inforData:[
+        {iamge:'',name:'苏华',type:'特种设备驾驶员',time:"15:32:24"},
+        {iamge:'',name:'苏华',type:'特种设备驾驶员',time:"15:32:24"},
+        {iamge:'',name:'苏华',type:'特种设备驾驶员',time:"15:32:24"},
+        {iamge:'',name:'苏华',type:'特种设备驾驶员',time:"15:32:24"},
+        {iamge:'',name:'苏华',type:'特种设备驾驶员',time:"15:32:24"},
+        {iamge:'',name:'苏华',type:'特种设备驾驶员',time:"15:32:24"},
+        {iamge:'',name:'苏华',type:'特种设备驾驶员',time:"15:32:24"},
+        {iamge:'',name:'苏华',type:'特种设备驾驶员',time:"15:32:24"},
+        {iamge:'',name:'苏华',type:'特种设备驾驶员',time:"15:32:24"},
+        {iamge:'',name:'苏华',type:'特种设备驾驶员',time:"15:32:24"},
+        ]
     };
   },
 
@@ -26,16 +47,32 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.container {
-  width: 100%;
-  height: 100%;
-  border: 1px solid #0081c3;
-
-  .titleTxt {
-    font-size: 18px;
-    color: #6ee4f0;
-    margin-top: 5px;
-    margin-left: 5px;
+.contents{
+  display: flex;
+  flex-flow: wrap;
+  justify-content: space-between;
+  height: 110px;
+  .smallBox{
+    background: linear-gradient(to top, #173b51, #132f44, #0e2135);
+    border-radius: 5px;
+    margin-top: 20px;
+    margin-bottom: 20px;
+    margin-left: 7px;
+    width: 18%;
+    .left{
+      width: 50px;
+      height: 70px;
+      margin:5px;
+      background-color: #fff;
+    }
+    .name{
+      color:#6de2ed;
+      margin-top:5px;
+    }
+    .type{
+      margin-top:10px;
+      font-size: 12px;
+    }
   }
 }
 </style>
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/rightBottom.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/rightBottom.vue
index d5ce27b8..60261552 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/rightBottom.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/rightBottom.vue
@@ -1,42 +1,78 @@
+
 <template>
 <!-- 证书统计 -->
-<div class="container">
-    <div class="titleTxt">{{ title }}</div>
-
-</div>
+  <div class="containerBox">
+    <div class="title">{{ title }}</div>
+    <div class="persontype">
+        <span>证件总数</span>
+        <p class="person">679</p>
+    </div>
+    <div class="content">
+      <JProgressChart :seriesData="seriesData" :yData="yData" />
+    </div>
+  </div>
 </template>
 
 <script>
+import JProgressChart from '../jChart/bar/JProgressChart.vue'
 export default {
-
+  components: { JProgressChart },
   props: {
     title: {
       type: String,
-      default: "default title"
+      default: 'default title'
     }
   },
   data() {
     return {
-
-    };
-  },
-
-
+      yData: [
+        '一建(建筑)',
+        '二建(建筑)',
+        'A证',
+        'B证',
+        'C证',
+      ].reverse(),
+      seriesData: [432,234,322,259,402]
+    }
+  }
 }
 </script>
 
 <style lang="less" scoped>
-.container {
+.containerBox {
   width: 100%;
   height: 100%;
   border: 1px solid #0081c3;
-
-  .titleTxt {
+  .title {
+    padding-left: 6px;
+    height: 30px;
+    line-height: 30px;
     font-size: 18px;
     color: #6ee4f0;
-    margin-top: 5px;
-    margin-left: 5px;
+  }
+  .persontype{
+    span{
+      font-size: 12px;
+      margin-left: 30px;
+    }
+    .person {
+      display: inline-block;
+      width: 15%;
+      height: 25px;
+      line-height: 25px;
+      text-align: center;
+      margin-left: 30px;
+      color: #47b1c4;
+      background-image: url(~@/assets/images/projectImg/numBgc.png);
+      background-size:100%;
+      background-repeat: no-repeat;
+    }
+  }
+  
+  .content {
+    height: calc(100% - 30px);
   }
 }
 </style>
 
+
diff --git a/src/views/projectAdmin/projectIndex.vue b/src/views/projectAdmin/projectIndex.vue
index 569808e0..684dfd1d 100644
--- a/src/views/projectAdmin/projectIndex.vue
+++ b/src/views/projectAdmin/projectIndex.vue
@@ -180,6 +180,7 @@ export default {
               projectSn: this.$store.state.projectSn,
           };
           getProjectInfoBySn(data).then((res)=>{
+            console.log('------------',res.result.projectNumber)
             this.projectNumber = res.result.projectNumber
           })
         },
@@ -196,8 +197,9 @@ export default {
         }).then((res)=>{
           console.log('全景成像测距',res)
           let toUrl = res.data.find((item)=>{
-            this.projectNumber == item.jinqianmaosn
-            return item.url
+            if(this.projectNumber == item.jinqianmaosn){
+              return item.url
+            }
           })
           window.open(toUrl.url)
          })