Commit c5f1e4f1 authored by lei's avatar lei

add:跳转隐患详情方法

parent e9aa1b6c
......@@ -30,6 +30,13 @@
<body>
<!-- 获取授权用户信息 本地token等操作 -->
<!-- <script type="text/javascript" src="sdk/jssdk2/index.js"></script> -->
<script type="text/javascript">
gemhoUtil.setCookie(
'token',
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiMTU4YjM0M2MtNTFmMS00ZDYzLTk0ZWUtNzcxZWRkYTAxMjFmIn0.ehBDVx2ldKNypKcQ4Vnzzii7Dy9El8gRBRQ1Fs_Lq0tkp-zCxSHoEesF5YsWD5weKSaYdAYj_3gXQk-P832QrA'
) // 存储1天后过期
console.log(gemhoUtil.getCookie('token'))
</script>
<div
id="app"
class="page_wrapper"
......
......@@ -161,78 +161,133 @@ window.onload = function () {
this.showPicker = false
},
getUserInfo() {
http.get('/gq/information/getAll/1 ').then((res) => {
if (res.code !== 200 && res.data == null) {
return
}
if (
res.data.roleDeptNameVo.roleName == '超级管理员' ||
res.data.roleDeptNameVo.roleName == '超级管理员'
) {
this.userInfo = {
userType: 'gl', // 登录用户type
userId: '1', // 登录用户id
userName: '张三', // 登录用户name
deptId: '1', // 登录用户部门id
deptName: res.data.roleDeptNameVo.deptName, // 登录用户部门name
role: 'dudao',
roleName: '督导人员',
}
} else if (res.data.roleDeptNameVo.roleName == '行业管理') {
this.userInfo = {
userType: 'gl', // 登录用户type
userId: '1', // 登录用户id
userName: '张三', // 登录用户name
deptId: '1', // 登录用户部门id
deptName: res.data.roleDeptNameVo.deptName, // 登录用户部门name
role: 'dudao',
roleName: '行业检查',
}
} else if (res.data.roleDeptNameVo.roleName == '街道主管') {
this.userInfo = {
userType: 'gl', // 登录用户type
userId: '1', // 登录用户id
userName: '张三', // 登录用户name
deptId: '1', // 登录用户部门id
deptName: res.data.roleDeptNameVo.deptName, // 登录用户部门name
role: 'dudao',
roleName: '行业检查',
}
} else if (res.data.roleDeptNameVo.roleName == '日常管理') {
this.userInfo = {
userType: 'gl', // 登录用户type
userId: '1', // 登录用户id
userName: '张三', // 登录用户name
deptId: '1', // 登录用户部门id
deptName: res.data.roleDeptNameVo.deptName, // 登录用户部门name
role: 'dudao',
roleName: '日常检查',
}
} else if (res.data.roleDeptNameVo.roleName == '商户') {
this.userInfo = {
userType: 'sj', // 登录用户type
userId: '1', // 登录用户id
userName: '张三', // 登录用户name
deptId: '1', // 登录用户部门id
deptName: res.data.roleDeptNameVo.deptName, // 登录用户部门name
businessAddress: res.data.merchantInfoNumVo.businessAddress, //
smallPlaceTypeName: res.data.merchantInfoNumVo.smallPlaceTypeName, //
unitName: res.data.merchantInfoNumVo.unitName, //
role: 'dudao',
roleName: '商家',
}
}
console.log(this.userInfo)
// 生成最终菜单列表
this.menuList = (res.data.modules || []).map((moduleItem) => ({
...(this.defaultMenuList.find(
(d) => d.title === moduleItem.title
) || {}),
...moduleItem,
remark: moduleItem.remark || '',
}))
// http.get('/gq/information/getAll/1 ').then((res) => {})
vant.Toast.loading({
message: '正在加载...',
forbidClick: true,
loadingType: 'spinner',
})
setTimeout(() => {
http2.post(
{
serviceId: API_KEY_MAP['noPage']['id'],
interfacePublicKey: API_KEY_MAP['noPage']['publicKey'],
interfacePrivateKey: API_KEY_MAP['noPage']['privateKey'],
reqParams: {
sign: 9,
pageNum: this.page++, // 每次请求增加下一页
pageSize: this.size,
sort: 'lawId,desc',
},
},
(res) => {
if (!res) {
// 中台返回为undefined 重新请求
vant.Toast.clear()
this.page = this.page - 1 // 重新请求后,分页数恢复上一次请求的值
setTimeout(() => {
// this.getList()
}, 0)
return
}
if (res) {
// console.log('接口回调数据', JSON.parse(res))
var result = JSON.parse(res)
this.list.push(...result.content)
this.total = result.totalElements
if (res.code !== 200 && res.data == null) {
return
}
if (
result.data.roleDeptNameVo.roleName == '超级管理员' ||
result.data.roleDeptNameVo.roleName == '超级管理员'
) {
this.userInfo = {
userType: 'gl', // 登录用户type
userId: '1', // 登录用户id
userName: '张三', // 登录用户name
deptId: '1', // 登录用户部门id
deptName: result.data.roleDeptNameVo.deptName, // 登录用户部门name
role: 'dudao',
roleName: '督导人员',
}
} else if (result.data.roleDeptNameVo.roleName == '行业管理') {
this.userInfo = {
userType: 'gl', // 登录用户type
userId: '1', // 登录用户id
userName: '张三', // 登录用户name
deptId: '1', // 登录用户部门id
deptName: result.data.roleDeptNameVo.deptName, // 登录用户部门name
role: 'dudao',
roleName: '行业检查',
}
} else if (result.data.roleDeptNameVo.roleName == '街道主管') {
this.userInfo = {
userType: 'gl', // 登录用户type
userId: '1', // 登录用户id
userName: '张三', // 登录用户name
deptId: '1', // 登录用户部门id
deptName: result.data.roleDeptNameVo.deptName, // 登录用户部门name
role: 'dudao',
roleName: '行业检查',
}
} else if (result.data.roleDeptNameVo.roleName == '日常管理') {
this.userInfo = {
userType: 'gl', // 登录用户type
userId: '1', // 登录用户id
userName: '张三', // 登录用户name
deptId: '1', // 登录用户部门id
deptName: result.data.roleDeptNameVo.deptName, // 登录用户部门name
role: 'dudao',
roleName: '日常检查',
}
} else if (result.data.roleDeptNameVo.roleName == '商户') {
this.userInfo = {
userType: 'sj', // 登录用户type
userId: '1', // 登录用户id
userName: '张三', // 登录用户name
deptId: '1', // 登录用户部门id
deptName: result.data.roleDeptNameVo.deptName, // 登录用户部门name
businessAddress:
result.data.merchantInfoNumVo.businessAddress, //
smallPlaceTypeName:
result.data.merchantInfoNumVo.smallPlaceTypeName, //
unitName: result.data.merchantInfoNumVo.unitName, //
role: 'dudao',
roleName: '商家',
}
}
// 生成最终菜单列表
this.menuList = (result.data.modules || []).map(
(moduleItem) => ({
...(this.defaultMenuList.find(
(d) => d.title === moduleItem.title
) || {}),
...moduleItem,
remark: moduleItem.remark || '',
})
)
if (this.page * this.size >= this.total) {
this.finished = true // 下滑不在刷新数据
}
}
this.loading = false
setTimeout(() => {
this.$nextTick(() => {
vant.Toast.clear()
})
}, 0)
this.$nextTick(() => {
// 滚动条跳转位置
window.scrollTo(0, gemhoUtil.getCookie('scrollPosition'))
})
}
)
}, 0)
},
// 获取用户数据的方法
getUserData() {
......
......@@ -8,103 +8,124 @@ const BASE_URL = 'https://gqyjpt.weihai.cn'
// }
// localStorage.setItem('wenti', JSON.stringify(errors))
var http2 = {
post: function(params, fn) {
// console.log('中台错误信息', JSON.stringify(localStorage.getItem('wenti')))
/**
* 网关验签接口
* @param {1} = appid应用唯一标识
* @param {2} = interfaceid接口唯一标识
* @param {3} = data接口参数,请使用json格式, 例如:{"siteid":"2","cateid":"1"}
* @param {4} = fromport端口来源"0":PC;"1":APP;"2":支付宝;"3":微信
* @param {5} = extraData 额外参数,附件,请求头一类的参数
*
*/
const data = SM.encrypt(JSON.stringify(params.reqParams), params.interfacePublicKey)
// console.log('http请求普通参数前', params.reqParams)
// console.log('http请求参数加密后', data)
const extraData = { // 公共请求头设置
// header: {
// // Authorization: "Bearer eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiI0ODA3ODFkZmQxYmE0MmM0OGQyZDQ5NTllYzcyYTUwNCIsInVzZXIiOiJqYyIsInN1YiI6ImpjIn0.WfLq11T7iWPiMuzqDY2N54aIqdv-ciYCe6pINqQAeBdqlMiJmkufsqlD2YMmUzsHA-o4WerkiSYnPzexEMiAJA"
// // Authorization: localStorage.getItem('token')
// Authorization: gemhoUtil.getCookie('token')
// },
verificationHeaders: { // 二次核验请求头
interfaceTicket: gemhoUtil.getCookie('ticket'),
}
}
if(gemhoUtil.getCookie('token')){
extraData.header = {
Authorization: gemhoUtil.getCookie('token')
}
}
post: function (params, fn) {
// console.log('中台错误信息', JSON.stringify(localStorage.getItem('wenti')))
/**
* 网关验签接口
* @param {1} = appid应用唯一标识
* @param {2} = interfaceid接口唯一标识
* @param {3} = data接口参数,请使用json格式, 例如:{"siteid":"2","cateid":"1"}
* @param {4} = fromport端口来源"0":PC;"1":APP;"2":支付宝;"3":微信
* @param {5} = extraData 额外参数,附件,请求头一类的参数
*
*/
const data = SM.encrypt(
JSON.stringify(params.reqParams),
params.interfacePublicKey
)
// console.log('http请求普通参数前', params.reqParams)
// console.log('http请求参数加密后', data)
const extraData = {
// 公共请求头设置
// header: {
// // Authorization: "Bearer eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiI0ODA3ODFkZmQxYmE0MmM0OGQyZDQ5NTllYzcyYTUwNCIsInVzZXIiOiJqYyIsInN1YiI6ImpjIn0.WfLq11T7iWPiMuzqDY2N54aIqdv-ciYCe6pINqQAeBdqlMiJmkufsqlD2YMmUzsHA-o4WerkiSYnPzexEMiAJA"
// // Authorization: localStorage.getItem('token')
// Authorization: gemhoUtil.getCookie('token')
// },
verificationHeaders: {
// 二次核验请求头
interfaceTicket: gemhoUtil.getCookie('ticket'),
},
}
// if (gemhoUtil.getCookie('token')) {
extraData.header = {
// Authorization: gemhoUtil.getCookie('token')
Authorization:
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiMTU4YjM0M2MtNTFmMS00ZDYzLTk0ZWUtNzcxZWRkYTAxMjFmIn0.ehBDVx2ldKNypKcQ4Vnzzii7Dy9El8gRBRQ1Fs_Lq0tkp-zCxSHoEesF5YsWD5weKSaYdAYj_3gXQk-P832QrA',
// }
}
if(params.fileList){ // 用于接口传递的额外参数 如文件流等){
extraData.fileList = params.fileList
}
// console.log('http请求额外参数', JSON.stringify(extraData))
// console.log('http2方法进来了~extraData', extraData)
// vaildInterfacefn("gqyjglptxiefn", params.serviceId, data, "1", "https://" + urldomaincreatesign, "https://" + urldomaingateway).then((value) => {
vaildInterfacefn("gqyjglptxiefn", params.serviceId, data, "1", extraData).then((value) => {
// console.log('vaildInterfacefn响应value', value)
/**
if (params.fileList) {
// 用于接口传递的额外参数 如文件流等){
extraData.fileList = params.fileList
}
// console.log('http请求额外参数', JSON.stringify(extraData))
// console.log('http2方法进来了~extraData', extraData)
// vaildInterfacefn("gqyjglptxiefn", params.serviceId, data, "1", "https://" + urldomaincreatesign, "https://" + urldomaingateway).then((value) => {
vaildInterfacefn(
'gqyjglptxiefn',
params.serviceId,
data,
'1',
extraData
).then((value) => {
// console.log('vaildInterfacefn响应value', value)
/**
* code: 200
data: "048b04671ad85e52e" // value 值就是接口返回的data值
msg: "请求成功"
success: true
*/
if(!value){
// var errors = JSON.parse(localStorage.getItem('wenti'))
// errors.push('中台发生了错误-中台value为undefined')
// localStorage.setItem('wenti', JSON.stringify(errors))
// vant.Dialog.alert({
// title: '信息提示',
// message: '网络异常, 请重试',
// // message: '请求异常'
// })
fn && fn(null)
return
}
let sm2_encrypt_result = value // 后台返回待解密内容
let sm2_decrypt_result = sm2_Decrypt(sm2_encrypt_result, params.interfacePrivateKey)
// console.log('vaildInterfacefn响应解密', sm2_decrypt_result)
if(!sm2_decrypt_result){ // 解密为空字符串
// var errors = JSON.parse(localStorage.getItem('wenti'))
// errors.push('中台发生了错误-解密为空')
// localStorage.setItem('wenti', JSON.stringify(errors))
fn && fn(null, 'decrypt')
return
}
const decryptRes = JSON.parse(sm2_decrypt_result)
if(decryptRes.code === 400 || decryptRes.code === 401 || decryptRes.status === 401){
gemhoUtil.setCookie('token', '') // 清空token
vant.Dialog.alert({
title: '信息提示',
message: decryptRes.msg || decryptRes.message,
}).then(() => { // confirm按钮回调
if(gemhoUtil.getPageName() === 'index'){
lightAppJssdk.navigation.close({
success:function(data){
//成功回调
console.log('关闭页面')
},fail:function(data){
console.log('关闭失败')
}
});
}else{
gemhoUtil.navigatePage('../index.html')
}
});
return
}
fn && fn(sm2_decrypt_result)
})
},
if (!value) {
// var errors = JSON.parse(localStorage.getItem('wenti'))
// errors.push('中台发生了错误-中台value为undefined')
// localStorage.setItem('wenti', JSON.stringify(errors))
// vant.Dialog.alert({
// title: '信息提示',
// message: '网络异常, 请重试',
// // message: '请求异常'
// })
fn && fn(null)
return
}
let sm2_encrypt_result = value // 后台返回待解密内容
let sm2_decrypt_result = sm2_Decrypt(
sm2_encrypt_result,
params.interfacePrivateKey
)
// console.log('vaildInterfacefn响应解密', sm2_decrypt_result)
if (!sm2_decrypt_result) {
// 解密为空字符串
// var errors = JSON.parse(localStorage.getItem('wenti'))
// errors.push('中台发生了错误-解密为空')
// localStorage.setItem('wenti', JSON.stringify(errors))
fn && fn(null, 'decrypt')
return
}
const decryptRes = JSON.parse(sm2_decrypt_result)
if (
decryptRes.code === 400 ||
decryptRes.code === 401 ||
decryptRes.status === 401
) {
gemhoUtil.setCookie('token', '') // 清空token
vant.Dialog.alert({
title: '信息提示',
message: decryptRes.msg || decryptRes.message,
}).then(() => {
// confirm按钮回调
if (gemhoUtil.getPageName() === 'index') {
lightAppJssdk.navigation.close({
success: function (data) {
//成功回调
console.log('关闭页面')
},
fail: function (data) {
console.log('关闭失败')
},
})
} else {
gemhoUtil.navigatePage('../index.html')
}
})
return
}
}
\ No newline at end of file
fn && fn(sm2_decrypt_result)
})
},
}
......@@ -2,81 +2,86 @@
* author: dabao
*/
var VUE = null
window.addEventListener("load", function() {
VUE = new Vue({
el: '#app',
data() {
return {
unitName: '',
value: '',
list: [],
loading: false,
finished: false,
page: 0,
size: 9999,
total: 0
}
},
mounted() {
this.getList()
},
methods: {
onSearch() {
console.log('xxxx', this.unitName)
},
detail(index) {
gemhoUtil.navigatePage('_sh.html?law_id=' + this.list[index].lawId)
},
getList() {
vant.Toast.loading({
message: '正在加载...',
forbidClick: true,
loadingType: 'spinner',
});
setTimeout(() => {
http2.post({
serviceId: API_KEY_MAP["page"]['id'],
interfacePublicKey: API_KEY_MAP["page"]["publicKey"],
interfacePrivateKey: API_KEY_MAP["page"]["privateKey"],
reqParams: {
sign: 9,
pageNum: this.page++, // 每次请求增加下一页
pageSize: this.size,
sort: 'lawId,desc',
}
}, (res) => {
if(!res){ // 中台返回为undefined 重新请求
vant.Toast.clear()
this.page = this.page - 1 // 重新请求后,分页数恢复上一次请求的值
setTimeout(() => {
// this.getList()
}, 0);
return
}
if (res) {
// console.log('接口回调数据', JSON.parse(res))
window.addEventListener('load', function () {
VUE = new Vue({
el: '#app',
data() {
return {
unitName: '',
value: '',
list: [],
loading: false,
finished: false,
page: 0,
size: 9999,
total: 0,
}
},
mounted() {
this.getList()
},
methods: {
onSearch() {
console.log('xxxx', this.unitName)
},
detail(index) {
gemhoUtil.navigatePage('_sh.html?law_id=' + this.list[index].lawId)
},
getList() {
vant.Toast.loading({
message: '正在加载...',
forbidClick: true,
loadingType: 'spinner',
})
setTimeout(() => {
http2.post(
{
serviceId: API_KEY_MAP['page']['id'],
interfacePublicKey: API_KEY_MAP['page']['publicKey'],
interfacePrivateKey: API_KEY_MAP['page']['privateKey'],
reqParams: {
sign: 9,
pageNum: this.page++, // 每次请求增加下一页
pageSize: this.size,
var result = JSON.parse(res)
this.list.push(...result.content);
this.total = result.totalElements
sort: 'lawId,desc',
},
},
(res) => {
if (!res) {
// 中台返回为undefined 重新请求
vant.Toast.clear()
this.page = this.page - 1 // 重新请求后,分页数恢复上一次请求的值
setTimeout(() => {
// this.getList()
}, 0)
return
}
if (res) {
// console.log('接口回调数据', JSON.parse(res))
if (this.page * this.size >= this.total) {
this.finished = true; // 下滑不在刷新数据
}
}
this.loading = false
setTimeout(() => {
this.$nextTick(()=>{
vant.Toast.clear()
})
}, 0);
this.$nextTick(()=>{
// 滚动条跳转位置
window.scrollTo(0, gemhoUtil.getCookie('scrollPosition'));
})
})
}, 0)
}
},
});
});
\ No newline at end of file
var result = JSON.parse(res)
this.list.push(...result.content)
this.total = result.totalElements
if (this.page * this.size >= this.total) {
this.finished = true // 下滑不在刷新数据
}
}
this.loading = false
setTimeout(() => {
this.$nextTick(() => {
vant.Toast.clear()
})
}, 0)
this.$nextTick(() => {
// 滚动条跳转位置
window.scrollTo(0, gemhoUtil.getCookie('scrollPosition'))
})
}
)
}, 0)
},
},
})
})
......@@ -66,6 +66,15 @@ window.addEventListener('load', function () {
},
viewDetail(id) {
console.log('查看详情:', id)
let param = {
id: id,
flag: 'YH_XQ',
pageName: '_yh_check',
}
let url = gemhoUtil.setParameter('_check_info.html', param)
console.log(url)
gemhoUtil.navigatePage(url, '跳转中...')
// 这里添加跳转逻辑
},
//获取隐患列表数据
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment