From d8cfe8bbe56afc52d2d27eed2bde8a653656d4ac Mon Sep 17 00:00:00 2001 From: lisl <1223762861@qq.com> Date: Fri, 10 Dec 2021 15:31:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E4=BC=B0=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=EF=BC=8C=E5=90=88=E8=AE=A1=E5=AE=89=E7=BD=AE=E9=9D=A2?= =?UTF-8?q?=E7=A7=AF=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=9B=BE=E6=A0=87=EF=BC=8C?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FrontCode2/sunshine_levy/index.html | 4 +- .../sunshine_levy/src/assets/img/area.png | Bin 0 -> 23607 bytes .../sunshine_levy/src/assets/img/assess_1.png | Bin 515 -> 15712 bytes .../sunshine_levy/src/assets/img/assess_2.png | Bin 390 -> 11064 bytes .../sunshine_levy/src/assets/img/company.png | Bin 0 -> 21640 bytes FrontCode2/sunshine_levy/src/main.js | 5 +- FrontCode2/sunshine_levy/src/store/index.js | 59 ------ FrontCode2/sunshine_levy/src/views/index.vue | 181 +++++------------- .../src/views/report/agreement.vue | 46 ++--- .../src/views/report/evaluatePage.vue | 16 +- .../src/views/report/evalute.vue | 52 +---- FrontCode2/sunshine_levy/src/views/test.vue | 26 ++- 12 files changed, 103 insertions(+), 286 deletions(-) create mode 100644 FrontCode2/sunshine_levy/src/assets/img/area.png create mode 100644 FrontCode2/sunshine_levy/src/assets/img/company.png delete mode 100644 FrontCode2/sunshine_levy/src/store/index.js diff --git a/FrontCode2/sunshine_levy/index.html b/FrontCode2/sunshine_levy/index.html index af029df..040be5e 100644 --- a/FrontCode2/sunshine_levy/index.html +++ b/FrontCode2/sunshine_levy/index.html @@ -7,7 +7,7 @@ content="width=device-width,user-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0" /> 宁波房屋征收 - --> @@ -886,7 +806,6 @@ export default { width: 24px; height: 24px; margin-right: 10px; - background: #2468f2; } span { font-family: PingFangSC-Regular, PingFang SC; @@ -935,6 +854,9 @@ export default { > :nth-child(2) { margin: 15px 0; } + > :nth-child(3) { + margin: 15px 0; + } } .assess2 { display: flex; @@ -946,7 +868,6 @@ export default { width: 24px; height: 24px; margin-right: 10px; - background: #2468f2; } span { font-size: 16px; diff --git a/FrontCode2/sunshine_levy/src/views/report/agreement.vue b/FrontCode2/sunshine_levy/src/views/report/agreement.vue index b20fa34..2fcdb4c 100644 --- a/FrontCode2/sunshine_levy/src/views/report/agreement.vue +++ b/FrontCode2/sunshine_levy/src/views/report/agreement.vue @@ -37,16 +37,18 @@ {{ item.summationShouldCompensateMoney }} +
+ + 合计安置面积 + {{ item.TotalAllocationArea }} +
-
- - 签订日期:{{ item.signTime }} -
- - 查看协议附件 + 查看协议附件
@@ -180,38 +182,12 @@ export default { height: 2px; } } - .flex { - display: flex; - align-items: center; - justify-content: center; - overflow: hidden; - height: 20px; - img { - margin-right: 10px; - height: 100%; - } - } - .backgroundColor { - background-color: #e3ebfd; - overflow: hidden; - span { - color: #688bf3; - padding-right: 10px; - white-space: nowrap; - } - } .smallBox { - display: flex; - flex-direction: column; height: auto; - - > :nth-child(2) { - text-align: center; - margin-top: 10px; - padding: 2px 5px; - color: #3c70dd; - border: 1px solid #2d6df2; + .el-button { + font-size: 16px; + margin: 0 auto; } } } diff --git a/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue b/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue index eae533c..1db1046 100644 --- a/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue +++ b/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue @@ -12,14 +12,14 @@ 被征收房屋座落: - ({{ info.houseAddress }}) + {{ info.houseAddress }}
评估方式:
- ({{ info.valuationMethodText }}) + {{ info.valuationMethodText }}
@@ -48,16 +48,20 @@ {{ info.decorateAssessedValue }}元
+ 评估公司: + {{ info.EvaluationCompany }} +
+
备注: -
({{ info.remark }})
+
{{ info.remark }}
diff --git a/FrontCode2/sunshine_levy/src/views/report/evalute.vue b/FrontCode2/sunshine_levy/src/views/report/evalute.vue index fee967e..94732f2 100644 --- a/FrontCode2/sunshine_levy/src/views/report/evalute.vue +++ b/FrontCode2/sunshine_levy/src/views/report/evalute.vue @@ -40,18 +40,10 @@ {{ item.countValue }}
-
- -
-
-
- - 评估人员:{{ item.createUserName }} -
-
- - 评估时间:{{ item.createTime }} -
+
+ + 评估公司 + {{ item.EvaluationCompany }}
@@ -92,18 +84,10 @@ {{ item.countValue }}
-
- -
-
-
- - 评估人员:{{ item.createUserName }} -
-
- - 评估时间:{{ item.createTime }} -
+
+ + 评估公司 + {{ item.EvaluationCompany }}
@@ -277,26 +261,6 @@ export default { height: 2px; } } - .content { - display: flex; - justify-content: space-between; - > div { - display: flex; - align-items: center; - } - .backgroundColor { - background-color: #e3ebfd; - img { - margin-right: 4px; - width: 20px; - } - span { - padding-right: 10px; - font-size: 12px; - color: #3876f3; - } - } - } } } } diff --git a/FrontCode2/sunshine_levy/src/views/test.vue b/FrontCode2/sunshine_levy/src/views/test.vue index 9dd0150..58e4a92 100644 --- a/FrontCode2/sunshine_levy/src/views/test.vue +++ b/FrontCode2/sunshine_levy/src/views/test.vue @@ -98,7 +98,7 @@
- 分户评估结果 + 分户评估报告
@@ -125,6 +125,10 @@ >¥{{ assess.countValue }}
+
+ 评估公司: + {{ assess.EvaluationCompany }} +
@@ -135,7 +139,7 @@
@@ -161,6 +165,10 @@ >¥{{ protocol.summationShouldCompensateMoney }}
+
+ 合计安置面积: + {{ protocol.TotalAllocationArea }} +
@@ -417,7 +425,8 @@ export default { } }; // debugger; - this.data = a.data.data; + // this.data = a.data.data; + this.onInit(); $(".logout").css("display", "none"); if (sessionStorage.getItem("mode") == "older") { changeStyle(); @@ -448,6 +457,7 @@ export default { }, appKey: "es4b8zmz+2001833218+dehllx", onSuccess: data => { + console.log("mm", data); this.loading = false; window.sessionStorage.setItem("homeData", JSON.stringify(data)); if (data.data.success) { @@ -538,9 +548,9 @@ export default { $(".logout").css("display", "block"); $("#app").removeClass("old_app3"); this.$router.push({ - name: "showPdf", + name: "reportAgreement", params: { - id + prjId: id } }); }, @@ -645,6 +655,7 @@ export default { setDisplay() { $(".absolute").click(e => { + console.log(e); if ( $(e.target.parentNode.parentNode) .find(".projectCenter") @@ -974,7 +985,6 @@ export default { width: 24px; height: 24px; margin-right: 10px; - background: #2468f2; } span { font-family: PingFangSC-Regular, PingFang SC; @@ -1023,6 +1033,9 @@ export default { > :nth-child(2) { margin: 15px 0; } + > :nth-child(3) { + margin: 15px 0; + } } .assess2 { display: flex; @@ -1034,7 +1047,6 @@ export default { width: 24px; height: 24px; margin-right: 10px; - background: #2468f2; } span { font-size: 16px;