ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bugfix

Browse Source 
前端二次进入页面和二次回退问题解决
This commit is contained in:
路 范
2021-12-02 11:18:07 +08:00
parent 184504d23e
commit b9e0f54b4d
25 changed files with 205 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Ewide.NbzsZheliban/Service/DataService.cs
View File

@@ -170,6 +170,12 @@ namespace Ewide.NbzsZheliban.Service
return await db.Ado.SqlQueryAsync<Bcxy>("select d.id,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,e.id dcbId,d.SignTime,1 type from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.IsInRecords = 1 and d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select d.id,isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId,e.id dcbId,d.SignTime,2 type from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.IsInRecords = 1 and d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); ");
}
}
/// <summary>
///
/// </summary>
/// <param name="cardno"></param>
/// <param name="username"></param>
/// <returns></returns>
private async Task<H5IndexModel> GetInfoByCardNoAsync(string cardno, string username)
{
var cachedata = _cache.Get("IndexData-" + cardno);
@@ -205,7 +211,7 @@ namespace Ewide.NbzsZheliban.Service
{
ID = b.ID,
Contents = b.Contents,
PublicTime = b.PublicTime.HasValue ? b.PublicTime.Value.ToString("yyyy-MM-dd") : string.Empty,
PublicTime = b.PublicTime.ToString(),
Title = b.Title,
Area = b.Area
}).ToList();
@@ -217,11 +223,15 @@ namespace Ewide.NbzsZheliban.Service
{
ID = b.ID,
Contents = b.Contents,
PublicTime = b.PublicTime.HasValue ? b.PublicTime.Value.ToString("yyyy-MM-dd") : string.Empty,
PublicTime = b.PublicTime.ToString(),
Title = b.Title,
Area = b.Area
}).ToList();
}
list_PoliciesRegulations.ForEach(a =>
{
a.PublicTime = Convert.ToDateTime(a.PublicTime).ToString("yyyy-MM-dd");
});
//移除没有协议也没有分户评估的项目 (空项目)
list_projects.FindAll(a => (a.BcxyList == null || a.BcxyList.Count == 0) && (a.FhpgList == null || a.FhpgList.Count == 0)).ForEach(a =>
{
@@ -403,6 +413,12 @@ namespace Ewide.NbzsZheliban.Service
var ticket = args.GetJsonValue("ticket", isThrowExp: true);
var id = args.GetJsonGuidValue("id", isThrowExp: true);
JObject userInfoObj = GetInfoByTicket(ticket);
//var cachedata=_cache.Get($"CacheData-ResidentialAgreement");
//if (!string.IsNullOrWhiteSpace(cachedata))
//{
// var listBcxy = JSON.Deserialize<List<Bcxy>>(cachedata);
// XyFile= listBcxy.Where(p => p.Id == id.ToString()).Select(p => new {ID= p.Id, XyFile=p.XyFile }).First();
//}
var XyFile = "";
//住宅
var entity_zz = db.Queryable<Nbzs.Entity.ResidentialAgreement>().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First();
@@ -430,7 +446,7 @@ namespace Ewide.NbzsZheliban.Service
var filePath = GetCurrentRootPath() + XyFile;
var pdfFile = new FileInfo(filePath);
if (File.Exists(pdfFile.Directory + "\\lock"))
if (File.Exists(pdfFile.Directory + "\\" + pdfFile.Name + ".lock"))
{
var picCount = pdfFile.Directory.GetFiles(pdfFile.Name + "-*.jpg").Length;
for (int i = 0; i < picCount; i++)
@@ -458,13 +474,13 @@ namespace Ewide.NbzsZheliban.Service
pics.Add(current_domain + XyFile + "-" + i + ".jpg");
if (i == 0)
{
File.WriteAllText(pdfFile.Directory.FullName + "\\lock", "lock");
File.WriteAllText(pdfFile.Directory.FullName + "\\" + pdfFile.Name + ".lock", pdfFile.Name + ".lock");
}
}
}
catch (Exception ex)
{
//throw Oops.Oh(ex.Message);
throw Oops.Oh(ex.Message + ex.StackTrace);
throw Oops.Oh(-2002, "无附件文件[" + nbzs_domain + XyFile + "]");
}
}

BIN
Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll
View File

Binary file not shown.

BIN
Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb
View File

Binary file not shown.

BIN
Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll
View File

Binary file not shown.

BIN
Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll
View File

Binary file not shown.

BIN
Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb
View File

Binary file not shown.

BIN
Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll
View File

Binary file not shown.

BIN
Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll
View File

Binary file not shown.

BIN
Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb
View File

Binary file not shown.

BIN
Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll
View File

Binary file not shown.

BIN
Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll
View File

Binary file not shown.

BIN
Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb
View File

Binary file not shown.

BIN
Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll
View File

Binary file not shown.

24
FrontCode2/sunshine_levy/index.html
View File

