diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/generalView.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/generalView.vue
index 78faca44..6c5de1e8 100644
--- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/generalView.vue
+++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/generalView.vue
@@ -15,7 +15,7 @@
         <td><span class="label">开工日期：</span>{{ projectInfo.commencementDate }}</td>
         <td colspan="2">
           <span class="label">开设工资专用账户时间：{{ projectInfo.payrollAccountTime }}</span>
-          <span style="color: green" v-if="projectInfo.balanceWarning=='(工资专用账户按要求在开工开始30天内创建)'">{{ projectInfo.dedicatedAccountWarning }}</span>
+          <span style="color: green" v-if="projectInfo.dedicatedAccountWarning=='(工资专用账户按要求在开工开始30天内创建)'">{{ projectInfo.dedicatedAccountWarning }}</span>
           <span style="color: red" v-else>{{ projectInfo.dedicatedAccountWarning }}</span>
 
         </td>
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue
index 4dcc41f4..c56b01f5 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue
@@ -413,7 +413,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="统计证信息" prop="certificateInformation">
+          <el-form-item label="信用承诺书" prop="certificateInformation"    style="position: relative;">
             <el-upload
               class="upload-demo"
               action="thinking/common/upload"
@@ -437,6 +437,9 @@
                 支持jpg/png/pdf/word/excel文件等，不超过200M
               </div>
             </el-upload>
