diff --git a/FrontCode2/sunshine_levy/src/common/util/tools.js b/FrontCode2/sunshine_levy/src/common/util/tools.js index d06bd84..c1ad860 100644 --- a/FrontCode2/sunshine_levy/src/common/util/tools.js +++ b/FrontCode2/sunshine_levy/src/common/util/tools.js @@ -1,3 +1,4 @@ +// 设置ticket export function SetTicket(data) { window.sessionStorage.setItem("ticket", data); } \ No newline at end of file diff --git a/FrontCode2/sunshine_levy/src/router/index.js b/FrontCode2/sunshine_levy/src/router/index.js index 400f3d8..1b41091 100644 --- a/FrontCode2/sunshine_levy/src/router/index.js +++ b/FrontCode2/sunshine_levy/src/router/index.js @@ -26,10 +26,10 @@ export default new Router({ }, // 评估结果页面 { - path: "/report/compensate", - name: "reportCompensate", + path: "/report/evalute", + name: "evaluteResult", component: () => - import ("../views/report/compensate") + import ("../views/report/evalute") }, // 协议结果页面 { diff --git a/FrontCode2/sunshine_levy/src/views/index.vue b/FrontCode2/sunshine_levy/src/views/index.vue index e7435b5..42cc1d1 100644 --- a/FrontCode2/sunshine_levy/src/views/index.vue +++ b/FrontCode2/sunshine_levy/src/views/index.vue @@ -23,6 +23,7 @@ {{ data.idCard }} +
{ @@ -337,7 +336,7 @@ export default { gotoProject(type) { this.$router.push({ name: "projectSelect", - params: { type: type, ticket: this.$route.query.ticket } + params: { type: type, ticket: this.ticket } }); }, // 加载项目数统计信息 @@ -348,11 +347,10 @@ export default { }, // 政策信息页面跳转 pageJump(id) { - // this.$router.push({ - // name: "policyInfo", - // params: { type: type, ticket: this.$route.query.ticket } - // }); - window.location.replace("http://localhost:8080/#/policyInfo?id=" + id); + this.$router.push({ + name: "policyInfo", + params: { ticket: this.ticket, id: id } + }); }, setZwUserAplus(Userid, userName) { // 设置用户信息埋点 diff --git a/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue b/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue index b01aa90..188e07c 100644 --- a/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue +++ b/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue @@ -26,8 +26,8 @@ export default { dataType: "JSON", type: "POST", data: { - ticket: window.sessionStorage.getItem("ticket"), - id: this.$route.query.id + ticket: this.$route.params.ticket, + id: this.$route.params.id }, appKey: "es4b8zmz+2001833218+dehllx", onSuccess: data => { diff --git a/FrontCode2/sunshine_levy/src/views/project/index.vue b/FrontCode2/sunshine_levy/src/views/project/index.vue index 104114c..7381751 100644 --- a/FrontCode2/sunshine_levy/src/views/project/index.vue +++ b/FrontCode2/sunshine_levy/src/views/project/index.vue @@ -1,17 +1,24 @@ - \ No newline at end of file + diff --git a/FrontCode2/sunshine_levy/src/views/report/agreement.vue b/FrontCode2/sunshine_levy/src/views/report/agreement.vue index f254886..141be81 100644 --- a/FrontCode2/sunshine_levy/src/views/report/agreement.vue +++ b/FrontCode2/sunshine_levy/src/views/report/agreement.vue @@ -3,33 +3,39 @@
-
为您查询到{{ this.result }}条结果
-
+
+ 为您查询到{{ this.info.prjList[0].bcxyList.length }}条结果 +
+
评估报告编号: - {{ item.number }} + {{ info.prjList[0].fhpgList[0].assessmentNo }}
被征收人姓名: - {{ item.name }} + {{ info.userName }}
被征收人房屋地址: - {{ item.address }} + {{ item.houseAddress }}
评估总金额: - {{ item.money }} + {{ info.prjList[0].fhpgList[0].countValue }}
合计补偿金额: - {{ item.money }} + {{ item.summationShouldCompensateMoney }}
@@ -37,7 +43,7 @@
- 签订日期:{{ item.time }} + 签订日期:{{ item.date }}
@@ -45,35 +51,48 @@