Merge branch 'master' of http://118.178.224.202:3000/ewide/zsxt_nbzs_h5

FrontCode2/sunshine_levy/src/views/project/index.vue

@@ -35,6 +35,7 @@
           class="proListBox shadow"
           v-for="item in info.prjList"
         >
+          <!-- 跳转项目详情 -->
           <div @click="gotoDetail(item.prjId)">
             <div class="proAreaBox">
               <div class="proArea">{{ item.area }}</div>
@@ -120,7 +121,6 @@ export default {
           name: "evaluteResult",
           params: {
             prjId: id,
-            type: this.type,
             ticket: this.$route.params.ticket
           }
         });
@@ -128,7 +128,10 @@ export default {
         // 协议结果页面
         this.$router.push({
           name: "reportAgreement",
-          params: { projectid: id, type: this.type, ticket: this.ticket }
+          params: {
+            prjId: id,
+            ticket: this.$route.params.ticket
+          }
         });
       }
     }

FrontCode2/sunshine_levy/src/views/report/agreement.vue

@@ -12,8 +12,8 @@
       <el-card body-style="padding:10px 10px 0">
         <div>
           <img alt src="@/assets/img/bianhao.png" />
-          评估报告编号：
-          <b>{{ info.prjList[0].fhpgList[0].assessmentNo }}</b>
+          协议编号：
+          <b>{{ item.xyNo }}</b>
         </div>
         <div>
           <img alt src="@/assets/img/name.png" />
@@ -22,8 +22,8 @@
         </div>
         <div>
           <img alt src="@/assets/img/address.png" />
-          被征收人房屋地址：
-          <b>{{ item.houseAddress }}</b>
+          协议类型：
+          <b>{{ item.type }}</b>
         </div>
         <div>
           <img alt src="@/assets/img/money.png" />
@@ -79,7 +79,7 @@ export default {
   },
   methods: {
     onInit() {
-      this.type = this.$route.params.type;
+      console.log("id", this.$route.params.prjId);
       if (!window.sessionStorage.getItem("projectId")) {
         SetProjectId(this.$route.params.prjId);
       }

FrontCode2/sunshine_levy/src/views/report/evalute.vue

@@ -77,7 +77,6 @@ export default {
   methods: {
     // 获取数据
     onInit() {
-      this.type = this.$route.params.type;
       if (!window.sessionStorage.getItem("projectId")) {
         SetProjectId(this.$route.params.prjId);
       }
@@ -112,7 +111,6 @@ export default {
     // 跳转评估结果pdf
     pageJump() {
       this.$router.push({
-        // name: "evaluteResult"
         path: "/evaluteResult"
       });
     }