+            <span @click=" downloadTemplate('（项目法人版）广东省智慧水利一期-水工程建设管理模块操作手册.pdf',
+                      '（项目法人版）广东省智慧水利一期-水工程建设管理模块操作手册.pdf')" style="color: #2679bc;font-size: 14px;position: absolute;top: 10px;
+    left: 120px;cursor: pointer;">下载模板</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -683,6 +686,15 @@ export default {
     });
   },
   methods: {
+    downloadTemplate(filename, name){
+      let a = document.createElement("a");
+      console.log(999, process.env.NODE_ENV);
+      a.href = "/jgThinking/static/" + filename;
+      // a.href = "/jgThinking/static/" + filename;
+      //路径中'/'为根目录，即index.html所在的目录
+      a.download = name;
+      a.click();
+    },
     // 资质类别字典翻译
     enterpriseTypeFormat(row, column) {
       return this.selectDictLabel(
@@ -753,6 +765,9 @@ export default {
         if (this.form.safetyProductionAttachment) {
           this.fileList2 = JSON.parse(this.form.safetyProductionAttachment);
         }
+        if (this.form.certificateInformation){
+          this.fileList5=JSON.parse(this.form.certificateInformation)
+        }
       });
     },
     // 取消按钮
@@ -847,6 +862,7 @@ export default {
         if (valid) {
           this.form.socialCreditCodeAttachment = JSON.stringify(this.fileList1);
           this.form.safetyProductionAttachment = JSON.stringify(this.fileList2);
+          this.form.certificateInformation=JSON.stringify(this.fileList5)
           if (this.form.id != null) {
             updateEnterpriseInfo(this.form).then((response) => {
               if (response.code === 200) {
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badCredit.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badCredit.vue
index 52c7d5f8..53cca25e 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badCredit.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badCredit.vue
@@ -190,7 +190,7 @@
                 v-model="form.qualificationCategory"
                 placeholder="请选择资质类别"
                 style="width: 100%"
-                disabled
+
               >
                 <el-option
                   v-for="dict in parentOption"
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue
index d9d556ab..adde058a 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue
@@ -290,7 +290,7 @@
                 v-model="form.qualificationCategory"
                 placeholder="请选择资质类型"
                 style="width: 100%"
-                disabled
+
               >
                 <el-option
                   v-for="dict in qualificationCategoryOptions"
@@ -413,7 +413,7 @@
                 v-model="form.isWaterCon"
                 placeholder="请选择是否是"
                 style="width: 100%"
-                disabled
+
               >
                 <el-option
                   v-for="dict in isOptions"
@@ -430,7 +430,7 @@
                 v-model="form.isWaterCon"
                 placeholder="请选择是否"
                 style="width: 100%"
-                disabled
+
               >
                 <el-option
                   v-for="dict in isOptions"
diff --git a/jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue b/jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue
index c9808abf..71cf998a 100644
--- a/jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue
@@ -51,6 +51,16 @@
             >
             </el-cascader>
           </el-form-item>
+
+        </el-form>
+      </el-col>
+      <el-col :span="16">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          :inline="true"
+          v-show="showSearch"
+        >
           <el-form-item label="是否有拖欠工资" prop="isMajorProject">
             <el-select
               v-model="queryParams.data.isUnPay"
@@ -68,15 +78,6 @@
               />
             </el-select>
           </el-form-item>
-        </el-form>
-      </el-col>
-      <el-col :span="16">
-        <el-form
-          :model="queryParams"
-          ref="queryForm"
-          :inline="true"
-          v-show="showSearch"
-        >
           <el-form-item label="是否省重大水利工程项目" prop="isMajorProject">
             <el-select
               v-model="queryParams.data.isMajorProject"
@@ -468,6 +469,7 @@ export default {
       this.totalLoading=true
       getNmgTotal(this.queryParams).then(res=>{
         this.totalData=res.data
+        console.log(this.totalData,'totalData')
         this.totalLoading=false
       })
     },
diff --git a/jwtech-admin-page/vue.config.js b/jwtech-admin-page/vue.config.js
index 050174ea..670a9356 100644
--- a/jwtech-admin-page/vue.config.js
+++ b/jwtech-admin-page/vue.config.js
@@ -43,7 +43,7 @@ module.exports = {
         // target: "http://127.0.0.1:18082",
         // target: "http://192.168.2.108:18080",
         // target: "http://192.168.2.103:18082",
-        target: "http://localhost:18082",
+        target: "http://192.168.31.26:18082",
         // target: "http://192.168.2.108:18080",
         // target: "http://192.168.1.20:8084",
         changeOrigin: true,
diff --git a/jwtech-pc-page/config/index.js b/jwtech-pc-page/config/index.js
index bd60b3d5..a6fd2b99 100644
--- a/jwtech-pc-page/config/index.js
+++ b/jwtech-pc-page/config/index.js
@@ -33,7 +33,7 @@ module.exports = {
     proxyTable: {
       '/jgThinking/thinking': {
         // target: 'http://127.0.0.1:18080/kms-pc-web',
-        target: 'http://localhost:18080',
+        target: 'http://19.25.74.73:8096',
         // target: 'http://192.168.2.100:18082/tianhui-admin-web',
         changeOrigin: true,
         pathRewrite: {
diff --git a/jwtech-pc-page/src/api/enterpriseInformation.js b/jwtech-pc-page/src/api/enterpriseInformation.js
index 6194b6f8..68bc7557 100644
--- a/jwtech-pc-page/src/api/enterpriseInformation.js
+++ b/jwtech-pc-page/src/api/enterpriseInformation.js
@@ -139,3 +139,11 @@ export function getInfoTotal(){
     method: 'get'
   })
 }
+
+
+export function getZhxxById(id){
+  return request({
+    url: '/enterprise/zhxx/'+id,
+    method: 'get'
+  })
+}
diff --git a/jwtech-pc-page/src/views/announcement/index.vue b/jwtech-pc-page/src/views/announcement/index.vue
index e14711c3..61b868de 100644
--- a/jwtech-pc-page/src/views/announcement/index.vue
+++ b/jwtech-pc-page/src/views/announcement/index.vue
@@ -3,9 +3,9 @@
     <div class="certification-tabs">
       <div class="tabs-wrap">
         <el-tabs ref="tabcs" v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="企业良好行为公告" name="good"></el-tab-pane>
-          <el-tab-pane label="企业不良行为公告" name="bad"></el-tab-pane>
-          <el-tab-pane label="企业信用统计" name="xinyong"></el-tab-pane>
+          <el-tab-pane label="企业动态信用良好行为" name="good"></el-tab-pane>
+          <el-tab-pane label="企业动态信用不良行为" name="bad"></el-tab-pane>
+          <el-tab-pane label="动态信用排名" name="xinyong"></el-tab-pane>
         </el-tabs>
       </div>
     </div>
@@ -48,7 +48,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="所在区域" v-if="activeName === 'xinyong'">
+          <el-form-item label="所在区域">
             <el-select
               v-model="queryForm.adcd"
               clearable
@@ -212,8 +212,8 @@ export default {
       this.activeName = this.$route.query.type;
     }
     if (this.$route.query.enterpriseName3) {
-      this.activeName = "bad"
-      this.queryForm.enterpriseName = this.$route.query.enterpriseName3
+      this.activeName = "bad";
+      this.queryForm.enterpriseName = this.$route.query.enterpriseName3;
     }
   },
   mounted() {
@@ -341,25 +341,26 @@ export default {
       this.getResult();
     },
     toDetail(row) {
-      console.log(111,row)
-      if (this.activeName!='xinyong'){
-      this.$router.push({
-        path: "/enterpriseInDetail",
-        query: {
-          type: this.activeName,
-          enterpriseId: row.enterpriseId
-        }
-      })}else {
+      console.log(111, row);
+      if (this.activeName != "xinyong") {
+        this.$router.push({
+          path: "/enterpriseInDetail",
+          query: {
+            type: this.activeName,
+            enterpriseId: row.enterpriseId
+          }
+        });
+      } else {
         this.$router.push({
           path: "/enterpriseInDetail",
           query: {
             type: this.activeName,
             enterpriseId: row.id
           }
-      })
+        });
+      }
     }
   }
-  }
 };
 </script>
 <style lang="less" scoped>
@@ -443,7 +444,7 @@ export default {
         }
 
         .el-input__inner {
-          width: 259px;
+          width: 220px;
           height: 50px;
           line-height: 50px;
           border-radius: 8px;
@@ -480,9 +481,9 @@ export default {
         }
 
         .el-button:nth-child(2) {
-          background: linear-gradient( 180deg, #FFFFFF 0%, #ECF6FF 100%);
-          border: 1px solid #005EB7;
-          color: #005EB7;
+          background: linear-gradient(180deg, #ffffff 0%, #ecf6ff 100%);
+          border: 1px solid #005eb7;
+          color: #005eb7;
         }
       }
 
diff --git a/jwtech-pc-page/src/views/enterpriseInformation/components/descriptionsEnterpriseTable.vue b/jwtech-pc-page/src/views/enterpriseInformation/components/descriptionsEnterpriseTable.vue
index dd68914e..9e2d7f38 100644
--- a/jwtech-pc-page/src/views/enterpriseInformation/components/descriptionsEnterpriseTable.vue
+++ b/jwtech-pc-page/src/views/enterpriseInformation/components/descriptionsEnterpriseTable.vue
@@ -24,44 +24,87 @@
 
     <div class="table-wrap">
       <div class="table-title">
-        <span>
+        <span
+          :class="currentItem === '1' ? 'act' : ''"
+          @click="currentItem = '1'"
+        >
           基本信息
         </span>
+
+        <span
+          :class="currentItem === '2' ? 'act' : ''"
+          @click="currentItem = '2'"
+        >
+          信用承若
+        </span>
       </div>
-      <el-descriptions
-        class="margin-top"
-        :column="2"
-        border
-        :content-style="rowCenter"
-        :label-style="labelRowCenter"
-      >
-        <el-descriptions-item
-          :label="item.label"
-          v-for="(item, index) in descrData"
-          :key="(item, index)"
+      <template v-if="currentItem === '1'">
+        <el-descriptions
+          class="margin-top"
+          :column="2"
+          border
+          :content-style="rowCenter"
+          :label-style="labelRowCenter"
+        >
+          <el-descriptions-item
+            :label="item.label"
+            v-for="(item, index) in descrData"
+            :key="(item, index)"
+          >
+            {{ item.val }}
+          </el-descriptions-item>
+          <el-descriptions-item label="单位类别" span="2">
+            {{ typeFormat(enterpriseType) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="注册地址" span="2">
+            {{ registeredAddress }}
+          </el-descriptions-item>
+          <el-descriptions-item label="经营范围" span="2">
+            {{ businessScope }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </template>
+      <template v-else>
+        <el-descriptions
+          class="margin-top"
+          :column="2"
+          border
+          :content-style="rowCenter"
+          :label-style="labelRowCenter"
         >
-          {{ item.val }}
-        </el-descriptions-item>
-        <el-descriptions-item label="单位类别" span="2">
-          {{ typeFormat(enterpriseType) }}
-        </el-descriptions-item>
-        <el-descriptions-item label="注册地址" span="2">
-          {{ registeredAddress }}
-        </el-descriptions-item>
-        <el-descriptions-item label="经营范围" span="2">
-          {{ businessScope }}
-        </el-descriptions-item>
-      </el-descriptions>
+          <el-descriptions-item label="企业承若书" span="2">
+            <div style="display: flex;flex-direction: column;">
+              <span
+                v-if="enterpriseObj.certificateInformation"
+                style="cursor: pointer;color: #0072ff;"
+                @click="
+                  downloadEnterprisePromise(
+                    enterpriseObj.certificateInformation
+                  )
+                "
+                >下载承若书</span
+              ><span style="color: #8b8b8b;" v-else>暂无文件</span>
+              <span
+                style="font-size: 14px;
+    color: #777777;"
+                >注:企业承诺书模版已更新，已使用原模板上传的仍然有效。</span
+              >
+            </div>
+          </el-descriptions-item>
+        </el-descriptions>
+      </template>
     </div>
   </div>
 </template>
 <script>
 import { enterpriseInfo } from "@/api/enterpriseInformation";
 import { getGuangDong } from "@/api/creditStatistics";
+import { getFileStream } from "@/api/common";
 
 export default {
   data() {
     return {
+      currentItem: "1",
       rowCenter: {
         borderColor: "#DADCE3"
       },
@@ -126,7 +169,7 @@ export default {
           label: "单位性质",
           code: "investmentComposition",
           val: ""
-        },
+        }
         // {
         //   label: "单位类别",
         //   code: "enterpriseType",
@@ -149,6 +192,23 @@ export default {
     this.getArea();
   },
   methods: {
+    downloadEnterprisePromise(file) {
+      console.log(file);
+      getFileStream({ fileName: file.fileName }).then(res => {
+        const blob = new Blob([res], {
+          // type类型后端返回来的数据中会有，根据自己实际进行修改
+          // 表格下载为 application/xlsx，压缩包为 application/zip等，
+          type: "application/xlsx"
+        }); //excel,pdf等
+        const href = URL.createObjectURL(blob); //创建新的URL表示指定的blob对象
+        const a = document.createElement("a"); //创建a标签
+        a.style.display = "none";
+        a.href = href; // 指定下载链接
+        a.download = file.name; //指定下载文件名
+        a.click(); //触发下载
+        URL.revokeObjectURL(a.href); //释放URL对象
+      });
+    },
     typeFormat(row, column) {
       return this.selectDictLabel(this.categoryList, row);
     },
@@ -300,21 +360,27 @@ export default {
       line-height: 47px;
       background-color: #f6f6f6;
 
+      &::before {
+        content: "";
+        display: inline-block;
+        width: 3px;
+        height: 16px;
+        background: #005eb7;
+        margin-right: 10px;
+        vertical-align: middle;
+      }
+
       span {
         font-family: PingFangSC, PingFang SC;
         font-weight: 600;
         font-size: 16px;
         color: #333333;
         font-style: normal;
+        margin-right: 10px;
+        cursor: pointer;
 
-        &::before {
-          content: "";
-          display: inline-block;
-          width: 3px;
-          height: 16px;
-          background: #005eb7;
-          margin-right: 10px;
-          vertical-align: middle;
+        &.act {
+          color: #005eb7;
         }
       }
     }
diff --git a/jwtech-pc-page/src/views/home/components/noticeAnnouncement.vue b/jwtech-pc-page/src/views/home/components/noticeAnnouncement.vue
index 08ece585..9b7d546f 100644
--- a/jwtech-pc-page/src/views/home/components/noticeAnnouncement.vue
+++ b/jwtech-pc-page/src/views/home/components/noticeAnnouncement.vue
@@ -38,7 +38,9 @@ export default {
           type: "like",
           value: ""
         },
-        data: {},
+        data: {
+          textType:0
+        },
         pageNum: 1,
         pageSize: 10
       },
diff --git a/jwtech-pc-page/src/views/home/components/statisticsRight.vue b/jwtech-pc-page/src/views/home/components/statisticsRight.vue
index 3128245b..c8fc9fcc 100644
--- a/jwtech-pc-page/src/views/home/components/statisticsRight.vue
+++ b/jwtech-pc-page/src/views/home/components/statisticsRight.vue
@@ -83,7 +83,7 @@ export default {
       });
       console.log(convertedData,2222)
       // **异步加载本地 China.json**
-      const guangdongJson = await fetch("/static/map/guangdong.json").then(res => res.json())
+      const guangdongJson = await fetch("./static/map/guangdong.json").then(res => res.json())
       console.log("1111111111111111111111")
       console.log(guangdongJson)
       echarts.registerMap("guangdong", guangdongJson);
@@ -211,7 +211,6 @@ export default {
             roam: true,
             label: {
               normal: {
-                show: WebTransportDatagramDuplexStream,
                 textStyle: {
                   color: '#fff'
                 }
diff --git a/jwtech-pc-page/src/views/home/components/userLogin.vue b/jwtech-pc-page/src/views/home/components/userLogin.vue
index 4d84f02d..d63328f9 100644
--- a/jwtech-pc-page/src/views/home/components/userLogin.vue
+++ b/jwtech-pc-page/src/views/home/components/userLogin.vue
@@ -54,11 +54,11 @@
         </div>
         <div class="c-item">
           <div class="c-item-top">{{info.goodCreditNum}}</div>
-          <div class="c-item-bottom">企业良好行为公告（条）</div>
+          <div class="c-item-bottom">良好行为公告（条）</div>
         </div>
         <div class="c-item">
           <div class="c-item-top">{{info.badCreditNum}}</div>
-          <div class="c-item-bottom">企业不良行为公告（条）</div>
+          <div class="c-item-bottom">不良行为公告（条）</div>
         </div>
       </div>
     </div>
@@ -221,6 +221,11 @@ export default {
             color: #333;
           }
         }
+
+        .c-item-bottom{
+          font-size: 14px;
+          letter-spacing: 0.3px;
+        }
       }
     }
   }
diff --git a/jwtech-pc-page/src/views/home/index.vue b/jwtech-pc-page/src/views/home/index.vue
index 53725d02..c1568f24 100644
--- a/jwtech-pc-page/src/views/home/index.vue
+++ b/jwtech-pc-page/src/views/home/index.vue
@@ -22,10 +22,16 @@
           @click="chooseTab('3')"
           >项目业绩</span
         > -->
+        <span
+          :class="activeTab == '5' ? 'activeSpan' : ''"
+          @click="chooseTab('5')"
+        >
+          企业信用良好信息</span
+        >
         <span
           :class="activeTab == '4' ? 'activeSpan' : ''"
           @click="chooseTab('4')"
-          >企业不良信息</span
+          >企业信用不良信息</span
         >
       </div>
       <div class="search_input" v-if="activeTab == '0'">
@@ -88,6 +94,21 @@
           </template>
         </el-input>
       </div>
+      <div class="search_input" v-else-if="activeTab == '5'">
+        <el-input
+          v-model="enterpriseName3"
+          placeholder="请输入要搜索的企业名称"
+          class="searchContent"
+          @keyup.enter.native="goSearch(5)"
+        >
+          <template slot="append">
+            <div class="searchBtn" @click="goSearch(5)">
+              <img src="@/assets/image/search.png" />
+              <span>搜索</span>
+            </div>
+          </template>
+        </el-input>
+      </div>
       <div class="search_input" v-else>
         <el-input
           v-model="enterpriseName3"
@@ -282,6 +303,14 @@ export default {
         } else {
           this.$message.warning("请输入企业名称");
         }
+      } else if (key == "5") {
+        if (this.enterpriseName3) {
+          this.$router.push(
+            "/announcement?enterpriseName1=" + this.enterpriseName3
+          );
+        } else {
+          this.$message.warning("请输入企业名称");
+        }
       }
     },
     chooseTab(key) {
@@ -315,7 +344,13 @@ export default {
   // padding: 0 360px;
   padding-bottom: 20px;
   // background: linear-gradient( 180deg, #005EB7 0%, #EDF7FF 100%);
-  background: linear-gradient(to bottom, #005EB7 0%, #EDF7FF 100% 670px, #EDF7FF 670px, #EDF7FF 100%);
+  background: linear-gradient(
+    to bottom,
+    #005eb7 0%,
+    #edf7ff 100% 670px,
+    #edf7ff 670px,
+    #edf7ff 100%
+  );
 
   .tabAndSearch-wrap {
     padding: 20px 0 20px 0;
@@ -325,6 +360,7 @@ export default {
       display: flex;
       margin: 0 auto;
       & > span {
+        flex: 1;
         display: inline-block;
         width: 232px;
         height: 70px;
@@ -333,7 +369,7 @@ export default {
         font-weight: bold;
         cursor: pointer;
         // color: #1672e5;
-        color: #005EB7;
+        color: #005eb7;
         text-align: center;
         background: url("~@/assets/image/home/search-item.png");
         background-size: 100% 100%;
@@ -367,7 +403,7 @@ export default {
         /deep/ .el-input-group__append {
           width: 100px;
           padding: 0 17px;
-          background: #0059A5;
+          background: #0059a5;
           border: 1px solid #aad8fb;
           border-left: none;
           border-radius: 0px 8px 8px 0px;
diff --git a/jwtech-pc-page/src/views/policyDoc/components/docWrap.vue b/jwtech-pc-page/src/views/policyDoc/components/docWrap.vue
index 6f2d8631..7b3943cd 100644
--- a/jwtech-pc-page/src/views/policyDoc/components/docWrap.vue
+++ b/jwtech-pc-page/src/views/policyDoc/components/docWrap.vue
@@ -32,6 +32,10 @@ import { zhxxList } from "@/api/zhxx";
 export default {
   name: "docWrap",
   props: {
+    isSearch: {
+      type: Boolean,
+      default: false
+    },
     title: {
       type: String,
       default: "政策文件"
@@ -40,6 +44,10 @@ export default {
       type: String,
       default: "1"
     },
+    proTotal: {
+      type: Number,
+      default: 0
+    },
     docData: {
       type: Array,
       default: () => []
@@ -47,7 +55,7 @@ export default {
   },
   data() {
     return {
-      total: 10,
+      total: 0,
       pageSizes: [10, 20, 30, 50],
       docDataList: [],
       queryForm: {
@@ -65,7 +73,12 @@ export default {
     };
   },
   mounted() {
-    this.getResult();
+    if (!this.isSearch) {
+      this.getResult();
+    } else {
+      this.docDataList = this.docData;
+      this.total = this.proTotal;
+    }
   },
   methods: {
     getResult() {
@@ -76,12 +89,13 @@ export default {
       });
     },
     toDetail(item) {
-      this.$router.push({
-        path: "/policyDocDetail",
-        query: {
-          id: item.id
-        }
-      });
+      this.$router.push(
+        "/summarizedDetail?title=" +
+          item.title +
+          "&id=" +
+          item.id +
+          "&fromDoc=1"
+      );
     }
   }
 };
diff --git a/jwtech-pc-page/src/views/policyDoc/index.vue b/jwtech-pc-page/src/views/policyDoc/index.vue
index 00e190fb..5f3d70c2 100644
--- a/jwtech-pc-page/src/views/policyDoc/index.vue
+++ b/jwtech-pc-page/src/views/policyDoc/index.vue
@@ -20,22 +20,30 @@
       </el-form>
     </div>
     <div class="docs-wrap">
-      <doc-wrap
-        v-for="(item, index) in zhxxType"
-        :key="item.title"
-        :title="item.title"
-        :type="item.value"
-        :docData="[
-          { id: 1, title: '标题1', content: '内容1', time: '2020-11-11' },
-          { id: 2, title: '标题2', content: '内容2', time: '2020-11-12' }
-        ]"
-        style="margin-bottom: 20px;"
-      ></doc-wrap>
+      <template v-if="isSearch">
+        <doc-wrap
+          :title="搜索结果"
+          :isSearch="true"
+          :docData="tableData"
+          :proTotal="total"
+          style="margin-bottom: 20px;"
+        ></doc-wrap>
+      </template>
+      <template v-else>
+        <doc-wrap
+          v-for="(item, index) in zhxxType"
+          :key="item.title"
+          :title="item.title"
+          :type="item.value"
+          style="margin-bottom: 20px;"
+        ></doc-wrap>
+      </template>
     </div>
   </div>
 </template>
 <script>
 import docWrap from "./components/docWrap.vue";
+import { zhxxList } from "@/api/zhxx";
 export default {
   components: {
     docWrap
@@ -59,6 +67,7 @@ export default {
         pageSize: 10
       },
       tableData: [],
+      isSearch: false,
       zhxxType: [
         { title: "政策法规", value: "1" },
         { title: "部门规章", value: "2" },
@@ -68,7 +77,15 @@ export default {
   },
   mounted() {},
   methods: {
+    getResult() {
+      zhxxList(this.queryForm).then(res => {
+        this.isSearch = true;
+        this.tableData = res.data.records;
+        this.total = res.data.total;
+      });
+    },
     resetForm() {
+      this.isSearch = false;
       this.queryForm = {
         cv: {
           name: "title",
@@ -78,7 +95,7 @@ export default {
         pageNum: 1,
         pageSize: 10
       };
-      this.getResult();
+      // this.getResult();
     }
   }
 };
diff --git a/jwtech-pc-page/src/views/summarizedInformation/summarizedDetail.vue b/jwtech-pc-page/src/views/summarizedInformation/summarizedDetail.vue
index 5abe5109..ce51885b 100644
--- a/jwtech-pc-page/src/views/summarizedInformation/summarizedDetail.vue
+++ b/jwtech-pc-page/src/views/summarizedInformation/summarizedDetail.vue
@@ -2,7 +2,14 @@
   <div class="pdf-wrap">
     <div class="pdf-header">
       <div class="header-wrap">
-        <el-breadcrumb separator-class="el-icon-arrow-right">
+        <el-breadcrumb separator-class="el-icon-arrow-right" v-if="fromDoc">
+          <el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item>
+          <el-breadcrumb-item :to="{ path: '/policyDoc' }"
+            >政策文件</el-breadcrumb-item
+          >
+          <el-breadcrumb-item>政策文件详情</el-breadcrumb-item>
+        </el-breadcrumb>
+        <el-breadcrumb separator-class="el-icon-arrow-right" v-else>
           <el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item>
           <el-breadcrumb-item :to="{ path: '/summarizedInformation' }"
             >公示公告</el-breadcrumb-item
@@ -41,7 +48,7 @@
   </div>
 </template>
 <script>
-import { zhxxList } from "@/api/enterpriseInformation";
+import { zhxxList,getZhxxById } from "@/api/enterpriseInformation";
 import { getFileStream } from "@/api/common";
 export default {
   data() {
@@ -54,20 +61,20 @@ export default {
         pageSize: 10
       },
       title: "",
-      info: {}
+      info: {},
+      fromDoc: false
     };
   },
   mounted() {
     this.title = this.$route.query.title;
+    this.fromDoc = this.$route.query.fromDoc == '1'
     this.getDetail();
   },
   methods: {
     getDetail() {
       this.queryForm.data.id = this.$route.query.id;
-      zhxxList(this.queryForm).then(res => {
-        if (res.data.records[0]) {
-          this.info = res.data.records[0];
-        }
+      getZhxxById(this.$route.query.id).then(res => {
+          this.info = res.data.data;
       });
     },
     // 查看信息中, 下载
diff --git a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java
index 6c17ac2f..d7f7482a 100644
--- a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java
+++ b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java
@@ -101,7 +101,6 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
         map.put("100+",0);
         LambdaQueryWrapper<BsSgcYxjdEnterpriseInfo>infoLw=new LambdaQueryWrapper<>();
         infoLw.isNotNull(BsSgcYxjdEnterpriseInfo::getScore);
-        infoLw.last("LIMIT 20");
         List<BsSgcYxjdEnterpriseInfo> infos = bsSgcYxjdEnterpriseInfoMapper.selectList(infoLw);
         for (BsSgcYxjdEnterpriseInfo enterpriseInfo:infos){
             Integer score = Integer.parseInt(enterpriseInfo.getScore());
@@ -128,7 +127,6 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
         Map<String,Long>map=new HashMap<>();
         LambdaQueryWrapper<BsSgcYxjdEnterpriseInfo>infoLw=new LambdaQueryWrapper<>();
         infoLw.isNotNull(BsSgcYxjdEnterpriseInfo::getEnterpriseType);
-        infoLw.last("LIMIT 20");
         List<BsSgcYxjdEnterpriseInfo> infos = bsSgcYxjdEnterpriseInfoMapper.selectList(infoLw);
         if (CollectionUtil.isNotEmpty(infos)) {
             map = infos.stream()
@@ -253,7 +251,6 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
             }
         }
 
-        List<HashMap<String, String>> mapList = new ArrayList<>();
         for (BsSgcYxjdEnterpriseInfo bsSgcYxjdEnterpriseInfo : list) {
             if (map.containsKey(bsSgcYxjdEnterpriseInfo.getAdcd()))
             {map.put(bsSgcYxjdEnterpriseInfo.getAdcd(), String.valueOf(Integer.parseInt(map.get(bsSgcYxjdEnterpriseInfo.getAdcd()))
diff --git a/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java b/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java
index f956759e..cb8814a1 100644
--- a/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java
+++ b/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java
@@ -136,7 +136,9 @@ public class BsSgcJsjdBuiNmgStatisticsService {
                             .mapToDouble(Double::parseDouble)
                             .sum();
                     if (conPay>0) {
-                        nmgListTotal.setConPay(nmgListTotal.getConPay()+conPay);
+                        String conFormater = String.format("%.2f", conPay);
+
+                        nmgListTotal.setConPay(nmgListTotal.getConPay()+Double.parseDouble(conFormater));
                     }
                 }
                 LambdaQueryWrapper<BsSgcJsjdBuiRealName> rnLw = new LambdaQueryWrapper<>();
@@ -166,7 +168,9 @@ public class BsSgcJsjdBuiNmgStatisticsService {
                             .filter(s -> s != null && !s.isEmpty())
                             .mapToDouble(Double::parseDouble)
                             .sum();
-                    nmgListTotal.setUnPayTotal(nmgListTotal.getUnPayTotal()+unPay);
+                    String unPayFormater = String.format("%.2f", unPay);
+
+                    nmgListTotal.setUnPayTotal(nmgListTotal.getUnPayTotal()+Double.parseDouble(unPayFormater));
                 }
 
             }
@@ -220,7 +224,8 @@ public class BsSgcJsjdBuiNmgStatisticsService {
                         .filter(s -> s != null && !s.isEmpty())
                         .mapToDouble(Double::parseDouble)
                         .sum();
-                proInfo.setConPay(String.valueOf(conPay));
+                String conFormater = String.format("%.2f", conPay);
+                proInfo.setConPay(conFormater);
             }
 
             List<BsSgcJsjdBuiComAcc> list1 = bsSgcJsjdBuiComAccService.list(Wrappers.lambdaQuery(BsSgcJsjdBuiComAcc.class)
@@ -269,7 +274,8 @@ public class BsSgcJsjdBuiNmgStatisticsService {
                         .sum();
 
                 if (salaryCurrent>0){
-                    proInfo.setPayTotal(String.valueOf(salaryCurrent));
+                    String salaryCurrentFormat = String.format("%.2f", salaryCurrent);
+                    proInfo.setPayTotal(salaryCurrentFormat);
                 }else {
                     proInfo.setPayTotal("--");
                 }
@@ -280,7 +286,8 @@ public class BsSgcJsjdBuiNmgStatisticsService {
                         .mapToDouble(Double::parseDouble)
                         .sum();
                 if (unSalary>0){
-                    proInfo.setUnPayTotal(String.valueOf(unSalary));
+                    String unSalaryFormater = String.format("%.2f", unSalary);
+                    proInfo.setUnPayTotal(unSalaryFormater);
                     proInfo.setIsUnPay("是");
                 }else {
                     proInfo.setUnPayTotal("0");
diff --git a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml
index a7b69171..46631e19 100644
--- a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml
+++ b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml
@@ -46,7 +46,7 @@
 
     <select id="getArea" resultMap="BsSgcYxjdEnterpriseInfo">
         SELECT SUBSTRING(adcd, 1, 4) adcd, COUNT(adcd) num
-        from bs_sgc_yxjd_enterprise_info
+        from bs_sgc_yxjd_enterprise_info where adcd is not null
         GROUP BY SUBSTRING(adcd, 1, 4)
     </select>