update:变更数据结构

This commit is contained in:
2021-09-10 16:11:49 +08:00
parent 5d68e6dd4d
commit 957677cf81
2 changed files with 273 additions and 223 deletions

View File

@@ -139,8 +139,6 @@
font-weight: 600; font-weight: 600;
line-height: 14px; line-height: 14px;
height: 17px;
color: #fff; color: #fff;
} }
.projectRightIcon { .projectRightIcon {
@@ -150,7 +148,7 @@
margin-left: 8px; margin-left: 8px;
} }
.projectCenter { .projectCenter {
height: 440px; /* height: 440px; */
padding-bottom: 35px; padding-bottom: 35px;
background: #fff; background: #fff;

View File

@@ -7,28 +7,19 @@
</div> </div>
<div> <div>
<div class="baseInfo"> <div class="baseInfo">
<van-image <van-image :src="require('@/assets/img/renyuanliebiao.png')" class="baseImg" />
:src="require('@/assets/img/renyuanliebiao.png')"
class="baseImg"
/>
<span class="baseFont">被征收人姓名</span> <span class="baseFont">被征收人姓名</span>
<span class="baseFont">{{ user.name }}</span> <span class="baseFont">{{ data.userName }}</span>
</div> </div>
<div class="baseInfo"> <div class="baseInfo">
<van-image <van-image :src="require('@/assets/img/credentials_icon.png')" class="baseImg" />
:src="require('@/assets/img/credentials_icon.png')"
class="baseImg"
/>
<span class="baseFont">身份证号码</span> <span class="baseFont">身份证号码</span>
<span class="baseFont">{{ user.identityId }}</span> <span class="baseFont">{{ data.idCard }}</span>
</div> </div>
</div> </div>
<div> <div>
<div class="gridBg centerMagin"> <div class="gridBg centerMagin">
<van-image <van-image :src="require('@/assets/img/scan.png')" class="gridImg" />
:src="require('@/assets/img/scan.png')"
class="gridImg"
/>
<van-image <van-image
:src="require('@/assets/img/evaluation .png')" :src="require('@/assets/img/evaluation .png')"
@click="gotoProject('pg')" @click="gotoProject('pg')"
@@ -43,26 +34,19 @@
</div> </div>
</div> </div>
<div class="centerMagin"> <div class="centerMagin">
<van-image <van-image :src="require('@/assets/img/government.png')" class="bigImg" />
:src="require('@/assets/img/government.png')"
class="bigImg"
/>
</div> </div>
<van-list>
<div :key="item.prjId" v-for="(item, i) in data.prjList">
<div class="centerMagin"> <div class="centerMagin">
<div class="project"> <div class="project">
<div> <div>
<van-image <van-image :src="require('@/assets/img/project.png')" class="projectIcon" />
:src="require('@/assets/img/project.png')" <span class="projectTitle">一块地</span>
class="projectIcon"
/>
<span class="projectTitle">{{ project.name }}</span>
</div> </div>
<div class="projectRight"> <div class="projectRight">
<van-image <van-image :src="require('@/assets/img/menu_yhxy.png')" class="projectRightIcon" />
:src="require('@/assets/img/menu_yhxy.png')" <span class="projectRightFont">{{item.currentState}}</span>
class="projectRightIcon"
/>
<span class="projectRightFont">协议签订阶段</span>
</div> </div>
</div> </div>
</div> </div>
@@ -74,17 +58,14 @@
class="projectCenterImg" class="projectCenterImg"
/> />
<span class="projectCenterFont">项目所在区域</span> <span class="projectCenterFont">项目所在区域</span>
<span class="projectCenterFont">{{ project.area }}</span> <span class="projectCenterFont">{{ item.area }}</span>
</div> </div>
</div> </div>
<div class="projectCenterInfo"> <div class="projectCenterInfo">
<div class="projectCenterInfo"> <div class="projectCenterInfo">
<van-image <van-image :src="require('@/assets/img/project_dep.png')" class="projectCenterImg" />
:src="require('@/assets/img/project_dep.png')"
class="projectCenterImg"
/>
<span class="projectCenterFont">征收部门</span> <span class="projectCenterFont">征收部门</span>
<span class="projectCenterFont">{{ project.department }}</span> <span class="projectCenterFont">{{ item.zsbm }}</span>
</div> </div>
</div> </div>
<div class="projectCenterInfo"> <div class="projectCenterInfo">
@@ -94,99 +75,100 @@
class="projectCenterImg" class="projectCenterImg"
/> />
<span class="projectCenterFont">所属年份</span> <span class="projectCenterFont">所属年份</span>
<span class="projectCenterFont">{{ project.year }}</span> <span class="projectCenterFont">{{ item.year }}</span>
</div> </div>
</div> </div>
<div class="projectCenterInfo"> <div class="projectCenterInfo">
<div class="projectCenterInfo"> <div class="projectCenterInfo">
<van-image <van-image :src="require('@/assets/img/project_no.png')" class="projectCenterImg" />
:src="require('@/assets/img/project_no.png')"
class="projectCenterImg"
/>
<span class="projectCenterFont">征收决定号</span> <span class="projectCenterFont">征收决定号</span>
<span class="projectCenterFont" style="color: #3883f1">{{ <span class="projectCenterFont" style="color: #3883f1">
project.num {{
}}</span> item.zsjdh
}}
</span>
</div> </div>
</div> </div>
<div class="centerMagin"> <div class="centerMagin">
<div class="assess"> <div class="assess">
<div> <div>
<van-image <van-image :src="require('@/assets/img/assess_1.png')" class="assessIcon" />
:src="require('@/assets/img/assess_1.png')"
class="assessIcon"
/>
<span class="assessTitle">分户评估结果</span> <span class="assessTitle">分户评估结果</span>
</div> </div>
<!-- <div> <!-- <div>
<van-image :src="require('@/assets/img/skip.png')" class="assessRightIcon" round /> <van-image :src="require('@/assets/img/skip.png')" class="assessRightIcon" round />
</div>--> </div>-->
</div> </div>
<div class="assessCenter1"> <van-list>
<div :key="assess.prjId" class="assessCenter1" v-for="(assess, i) in item.fhpgList">
<div class="assessBox"> <div class="assessBox">
<span class="projectCenterFont">评估报告编号</span> <span class="projectCenterFont">评估报告编号</span>
<span class="projectCenterFont">{{ assess.num }}</span> <span class="projectCenterFont">{{ assess.assessmentNo }}</span>
</div> </div>
<div class="assessBox"> <div class="assessBox">
<span class="projectCenterFont" style="width: 40%" <span class="projectCenterFont" style="width: 40%">被征收房屋地址</span>
>被征收房屋地址</span <span class="projectCenterFont protocolTitle">
> {{
<span class="projectCenterFont protocolTitle">{{ assess.houseAddress
assess.address }}
}}</span> </span>
</div> </div>
<div class="assessBox"> <div class="assessBox">
<span class="projectCenterFont">评估总金额</span> <span class="projectCenterFont">评估总金额</span>
<span class="projectTitle" style="color: red" <span class="projectTitle" style="color: red">¥{{ assess.countValue }}</span>
>¥{{ assess.amount }}</span
>
</div> </div>
</div> </div>
</van-list>
<div class="assess"> <div class="assess">
<div> <div>
<van-image <van-image :src="require('@/assets/img/assess_2.png')" class="assessIcon" />
:src="require('@/assets/img/assess_2.png')"
class="assessIcon"
/>
<span class="assessTitle">补偿协议</span> <span class="assessTitle">补偿协议</span>
</div> </div>
<!-- <div> <!-- <div>
<van-image :src="require('@/assets/img/skip.png')" class="assessRightIcon" round /> <van-image :src="require('@/assets/img/skip.png')" class="assessRightIcon" round />
</div>--> </div>-->
</div> </div>
<div class="assessCenter2"> <van-list>
<div
:key="protocol.prjId"
class="assessCenter2"
v-for="(protocol, i) in item.bcxyList"
>
<div class="assessBox"> <div class="assessBox">
<span class="projectCenterFont">协议编号</span> <span class="projectCenterFont">协议编号</span>
<span class="projectCenterFont">{{ retrievalProtocol.num }}</span> <span class="projectCenterFont">{{ protocol.xyNo }}</span>
</div> </div>
<div class="assessBox"> <div class="assessBox">
<span class="projectCenterFont" style="width: 40%" <span class="projectCenterFont" style="width: 40%">被征收房屋地址</span>
>被征收房屋地址</span <span class="projectCenterFont protocolTitle">
> {{
<span class="projectCenterFont protocolTitle">{{ protocol.houseAddress
retrievalProtocol.address }}
}}</span> </span>
</div> </div>
<div class="assessBox"> <div class="assessBox">
<span class="projectCenterFont">补偿方式</span> <span class="projectCenterFont">补偿方式</span>
<span class="projectCenterFont">{{ <span class="projectCenterFont">
retrievalProtocol.compensation {{
}}</span> protocol.compensation
}}
</span>
</div> </div>
<div class="assessBox"> <div class="assessBox">
<span class="projectCenterFont">合计补偿资金</span> <span class="projectCenterFont">合计补偿资金</span>
<span class="projectTitle" style="color: red" <span
>¥{{ retrievalProtocol.amount }}</span class="projectTitle"
> style="color: red"
</div> >¥{{ protocol.summationShouldCompensateMoney }}</span>
</div>
</div>
</van-list>
</div> </div>
</div> </div>
</div> </div>
</van-list>
<div class="centerMagin"> <div class="centerMagin">
<van-image <van-image :src="require('@/assets/img/expropriationPolicy.png')" class="bigImg" />
:src="require('@/assets/img/expropriationPolicy.png')"
class="bigImg"
/>
</div> </div>
<div class="centerMagin"> <div class="centerMagin">
<span class="projectTitle" style="color: #202020">征收政策</span> <span class="projectTitle" style="color: #202020">征收政策</span>
@@ -204,10 +186,7 @@
<div :key="item.id" class="protocolList" v-for="(item, i) in list"> <div :key="item.id" class="protocolList" v-for="(item, i) in list">
<div class="protocolLine" v-if="i != list.length - 1"> <div class="protocolLine" v-if="i != list.length - 1">
<div class="font14 protocolTitle">{{ item.title }}</div> <div class="font14 protocolTitle">{{ item.title }}</div>
<div <div class="assessBox" style="padding-left: 5px; padding-right: 5px">
class="assessBox"
style="padding-left: 5px; padding-right: 5px"
>
<div> <div>
<span class="font11">发布时间</span> <span class="font11">发布时间</span>
<span class="font11">{{ item.publish_date }}</span> <span class="font11">{{ item.publish_date }}</span>
@@ -220,10 +199,7 @@
</div> </div>
<div style="padding-bottom: 10px" v-else> <div style="padding-bottom: 10px" v-else>
<div class="font14 protocolTitle">{{ item.title }}</div> <div class="font14 protocolTitle">{{ item.title }}</div>
<div <div class="assessBox" style="padding-left: 5px; padding-right: 5px">
class="assessBox"
style="padding-left: 5px; padding-right: 5px"
>
<div> <div>
<span class="font11">发布时间</span> <span class="font11">发布时间</span>
<span class="font11">{{ item.publish_date }}</span> <span class="font11">{{ item.publish_date }}</span>
@@ -243,51 +219,51 @@
</template> </template>
<script> <script>
import "./home.css"; import './home.css';
import { apis } from "@/common/apis"; import { apis } from '@/common/apis';
import { token } from "@/common/token"; import { token } from '@/common/token';
import request from "@/common/util"; import request from '@/common/util';
export default { export default {
name: "home", name: 'home',
data() { data() {
return { return {
apidata: { // apidata: {
success: true, // success: true,
code: 200, // code: 200,
message: "请求成功", // message: '请求成功',
data: { // data: {
prjList: [ // prjList: [
{ // {
prjId: "936d98a8-2c8f-410f-b126-68a7568f60c4", // prjId: '936d98a8-2c8f-410f-b126-68a7568f60c4',
area: "海曙区", // area: '海曙区',
zsbm: "宁波市海曙区房屋征收管理服务中心", // zsbm: '宁波市海曙区房屋征收管理服务中心',
year: 2021.0, // year: 2021.0,
zsjdh: "海政发[2021]513号", // zsjdh: '海政发[2021]513号',
currentState: "项目报结", // currentState: '项目报结',
fhpgList: [ // fhpgList: [
{ // {
prjId: "936d98a8-2c8f-410f-b126-68a7568f60c4", // prjId: '936d98a8-2c8f-410f-b126-68a7568f60c4',
assessmentNo: "0513", // assessmentNo: '0513',
houseAddress: "高桥镇", // houseAddress: '高桥镇',
countValue: "137654.00", // countValue: '137654.00',
}, // },
], // ],
bcxyList: [ // bcxyList: [
{ // {
prjId: "936d98a8-2c8f-410f-b126-68a7568f60c4", // prjId: '936d98a8-2c8f-410f-b126-68a7568f60c4',
xyNo: "海政发2021513-0513-1", // xyNo: '海政发2021513-0513-1',
houseAddress: "高桥镇", // houseAddress: '高桥镇',
summationShouldCompensateMoney: "137654.00", // summationShouldCompensateMoney: '137654.00',
}, // },
], // ],
}, // },
], // ],
idCard: "330203199904044544身份证号码", // idCard: '330203199904044544身份证号码',
userName: "姓名", // userName: '姓名',
}, // },
extras: null, // extras: null,
timestamp: 1631256680049, // timestamp: 1631256680049,
}, // },
// user: { // user: {
// name: "加载中...", // name: "加载中...",
// identityId: "加载中...", // identityId: "加载中...",
@@ -310,25 +286,26 @@ export default {
// compensation: "加载中...", // compensation: "加载中...",
// amount: "0", // amount: "0",
// }, // },
total: "8", data: {},
total: '8',
list: [ list: [
{ {
id: 11, id: 11,
area: "全大市", area: '全大市',
title: "宁波市住房和城乡建设委员会开展关于住房的政策", title: '宁波市住房和城乡建设委员会开展关于住房的政策',
publish_date: "2021年09月05日", publish_date: '2021年09月05日',
}, },
{ {
id: 22, id: 22,
area: "全大市", area: '全大市',
title: "宁波市住房和城乡建设委员会开展关于住房的政策", title: '宁波市住房和城乡建设委员会开展关于住房的政策',
publish_date: "2021年09月05日", publish_date: '2021年09月05日',
}, },
{ {
id: 33, id: 33,
area: "全大市", area: '全大市',
title: "宁波市住房和城乡建设委员会开展关于住房的政策", title: '宁波市住房和城乡建设委员会开展关于住房的政策',
publish_date: "2021年09月05日", publish_date: '2021年09月05日',
}, },
], ],
loading: false, loading: false,
@@ -341,7 +318,82 @@ export default {
methods: { methods: {
onLoad() {}, onLoad() {},
onInit() { onInit() {
debugger; let apidata = {
success: true,
code: 200,
message: '请求成功',
data: {
prjList: [
{
prjId: '936d98a8-2c8f-410f-b126-68a7568f60c4',
area: '海曙区',
zsbm: '宁波市海曙区房屋征收管理服务中心',
year: 2021.0,
zsjdh: '海政发[2021]513号',
currentState: '项目报结',
fhpgList: [
{
prjId: '936d98a8-2c8f-410f-b126-68a7568f60c4',
assessmentNo: '0513',
houseAddress: '高桥镇',
countValue: '137654.00',
},
{
prjId: '936d98a8-2c8f-410f-b126-68a7568f6022',
assessmentNo: '0514',
houseAddress: '高桥镇11',
countValue: '137611.00',
},
],
bcxyList: [
{
prjId: '936d98a8-2c8f-410f-b126-68a7568f60c4',
xyNo: '海政发2021513-0513-1',
houseAddress: '高桥镇',
summationShouldCompensateMoney: '137654.00',
},
{
prjId: '936d98a8-2c8f-410f-b126-68a7568f6334',
xyNo: '海政发2021513-0513-3',
houseAddress: '高桥镇33',
summationShouldCompensateMoney: '137633.00',
},
],
},
{
prjId: '936d98a8-2c8f-410f-b126-68a7568f60c3',
area: '海曙区11',
zsbm: '宁波市海曙区房屋征收管理服务中心11',
year: 2021.0,
zsjdh: '海政发[2021]513号11',
currentState: '项目报结',
fhpgList: [
{
prjId: '936d98a8-2c8f-410f-b126-68a7568f60c4',
assessmentNo: '0513',
houseAddress: '高桥镇',
countValue: '137654.00',
},
],
bcxyList: [
{
prjId: '936d98a8-2c8f-410f-b126-68a7568f60c4',
xyNo: '海政发2021513-0513-1',
houseAddress: '高桥镇',
summationShouldCompensateMoney: '137654.00',
},
],
},
],
idCard: '330203199904044544',
userName: '姓名',
},
extras: null,
timestamp: 1631256680049,
};
if (apidata.code == 200) {
this.data = apidata.data;
}
// this.onLogin(); // this.onLogin();
//获取当前数据 //获取当前数据
// apis.getprjdata({ ticket: this.$route.query.ticket }).then((prjdata) => { // apis.getprjdata({ ticket: this.$route.query.ticket }).then((prjdata) => {
@@ -352,11 +404,11 @@ export default {
// }); // });
}, },
gotoProject(type) { gotoProject(type) {
this.$router.push({ name: "projectSelect", params: { type: type } }); this.$router.push({ name: 'projectSelect', params: { type: type } });
}, },
onLogin() { onLogin() {
// this.loading = true; // this.loading = true;
let form = { account: "zgbqc", password: "111qqqqq" }; let form = { account: 'zgbqc', password: '111qqqqq' };
apis apis
.login(form) .login(form)
.finally(() => { .finally(() => {
@@ -393,7 +445,7 @@ export default {
var tbl = []; var tbl = [];
var len = n - num.toString().length; var len = n - num.toString().length;
if (len <= 0) return num; if (len <= 0) return num;
if (!tbl[len]) tbl[len] = new Array(len + 1).join("0"); if (!tbl[len]) tbl[len] = new Array(len + 1).join('0');
return tbl[len] + num; return tbl[len] + num;
}, },
}, },