diff --git a/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs b/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs index 8fa420e..f9800d4 100644 --- a/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs +++ b/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs @@ -57,6 +57,7 @@ namespace Ewide.NbzsZheliban.Entity.Extends /// 区域 /// public string Area { get; set; } + public string Name { get; set; } [Newtonsoft.Json.JsonIgnore] public string AreaID { get; set; } /// diff --git a/Ewide.NbzsZheliban/Service/DataService.cs b/Ewide.NbzsZheliban/Service/DataService.cs index 4eae559..0cd2c4c 100644 --- a/Ewide.NbzsZheliban/Service/DataService.cs +++ b/Ewide.NbzsZheliban/Service/DataService.cs @@ -113,7 +113,7 @@ namespace Ewide.NbzsZheliban.Service //调查表集合 var list_dcbs = list_zz_dcb.Concat(list_fzz_dcb); //项目列表 - var list_projects = await db.Ado.SqlQueryAsync("select a.ID Prjid,a.area,a.AreaID,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') "); + var list_projects = await db.Ado.SqlQueryAsync("select a.ID Prjid,a.area,a.AreaID,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState,NAME from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') "); //分户评估 var InvestigateTableID_param = "'" + string.Join("','", list_dcbs.Select(p => p.dcbId)) + "'"; var list_fhpgs = await db.Ado.SqlQueryAsync("select d.id,e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue,e.id dcbId,d.CreateTime,d.CreateUserName from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select d.id,e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue,e.id dcbId,d.CreateTime,d.CreateUserName from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;"); @@ -198,7 +198,6 @@ namespace Ewide.NbzsZheliban.Service }).FirstAsync(); return entity; } - /// /// 协议详细 /// @@ -206,7 +205,7 @@ namespace Ewide.NbzsZheliban.Service /// [HttpPost("/agreement/info")] [Microsoft.AspNetCore.Authorization.AllowAnonymous] - public IActionResult AgreementInfo([FromBody] JObject args) + public async Task AgreementInfo([FromBody] JObject args) { var ticket = args.GetJsonValue("ticket", isThrowExp: true); var id = args.GetJsonGuidValue("id", isThrowExp: true); @@ -231,9 +230,44 @@ namespace Ewide.NbzsZheliban.Service } if (string.IsNullOrEmpty(XyFile)) throw Oops.Oh("未上传附件"); - var filePath = App.Configuration["nbzs_file_path"] + XyFile; - return new FileStreamResult(new FileStream(filePath, FileMode.Open), "application/octet-stream") { FileDownloadName = new FileInfo(filePath).Name }; + var filePath = App.Configuration["nbzs_domain"] + XyFile; + return filePath; } + ///// + ///// 协议详细 + ///// + ///// + ///// + //[HttpPost("/agreement/info")] + //[Microsoft.AspNetCore.Authorization.AllowAnonymous] + //public IActionResult AgreementInfo([FromBody] JObject args) + //{ + // var ticket = args.GetJsonValue("ticket", isThrowExp: true); + // var id = args.GetJsonGuidValue("id", isThrowExp: true); + // JObject userInfoObj = GetInfoByTicket(ticket); + // var XyFile = ""; + // //住宅 + // var entity_zz = db.Queryable().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First(); + // if (entity_zz != null) + // { + // XyFile = entity_zz.XyFile; + // } + // //非住宅 + // else + // { + // var entity_fzz = db.Queryable().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First(); + // if (entity_fzz != null) + // { + // XyFile = entity_fzz.XyFile; + // } + // else + // throw Oops.Oh("ID错误"); + // } + // if (string.IsNullOrEmpty(XyFile)) + // throw Oops.Oh("未上传附件"); + // var filePath = App.Configuration["nbzs_file_path"] + XyFile; + // return new FileStreamResult(new FileStream(filePath, FileMode.Open), "application/octet-stream") { FileDownloadName = new FileInfo(filePath).Name }; + //} /// /// 分布评估详细 /// diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll index a153e27..1985898 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb index f30c14e..31f5a67 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb differ diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll index 0ca52f1..aa6215c 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll index f4a9c5f..8772497 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 edd1542..e2a26a0 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 67c5fb7..e29af55 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/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache index f5e894a..14d34b4 100644 Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache differ diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll index a153e27..1985898 100644 Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb index f30c14e..31f5a67 100644 Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb differ diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll index 0ca52f1..aa6215c 100644 Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Debug/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 39420ca..e933950 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 f4a9c5f..8772497 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 edd1542..e2a26a0 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 67c5fb7..e29af55 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/assets/img/zspg.png b/FrontCode2/sunshine_levy/src/assets/img/zspg.png new file mode 100644 index 0000000..d2a21ed Binary files /dev/null and b/FrontCode2/sunshine_levy/src/assets/img/zspg.png differ diff --git a/FrontCode2/sunshine_levy/src/assets/img/zsxy.png b/FrontCode2/sunshine_levy/src/assets/img/zsxy.png new file mode 100644 index 0000000..cc5daa0 Binary files /dev/null and b/FrontCode2/sunshine_levy/src/assets/img/zsxy.png differ diff --git a/FrontCode2/sunshine_levy/src/common/util/tools.js b/FrontCode2/sunshine_levy/src/common/util/tools.js index c1ad860..d8e2c6d 100644 --- a/FrontCode2/sunshine_levy/src/common/util/tools.js +++ b/FrontCode2/sunshine_levy/src/common/util/tools.js @@ -1,4 +1,9 @@ // 设置ticket export function SetTicket(data) { window.sessionStorage.setItem("ticket", data); +} + +// 设置项目id +export function SetProjectId(data) { + window.sessionStorage.setItem("projectId", data); } \ 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 b7bc99b..d848764 100644 --- a/FrontCode2/sunshine_levy/src/views/index.vue +++ b/FrontCode2/sunshine_levy/src/views/index.vue @@ -53,7 +53,9 @@
+
+
{{ item.name }}
+
+
- +
@@ -126,15 +130,14 @@ /> 分户评估结果
-
+
评估报告编号： @@ -171,11 +174,13 @@
-->
+
协议编号： @@ -225,6 +230,7 @@
+
{ + onSuccess: data => { console.log("首页数据", data); if (data.data && data.data.success == true) { this.data = data.data.data; @@ -328,16 +336,20 @@ export default { } else console.log("用户无数据，不展示"); } }, - onFail: (err) => { + onFail: err => { console.log("用户无数据，不展示"); - }, + } }); }, // 跳转项目详情 - gotoProject(type) { + gotoProject(type, id) { this.$router.push({ name: "projectSelect", - params: { type: type, ticket: this.$route.query.ticket }, + params: { + type: type, + ticket: this.$route.query.ticket || this.ticket, + prjId: id || this.data.prjList[0].prjId + } }); }, // 加载项目数统计信息 @@ -357,19 +369,19 @@ export default { // 设置用户信息埋点 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() { @@ -389,7 +401,7 @@ export default { action: "aplus.sendPV", arguments: [ { - is_auto: false, + is_auto: false }, { isMini: true, @@ -397,20 +409,20 @@ 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); }); }); - }, - }, + } + } }; diff --git a/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue b/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue index 81f5be2..9465436 100644 --- a/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue +++ b/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue @@ -1,22 +1,27 @@ diff --git a/FrontCode2/sunshine_levy/src/views/report/evalute.vue b/FrontCode2/sunshine_levy/src/views/report/evalute.vue index 3151f60..10d53b7 100644 --- a/FrontCode2/sunshine_levy/src/views/report/evalute.vue +++ b/FrontCode2/sunshine_levy/src/views/report/evalute.vue @@ -3,12 +3,10 @@
-
- 为您查询到{{ this.info.prjList[0].fhpgList.length }}条结果 -
+
为您查询到{{ this.prjListLength }}条结果
@@ -38,11 +36,11 @@
- 评估人员：{{ item.person }} + 评估人员：{{ item.createUserName }}
- 评估时间：{{ item.time }} + 评估时间：{{ item.createTime }}
@@ -51,6 +49,7 @@