diff --git a/Ewide.NbzsZheliban/Service/DataService.cs b/Ewide.NbzsZheliban/Service/DataService.cs index 4ccf4c0..bc25036 100644 --- a/Ewide.NbzsZheliban/Service/DataService.cs +++ b/Ewide.NbzsZheliban/Service/DataService.cs @@ -135,6 +135,7 @@ namespace Ewide.NbzsZheliban.Service public async Task PrjList2([FromBody] JObject args) { var cardno = "341203199206303411"; + var username = "张三丰"; //var cardno = args.GetJsonValue("cardno", isThrowExp: true); //住宅调查表 @@ -158,7 +159,9 @@ namespace Ewide.NbzsZheliban.Service }); H5IndexModel h5IndexModel = new() { - PrjList = list_projects + PrjList = list_projects, + IdCard = cardno, + UserName = username }; return h5IndexModel; diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll index 4c34237..4cb6a2f 100644 Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb index 8435aa7..a53f820 100644 Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb differ diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll index 1268407..38791a1 100644 Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache index 87994cc..6c08fce 100644 Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache and b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache differ diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll index 4c34237..4cb6a2f 100644 Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb index 8435aa7..a53f820 100644 Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb differ diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll index 1268407..38791a1 100644 Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll differ diff --git a/FrontCode2/sunshine_levy/src/views/home.css b/FrontCode2/sunshine_levy/src/views/home.css index 640008d..36ce6df 100644 --- a/FrontCode2/sunshine_levy/src/views/home.css +++ b/FrontCode2/sunshine_levy/src/views/home.css @@ -139,8 +139,6 @@ font-weight: 600; line-height: 14px; - height: 17px; - color: #fff; } .projectRightIcon { @@ -150,7 +148,7 @@ margin-left: 8px; } .projectCenter { - height: 440px; + /* height: 440px; */ padding-bottom: 35px; background: #fff; diff --git a/FrontCode2/sunshine_levy/src/views/index.vue b/FrontCode2/sunshine_levy/src/views/index.vue index ae7a4c2..3c47ae9 100644 --- a/FrontCode2/sunshine_levy/src/views/index.vue +++ b/FrontCode2/sunshine_levy/src/views/index.vue @@ -12,7 +12,7 @@ class="baseImg" /> 被征收人姓名: - {{ user.name }} + {{ data.userName }}
身份证号码: - {{ user.identityId }} + {{ data.idCard }}
@@ -48,140 +48,158 @@ class="bigImg" />
-
-
-
- - {{ project.name }} -
-
- - 协议签订阶段 -
-
-
-
-
-
- - 项目所在区域: - {{ project.area }} -
-
-
-
- - 征收部门: - {{ project.department }} -
-
-
-
- - 所属年份: - {{ project.year }} -
-
-
-
- - 征收决定号: - {{ - project.num - }} -
-
-
-
-
- - 分户评估结果 -
- -
-
-
- 评估报告编号: - {{ assess.num }} -
-
- 被征收房屋地址: - {{ - assess.address - }} -
-
- 评估总金额: - ¥{{ assess.amount }} + +
+
+
+
+ + 一块地??? +
+
+ + {{ item.currentState }} +
-
-
- - 补偿协议 +
+
+
+ + 项目所在区域: + {{ item.area }} +
- -
-
-
- 协议编号: - {{ retrievalProtocol.num }} +
+
+ + 征收部门: + {{ item.zsbm }} +
-
- 被征收房屋地址: - {{ - retrievalProtocol.address - }} +
+
+ + 所属年份: + {{ item.year }} +
-
- 补偿方式: - {{ - retrievalProtocol.compensation - }} +
+
+ + 征收决定号: + + {{ item.zsjdh }} + +
-
- 合计补偿资金: - ¥{{ retrievalProtocol.amount }} +
+
+
+ + 分户评估结果 +
+ +
+ +
+
+ 评估报告编号: + {{ + assess.assessmentNo + }} +
+
+ 被征收房屋地址: + + {{ assess.houseAddress }} + +
+
+ 评估总金额: + ¥{{ assess.countValue }} +
+
+
+
+
+ + 补偿协议 +
+ +
+ +
+
+ 协议编号: + {{ protocol.xyNo }} +
+
+ 被征收房屋地址: + + {{ protocol.houseAddress }} + +
+
+ 补偿方式: + + {{ protocol.compensation }} + +
+
+ 合计补偿资金: + ¥{{ protocol.summationShouldCompensateMoney }} +
+
+
-
+
{