横幅

src/views/enforce/earlyWarning.vue

@@ -189,7 +189,7 @@
     const onClickButton = () => {
         data.curPage = 1;
         data.dataList = [];
-        queryList();
+        onRefresh();
     }
 
     const toComplaintView = (id, name) => {

src/views/enforce/enforceNotice.vue

@@ -1,4 +1,3 @@
-
 <template>
     <div class="shop app_content">
         <!-- 导航栏 -->
@@ -24,9 +23,9 @@
 
         <!-- 中间 -->
         <div class="shop-center">
-			<lodding-card :isLodding="isLodding">
 
-     <div class="noticebox">
+            <van-pull-refresh v-model="data.refreshing" @refresh="onRefresh">
+                <van-list v-model:loading="data.loading" :finished="data.finished" finished-text="没有更多了" @load="onLoad">
                     <div class="notice-item" v-for="(item, index) in data.dataList" :key="index"><i></i>
                         <div class="item-cont">
                             <span class="item-title">{{ item.planName }}</span>
@@ -37,22 +36,12 @@
                    <div>{{ item.createTime }}</div>
                </div>
            </span>
-           <div class="item-text" @click="toPdfView(null==item.fileObject?'':item.fileObject.fileUrl)"><a>{{ null==item.fileObject?'':item.fileObject.fileName }}</a></div>
+                            <div class="item-text" @click="toPdfView(null==item.fileObject?'':item.fileObject.fileUrl)">
-         </div>
+                                <a>{{ null==item.fileObject?'':item.fileObject.fileName }}</a></div>
-       </div>
-
-       <!-- <div class="notice-item"><i></i>
-         <div class="item-cont">
-           <span class="item-title">龙华区司法局</span>
-           <span class="item-time">2024-02-15</span>
-           <div class="item-text">2024年度龙华区民治街道年度行政执法检查计划</div>
                         </div>
-       </div> -->
-
                     </div>
-
+                </van-list>
-
+            </van-pull-refresh>
-			</lodding-card>
         </div>
 
         <!-- 底部 -->
@@ -64,6 +53,7 @@
 
 <script setup name="enforcementInspectionProgram">
     import {queryEnforcementInspectionProgramListNoPermission} from "@/api/enforce";
+
     const {useCommon} = $globalStore;
 
     const router = useRouter();
@@ -71,6 +61,9 @@ let allchecked = ref(false); // 是否全选
     let refreshLoad = ref(false); // 是否加载中
 
     let searchParam = reactive({
+        // 分页
+        pageNum: 1,
+        pageSize: 6,
         //搜索框
         searchText: ref(''),
         //日期查询
@@ -88,6 +81,11 @@ const data = reactive({
         minDate: new Date(2020, 0, 1),
         maxDate: new Date(2125, 5, 1),
         columnsType: ['year', 'month'],
+        loading: false,
+        finished: false,
+        refreshing: false,
+        curPage: 1,
+        total: 0,
     });
 
     // 设置初始值为当前时间
@@ -96,13 +94,21 @@ onMounted(() => {
         // getCard();
         searchParam.enterpriseNumber = useCommon.enterpriseNumber;
         console.log(useCommon.enterpriseNumber)
-  queryList();
+        // queryList();
         data.dateSearch = nowDate(new Date());
     });
     const queryList = () => {
+        searchParam.pageNum = (data.curPage-1)*searchParam.pageSize;
         queryEnforcementInspectionProgramListNoPermission(searchParam, success => {
-    console.log(success)
+            data.curPage++;
-    data.dataList = success.data;
+            data.loading = false;   // 查4出结果停止加载
+            if (success.total <= data.dataList.length) {
+                // 查到最后没数据
+                data.finished = ref(true);
+                return;
+            }
+            // data.dataList = success.data;
+            data.dataList.push(...success.rows);
             freshMap.refreshLoad = false;
             freshMap.listLoading = false;
             freshMap.listFinished = true;
@@ -125,8 +131,9 @@ const onSearch = (val) => {
             })
     };
     const onClickButton = () => {
-  console.log(searchParam.searchText)
+        data.curPage = 1;
-  queryList();
+        data.dataList = [];
+        onRefresh();
     }
     onActivated(() => {
     });
@@ -148,23 +155,28 @@ let freshMap = reactive({
         listFinished: false, // 是否加载完成标识
     });
 
-
     //下拉刷新
     const onRefresh = () => {
-	freshMap.listFinished = false;
+        // 清空列表数据
-	freshMap.listLoading = true;
+        data.dataList = [];
-	// getGoodslist();
+        data.finished = false;
-  queryList();
+
+        // 重新加载数据
+        // 将 loading 设置为 true，表示处于加载状态
+        data.loading = true;
+        onLoad();
     };
-
     // 触底加载
     const onLoad = () => {
-	freshMap.listFinished = true;
+        setTimeout(() => {
-  freshMap.loading = false;
+            if (data.refreshing) {
+                data.refreshing = false;
+            }
+            queryList();
+        }, 1000);
     };
 
 
-
     //获取分类下的商品列表
     const getGoodslist = async (onLoad) => {
         // const res = await useClassify.classifyGoods();
@@ -191,8 +203,7 @@ onMounted(async () => {
         // } else {
         // 	isLodding.value = false;
         // }
-  queryList();
+        // queryList();
-  isLodding.value = false;
     });
 
     const selectDate = () => {
@@ -208,7 +219,10 @@ const onDateConfirm = (value)=> {
         data.dateSearch = value.selectedValues[0] + "/" + value.selectedValues[1]
         data.showDatePicker = false;
         searchParam.dateSearch = value.selectedValues[0] + "-" + value.selectedValues[1];
-      queryList();
+
+        data.curPage = 1;
+        data.dataList = [];
+        onRefresh();
     }
     const nowDate = (time) => {
         var year = time.getFullYear(); // 年
@@ -226,12 +240,18 @@ const nowDate = (time) => {
     const searchDateType = (val) => {
         searchParam.dateType = val;
         searchParam.isComplaint = null;
-  queryList();
+
+        data.curPage = 1;
+        data.dataList = [];
+        onRefresh();
     }
     const searchComplaint = (val) => {
         searchParam.isComplaint = val;
         searchParam.dateType = null;
-  queryList();
+
+        data.curPage = 1;
+        data.dataList = [];
+        onRefresh();
     }
 
     const toPdfView = (url) => {
@@ -281,11 +301,13 @@ const toPdfView = (url) =>{
                     width: 100%;
                     padding: 0.27rem 0;
                     flex-direction: column;
+
                     .card_body {
                         background-color: #fff;
                         border-radius: 0.27rem;
                         flex: 1;
                     }
+
                     .card_box_span {
                         display: flex;
                         align-items: center;
@@ -298,6 +320,7 @@ const toPdfView = (url) =>{
                             margin: 0;
                         }
                     }
+
                     .card_box_action {
                         position: absolute;
                         right: 4%;
@@ -309,6 +332,7 @@ const toPdfView = (url) =>{
         .shop_footer_body {
             //height: 101px;
             position: relative;
+
             .footer-one-btn {
                 height: 1.33rem;
                 bottom: 1.34rem;
@@ -323,6 +347,7 @@ const toPdfView = (url) =>{
         padding-left: 0.27rem;
         margin-top: 0.27rem;
         align-items: end;
+
         .search-button {
             width: 15%;
             height: 100%;
@@ -332,6 +357,7 @@ const toPdfView = (url) =>{
             font-size: 0.3rem;
         }
     }
+
     .search-button-date {
         display: flex;
         flex-direction: row;
@@ -341,11 +367,13 @@ const toPdfView = (url) =>{
         .date-select {
             font-size: 0.52rem;
             margin: 3% 0 0 4%;
+
             i {
                 transform: rotate(90deg);
                 font-size: 0.4rem;
             }
         }
+
         .search-button {
             width: 15%;
             height: 80%;

src/views/enforceHome.vue

@@ -84,6 +84,7 @@
     import {Loading} from 'vant';
     import {getEnterpriseMerchantAuthorization, getSzyptLoginAuth} from '../api/Home';
     import {queryEnforcementInspectionProgramListNoPermission} from "@/api/enforce";
+
     const isLoading = ref(true);
     const {useCommon} = $globalStore;
     const router = useRouter();
@@ -177,32 +178,31 @@
     }
     const queryList = () => {
         queryEnforcementInspectionProgramListNoPermission({}, success => {
-        console.log(success)
+            if (success.rows.length > 4) {
-        if(success.data.length > 4 ){
                 for (let i = 0; i < 5; i++) {
-            carouselList.push(success.data[i]); 
+                    carouselList.push(success.rows[i]);
-            noticeObj.noticeList.push(success.data[i].planName)
+                    noticeObj.noticeList.push(success.rows[i].planName)
                     var obj = {
-				      content: success.data[i].planName
+                        content: success.rows[i].planName
                     }
                     data.noticeList.push(obj)
                     // noticeStr += success.data[i].planName + "                         ";
                     // noticeStr += success.data[i].planName != null ?success.data[i].planName + "":"";
                 }
-          noticeStr += success.data[0].planName != null ?success.data[0].planName + "":""; 
+                noticeStr += success.rows[0].planName != null ? success.rows[0].planName + "" : "";
             } else {
-          carouselList = success.data; 
+                carouselList = success.rows;
 
-          for (let i = 0; i <= success.data.length; i++) {
+                for (let i = 0; i < success.rows.length; i++) {
                     // carouselList.push(success.data[i]);
-            noticeObj.noticeList.push(success.data[i].planName);
+                    noticeObj.noticeList.push(success.rows[i].planName);
-          } 
-          noticeStr += success.data[0].planName != null ?success.data[0].planName + "":""; 
                     var obj = {
-				      content: success.data[i].planName
+                        content: success.rows[i].planName
                     }
                     data.noticeList.push(obj)
                 }
+                // noticeStr += success.rows[0].planName != null ? success.rows[0].planName + "" : "";
+            }
             freshMap.key = 1
             console.log(carouselList);
             console.log(data.noticeList);
@@ -386,6 +386,7 @@
                     font-size: 0.5rem;
                 }
             }
+
             .box-qr-code::before {
                 content: "";
                 position: absolute;
@@ -430,6 +431,7 @@
                     font-size: 0.5rem;
                 }
             }
+
             .box-info::before {
                 content: "";
                 position: absolute;
@@ -475,6 +477,7 @@
                 }
             }
         }
+
         .box-complaint::before {
             content: "";
             position: absolute;
@@ -622,14 +625,17 @@
         background: url("../assets/images/logo.png") no-repeat;
         background-size: 100% auto;
     }
+
     .loading-div {
         position: absolute;
         top: 45%;
         left: 48%;
     }
+
     .notice-bar-container {
         margin-bottom: 0.27rem;
     }
+
     .notice-bar-container:last-child {
         margin-bottom: 0;
     }
@@ -666,6 +672,7 @@
     .noticeContent ul {
         width: 100%;
     }
+
     .noticeContent li {
         position: relative;
         margin: 0.27rem 0 0 0;
@@ -680,6 +687,7 @@
         text-overflow: ellipsis;
         box-sizing: border-box;
     }
+
     .noticeContent li::before {
         display: inline-block;
         position: absolute;
@@ -691,12 +699,14 @@
         background: url("../assets/images/icon_notice.png") no-repeat;
         background-size: auto 85%;
     }
+
     .notice_list {
         display: block;
         position: absolute;
         top: 0;
         left: 0;
     }
+
     .notice_top {
         transition: all 0.5s;
         margin-top: -30px;