diff --git a/Ewide.NbzsZheliban/Entity/Base/RespModel.cs b/Ewide.NbzsZheliban/Entity/Base/RespModel.cs new file mode 100644 index 0000000..7ebb673 --- /dev/null +++ b/Ewide.NbzsZheliban/Entity/Base/RespModel.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Ewide.NbzsZheliban.Entity.Base +{ + [Serializable, System.Runtime.Serialization.DataContract] + public class RespModel + { + /// + /// 是否成功 + /// + [System.Runtime.Serialization.DataMember] + public bool issuccess { get; set; } + /// + /// 错误码 + /// + [System.Runtime.Serialization.DataMember] + public string errorcode { get; set; } + [System.Runtime.Serialization.DataMember] + public string message { get; set; } + /// + /// + /// + [System.Runtime.Serialization.DataMember] + public object data { get; set; } + /// + /// + /// + [System.Runtime.Serialization.DataMember] + public int allcount { get; set; } + /// + /// 附加对象 + /// + [System.Runtime.Serialization.DataMember] + public object addition { get; set; } + + /// + /// 消耗时间,单位毫秒 + /// + [System.Runtime.Serialization.DataMember] + public long consume_time { get; set; } + } +} diff --git a/Ewide.NbzsZheliban/Service/BaseService.cs b/Ewide.NbzsZheliban/Service/BaseService.cs index 888b955..d268069 100644 --- a/Ewide.NbzsZheliban/Service/BaseService.cs +++ b/Ewide.NbzsZheliban/Service/BaseService.cs @@ -1,4 +1,5 @@ -using Furion.JsonSerialization; +using Ewide.NbzsZheliban.Entity.Base; +using Furion.JsonSerialization; using SqlSugar; using System; using System.Collections.Generic; @@ -10,6 +11,5 @@ namespace Ewide.NbzsZheliban.Service { public class BaseService : Furion.DynamicApiController.IDynamicApiController { - } } diff --git a/Ewide.NbzsZheliban/Service/DataService.cs b/Ewide.NbzsZheliban/Service/DataService.cs index 39e5af0..7e86d6d 100644 --- a/Ewide.NbzsZheliban/Service/DataService.cs +++ b/Ewide.NbzsZheliban/Service/DataService.cs @@ -1,6 +1,10 @@ using Ewide.NbzsZheliban.Entity; +using Ewide.NbzsZheliban.Entity.Base; using Ewide.NbzsZheliban.Entity.Extends; using Ewide.NbzsZheliban.Tools; +using Furion; +using Furion.DataEncryption; +using Furion.FriendlyException; using Furion.JsonSerialization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; @@ -30,35 +34,93 @@ namespace Ewide.NbzsZheliban.Service /// /// /// - [HttpGet("/project/list")] + [HttpPost("/project/list")] [Microsoft.AspNetCore.Authorization.AllowAnonymous] public async Task PrjList([FromBody] JObject args) { - var cardno = args.GetJsonValue("cardno", isThrowExp: true); - //住宅调查表 - var list_zz_dcb = await db.Ado.SqlQueryAsync("select ID dcbId,ProjectId PrjId from InvestigateTable b where b.ExpropriatedCardNo=@ExpropriatedCardNo", new List { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray()); - //非住宅调查表 - var list_fzz_dcb = await db.Ado.SqlQueryAsync("select ID dcbId,ProjectId PrjId from NonResidentialInvestigateTable b where b.PropertyRightCardNo=@ExpropriatedCardNo", new List { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray()); - //调查表集合 - var list_dcbs = list_zz_dcb.Concat(list_fzz_dcb); - //项目列表 - var list_projects = await db.Ado.SqlQueryAsync("select a.ID Prjid,a.area,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 InvestigateTableID_param = "'" + string.Join("','", list_dcbs.Select(p => p.dcbId)) + "'"; - var list_fhpgs = await db.Ado.SqlQueryAsync("select e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;"); - //补偿协议 - var list_bcxys = await db.Ado.SqlQueryAsync("select isnull(d.CollectDecisionNoHeadName,'')+isnull(d.No1,'')+'-'+isnull(d.No2,'')+(case when (d.No3 is null or d.No3 = '') then '' else ('-'+d.No3) end ) XyNo,d.SwitchProductionWay,e.HouseAddress,d.SummationShouldCompensateMoney,e.ProjectId as PrjId from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); "); + #region 票据 + var ticket = args.GetJsonValue("ticket", isThrowExp: true); + //var ticket = Request.Query["ticket"]; + if (!string.IsNullOrWhiteSpace(ticket)) + { + var time = DateTime.Now.ToString("yyyyMMddHHmmss"); + var servicecode = App.Configuration["zlb_setting:servicecode"]; + var servicepwd = App.Configuration["zlb_setting:servicepwd"]; + var sign = MD5Encryption.Encrypt(servicecode + servicepwd + time); + var datatype = "json"; + var url = App.Configuration["zlb_setting:ticket_url"] + .Replace("{servicecode}", servicecode) + .Replace("{time}", time) + .Replace("{sign}", sign) + .Replace("{ticket}", ticket) + .Replace("{datatype}", datatype) + ; + var tickerRsltStr = Ewide.NbzsZheliban.Tools.HttpHelper.CallUrl(url, ""); + JObject ticketObj = null; + try + { + ticketObj = JObject.Parse(tickerRsltStr); + } + catch (Newtonsoft.Json.JsonReaderException) + { + throw Oops.Oh($"ticket接口返回值有误,[{tickerRsltStr}]"); + } + if (ticketObj["result"].Value() != 0) + throw Oops.Oh($"ticket接口返回值有误,[{tickerRsltStr}]"); + time = DateTime.Now.ToString("yyyyMMddHHmmss"); + sign = MD5Encryption.Encrypt(servicecode + servicepwd + time); + url = App.Configuration["zlb_setting:token_url"] + .Replace("{servicecode}", servicecode) + .Replace("{time}", time) + .Replace("{sign}", sign) + .Replace("{token}", ticketObj["token"].ToString()) + .Replace("{datatype}", datatype) + ; + var userinfoRsltStr = Ewide.NbzsZheliban.Tools.HttpHelper.CallUrl(url, ""); + JObject userinfoObj = null; + try + { + userinfoObj = JObject.Parse(userinfoRsltStr); + } + catch (Newtonsoft.Json.JsonReaderException) + { + throw Oops.Oh($"token接口返回值有误,[{tickerRsltStr}]"); + } + if (userinfoObj["result"].Value() != 0) + throw Oops.Oh($"ticket接口返回值有误,[{tickerRsltStr}]"); + var cardno = userinfoObj["idnum"].ToString(); + var username = userinfoObj["username"].ToString(); + #endregion + //var cardno = args.GetJsonValue("cardno", isThrowExp: true); + //住宅调查表 + var list_zz_dcb = await db.Ado.SqlQueryAsync("select ID dcbId,ProjectId PrjId from InvestigateTable b where b.ExpropriatedCardNo=@ExpropriatedCardNo", new List { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray()); + //非住宅调查表 + var list_fzz_dcb = await db.Ado.SqlQueryAsync("select ID dcbId,ProjectId PrjId from NonResidentialInvestigateTable b where b.PropertyRightCardNo=@ExpropriatedCardNo", new List { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray()); + //调查表集合 + var list_dcbs = list_zz_dcb.Concat(list_fzz_dcb); + //项目列表 + var list_projects = await db.Ado.SqlQueryAsync("select a.ID Prjid,a.area,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 InvestigateTableID_param = "'" + string.Join("','", list_dcbs.Select(p => p.dcbId)) + "'"; + var list_fhpgs = await db.Ado.SqlQueryAsync("select e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;"); + //补偿协议 + var list_bcxys = await db.Ado.SqlQueryAsync("select isnull(d.CollectDecisionNoHeadName,'')+isnull(d.No1,'')+'-'+isnull(d.No2,'')+(case when (d.No3 is null or d.No3 = '') then '' else ('-'+d.No3) end ) XyNo,d.SwitchProductionWay,e.HouseAddress,d.SummationShouldCompensateMoney,e.ProjectId as PrjId from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); "); - list_projects.ForEach(p => + list_projects.ForEach(p => + { + p.FhpgList = list_fhpgs.Where(a => a.PrjId == p.PrjId); + p.BcxyList = list_bcxys.Where(a => a.PrjId == p.PrjId); + }); + H5IndexModel h5IndexModel = new() + { + PrjList = list_projects + }; + return h5IndexModel; + } + else { - p.FhpgList = list_fhpgs.Where(a => a.PrjId == p.PrjId); - p.BcxyList = list_bcxys.Where(a => a.PrjId == p.PrjId); - }); - H5IndexModel h5IndexModel = new() - { - PrjList = list_projects - }; - return h5IndexModel; + throw Oops.Oh("无效访问"); + } } } } diff --git a/Ewide.NbzsZheliban/Tools/MyExtensions.cs b/Ewide.NbzsZheliban/Tools/MyExtensions.cs index fef608e..64c3d2a 100644 --- a/Ewide.NbzsZheliban/Tools/MyExtensions.cs +++ b/Ewide.NbzsZheliban/Tools/MyExtensions.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Furion.FriendlyException; +using Microsoft.AspNetCore.Http; using Microsoft.VisualBasic; using Newtonsoft.Json.Linq; using System; @@ -900,12 +901,12 @@ namespace Ewide.NbzsZheliban.Tools public static string GetJsonValue(this JObject jObject, string jsonName, bool isToLower = true, bool isThrowExp = false) { if (jObject == null) - throw new Exception("参数为空"); + throw Oops.Oh("参数为空"); JToken token = jObject[isToLower ? jsonName.ToLower() : jsonName]; if (token == null) { if (isThrowExp) - throw new Exception(jsonName + "是必需的"); + throw Oops.Oh(jsonName + "是必需的"); return string.Empty; } else @@ -989,7 +990,7 @@ namespace Ewide.NbzsZheliban.Tools if (jObject == null) { if (isThrowExp) - throw new Exception(jsonName + "是必需的"); + throw Oops.Oh(jsonName + "是必需的"); return null; } string v = GetJsonValue(jObject, jsonName, isToLower); @@ -1000,7 +1001,7 @@ namespace Ewide.NbzsZheliban.Tools else { if (isThrowExp) - throw new Exception(jsonName + "是必需的"); + throw Oops.Oh(jsonName + "是必需的"); return null; } } @@ -1018,7 +1019,7 @@ namespace Ewide.NbzsZheliban.Tools else { if (isThrowExp) - throw new Exception(jsonName + "是必需的"); + throw Oops.Oh(jsonName + "是必需的"); return null; } } @@ -1200,7 +1201,7 @@ namespace Ewide.NbzsZheliban.Tools value = jobj.GetJsonBoolValue(pro.Name, isToLower); break; default: - throw new Exception("补充类型:" + propName); + throw Oops.Oh("补充类型:" + propName); } pro.SetValue(obj, value, null); } diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll index 3d1dd03..712befd 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 71e762f..2036d4a 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 67ef558..3410cdb 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 1c53773..ff86cf4 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 f64fbb1..ab31105 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 e5e1f48..823d0fa 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 142339a..62a62a5 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.csproj.CoreCompileInputs.cache b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache index 93832f4..55ce93d 100644 --- a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache +++ b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e18cbf8e59bc83ce9fd9daee67e8ec04308bbafb +fbae486d0767770514b6ba877c8b825b66bbda21 diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll index 3d1dd03..712befd 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 71e762f..2036d4a 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 67ef558..3410cdb 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 a62a0aa..b07cc0b 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.csproj.CoreCompileInputs.cache b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache index 77d25f4..ddddfeb 100644 --- a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache +++ b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -4bde41c8041738fd99537bb8a528c2972537dead +e152e943102a596d81738a7c8388c9d1012f3a29 diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll index 1c53773..ff86cf4 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 f64fbb1..ab31105 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 e5e1f48..823d0fa 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/package-lock.json b/FrontCode2/sunshine_levy/package-lock.json index 7f13fde..3e15ecb 100644 --- a/FrontCode2/sunshine_levy/package-lock.json +++ b/FrontCode2/sunshine_levy/package-lock.json @@ -5281,6 +5281,11 @@ "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==", "dev": true }, + "js-md5": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz", + "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==" + }, "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", diff --git a/FrontCode2/sunshine_levy/package.json b/FrontCode2/sunshine_levy/package.json index bc7531b..cecce38 100644 --- a/FrontCode2/sunshine_levy/package.json +++ b/FrontCode2/sunshine_levy/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "axios": "^0.21.4", + "js-md5": "^0.7.3", "lib-flexible": "^0.3.2", "px2rem-loader": "^0.1.9", "vant": "^2.12.27", diff --git a/FrontCode2/sunshine_levy/src/common/apis/requests.js b/FrontCode2/sunshine_levy/src/common/apis/requests.js index 3365ca8..13eff6f 100644 --- a/FrontCode2/sunshine_levy/src/common/apis/requests.js +++ b/FrontCode2/sunshine_levy/src/common/apis/requests.js @@ -11,6 +11,7 @@ const url = { // 项目数统计信息 projectStatistics: '/webapi/project.ashx?action=getStatistics', + getprjdata: 'http://183.136.157.9:7099/api/project/list' }; export default url; \ No newline at end of file diff --git a/FrontCode2/sunshine_levy/src/common/util/index.js b/FrontCode2/sunshine_levy/src/common/util/index.js new file mode 100644 index 0000000..fdae065 --- /dev/null +++ b/FrontCode2/sunshine_levy/src/common/util/index.js @@ -0,0 +1,27 @@ +import axios from "axios" + +const instance = axios.create({ + baseURL: "https://some-domain.com/api/", + timeout: 5000, + +}) + +// 添加请求拦截器 +axios.interceptors.request.use(function(config) { + // 在发送请求之前做些什么 + return config; +}, function(error) { + // 对请求错误做些什么 + return Promise.reject(error); +}); + +// 添加响应拦截器 +axios.interceptors.response.use(function(response) { + // 对响应数据做点什么 + return response; +}, function(error) { + // 对响应错误做点什么 + return Promise.reject(error); +}); + +export default instance \ No newline at end of file diff --git a/FrontCode2/sunshine_levy/src/components/index.vue b/FrontCode2/sunshine_levy/src/components/index.vue index 5f64cf0..1a66afd 100644 --- a/FrontCode2/sunshine_levy/src/components/index.vue +++ b/FrontCode2/sunshine_levy/src/components/index.vue @@ -7,35 +7,59 @@
- + 被征收人姓名： - {{user.name}} + {{ user.name }}
- + 身份证号码： - {{user.identityId}} + {{ user.identityId }}
- - - + + +
- +
- - {{project.name}} + + {{ project.name }}
- + 协议签订阶段
@@ -43,125 +67,176 @@
- + 项目所在区域： - {{project.area}} + {{ project.area }}
- + 征收部门： - {{project.department}} + {{ project.department }}
- + 所属年份： - {{project.year}} + {{ project.year }}
- + 征收决定号： - {{project.num}} + {{ + project.num + }}
- + 分户评估结果
- +
评估报告编号： - {{assess.num}} + {{ assess.num }}
- 被征收房屋地址： - {{assess.address}} + 被征收房屋地址： + {{ + assess.address + }}
评估总金额： - ¥{{assess.amount}} + ¥{{ assess.amount }}
- + 补偿协议
- +
协议编号： - {{retrievalProtocol.num}} + {{ retrievalProtocol.num }}
- 被征收房屋地址： - {{retrievalProtocol.address}} + 被征收房屋地址： + {{ + retrievalProtocol.address + }}
补偿方式： - {{retrievalProtocol.compensation}} + {{ + retrievalProtocol.compensation + }}
合计补偿资金： - ¥{{retrievalProtocol.amount}} + ¥{{ retrievalProtocol.amount }}
- +
- 征收政策 -
- 共{{total}}条 + 征收政策 +
+ 共{{ total }}条
查看全部
-
+
-
-
-
{{item.title}}
-
+
+
+
{{ item.title }}
+
发布时间： - {{item.publish_date}} + {{ item.publish_date }}
区域： - {{item.area}} + {{ item.area }}
-
-
{{item.title}}
-
+
+
{{ item.title }}
+
发布时间： - {{item.publish_date}} + {{ item.publish_date }}
区域： - {{item.area}} + {{ item.area }}
@@ -174,55 +249,55 @@ diff --git a/FrontCode2/sunshine_levy/src/main.js b/FrontCode2/sunshine_levy/src/main.js index be04d2d..17d9358 100644 --- a/FrontCode2/sunshine_levy/src/main.js +++ b/FrontCode2/sunshine_levy/src/main.js @@ -38,7 +38,8 @@ import { Divider } from 'vant'; Vue.use(Divider); Vue.config.productionTip = false - +import md5 from 'js-md5' +Vue.prototype.$md5 = md5 /* eslint-disable no-new */ const vm = new Vue({ el: '#app', diff --git a/README.md b/README.md index da942ea..46d3d5d 100644 --- a/README.md +++ b/README.md @@ -23,4 +23,9 @@ git checkout zsxt_nbzs_h5 打开项目vs,增加类库 递归克隆 -git clone --recursive http://118.178.224.202:3000/ewide/zsxt_nbzs_h5.git \ No newline at end of file +git clone --recursive http://118.178.224.202:3000/ewide/zsxt_nbzs_h5.git + +--测试回调 +https://puser.zjzwfw.gov.cn/sso/newusp.do?action=ssoLogin&servicecode=fwzs&goto=http://183.136.157.9:7099/#/index + +https://appapi.zjzwfw.gov.cn/sso/servlet/simpleauth?method=ticketValidation&servicecode=fwzs \ No newline at end of file