@@ -3,8 +3,28 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0" />
<meta name="viewport"
content="width=device-width,user-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0" />
<title>宁波房屋征收</title>
<script>
function getQueryString(name) {
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
var r = window.location.search.substr(1).match(reg);
if (r != null) return unescape(r[2]); return null;
}
//debugger
var ticket = getQueryString('ticket');
console.log('1201-ticket' + ticket)
if (ticket)
window.sessionStorage.setItem('ticket', ticket)
else {
if (window.sessionStorage.getItem('ticket') == null) {
setTimeout(function () { window.close() }, 10);
//window.open('https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs')
location.replace('https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs')
}
}
</script>
<script type="text/javascript" src="https://d.alicdn.com/alilog/mlog/aplus.js?id=202951085"></script>
<script type="text/javascript" src="//jssdk.yyhj.zjzwfw.gov.cn/jsbridge/v2.0.0/bridge.min.js"></script>
<!-- 引入ZWJSBridge -->
@@ -15,7 +35,7 @@
<div id="app"></div>
<!-- built files will be auto injected -->
<script>
(function(w, d, s, q, i) {
(function (w, d, s, q, i) {
w[q] = w[q] || [];
var f = d.getElementsByTagName(s)[0];
var j = d.createElement(s);

3
FrontCode2/sunshine_levy/src/common/util/tools.js
View File

@@ -2,6 +2,9 @@
export function SetTicket(data) {
window.sessionStorage.setItem("ticket", data);
}
export function GetTicket() {
window.sessionStorage.getItem("ticket");
}
// 设置项目id
export function SetProjectId(data) {

153
FrontCode2/sunshine_levy/src/router/index.js
View File

@@ -6,76 +6,103 @@ Vue.use(Router);
const router = new Router({
mode: "hash",
routes: [{
path: "/",
name: "index",
meta: { index: 1, title: "宁波房屋征收" },
component: () =>
import ("../views")
},
// 选择项目页面
{
path: "/project-select",
name: "projectSelect",
meta: { index: 2, title: "征收信息查询" },
component: () =>
import ("../views/project")
},
// 评估结果一级页面
{
path: "/report/evalute",
name: "evalute",
meta: { index: 3, title: "评估结果" },
component: () =>
import ("../views/report/evalute")
},
// 协议结果页面
{
path: "/report/agreement",
name: "reportAgreement",
meta: { index: 4, title: "协议结果" },
component: () =>
import ("../views/report/agreement")
},
// 补偿协议pdf
{
path: "/showPdf",
name: "showPdf",
meta: { index: 5, title: "协议详情" },
component: () =>
import ("../views/pdf/pdf")
},
// 评估结果二级页面(表格页面)
{
path: "/evaluatePage",
name: "evaluatePage",
meta: { index: 6, title: "评估报告" },
component: () =>
import ("../views/report/evaluatePage")
},
// 评估结果二级页面(pdf页面)
{
path: "/evaluateResultPdf",
name: "evaluateResultPdf",
meta: { index: 7, title: "评估报告" },
component: () =>
import ("../views/pdf/evaluateResultPdf")
},
// 政策详情页面
{
path: "/policyInfo",
name: "policyInfo",
meta: { index: 8, title: "政策详情" },
component: () =>
import ("../views/policyInfo/policyInfo")
}
path: "/",
name: "index",
meta: { index: 1, title: "宁波房屋征收" },
component: () =>
import("../views/transit")
},
// 选择项目页面
{
path: "/project-select",
name: "projectSelect",
meta: { index: 2, title: "征收信息查询" },
component: () =>
import("../views/project")
},
// 评估结果一级页面
{
path: "/report/evalute",
name: "evalute",
meta: { index: 3, title: "评估结果" },
component: () =>
import("../views/report/evalute")
},
// 协议结果页面
{
path: "/report/agreement",
name: "reportAgreement",
meta: { index: 4, title: "协议结果" },
component: () =>
import("../views/report/agreement")
},
// 补偿协议pdf
{
path: "/showPdf",
name: "showPdf",
meta: { index: 5, title: "协议详情" },
component: () =>
import("../views/pdf/pdf")
},
// 评估结果二级页面(表格页面)
{
path: "/evaluatePage",
name: "evaluatePage",
meta: { index: 6, title: "评估报告" },
component: () =>
import("../views/report/evaluatePage")
},
// 评估结果二级页面(pdf页面)
{
path: "/evaluateResultPdf",
name: "evaluateResultPdf",
meta: { index: 7, title: "评估报告" },
component: () =>
import("../views/pdf/evaluateResultPdf")
},
// 政策详情页面
{
path: "/policyInfo",
name: "policyInfo",
meta: { index: 8, title: "政策详情" },
component: () =>
import("../views/policyInfo/policyInfo")
}, {
path: "/final",
name: "final",
meta: { index: 9, title: "宁波房屋征收" },
component: () =>
import("../views")
}
]
});
router.beforeEach((to, from, next) => {
//debugger
console.log('1201-进入路由1--form-to:' + from.name + "->" + to.name);
if (to.meta.title) {
document.title = to.meta.title;
}
next();
// if (from.name == null && to.name == 'index') {
// router.push('/transit');
// next();
// } else {
if (from.name == 'final' && to.name == 'index') {
console.log('1201-进入判断2--form-to:' + from.name + "->" + to.name);
ZWJSBridge.close().then((result) => {
console.log('1201-进入close回调3--form-to:' + from.name + "->" + to.name);
console.log(result);
}).catch((error) => {
console.log('1201-进入close回调异常4--form-to:' + from.name + "->" + to.name);
console.log(error);
});
console.log('1201-退出之前5--form-to:' + from.name + "->" + to.name);
}
else {
console.log('1201-next之前6--form-to:' + from.name + "->" + to.name);
next();
}
// }
});
export default router;

70
FrontCode2/sunshine_levy/src/views/index.vue
View File

@@ -29,7 +29,7 @@
</div>
<div @click="gotoProject('pg')" style="background: #f1ae4b">
<img src="@/assets/img/evaluation.png" />
<span>查评估结果</span>
<span>查评估报告</span>
</div>
<div @click="gotoProject('xy')" style="background: #16d7ed">
<img src="@/assets/img/compensation.png" />
@@ -286,25 +286,35 @@ export default {
};
},
created() {
if (!this.$route.query.ticket) {
// window.location.replace(
// "https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs"
// );
ZWJSBridge.openLink({
url: "https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs",
})
.then((result) => {
console.log(result);
})
.catch((error) => {
console.log(error);
});
} else {
this.onInit();
}
// this.onInit();
// SetTicket(this.$route.query.ticket);
// if (!this.$route.query.ticket) {
// // //this.$router.push('https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs');
// // ZWJSBridge.openLink({
// // url: "https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs",
// // })
// // .then((result) => {
// // console.log('1130-1'+result)
// // window.parent.location.reload();
// // ZWJSBridge.close();
// // })
// // .catch((error) => {
// // console.log(error);
// // });
// // ZWJSBridge.close()
// // .then((result) => {
// // window.location.replace(
// // "https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs&goto=https://mapi.zjzwfw.gov.cn/web/mgop/gov-open/zj/2001833218/reserved/index.html"
// // );
// // })
// // .catch((error) => {
// // console.log(error);
// // });
// } else {
// this.onInit();
// }
this.onInit();
this.setLocationAplus();
SetTicket(this.$route.query.ticket);
// SetTicket(this.$route.query.ticket);
$(".logout").css("display", "none");
if (sessionStorage.getItem("mode") == "older") {
changeStyle();
@@ -313,6 +323,24 @@ export default {
$("#app").addClass("old_app3");
}
},
beforeRouteLeave(to, from, next) {
//debugger;
if (from.name == "final" && to.name == "index") {
ZWJSBridge.close()
.then((result) => {
console.log(
"1201-index页面的close回调3--form-to:" + from.name + "->" + to.name
);
console.log(result);
})
.catch((error) => {
console.log(
"1201-index页面的close回调异常4--form-to:" + from.name + "->" + to.name
);
console.log(error);
});
} else next();
},
mounted() {
if (sessionStorage.getItem("mode") == "older") {
$(".container").addClass("old_container");
@@ -327,7 +355,8 @@ export default {
dataType: "JSON",
type: "POST",
data: {
ticket: this.$route.query.ticket,
ticket:
this.$route.query.ticket || window.sessionStorage.getItem("ticket"),
},
appKey: "es4b8zmz+2001833218+dehllx",
onSuccess: (data) => {
@@ -501,6 +530,7 @@ export default {
});
},
scan() {
//this.$router.push("http://localhost:8080/#/");
//扫一扫
ZWJSBridge.scan({ type: "qrCode" })
.then((data) => {

16
FrontCode2/sunshine_levy/src/views/transit/index.vue Normal file
View File

@@ -0,0 +1,16 @@
<template>
<div class="container"></div>
</template>
<script>
export default {
data() {
return {};
},
created() {
//debugger;
this.$router.push("final");
},
methods: {},
};
</script>

3
framework/Api/Ewide.Web.Entry/appsettings.json
View File

@@ -35,7 +35,8 @@
"AllowedHosts": "*",
"nbzs_file_path": "D:\\1_发布程序",
"nbzs_domain-bak": "https://zsxt.nbzs.org.cn",
"nbzs_domain": "http://118.178.224.202:2258/",
"nbzs_domain_118": "http://118.178.224.202:2258/",
"nbzs_domain": "http://10.19.94.9:8020/",
"current_domain": "http://localhost:5566/",
"CorsAccessorSettings": {
"PolicyName": "自定义跨域策略名",

BIN
framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/b02f32b4-fa82-44c2-b407-614612c65534.pdf Normal file
View File

Binary file not shown.

BIN
framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/b02f32b4-fa82-44c2-b407-614612c65534.pdf-0.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 MiB

BIN
framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/b02f32b4-fa82-44c2-b407-614612c65534.pdf-1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 110 KiB

1
framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/lock Normal file
View File

@@ -0,0 +1 @@
lock