Skip to content

G
GaoQuYingJiH5-ASD
Commit 7687117a authored by lei's avatar lei
Browse files
Options

add:督导首页，检查页面的接口

parent 2372d2b0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 426 additions and 266 deletions
index.html
View file @ 7687117a
...@@ -29,16 +29,15 @@ ...@@ -29,16 +29,15 @@
<body> <body>
<!-- 获取授权用户信息 本地token等操作 --> <!-- 获取授权用户信息 本地token等操作 -->
<script <!-- <script
type="text/javascript" type="text/javascript"
src="sdk/jssdk2/index.js" src="sdk/jssdk2/index.js"
></script> ></script> -->
<script type="text/javascript"> <script type="text/javascript">
gemhoUtil.setCookie( gemhoUtil.setCookie(
'token', 'token',
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiMTU4YjM0M2MtNTFmMS00ZDYzLTk0ZWUtNzcxZWRkYTAxMjFmIn0.ehBDVx2ldKNypKcQ4Vnzzii7Dy9El8gRBRQ1Fs_Lq0tkp-zCxSHoEesF5YsWD5weKSaYdAYj_3gXQk-P832QrA' 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiMTU4YjM0M2MtNTFmMS00ZDYzLTk0ZWUtNzcxZWRkYTAxMjFmIn0.ehBDVx2ldKNypKcQ4Vnzzii7Dy9El8gRBRQ1Fs_Lq0tkp-zCxSHoEesF5YsWD5weKSaYdAYj_3gXQk-P832QrA'
) // 存储1天后过期 ) // 存储1天后过期
console.log(gemhoUtil.getCookie('token'))
</script> </script>
<div <div
id="app" id="app"
......
index.js
View file @ 7687117a
...@@ -113,6 +113,7 @@ window.onload = function () { ...@@ -113,6 +113,7 @@ window.onload = function () {
// alert('扫码成功'+JSON.stringify(data)) // alert('扫码成功'+JSON.stringify(data))
// location.href = 'shanghu_home.html' // location.href = 'shanghu_home.html'
gemhoUtil.navigatePage(`src/_checkrecord.html`) gemhoUtil.navigatePage(`src/_checkrecord.html`)
//成功回调 //成功回调
}, },
...@@ -122,7 +123,7 @@ window.onload = function () { ...@@ -122,7 +123,7 @@ window.onload = function () {
}, },
}) })
} else { } else {
this.userInfo.userType === 'sj' this.userInfo.userType === 'shop'
? (toData = 'checkrecord') ? (toData = 'checkrecord')
: (toData = 'shanghu_list') : (toData = 'shanghu_list')
...@@ -163,23 +164,23 @@ window.onload = function () { ...@@ -163,23 +164,23 @@ window.onload = function () {
this.showPicker = false this.showPicker = false
}, },
getUserInfo() { getUserInfo() {
// http.get('/gq/information/getAll/1 ').then((res) => {})
vant.Toast.loading({ vant.Toast.loading({
message: '正在加载...', message: '正在加载...',
forbidClick: true, forbidClick: true,
loadingType: 'spinner', loadingType: 'spinner',
}) })
setTimeout(() => { setTimeout(() => {
http2.post( // http2.post(
http.post(
'/gq/asd/common',
{ {
serviceId: API_KEY_MAP['no-page']['id'], serviceId: API_KEY_MAP['no-page']['id'],
interfacePublicKey: API_KEY_MAP['no-page']['publicKey'], interfacePublicKey: API_KEY_MAP['no-page']['publicKey'],
interfacePrivateKey: API_KEY_MAP['no-page']['privateKey'], interfacePrivateKey: API_KEY_MAP['no-page']['privateKey'],
reqParams: { reqParams: {
sign: 1, sign: 9,
pageNum: this.page++, // 每次请求增加下一页 pageNum: this.page++, // 每次请求增加下一页
pageSize: this.size, pageSize: this.size,
sort: 'lawId,desc', sort: 'lawId,desc',
}, },
}, },
...@@ -194,12 +195,8 @@ window.onload = function () { ...@@ -194,12 +195,8 @@ window.onload = function () {
return return
} }
if (res) { if (res) {
// console.log('接口回调数据', JSON.parse(res))
var result = JSON.parse(res) var result = JSON.parse(res)
// this.list.push(...result.content) if (result.code !== 200 && result.data == null) {
// this.total = result.totalElements
if (res.code !== 200 && res.data == null) {
return return
} }
this.userInfo = { this.userInfo = {
...@@ -209,14 +206,14 @@ window.onload = function () { ...@@ -209,14 +206,14 @@ window.onload = function () {
deptId: '1', // 登录用户部门id deptId: '1', // 登录用户部门id
deptName: result.data.roleDeptNameVo.deptName, // 登录用户部门name deptName: result.data.roleDeptNameVo.deptName, // 登录用户部门name
businessAddress: businessAddress:
result.data.merchantInfoNumVo.businessAddress, // result.data.merchantInfoNumVo?.businessAddress, //
smallPlaceTypeName: smallPlaceTypeName:
result.data.merchantInfoNumVo.smallPlaceTypeName, // result.data.merchantInfoNumVo?.smallPlaceTypeName, //
unitName: result.data.merchantInfoNumVo.unitName, // unitName: result.data.merchantInfoNumVo?.unitName, //
role: 'dudao', role: 'dudao',
roleName: result.data.roleDeptNameVo.roleName, roleName: result.data.roleDeptNameVo.roleName,
} }
gemhoUtil.setCookie('userType', this.userInfo.userType)
// 生成最终菜单列表 // 生成最终菜单列表
this.menuList = (result.data.modules || []).map( this.menuList = (result.data.modules || []).map(
(moduleItem) => ({ (moduleItem) => ({
...@@ -248,16 +245,54 @@ window.onload = function () { ...@@ -248,16 +245,54 @@ window.onload = function () {
}, },
// 获取用户数据的方法 // 获取用户数据的方法
getUserData() { getUserData() {
http vant.Toast.loading({
.get( message: '正在加载...',
'/gq/checkRecord/merHomeStatistics?merId=1&date=' + forbidClick: true,
this.selectedDate loadingType: 'spinner',
) })
.then((res) => { setTimeout(() => {
if (res.code == 200) { // http2.post(
this.userData = res.data http.post(
'/gq/asd/common',
{
serviceId: API_KEY_MAP['no-page']['id'],
interfacePublicKey: API_KEY_MAP['no-page']['publicKey'],
interfacePrivateKey: API_KEY_MAP['no-page']['privateKey'],
reqParams: {
sign: 6,
pageNum: this.page++, // 每次请求增加下一页
pageSize: this.size,
date: this.selectedDate,
sort: 'lawId,desc',
},
},
(res) => {
if (!res) {
// 中台返回为undefined 重新请求
vant.Toast.clear()
this.page = this.page - 1 // 重新请求后，分页数恢复上一次请求的值
setTimeout(() => {
// this.getList()
}, 0)
return
}
if (res) {
var result = JSON.parse(res)
this.userData = result.data
}
} }
}) )
}, 0)
// http
// .get(
// '/gq/checkRecord/merHomeStatistics?merId=1&date=' +
// this.selectedDate
// )
// .then((res) => {
// if (res.code == 200) {
// this.userData = res.data
// }
// })
}, },
}, },
//过滤器 //过滤器
......
sdk/util.js
View file @ 7687117a
This diff is collapsed.
src/_checkrecord.html
View file @ 7687117a
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
<div class="header"> <div class="header">
<!-- <div class="level">安全等级</div> --> <!-- <div class="level">安全等级</div> -->
<div class="title"> <div class="title">
<img src="../image/code/sj.png" alt=""><span>{{userInfo.unitName}}</span> <img src="../image/code/sj.png" alt=""><span>{{unitName}}</span>
</div> </div>
<div class="detail"> <div class="detail">
<van-row> <van-row>
<van-col span="24">场所类型: {{userInfo.smallPlaceTypeName}}</van-col> <van-col span="24">场所类型: {{smallPlaceTypeName}}</van-col>
</van-row> </van-row>
<van-row type="flex" justify="space-around" <van-row type="flex" justify="space-around"
style="width:100%; margin-top: .3rem; margin-bottom: .3rem;"> style="width:100%; margin-top: .3rem; margin-bottom: .3rem;">
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<van-list> <van-list>
<van-cell v-for="item in hazardList" :key="item.id"> <van-cell v-for="item in hazardList" :key="item.id" @click="viewDetail(item.id)">
<div style="width: 100%;"> <div style="width: 100%;">
<!-- 第一行：隐患描述 --> <!-- 第一行：隐患描述 -->
<div style=" <div style="
...@@ -54,7 +54,8 @@ ...@@ -54,7 +54,8 @@
font-size: 0.3rem; font-size: 0.3rem;
font-weight: bold; font-weight: bold;
font-family: PingFang SC; font-family: PingFang SC;
">{{ item.remark }}</div> ">九小场所消防安全检查清单</div>
<!-- ">{{ item.remark }}</div> -->
<!-- 第二行：状态和时间 --> <!-- 第二行：状态和时间 -->
<div style="display: flex; justify-content: start; gap: .34rem; margin: 8px 0;"> <div style="display: flex; justify-content: start; gap: .34rem; margin: 8px 0;">
...@@ -62,7 +63,7 @@ ...@@ -62,7 +63,7 @@
</div> </div>
<!-- 第三行：商家和箭头 --> <!-- 第三行：商家和箭头 -->
<div style="display: flex; justify-content: start; gap: .4rem; align-items: center;"> <div style="display: flex; justify-content: start; gap: .4rem; align-items: center;">
<span>检查人：{{item.checkPeople}}</span> <span>检查人：{{item.checkPeopleName}}</span>
<span>隐患数：{{item.hiddenCount}}</span> <span>隐患数：{{item.hiddenCount}}</span>
<span>未整改：{{item.notRectifiedCount}}</span> <span>未整改：{{item.notRectifiedCount}}</span>
</div> </div>
......
src/_checkrecord.js
View file @ 7687117a
...@@ -17,62 +17,146 @@ window.addEventListener('load', function () { ...@@ -17,62 +17,146 @@ window.addEventListener('load', function () {
hiddenCount: 0, //隐患数 hiddenCount: 0, //隐患数
hiddenNoReCount: 0, //未整改数 hiddenNoReCount: 0, //未整改数
}, },
page: 1,
size: 10,
merId: null, // 商户id
unitName: '', // 单位名称
smallPlaceTypeName: '', // 场所类型
} }
}, },
created() { created() {
let urlParams = gemhoUtil.getUrlParams()
this.merId = urlParams.id
this.unitName = urlParams.unitName
this.smallPlaceTypeName = urlParams.smallPlaceTypeName
this.init() this.init()
}, },
computed: {}, computed: {},
methods: { methods: {
//初始化页面 //初始化页面
init() { init() {
this.getUserInfo()
this.getUserData() this.getUserData()
this.getMerchantSelfCheckData() this.getMerchantSelfCheckData()
}, },
/**请求数据 */ /**请求数据 */
// 获取用户数据的方法 // 获取用户数据的方法
getUserData() { getUserData() {
http // http
.get('/gq/checkRecord/merHomeStatistics?date=' + this.selectedDate) // .get('/gq/checkRecord/merHomeStatistics?date=' + this.selectedDate)
.then((res) => { // .then((res) => {
if (res.code == 200) { // if (res.code == 200) {
this.userData = res.data // this.userData = res.data
} // }
}) // })
}, vant.Toast.loading({
//获取用户信息 message: '正在加载...',
getUserInfo() { forbidClick: true,
http.get('/gq/information/getAll/141 ').then((res) => { loadingType: 'spinner',
if (res.code !== 200 && res.data == null) {
return
}
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: '商家',
}
}
}) })
setTimeout(() => {
// http2.post(
http.post(
'/gq/asd/common',
{
serviceId: API_KEY_MAP['no-page']['id'],
interfacePublicKey: API_KEY_MAP['no-page']['publicKey'],
interfacePrivateKey: API_KEY_MAP['no-page']['privateKey'],
reqParams: {
sign: 6,
merId: this.merId,
pageNum: this.page++, // 每次请求增加下一页
pageSize: this.size,
date: this.selectedDate,
sort: 'lawId,desc',
},
},
(res) => {
if (!res) {
// 中台返回为undefined 重新请求
vant.Toast.clear()
this.page = this.page - 1 // 重新请求后，分页数恢复上一次请求的值
setTimeout(() => {
// this.getList()
}, 0)
return
}
if (res) {
var result = JSON.parse(res)
this.userData = result.data
}
}
)
}, 0)
}, },
//获取商户自查数据 //获取商户自查数据
getMerchantSelfCheckData() { getMerchantSelfCheckData() {
http // 更多示例数据...
.get( vant.Toast.loading({
'/gq/checkRecord/list?merId=1&pageSize=10&pageNum=0&type=' + message: '正在加载...',
this.activeTab forbidClick: true,
loadingType: 'spinner',
})
setTimeout(() => {
// http2.post(
http.post(
'/gq/asd/common',
{
serviceId: API_KEY_MAP['page']['id'],
interfacePublicKey: API_KEY_MAP['page']['publicKey'],
interfacePrivateKey: API_KEY_MAP['page']['privateKey'],
reqParams: {
sign: 1,
type: this.activeTab,
merId: this.merId,
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) {
var result = JSON.parse(res)
if (result.code !== 200 && result.data == null) {
return
}
this.hazardList = result.rows
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'))
})
}
) )
.then((res) => { }, 0)
this.hazardList = res.rows },
}) viewDetail(id) {
let param = {
id: id,
flag: 'JC_XQ',
pageName: '_checkrecord',
}
let url = gemhoUtil.setParameter('_check_info.html', param)
gemhoUtil.navigatePage(url, '跳转中...')
// 这里添加跳转逻辑
}, },
}, },
}) })
......
src/_shanghu_list.html
View file @ 7687117a
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<!-- 隐患列表 --> <!-- 隐患列表 -->
<van-list v-model:loading="loading" :offset="10" :finished="finished" finished-text="没有更多了" @load="getList" :immediate-check="false"> <van-list v-model:loading="loading" :offset="10" :finished="finished" finished-text="没有更多了" @load="getList" :immediate-check="false">
<van-cell v-for="item in list" :key="item.id" <van-cell v-for="item in list" :key="item.id"
style="margin-bottom: 0.25rem;margin-top: 0.25rem;" @click="viewDetail(item.id)"> style="margin-bottom: 0.25rem;margin-top: 0.25rem;" @click="viewDetail(item)">
<div style="width: 100%;"> <div style="width: 100%;">
<!-- 第一行：隐患描述 --> <!-- 第一行：隐患描述 -->
<div style=" <div style="
......
src/_shanghu_list.js
View file @ 7687117a
...@@ -24,8 +24,15 @@ window.addEventListener('load', function () { ...@@ -24,8 +24,15 @@ window.addEventListener('load', function () {
onSearch() { onSearch() {
console.log('xxxx', this.unitName) console.log('xxxx', this.unitName)
}, },
detail(index) { viewDetail(itme) {
gemhoUtil.navigatePage('_sh.html?law_id=' + this.list[index].lawId) let param = {
id: itme.id,
unitName: itme.unitName,
smallPlaceTypeName: itme.smallPlaceTypeName,
pageName: '_shanghu_list',
}
let url = gemhoUtil.setParameter('_checkrecord.html', param)
gemhoUtil.navigatePage(url, '跳转中...')
}, },
getList() { getList() {
vant.Toast.loading({ vant.Toast.loading({
...@@ -34,16 +41,17 @@ window.addEventListener('load', function () { ...@@ -34,16 +41,17 @@ window.addEventListener('load', function () {
loadingType: 'spinner', loadingType: 'spinner',
}) })
setTimeout(() => { setTimeout(() => {
http2.post( // http2.post(
http.post(
'/gq/asd/common',
{ {
serviceId: API_KEY_MAP['page']['id'], serviceId: API_KEY_MAP['page']['id'],
interfacePublicKey: API_KEY_MAP['page']['publicKey'], interfacePublicKey: API_KEY_MAP['page']['publicKey'],
interfacePrivateKey: API_KEY_MAP['page']['privateKey'], interfacePrivateKey: API_KEY_MAP['page']['privateKey'],
reqParams: { reqParams: {
sign: 9, sign: 10,
pageNum: this.page++, // 每次请求增加下一页 pageNum: this.page++, // 每次请求增加下一页
pageSize: this.size, pageSize: this.size,
sort: 'lawId,desc', sort: 'lawId,desc',
}, },
}, },
...@@ -51,7 +59,7 @@ window.addEventListener('load', function () { ...@@ -51,7 +59,7 @@ window.addEventListener('load', function () {
if (!res) { if (!res) {
// 中台返回为undefined 重新请求 // 中台返回为undefined 重新请求
vant.Toast.clear() vant.Toast.clear()
this.page = th e - 1 // 重新请求后，分页数恢复上一次请求的值 this.page = this.page - 1 // 重新请求后，分页数恢复上一次请求的值
setTimeout(() => { setTimeout(() => {
// this.getList() // this.getList()
}, 0) }, 0)
...@@ -61,8 +69,10 @@ window.addEventListener('load', function () { ...@@ -61,8 +69,10 @@ window.addEventListener('load', function () {
// console.log('接口回调数据', JSON.parse(res)) // console.log('接口回调数据', JSON.parse(res))
var result = JSON.parse(res) var result = JSON.parse(res)
this.list.push(...result.content)
this.total = result.totalElements this.list = result.data
// this.total = result.totalElements
if (this.page * this.size >= this.total) { if (this.page * this.size >= this.total) {
this.finished = true // 下滑不在刷新数据 this.finished = true // 下滑不在刷新数据
......
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