Commit 615dbc43 authored by xinzhedeai's avatar xinzhedeai

add: 隐患列表 提醒tab切换动态处理

parent 1d75b2eb
...@@ -253,21 +253,21 @@ ...@@ -253,21 +253,21 @@
<!-- 第三层统计信息之后新增提醒模块(商户专属) --> <!-- 第三层统计信息之后新增提醒模块(商户专属) -->
<div class="info-reminder"> <div class="info-reminder">
<!-- 第一个提醒项:整改未通过 --> <!-- 第一个提醒项:整改未通过 -->
<div class="reminder-item"> <div class="reminder-item" @click="navTo('nopass')">
<div class="reminder-badge">3</div> <div class="reminder-badge">3</div>
<img src="./image/code/home/icon1.png" class="reminder-img" alt="整改未通过"> <img src="./image/code/home/icon1.png" class="reminder-img" alt="整改未通过">
<p class="reminder-text">整改未通过</p> <p class="reminder-text">整改未通过</p>
</div> </div>
<!-- 第二个提醒项:即将超期 --> <!-- 第二个提醒项:即将超期 -->
<div class="reminder-item"> <div class="reminder-item" @click="navTo('willExpire')">
<div class="reminder-badge orange-badge">5</div> <div class="reminder-badge orange-badge">5</div>
<img src="./image/code/home/icon2.png" class="reminder-img" alt="整改未通过"> <img src="./image/code/home/icon2.png" class="reminder-img" alt="整改未通过">
<p class="reminder-text">即将超期</p> <p class="reminder-text">即将超期</p>
</div> </div>
<!-- 第三个提醒项:整改超期 --> <!-- 第三个提醒项:整改超期 -->
<div class="reminder-item"> <div class="reminder-item" @click="navTo('expired')">
<div class="reminder-badge red-badge">2</div> <div class="reminder-badge red-badge">2</div>
<img src="./image/code/home/icon3.png" class="reminder-img" alt="整改未通过"> <img src="./image/code/home/icon3.png" class="reminder-img" alt="整改未通过">
<p class="reminder-text">整改超期</p> <p class="reminder-text">整改超期</p>
......
...@@ -80,7 +80,7 @@ window.onload = function () { ...@@ -80,7 +80,7 @@ window.onload = function () {
className: 'shangjia', className: 'shangjia',
title: '商家信息', title: '商家信息',
remark: '', remark: '',
navTo: 'shanghu_detail', navTo: 'shanghu_detail-edit',
}, },
{ {
className: 'zicha', className: 'zicha',
...@@ -167,8 +167,13 @@ window.onload = function () { ...@@ -167,8 +167,13 @@ window.onload = function () {
// gemhoUtil.navigatePage(`src/_${toData}.html`) // gemhoUtil.navigatePage(`src/_${toData}.html`)
} }
}, },
navTo(url) { navTo(type) { // 消息统计跳转
// gemhoUtil.nav2asd(url) const param = {
type,
merId: this.userInfo.merId
};
let url = gemhoUtil.setParameter(`./src/_yh_check.html`, param)
gemhoUtil.navigatePage(url, '跳转中...')
}, },
gotoPage(stringifyUrl) { gotoPage(stringifyUrl) {
let url = gemhoUtil.setParameter(`src/_${stringifyUrl}.html`) let url = gemhoUtil.setParameter(`src/_${stringifyUrl}.html`)
......
...@@ -27,18 +27,24 @@ ...@@ -27,18 +27,24 @@
</van-search> </van-search>
</div> </div>
<!-- Tab栏 --> <!-- Tab栏 -->
<van-tabs v-model:active="activeTab" title-active-color="#1989fa" line-height="2px" <van-tabs v-model:active="activeTab" title-active-color="#1989fa" line-height="2px" @change="tabChange"
style="margin-bottom: 15px;"> style="margin-bottom: 15px;">
<van-tab title="全部" name=""></van-tab> <!-- <div v-for="item in tabList""> -->
<van-tab :title="item.title" :badge="item.msgNum||null" v-for="item in tabList"></van-tab>
<!-- </div> -->
<!-- <van-tab title="全部" name=""></van-tab>
<van-tab title="待审核" badge="5"></van-tab> <van-tab title="待审核" badge="5"></van-tab>
<van-tab title="待整改" ></van-tab> <van-tab title="待整改" ></van-tab>
<van-tab title="已整改" ></van-tab> <van-tab title="已整改" ></van-tab>
<van-tab title="整改逾期" ></van-tab> <van-tab title="整改逾期" ></van-tab> -->
</van-tabs> </van-tabs>
<!-- 隐患列表 --> <!-- 隐患列表 -->
<van-list> <van-list>
<van-cell v-for="item in filteredHazards" :key="item.id" class="list-item"> <van-cell v-for="item in hazardList" :key="item.id" class="list-item">
<div style="width: 100%;"> <div style="width: 100%;">
<!-- 第一行:隐患描述 --> <!-- 第一行:隐患描述 -->
<div style=" <div style="
......
...@@ -11,19 +11,41 @@ window.addEventListener('load', function () { ...@@ -11,19 +11,41 @@ window.addEventListener('load', function () {
// 更多示例数据... // 更多示例数据...
], ],
activeTab: '', activeTab: '',
status: '',
merId: '', merId: '',
showSearch: false, // 控制搜索框的显示和隐藏 showSearch: false, // 控制搜索框的显示和隐藏
// 整改状态 0:待整改 1:已整改 2:待审核 3:整改逾期
tabList: [
{ name: '', title: '全部', msgNum:0, },
{ name: '2', title: '待审核', msgNum:0, },
{ name: '0', title: '待整改', msgNum:5, },
{ name: '1', title: '已整改' , msgNum:6,},
{ name: '3', title: '整改逾期' , msgNum:7,},
],
} }
}, },
computed: { computed: {
filteredHazards() { yhstatus(){ // tab值对应的隐患状态码装欢
const statusMap = ['全部', '待审核', '待整改', '已整改', '整改逾期'] if(this.activeTab === 0){
return this.hazardList.filter((item) => return ''
this.activeTab === '' }else if(this.activeTab === 1){
? true return ~~'2'
: item.rectificationStatusName === statusMap[this.activeTab] }else if(this.activeTab === 2){
) return ~~'0'
}, }else if(this.activeTab === 3){
return ~~'1'
}else if(this.activeTab === 4){
return ~~'3'
}
}
// filteredHazards() {
// const statusMap = ['全部', '待审核', '待整改', '已整改', '整改逾期']
// return this.hazardList.filter((item) =>
// this.activeTab === ''
// ? true
// : item.rectificationStatusName === statusMap[this.activeTab]
// )
// },
}, },
created() { created() {
let merId = gemhoUtil.getParameter('merId') let merId = gemhoUtil.getParameter('merId')
...@@ -32,12 +54,25 @@ window.addEventListener('load', function () { ...@@ -32,12 +54,25 @@ window.addEventListener('load', function () {
} else { } else {
this.merId = '' this.merId = ''
} }
// 2025年6月7日 新增首页(信息统计跳转)类别区分逻辑。
let type = gemhoUtil.getParameter('type')
if(type === 'nopass'){
this.activeTab = 1
}else if(type === 'willExpire'){ // 即将超期待整改
this.activeTab = 2
}else if(type === 'expired'){ // 超期 整改逾期
this.activeTab = 4
}
if (gemhoUtil.getCookie('userType') !== 'shop') { if (gemhoUtil.getCookie('userType') !== 'shop') {
this.showSearch = true this.showSearch = true
} }
this.init() this.init()
}, },
methods: { methods: {
tabChange(title){
console.log('tab 切换', title)
this.onSearch()
},
init() { init() {
this.getHazardList() this.getHazardList()
}, },
...@@ -62,6 +97,7 @@ window.addEventListener('load', function () { ...@@ -62,6 +97,7 @@ window.addEventListener('load', function () {
pageNum: this.page++, // 每次请求增加下一页 pageNum: this.page++, // 每次请求增加下一页
pageSize: this.size, pageSize: this.size,
sort: 'lawId,desc', sort: 'lawId,desc',
status: this.yhstatus
}, },
}, },
(res) => { (res) => {
......
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