Skip to content

G
GaoQuYingJiH5-ASD
Commit c1bcba75 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

add：上报隐患列表接口对接

parent d38bdb7b
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 80 deletions
sdk/axios_http.js
View file @ c1bcba75
...@@ -25,13 +25,13 @@ axios.defaults.headers.common['Authorization'] = ...@@ -25,13 +25,13 @@ axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJlUzUxMiJ9.eyJzdWlioilxNZ92MZAzMDl00SlslmxyZ2luX3VzZXJfa2V5ljoiMEONTM1NzktNTJiMSO0N2QwLTkzNmEtMmViNWFhYzMzMTI1In0.EG_EwS7xS1jgi29Ly7WXOJBCW4DcAyOtLD4he06sV8b4i70kknNQqVAx063NpcDa5kmTFdZ6zEfPHYPfVR4dEO' // 'Bearer eyJhbGciOiJlUzUxMiJ9.eyJzdWlioilxNZ92MZAzMDl00SlslmxyZ2luX3VzZXJfa2V5ljoiMEONTM1NzktNTJiMSO0N2QwLTkzNmEtMmViNWFhYzMzMTI1In0.EG_EwS7xS1jgi29Ly7WXOJBCW4DcAyOtLD4he06sV8b4i70kknNQqVAx063NpcDa5kmTFdZ6zEfPHYPfVR4dEO'
// wgy账号token // wgy账号token
axios.defaults.headers.common['Authorization'] = // axios.defaults.headers.common['Authorization'] =
'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLlrZnmgJ3lv40iLCJsb2dpbl91c2VyX2tleSI6IjU3MTM1MWEyLTVhNDAtNGRhMS05ODk0LTFjMzZhNTJlMzkxMyJ9.ryYWzzcwCU2EHNYb2AQCMfP2S_rvBheuhexKV6NP-E_8BQ7vlpLAYXAB6xmuPgyAotnwzxXOcOxuopdIpbiJnQ' // 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiLlrZnmgJ3lv40iLCJsb2dpbl91c2VyX2tleSI6IjU3MTM1MWEyLTVhNDAtNGRhMS05ODk0LTFjMzZhNTJlMzkxMyJ9.ryYWzzcwCU2EHNYb2AQCMfP2S_rvBheuhexKV6NP-E_8BQ7vlpLAYXAB6xmuPgyAotnwzxXOcOxuopdIpbiJnQ'
// admin账号token // admin账号token
// axios.defaults.headers.common['Authorization'] = axios.defaults.headers.common['Authorization'] =
// 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiOTEyODc0N2ItNGE4NC00MWRjLTg0ZGUtZTY1ODNkMzBiNDcwIn0.w_JRlifng-sUQqvGnuRFH5-wiL-1tfwI1cF7E97gjaOZ37bvRQld3120Myf9MYqLtVHUVX_vhlcBj7Kmg9exZw' 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsImxvZ2luX3VzZXJfa2V5IjoiOTEyODc0N2ItNGE4NC00MWRjLTg0ZGUtZTY1ODNkMzBiNDcwIn0.w_JRlifng-sUQqvGnuRFH5-wiL-1tfwI1cF7E97gjaOZ37bvRQld3120Myf9MYqLtVHUVX_vhlcBj7Kmg9exZw'
// 请求拦截器 // 请求拦截器
......
src/_shangbao-list.html
View file @ c1bcba75
...@@ -21,14 +21,14 @@ ...@@ -21,14 +21,14 @@
<!-- Tab栏 --> <!-- Tab栏 -->
<van-tabs v-model:active="activeTab" @click="tabChange" title-active-color="#1989fa" line-height="2px" <van-tabs v-model:active="activeTab" @click="tabChange" title-active-color="#1989fa" line-height="2px"
style="margin-bottom: 15px;"> style="margin-bottom: 15px;">
<van-tab title="隐患整改" name="1"></van-tab> <van-tab title="隐患整改" name="0"></van-tab>
<van-tab title="整改逾期" name="2"></van-tab> <van-tab title="整改逾期" name="1"></van-tab>
</van-tabs> </van-tabs>
</div> </div>
<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 hazardList" :key="item.id" @click="viewDetail(item.id)"> <van-cell v-for="item in hazardList" :key="item.id" @click="viewDetail(item.id)">
<div style="width: 100%;position: relative;" v-if="activeTab=='1'"> <div style="width: 100%;position: relative;">
<!-- 第一行：商户名称 --> <!-- 第一行：商户名称 -->
<div class="tab1-row1 bold">{{ item.merName }}</div> <div class="tab1-row1 bold">{{ item.merName }}</div>
...@@ -39,33 +39,16 @@ ...@@ -39,33 +39,16 @@
<!-- 第三行：监察人 + 检查日期（两列） --> <!-- 第三行：监察人 + 检查日期（两列） -->
<div class="tab1-row2"> <div class="tab1-row2">
<span>上报日期：{{ item.checkDate && item.checkDate.split(' ')[0] }}</span> <span>上报日期：{{ item.pushDate }}</span>
<span>上报人：{{ item.checkPeopleName }}</span> <span>上报人：{{ item.pushPeople }}</span>
</div> </div>
<div class="tab1-row1"> <div class="tab1-row1">
<span>整改截止日期：{{ item.checkUnit }}</span> <span v-if="activeTab=='0'">整改次数:{{ item.rectificationCount }}</span>
<span v-if="activeTab=='1'">整改截止日期：{{ item.rectificationDeadline }}</span>
</div> </div>
</div> </div>
<div style="width: 100%;" v-if="activeTab=='2'">
<!-- 第一行：商户名称 -->
<div class="tab1-row1 bold">{{ item.merName }}</div>
<!-- 第二行：场所类型 + 检查单位（两列） -->
<div class="tab1-row1">
<span>{{ item.placeType }}</span>
</div>
<!-- 第三行：监察人 + 检查日期（两列） -->
<div class="tab1-row2">
<span>上报日期：{{ item.checkDate && item.checkDate.split(' ')[0] }}</span>
<span>上报人：{{ item.checkPeopleName }}</span>
</div>
<div class="tab1-row1">
<span>整改次数：{{ item.checkUnit }}</span>
</div>
</div>
</van-cell> </van-cell>
</van-list> </van-list>
</div> </div>
......
src/_shangbao-list.js
View file @ c1bcba75
...@@ -6,49 +6,8 @@ window.addEventListener('load', function () { ...@@ -6,49 +6,8 @@ window.addEventListener('load', function () {
return { return {
merName: '', merName: '',
// 新增子Tab数据 // 新增子Tab数据
activeTab: '1', activeTab: '0',
hazardList: [ hazardList: [],
{
id: 1,
merchantName: '福源便利店', // 商户名称
smallPlaceTypeName: '零售店铺', // 场所类型
checkUnit: '高区消防救援大队', // 检查单位
checkPeopleName: '王建军', // 监察人
checkDate: '2024-07-12', // 检查日期
notRectifiedCount: 3, // 未整改数
hiddenCount: 7 // 隐患数
},
{
id: 2,
merchantName: '美味家火锅店',
smallPlaceTypeName: '餐饮场所',
checkUnit: '高区市场监督管理局',
checkPeopleName: '李雪晴',
checkDate: '2024-07-14',
notRectifiedCount: 0,
hiddenCount: 2
},
{
id: 3,
merchantName: '阳光网吧',
smallPlaceTypeName: '娱乐场所',
checkUnit: '高区应急管理局',
checkPeopleName: '张卫国',
checkDate: '2024-07-15',
notRectifiedCount: 1,
hiddenCount: 5
},
{
id: 4,
merchantName: '康旭药店',
smallPlaceTypeName: '医疗场所',
checkUnit: '高区消防救援大队',
checkPeopleName: '陈雨桐',
checkDate: '2024-07-16',
notRectifiedCount: 4,
hiddenCount: 9
}
],
// 新增以下数据 // 新增以下数据
userInfo: {}, userInfo: {},
userData: { userData: {
...@@ -61,7 +20,7 @@ window.addEventListener('load', function () { ...@@ -61,7 +20,7 @@ window.addEventListener('load', function () {
loading: false, loading: false,
finished: false, finished: false,
page: 1, page: 1,
size: 10, size: 6,
total: 0, total: 0,
merId: null, // 商户id merId: null, // 商户id
unitName: '', // 单位名称 unitName: '', // 单位名称
...@@ -109,14 +68,11 @@ window.addEventListener('load', function () { ...@@ -109,14 +68,11 @@ window.addEventListener('load', function () {
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: 1, sign: 29,
type: this.activeTab, type: this.activeTab,
merId: this.merId, pageNum: this.page, // 每次请求增加下一页
pageNum: this.page++, // 每次请求增加下一页
pageSize: this.size, pageSize: this.size,
sort: 'lawId,desc', merName: this.merName
merName: this.merName,
}, },
}, },
(res) => { (res) => {
...@@ -139,6 +95,8 @@ window.addEventListener('load', function () { ...@@ -139,6 +95,8 @@ window.addEventListener('load', function () {
this.total = result.total this.total = result.total
if (this.page * this.size >= this.total) { if (this.page * this.size >= this.total) {
this.finished = true // 下滑不在刷新数据 this.finished = true // 下滑不在刷新数据
}else{
this.page++
} }
} }
this.loading = false this.loading = false
...@@ -160,7 +118,7 @@ window.addEventListener('load', function () { ...@@ -160,7 +118,7 @@ window.addEventListener('load', function () {
let param = { let param = {
...urlParams, ...urlParams,
id: item.id, id: item.id,
flag: 'JC_XQ', flag: item.status,
pageName: '_shangbao-list', pageName: '_shangbao-list',
addr: item.addr, addr: item.addr,
merchantName: item.merName, merchantName: item.merName,
......
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