Commit 0bd1c3fb authored by xinzhedeai's avatar xinzhedeai

add:1检查列表 处理 2 无用文件整理

parent c1bcba75
...@@ -339,8 +339,8 @@ window.onload = function () { ...@@ -339,8 +339,8 @@ window.onload = function () {
// } else { // } else {
// this.defaultMenuList[1].navTo = 'shanghu_list' // this.defaultMenuList[1].navTo = 'shanghu_list'
// } // }
// 2025年6月9日 跳转检查记录 统一跳转新页面。 // // 2025年6月9日 跳转检查记录 统一跳转新页面。
this.defaultMenuList[1].navTo = 'checkrecord-all' // this.defaultMenuList[1].navTo = 'checkrecord-all'
// 生成最终菜单列表 // 生成最终菜单列表
......
...@@ -30,8 +30,8 @@ axios.defaults.headers.common['Authorization'] = ...@@ -30,8 +30,8 @@ axios.defaults.headers.common['Authorization'] =
// 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'
// 请求拦截器 // 请求拦截器
......
...@@ -19,8 +19,8 @@ if (window.env == 'dev') { ...@@ -19,8 +19,8 @@ if (window.env == 'dev') {
// 'Bearer eyJhbGciOiJlUzUxMiJ9.eyJzdWlioilxNZ92MZAzMDl00SlslmxyZ2luX3VzZXJfa2V5ljoiMEONTM1NzktNTJiMSO0N2QwLTkzNmEtMmViNWFhYzMzMTI1In0.EG_EwS7xS1jgi29Ly7WXOJBCW4DcAyOtLD4he06sV8b4i70kknNQqVAx063NpcDa5kmTFdZ6zEfPHYPfVR4dEO' // 'Bearer eyJhbGciOiJlUzUxMiJ9.eyJzdWlioilxNZ92MZAzMDl00SlslmxyZ2luX3VzZXJfa2V5ljoiMEONTM1NzktNTJiMSO0N2QwLTkzNmEtMmViNWFhYzMzMTI1In0.EG_EwS7xS1jgi29Ly7WXOJBCW4DcAyOtLD4he06sV8b4i70kknNQqVAx063NpcDa5kmTFdZ6zEfPHYPfVR4dEO'
// 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'
// wgy账号token // wgy账号token
// axios.defaults.headers.common['Authorization'] = // axios.defaults.headers.common['Authorization'] =
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="wrapper" v-cloak> <div class="wrapper" v-cloak>
<!-- 商户头部信息 --> <!-- 商户头部信息 -->
<div class="header"> <div class="header">
<van-search v-model="merName" show-action placeholder="请输入商家关键词" @search="onSearch"> <van-search v-model="merName" show-action placeholder="请输入商家关键词" @search="onSearch" v-if="userType!=='shop'">
<template #action> <template #action>
<div @click="onSearch"></div> <div @click="onSearch"></div>
</template> </template>
...@@ -28,33 +28,8 @@ ...@@ -28,33 +28,8 @@
<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 class="reminder-badge" v-if="item.msgFlag"></div> <div style="width: 100%;" v-if="userType=='shop'">
<!-- 第一行:商户名称 -->
<div class="tab1-row1 bold">{{ item.merName }}</div>
<!-- 第二行:场所类型 + 检查单位(两列) -->
<div class="tab1-row1">
<span>场所类型:{{ item.placeType }}</span>
</div>
<!-- 第三行:监察人 + 检查日期(两列) -->
<div class="tab1-row2">
<span>检查人:{{ item.checkPeopleName }}</span>
<span>检查日期:{{ item.checkDate && item.checkDate.split(' ')[0] }}</span>
</div>
<div class="tab1-row1">
<span>检查单位:{{ item.checkUnit }}</span>
</div>
<!-- 第四行:未整改数 + 隐患数(两列) -->
<div class="tab1-row2">
<span>未整改数:{{ item.notRectifiedCount }}处</span>
<span>隐患数:{{ item.hiddenCount }}处</span>
</div>
</div>
<div style="width: 100%;" v-if="activeTab=='2'">
<!-- 第一行:隐患描述 --> <!-- 第一行:隐患描述 -->
<div style=" <div style="
white-space: nowrap; white-space: nowrap;
...@@ -65,19 +40,76 @@ ...@@ -65,19 +40,76 @@
font-weight: bold; font-weight: bold;
font-family: PingFang SC; font-family: PingFang SC;
">九小场所消防安全检查清单</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;">
<span style="color: #737373; font-size: 0.28rem;">检查时间:{{ item.checkDate }}</span> <span style="color: #737373; font-size: 0.28rem;">检查时间:{{ item.checkDate }}</span>
</div> </div>
<!-- 第三行:商家和箭头 --> <div class="tab1-row1" v-if="activeTab=='1'">
<span>检查单位:{{ item.checkUnit || '-' }}</span>
</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.checkPeopleName}}</span> <span>检查人:{{item.checkPeopleName || '-'}}</span>
<span>隐患数:{{item.hiddenCount}}</span> <span>隐患数:{{item.hiddenCount}}</span>
<span>未整改:{{item.notRectifiedCount}}</span> <span>未整改:{{item.notRectifiedCount}}</span>
</div> </div>
</div> </div>
<!-- 非商户角色看到的页面 -->
<div v-if="userType!=='shop'">
<div style="width: 100%;position: relative;" v-if="activeTab=='1'">
<div class="reminder-badge" v-if="item.msgFlag"></div>
<!-- 第一行:商户名称 -->
<div class="tab1-row1 bold">{{ item.merName }}</div>
<!-- 第二行:场所类型 + 检查单位(两列) -->
<div class="tab1-row1">
<span>场所类型:{{ item.placeType }}</span>
</div>
<!-- 第三行:监察人 + 检查日期(两列) -->
<div class="tab1-row2">
<span>检查人:{{ item.checkPeopleName || '-' }}</span>
<span>检查日期:{{ item.checkDate && item.checkDate.split(' ')[0] }}</span>
</div>
<div class="tab1-row1">
<span>检查单位:{{ item.checkUnit || '-' }}</span>
</div>
<!-- 第四行:未整改数 + 隐患数(两列) -->
<div class="tab1-row2">
<span>未整改数:{{ item.notRectifiedCount }}处</span>
<span>隐患数:{{ item.hiddenCount }}处</span>
</div>
</div>
<div style="width: 100%;" v-if="activeTab=='2'">
<!-- 第一行:隐患描述 -->
<div style="
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #333;
font-size: 0.3rem;
font-weight: bold;
font-family: PingFang SC;
">{{ item.merName }}</div>
<!-- ">{{ item.remark }}</div> -->
<!-- 第二行:状态和时间 -->
<div style="display: flex; justify-content: start; gap: .34rem; margin: 8px 0;">
<span style="color: #737373; font-size: 0.28rem;">检查时间:{{ item.checkDate }}</span>
</div>
<div class="tab1-row1">
<span>检查单位:{{ item.checkUnit }}</span>
</div>
<!-- 第三行:商家和箭头 -->
<div style="display: flex; justify-content: start; gap: .4rem; align-items: center;">
<span>检查人:{{item.checkPeopleName}}</span>
<span>隐患数:{{item.hiddenCount}}</span>
<span>未整改:{{item.notRectifiedCount}}</span>
</div>
</div>
</div>
</van-cell> </van-cell>
</van-list> </van-list>
</div> </div>
......
...@@ -4,51 +4,11 @@ window.addEventListener('load', function () { ...@@ -4,51 +4,11 @@ window.addEventListener('load', function () {
el: '#app', el: '#app',
data() { data() {
return { return {
userType: gemhoUtil.getCookie('userType'),
merName: '', merName: '',
// 新增子Tab数据 // 新增子Tab数据
activeTab: '1', activeTab: '1',
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: {
......
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