Browse Source

Merge branch 'fix_refresh' of shuzhihua/pms-app into master

yanghao 1 week ago
parent
commit
fd0b04bb6c
2 changed files with 8 additions and 2 deletions
  1. 2 2
      config/env.dev.js
  2. 6 0
      pages/recordFilling/detail.vue

+ 2 - 2
config/env.dev.js

@@ -1,7 +1,7 @@
 // 开发环境配置
 export default {
-	apiUrl: 'http://192.168.188.16:48080',
-	// apiUrl: 'https://iot.deepoil.cc',
+	// apiUrl: 'http://192.168.188.16:48080',
+	apiUrl: 'https://iot.deepoil.cc',
 	// apiUrl: 'https://aims.deepoil.cc', //正式
 	apiUrlSuffix: '/admin-api',
 	// 其他开发环境配置...  

+ 6 - 0
pages/recordFilling/detail.vue

@@ -507,6 +507,11 @@ const queryList = (pageNo, pageSize) => {
       console.log("resList--", resList);
       // 将请求结果通过complete传给z-paging处理,同时也代表请求结束,这一行必须调用
       paging.value.complete(resList);
+
+      if (pageNo * pageSize >= totalNum.value) {
+        paging.value.complete([]);
+        return;
+      }
     })
     .catch((res) => {
       // 如果请求失败写paging.value.complete(false);
@@ -515,6 +520,7 @@ const queryList = (pageNo, pageSize) => {
       paging.value.complete(false);
     });
 };
+
 // 判断是否小于阈值 (<0)
 const checkLessThreshold = (item) => {
   if (item.fillContent < 0) {