1

src/views/systemSettings/views/warningSet/warningEdit.vue

@@ -154,7 +154,7 @@
             <span class="icon el-icon-plus"></span>
           </div>
         </div> -->
-        <el-row :gutter="24">
+        <el-row :gutter="24" @scroll="scrollEvent">
           <el-col :span="4">
             <div @click="addDig" class="lbox-add">
               <div class="terminal-info-add-icons">
@@ -495,7 +495,8 @@ export default {
       tableType: "",
       noMore: false,
       loading: false,
-      page: 0,
+      page: 1,
+      AirportList: [],
       characterList: [], //二字码列表
     };
   },
@@ -541,11 +542,9 @@ export default {
         if (code == 0) {
           this.loading = false;
           this.page--;
-          this.tableFormer = returnData.listValues[0];
-          this.tableFormer.BeginTime1 = [
-            returnData.listValues[0].startDate,
-            returnData.listValues[0].endDate,
-          ];
+          this.tableFormer = returnData.listValues[0]
+            ? returnData.listValues[0]
+            : {};
         } else {
           this.page--;
           this.$message.error.message;
@@ -666,6 +665,7 @@ export default {
         arr.push(this.$route.query.id);
         const { code, returnData } = await Query({
           id: DATACONTENT_ID.sysServiceStrategyId,
+          needPage: this.page,
           dataContent: arr,
         });
         if (code == 0) {
@@ -674,10 +674,12 @@ export default {
           this.tableColsCopy = this.tableCols.filter((item) => item.needShow);
         } else {
           this.$message.error.message;
+          this.page--;
         }
       } catch (error) {
         console.log(error);
         console.log(error);
+        this.page--;
       }
       // const res = await UserWarningList({
       //   sceneId: this.id,
@@ -905,6 +907,22 @@ export default {
         console.log("出错了", error.message || error);
       }
     },
+    // 列表滚动事件
+    scrollEvent(e) {
+      if (
+        e.srcElement.offsetHeight +
+          e.srcElement.scrollTop -
+          e.srcElement.scrollHeight ===
+        0
+      ) {
+        if (this.isUpdate) {
+          this.page += 1;
+          this.UserWarning();
+        } else {
+          this.$message.warning("到底了");
+        }
+      }
+    },
   },
 };
 </script>

src/views/systemSettings/views/warningSet/warningSet.vue

@@ -318,6 +318,7 @@ export default {
       rmFlag: false,
       tableObj: {}, //增/删/改数据缓存
       tableType: "",
+      tableOptions: {},
     };
   },
   created() {
@@ -371,7 +372,6 @@ export default {
           e.srcElement.scrollHeight ===
         0
       ) {
-        debugger;
         if (this.isUpdate) {
           this.page += 1;
           this.getWarningList();