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"
/>
-
-
被征收人信息查询
@@ -97,7 +93,7 @@
@@ -123,6 +119,10 @@
>¥{{ assess.countValue }}
+
+ 评估公司:
+ {{ assess.EvaluationCompany }}
+
@@ -133,7 +133,7 @@
@@ -159,6 +159,10 @@
>¥{{ protocol.summationShouldCompensateMoney }}
+
+ 合计安置面积:
+ {{ protocol.TotalAllocationArea }}
+
@@ -219,9 +223,9 @@ export default {
userName: "加载中...",
policiesRegulationsLists: {
totalCount: 0,
- list: [],
- },
- },
+ list: []
+ }
+ }
};
},
created() {
@@ -249,13 +253,13 @@ export default {
//debugger;
if (from.name == "final" && to.name == "index") {
ZWJSBridge.close()
- .then((result) => {
+ .then(result => {
console.log(
"1201-index页面的close回调3--form-to:" + from.name + "->" + to.name
);
console.log(result);
})
- .catch((error) => {
+ .catch(error => {
console.log(
"1201-index页面的close回调异常4--form-to:" +
from.name +
@@ -283,11 +287,12 @@ export default {
type: "POST",
data: {
ticket:
- this.$route.query.ticket || window.sessionStorage.getItem("ticket"),
+ this.$route.query.ticket || window.sessionStorage.getItem("ticket")
},
appKey: "es4b8zmz+2001833218+dehllx",
- onSuccess: (data) => {
+ onSuccess: data => {
this.loading = false;
+
window.sessionStorage.setItem("homeData", JSON.stringify(data));
if (data.data.success) {
this.data = data.data.data;
@@ -301,7 +306,7 @@ export default {
message: "登录超时,请重新登录",
duration: 3000,
type: "info",
- center: true,
+ center: true
});
setTimeout(() => {
window.location.replace(
@@ -313,20 +318,20 @@ export default {
message: "请求出错",
duration: 3000,
type: "error",
- center: true,
+ center: true
});
}
}
},
- onFail: (err) => {
+ onFail: err => {
this.loading = false;
this.$notify({
title: "错误",
message: "请求失败",
duration: 3000,
- type: "error",
+ type: "error"
});
- },
+ }
});
},
toOlderMode() {
@@ -356,8 +361,8 @@ export default {
this.$router.push({
name: "projectSelect",
params: {
- type: type,
- },
+ type: type
+ }
});
},
// 直接跳转分户评估结果页面
@@ -368,8 +373,8 @@ export default {
name: "evaluatePage",
params: {
fhpgId: id,
- type,
- },
+ type
+ }
});
},
// 直接跳转协议结果pdf
@@ -377,10 +382,10 @@ export default {
$(".logout").css("display", "block");
$("#app").removeClass("old_app3");
this.$router.push({
- name: "showPdf",
+ name: "reportAgreement",
params: {
- id,
- },
+ prjId: id
+ }
});
},
// 加载项目数统计信息
@@ -395,38 +400,38 @@ export default {
$("#app").removeClass("old_app3");
this.$router.push({
name: "policyInfo",
- params: { id },
+ params: { id }
});
},
setZwUserAplus(Userid, userName) {
// 设置用户信息埋点
aplus_queue.push({
action: "aplus.setMetaInfo",
- arguments: ["_hold", "BLOCK"],
+ arguments: ["_hold", "BLOCK"]
});
aplus_queue.push({
action: "aplus.setMetaInfo",
- arguments: ["_user_nick", userName], // this.userInfoData.username],
+ arguments: ["_user_nick", userName] // this.userInfoData.username],
});
aplus_queue.push({
action: "aplus.setMetaInfo",
- arguments: ["_user_id", Userid],
+ arguments: ["_user_id", Userid]
});
aplus_queue.push({
action: "aplus.setMetaInfo",
- arguments: ["_hold", "START"],
+ arguments: ["_hold", "START"]
});
},
setLocationAplus() {
ZWJSBridge.onReady(() => {
// console.log("初始化完成后,执行bridge方法");
ZWJSBridge.getUserType()
- .then((result1) => {
+ .then(result1 => {
// console.log("getUserType():" + JSON.stringify(result1));
// console.log("result1.userType:" + result1.userType);
//经纬度
ZWJSBridge.getLocation()
- .then((result2) => {
+ .then(result2 => {
// console.log("getLocation():" + JSON.stringify(result2));
// console.log("result2.longitude:" + result2.longitude);
// console.log("result2.latitude:" + result2.latitude);
@@ -434,7 +439,7 @@ export default {
action: "aplus.sendPV",
arguments: [
{
- is_auto: false,
+ is_auto: false
},
{
isMini: true,
@@ -442,16 +447,16 @@ export default {
miniAppName: "房屋征收",
long: result2.longitude,
lati: result2.latitude,
- userType: result1.userType,
- },
- ],
+ userType: result1.userType
+ }
+ ]
});
})
- .catch((error) => {
+ .catch(error => {
// console.log(error);
});
})
- .catch((error) => {
+ .catch(error => {
// console.log(error);
});
});
@@ -460,7 +465,7 @@ export default {
//this.$router.push("http://localhost:8080/#/");
//扫一扫
ZWJSBridge.scan({ type: "qrCode" })
- .then((data) => {
+ .then(data => {
// data =>{"text" : "扫描到的内容"}
if (data.text.indexOf("http") > -1) {
window.location.replace(data.text);
@@ -469,11 +474,11 @@ export default {
message: data.text,
duration: 3000,
type: "info",
- center: true,
+ center: true
});
}
})
- .catch((error) => {
+ .catch(error => {
console.log(error);
});
},
@@ -568,93 +573,8 @@ export default {
.find("i")
.css("transform", "rotate(-45deg)");
}
- },
- /**
- * @项目折叠与隐藏
- */
-
- setDisplay() {
- $(".absolute").click((e) => {
- if (
- $(e.target.parentNode.parentNode)
- .find(".projectCenter")
- .css("display") == "none"
- ) {
- $(e.target.parentNode.parentNode)
- .find(".projectCenter")
- .css("display", "block");
-
- $(e.target.parentNode).find("i").css("transform", "rotate(45deg)");
- } else {
- $(e.target.parentNode.parentNode)
- .find(".projectCenter")
- .css("display", "none");
-
- $(e.target.parentNode).find("i").css("transform", "rotate(-45deg)");
- }
- });
-
- $(".absolute0").click((e) => {
- if (
- $(e.target.parentNode.parentNode.parentNode)
- .find(".projectCenter")
- .css("display") == "none"
- ) {
- $(e.target.parentNode.parentNode.parentNode)
- .find(".projectCenter")
- .css("display", "block");
-
- $(e.target.parentNode).find("i").css("transform", "rotate(45deg)");
- } else {
- $(e.target.parentNode.parentNode.parentNode)
- .find(".projectCenter")
- .css("display", "none");
-
- $(e.target.parentNode).find("i").css("transform", "rotate(-45deg)");
- }
- });
-
- $(".absolute1").click((e) => {
- if (
- $(e.target.parentNode.parentNode)
- .find(".assessCenter1")
- .css("display") == "none"
- ) {
- $(e.target.parentNode.parentNode)
- .find(".assessCenter1")
- .css("display", "block");
-
- $(e.target.parentNode).find("i").css("transform", "rotate(45deg)");
- } else {
- $(e.target.parentNode.parentNode)
- .find(".assessCenter1")
- .css("display", "none");
-
- $(e.target.parentNode).find("i").css("transform", "rotate(-45deg)");
- }
- });
-
- $(".absolute2").click((e) => {
- if (
- $(e.target.parentNode.parentNode)
- .find(".assessCenter2")
- .css("display") == "none"
- ) {
- $(e.target.parentNode.parentNode)
- .find(".assessCenter2")
- .css("display", "block");
-
- $(e.target.parentNode).find("i").css("transform", "rotate(45deg)");
- } else {
- $(e.target.parentNode.parentNode)
- .find(".assessCenter2")
- .css("display", "none");
-
- $(e.target.parentNode).find("i").css("transform", "rotate(-45deg)");
- }
- });
- },
- },
+ }
+ }
};
@@ -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;