diff --git a/FrontCode2/sunshine_levy/src/App.vue b/FrontCode2/sunshine_levy/src/App.vue index fe7f82f..767f6ca 100644 --- a/FrontCode2/sunshine_levy/src/App.vue +++ b/FrontCode2/sunshine_levy/src/App.vue @@ -11,7 +11,7 @@ export default { diff --git a/FrontCode2/sunshine_levy/src/elementui/index.js b/FrontCode2/sunshine_levy/src/elementui/index.js index 55e0134..6494891 100644 --- a/FrontCode2/sunshine_levy/src/elementui/index.js +++ b/FrontCode2/sunshine_levy/src/elementui/index.js @@ -1,9 +1,11 @@ import Vue from "vue"; -import { Form, FormItem, Button, Card, Loading } from "element-ui"; +import { Form, FormItem, Button, Card, Loading, Message } from "element-ui"; Vue.use(Form); Vue.use(FormItem); Vue.use(Button); Vue.use(Card); -Vue.use(Loading); \ No newline at end of file +Vue.use(Loading); + +Vue.component(Message); \ No newline at end of file diff --git a/FrontCode2/sunshine_levy/src/views/index.vue b/FrontCode2/sunshine_levy/src/views/index.vue index 0d700ef..ed19934 100644 --- a/FrontCode2/sunshine_levy/src/views/index.vue +++ b/FrontCode2/sunshine_levy/src/views/index.vue @@ -11,261 +11,173 @@
- 被征收人姓名: - {{ data.userName }} + 被征收人姓名:{{ data.userName }}
- 身份证号码: - {{ setIdCard(data.idCard) }} + 身份证号码:{{ setIdCard(data.idCard) }}
-
-
+
+
- 扫一扫 + 扫一扫
-
+
- 查评估结果 + 查评估结果
-
+
- 查补偿协议 + 查补偿协议
-
- +
+
- -
-
- -
-
- -
- {{ item.name }} -
- -
- +
+ +
+
+ - {{ item.currentState }} +
+ {{ item.name }} +
+ +
+ + {{ item.currentState }} +
+
+
+ +
+
+ + 项目所在区域:{{ item.area }} +
+
+ + 征收部门:{{ item.zsbm }} +
+
+ + 所属年份:{{ item.year }} +
+
+ + 征收决定号: + + {{ item.zsjdh }} +
-
- -
-
-
- - 项目所在区域: - {{ item.area }} -
-
-
-
- - 征收部门: - {{ item.zsbm }} -
-
-
-
- - 所属年份: - {{ item.year }} -
-
-
-
- - 征收决定号: - - {{ item.zsjdh }} - -
-
+ +
+ + 分户评估结果 +
+
+
+ 评估报告编号: + {{ assess.assessmentNo }}
-
- -
-
- - 分户评估结果 -
-
- - -
-
- 评估报告编号: - {{ - assess.assessmentNo - }} -
-
- 被征收房屋地址: - - {{ assess.houseAddress }} - -
-
- 评估总金额: - ¥{{ assess.countValue }} -
-
-
- -
-
- - 补偿结果 -
-
- - -
-
- 协议编号: - {{ protocol.xyNo }} -
-
- 被征收房屋地址: - - {{ protocol.houseAddress }} - -
-
- 补偿方式: - - {{ protocol.switchProductionWay }} - -
-
- 合计补偿资金: - ¥{{ protocol.summationShouldCompensateMoney }} -
-
-
+
+ 被征收房屋地址: + + {{ assess.houseAddress }} + +
+
+ 评估总金额: + ¥{{ assess.countValue }} +
+
+ +
+ + 补偿结果 +
+
+
+ 协议编号: + {{ protocol.xyNo }} +
+
+ 被征收房屋地址: + + {{ protocol.houseAddress }} + +
+
+ 补偿方式: + + {{ protocol.switchProductionWay }} + +
+
+ 合计补偿资金: + ¥{{ protocol.summationShouldCompensateMoney }}
- +
-
- +
+
-
- 征收政策 -
- 共{{ data.policiesRegulationsLists.totalCount }}条 -
+
+ 征收政策 + 共{{ data.policiesRegulationsLists.totalCount }}条
-
-
- - -
- -
-
{{ item.title }}
-
-
- 发布时间: - {{ item.publicTime }} -
-
- 区域: - {{ item.area }} -
-
-
- -
-
{{ item.title }}
-
-
- 发布时间: - {{ item.publicTime }} -
-
- 区域: - {{ item.area }} -
-
-
+
+
+ +
+
{{ item.title }}
+
+ 发布时间:{{ item.publicTime }} + 区域:{{ item.area }}
- +
+ +
+
{{ item.title }}
+
+ 发布时间:{{ item.publicTime }} + 区域:{{ item.area }} +
+
@@ -411,9 +323,12 @@ export default { }); }, // 直接跳转协议结果pdf - toAgreement() { + toAgreement(id) { this.$router.push({ - name: "showPdf" + name: "showPdf", + params: { + id + } }); }, // 加载项目数统计信息 @@ -494,8 +409,14 @@ export default { .page { border-radius: 6px; background: #f2fbfd; + padding-bottom: 20px; + > div:nth-child(n + 2) { + margin-top: 10px; + margin-right: 12px; + margin-left: 10px; + } } - +// 最上面盒子 .topBox { overflow: hidden; width: 100%; @@ -514,239 +435,187 @@ export default { font-family: PingFangSC-Semibold, PingFang SC; font-size: 16px; font-weight: 600; - color: #fff; + color: #ffffff; + } + .baseInfo { + display: flex; + .van-image { + width: 22px; + height: 21px; + padding-right: 10px; + padding-left: 31px; + } + span { + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + line-height: 20px; + height: 20px; + color: #fff; + } + } + .gridBg { + display: flex; + overflow: hidden; + align-items: center; + justify-content: space-around; + margin: 10px 12px 0 10px; + height: 120px; + border-radius: 3px; + background: rgba(255, 255, 255, 0.28); + > div { + display: flex; + align-items: center; + flex-direction: column; + justify-content: center; + width: 90px; + height: 80px; + margin: 12px 6px; + padding-top: 5px; + border-radius: 10px; + .van-image { + width: 38px; + height: 35px; + } + span { + padding-top: 5px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + line-height: 20px; + height: 20px; + color: #fff; + } + } } } - -.baseInfo { - display: flex; - .van-image { - width: 22px; - height: 21px; - padding-right: 10px; - padding-left: 31px; - } - span { - font-family: PingFangSC-Medium, PingFang SC; - font-weight: 500; - line-height: 20px; - height: 20px; - color: #fff; - } -} - -.baseFont { - font-family: PingFangSC-Medium, PingFang SC; - font-weight: 500; - line-height: 20px; - height: 20px; - color: #fff; -} - -.centerMagin { - margin-top: 10px; - margin-right: 12px; - margin-left: 10px; -} - -.gridBg { - display: flex; - overflow: hidden; - align-items: center; - justify-content: space-around; - height: 120px; - border-radius: 3px; - background: rgba(255, 255, 255, 0.28); -} - -.gridImg { - display: flex; - align-items: center; - flex-direction: column; - justify-content: center; - width: 90px; - height: 80px; - margin: 12px 6px; - padding-top: 5px; - border-radius: 10px; - .van-image { - width: 38px; - height: 35px; - } - span { - padding-top: 5px; - } -} - -.bigImg { - width: 100%; -} - +// 项目部分 .project { display: flex; align-items: center; justify-content: space-between; height: 41px; - margin-top: 10px; - margin-right: 12px; - margin-left: 10px; - padding-right: 0; - padding-left: 0; - background: url(../assets/img/project_bg.png); - background-size: 100% 41px; -} - -.project > div:nth-child(1) { - display: flex; - align-items: center; - width: 50%; - height: 100%; - span { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + padding: unset 0; + background: url(../assets/img/project_bg.png) no-repeat; + background-position: 0 -2px; + background-size: 100% 120%; + > div:nth-child(1) { + display: flex; + align-items: center; + width: 50%; + height: 100%; + .projectIcon { + display: flex; + align-items: center; + justify-content: center; + padding: 0 8px; + height: 100%; + margin-right: 10px; + border-radius: 5px 0 0; + background: #3284cd; + } + .projectTitle { + font-family: PingFangSC-Semibold, PingFang SC; + font-size: 16px; + font-weight: 600; + color: #fff; + } + span { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + } + .projectRight { + display: flex; + align-items: center; + height: 27px; + opacity: 0.82; + border-radius: 13px 0 0 17px; + background: #24bca3; + .van-image { + width: 17px; + height: 17px; + margin-right: 3px; + margin-left: 8px; + } + span { + font-family: PingFangSC-Semibold, PingFang SC; + font-size: 12px; + font-weight: 600; + padding-right: 5px; + color: #fff; + } } } - -.projectIcon { - display: flex; - align-items: center; - justify-content: center; - padding: 0 8px; - height: 100%; - margin-right: 10px; - border-radius: 5px 0 0; - background: #3284cd; -} - -/* 项目名字 */ - -.projectTitle { - font-family: PingFangSC-Semibold, PingFang SC; - font-size: 16px; - font-weight: 600; - color: #fff; -} - -.projectRight { - display: flex; - align-items: center; - height: 27px; - opacity: 0.82; - border-radius: 13px 0 0 17px; - background: #24bca3; -} - -/* 项目名字旁边小字 */ - -.projectRightFont { - font-family: PingFangSC-Semibold, PingFang SC; - font-size: 12px; - line-height: 14px; - padding-right: 5px; - color: #fff; -} - -.projectRightIcon { - width: 17px; - height: 17px; - margin-right: 3px; - margin-left: 8px; -} - .projectCenter { - /* height: 440px; */ padding-bottom: 35px; background: #fff; box-shadow: 0 2px 6px 1px rgba(212, 212, 212, 0.5); -} - -.projectCenterBox { - padding: 8px 0; -} - -.projectCenterInfo { - display: flex; - align-items: center; - padding-top: 5px; - width: 100%; -} - -/* 项目内容小图标 */ - -.projectCenterImg { - width: 15px; - height: 15px; - padding: 0 10px; -} - -/* 项目内容文字 */ - -.projectCenterFont { - font-family: PingFangSC-Regular, PingFang SC; - font-size: 14px; - font-weight: 400; - line-height: 20px; - /* height: 12px; */ - color: #2c2b2b; -} - -.assess { - display: flex; - align-items: center; - justify-content: space-between; - width: 100%; - height: 25px; - padding-right: 0; - padding-left: 0; -} - -.assessIcon { - width: 24px; - height: 24px; - margin-right: 10px; - vertical-align: middle; - background: #2468f2; -} - -/* 分户,协议标题 */ - -.assessTitle { - font-family: PingFangSC-Regular, PingFang SC; - font-size: 16px; - font-weight: 400; - line-height: 20px; - height: 20px; - color: #2468f2; -} - -.assessRightIcon { - width: 24px; - height: 24px; - background: #2468f2; -} - -.assessBox { - display: flex; - align-items: center; - justify-content: space-between; - padding-top: 10px; - padding-bottom: 10px; - padding-left: 12px; -} - -.assessBox > span:nth-child(1) { - white-space: nowrap; -} - -.assessCenter1 { - margin: 15px 10px; - border-left: 2px solid #24bca3; -} - -.assessCenter2 { - margin: 15px 10px; - border-left: 2px solid #ff5959; + .projectCenterBox { + > div { + display: flex; + align-items: center; + padding-top: 15px; + width: 100%; + overflow: hidden; + .van-image { + width: 15px; + height: 15px; + padding: 0 10px; + } + span { + font-family: PingFangSC-Regular, PingFang SC; + font-size: 14px; + font-weight: 400; + color: #2c2b2b; + } + } + } + .assess { + display: flex; + align-items: center; + height: 25px; + padding: 20px 10px; + .van-image { + width: 24px; + height: 24px; + margin-right: 10px; + background: #2468f2; + } + span { + font-family: PingFangSC-Regular, PingFang SC; + font-size: 16px; + font-weight: 400; + color: #2468f2; + } + } + .assessCenter1 { + margin: 0px 22px; + border-left: 2px solid #24bca3; + font-weight: 400; + > div { + display: flex; + align-items: center; + justify-content: space-between; + padding: 5px 0 5px 12px; + > span:nth-child(1) { + white-space: nowrap; + } + } + } + .assessCenter2 { + margin: 0px 22px; + border-left: 2px solid #ff5959; + font-weight: 400; + > div { + display: flex; + align-items: center; + justify-content: space-between; + padding: 5px 0 5px 12px; + > span:nth-child(1) { + white-space: nowrap; + } + } + } } .protocolTitle { @@ -754,39 +623,54 @@ export default { white-space: nowrap; text-overflow: ellipsis; } - -/* 政策的发布时间和区域 */ - -.font11 { - font-family: PingFangSC-Regular, PingFang SC; - font-size: 12px; - font-weight: 400; - line-height: 11px; - height: 11px; - color: #9da2a3; +// 征收政策部分 +.zszc { + span { + font-size: 16px; + font-weight: 800; + color: #202020; + display: block; + } + > span:nth-child(2) { + margin: 10px 0; + color: #2c2b2b; + font-size: 12px; + } } .protocolBox { border-radius: 4px; background: #fff; box-shadow: 0 2px 5px 0 rgba(168, 168, 168, 0.5); -} - -/* .font14 { - font-family: PingFangSC-Regular, PingFang SC; - font-size: 14px; - font-weight: 400; - line-height: 20px; - height: 20px; - color: #202020; -} */ - -.protocolList { - padding: 20px 21px 0 20px; -} - -.protocolLine { - padding-bottom: 10px; - border-bottom: 1px dashed rgba(168, 168, 168, 0.5); + .protocolList { + padding: 0 20px; + > div { + > div:nth-child(1) { + font-size: 14px; + font-weight: 400; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + width: 294px; + font-family: PingFangSC-Regular, PingFang SC; + color: #202020; + padding-top: 20px; + } + > div:nth-child(2) { + padding: unset 5px; + display: flex; + justify-content: space-between; + align-items: center; + padding: 20px 0; + span { + font-size: 12px; + color: #9da2a3; + font-weight: 400; + line-height: 11px; + height: 11px; + } + } + } + } } diff --git a/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue b/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue index cdd4d24..97fe612 100644 --- a/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue +++ b/FrontCode2/sunshine_levy/src/views/policyInfo/policyInfo.vue @@ -61,12 +61,12 @@ export default { .title { text-align: center; font-weight: bolder; - font-size: 14px; + font-size: 16px; } .date { text-align: center; margin: 10px 0; - font-size: 14px; + font-size: 16px; } .bottomContent { margin-top: 10px; diff --git a/FrontCode2/sunshine_levy/src/views/report/agreement.vue b/FrontCode2/sunshine_levy/src/views/report/agreement.vue index 4a02067..a75383c 100644 --- a/FrontCode2/sunshine_levy/src/views/report/agreement.vue +++ b/FrontCode2/sunshine_levy/src/views/report/agreement.vue @@ -97,7 +97,7 @@ export default { mounted() {}, methods: { onInit() { - if (!window.sessionStorage.getItem("projectId")) { + if (this.$route.params.prjId) { SetProjectId(this.$route.params.prjId); } let data = JSON.parse(window.sessionStorage.getItem("homeData")); diff --git a/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue b/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue index 955ced5..63734e2 100644 --- a/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue +++ b/FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue @@ -134,9 +134,11 @@ export default { this.info = res; } else { this.loading = false; - this.$notify({ + this.$message({ message: "请求出错", - duration: 3000 + duration: 3000, + type: "error", + center: true }); } },