隐患排查修改完成

src/router/index.js

@@ -427,7 +427,7 @@ const routes = [
     name: "yinhuanform",
     component: () => import("../views/meihuajing/yinhuanpaicha/yinhuanform.vue"),
     meta: {
-      title: "风险评级"
+      title: "隐患录入"
     }
   },
   //我的整改 未整改
@@ -600,7 +600,7 @@ const routes = [
     name: "yinhuaninfo_duban",
     component: () => import("../views/meihuajing/yinhuanpaicha/yinhuaninfo_duban.vue"),
     meta: {
-      title: "我的督办"
+      title: "安全管理"
     }
   },
   //路由重定向

src/views/meihuajing/yinhuanpaicha/yinhuanform_my_yys.vue

@@ -239,7 +239,7 @@
             autosize
             label="整改意见"
             type="textarea"
-            placeholder="请输入信息"
+            placeholder=""
             readonly="false"
           />
         </van-cell-group>

src/views/meihuajing/yinhuanpaicha/yinhuaninfo.vue

@@ -115,209 +115,237 @@
     <div class="footed">
       <van-tabs @click="onClick" v-model="active">
         <van-tab title="我的督办">
-          <div
-            class="footed_box"
-            v-for="(item, index) in TroubleshootData_list"
-            :key="index"
+          <van-list
+            v-model="loading"
+            :finished="finished"
+            finished-text="没有更多了"
+            @load="onLoad"
           >
-            <div class="footed_box_one">
-              <p class="footed_box_one_p1">{{ item.inspected_person }}</p>
-              <!-- <p class="footed_box_one_p2">{{item.created_at}}</p> -->
-              <p
-                class="footed_box_one_p6"
-                v-if="item.rectification_status == 0"
-              >
-                未整改
-              </p>
-              <p
-                class="footed_box_one_p6_2"
-                v-if="item.rectification_status == 1"
-              >
-                已整改
-              </p>
-              <p
-                class="footed_box_one_p6_3"
-                style="background: #fdaf00"
-                v-if="item.rectification_status == 2"
-              >
-                申请延期
-              </p>
-              <p
-                class="footed_box_one_p6_3"
-                v-if="item.rectification_status == 3"
-              >
-                逾期
-              </p>
-
-              <p class="footed_box_one_p4" v-if="item.status == 1">未验收</p>
-              <p class="footed_box_one_p3" v-if="item.status == 2">已验收</p>
-              <p class="footed_box_one_p5" v-if="item.status == 3">逾期</p>
-              <p class="footed_box_one_p5" v-if="item.status == 4">未通过</p>
-            </div>
-            <div class="footed_box_two">
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">风险点</span>
-                <span>{{ item.risk_point }}</span>
+            <div
+              class="footed_box"
+              v-for="(item, index) in TroubleshootData_list"
+              :key="index"
+            >
+              <div class="footed_box_one">
+                <p class="footed_box_one_p1">{{ item.inspected_person }}</p>
+                <!-- <p class="footed_box_one_p2">{{item.created_at}}</p> -->
+                <p
+                  class="footed_box_one_p6"
+                  v-if="item.rectification_status == 0"
+                >
+                  未整改
+                </p>
+                <p
+                  class="footed_box_one_p6_2"
+                  v-if="item.rectification_status == 1"
+                >
+                  已整改
+                </p>
+                <p
+                  class="footed_box_one_p6_3"
+                  style="background: #fdaf00"
+                  v-if="item.rectification_status == 2"
+                >
+                  申请延期
+                </p>
+                <p
+                  class="footed_box_one_p6_3"
+                  v-if="item.rectification_status == 3"
+                >
+                  逾期
+                </p>
+
+                <p class="footed_box_one_p4" v-if="item.status == 1">未验收</p>
+                <p class="footed_box_one_p3" v-if="item.status == 2">已验收</p>
+                <p class="footed_box_one_p5" v-if="item.status == 3">逾期</p>
+                <p class="footed_box_one_p5" v-if="item.status == 4">未通过</p>
               </div>
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">检查专业</span>
-                <span>{{ item.inspection_specialty }}</span>
+              <div class="footed_box_two">
+                <div class="footed_box_two_div">
+                  <span class="footed_box_span1">风险点</span>
+                  <span>{{ item.risk_point }}</span>
+                </div>
+                <div class="footed_box_two_div">
+                  <span class="footed_box_span1">检查专业</span>
+                  <span>{{ item.inspection_specialty }}</span>
+                </div>
+                <div class="footed_box_two_div">
+                  <span class="footed_box_span1">责任单位</span>
+                  <span>{{ item.rectification_duty_unit }}</span>
+                </div>
               </div>
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">责任单位</span>
-                <span>{{ item.rectification_duty_unit }}</span>
+              <div class="footed_box_three" @click="dianji(item)">
+                <img src="../../../assets/images/meihuajing/信息.png" alt="" />
               </div>
             </div>
-            <div class="footed_box_three" @click="dianji(item)">
-              <img src="../../../assets/images/meihuajing/信息.png" alt="" />
-            </div>
-          </div>
+          </van-list>
         </van-tab>
         <van-tab title="我的验收" :badge="check_accept">
-          <div
-            class="footed_box"
-            v-for="(item, index) in TroubleshootData_list"
-            :key="index"
+          <van-list
+            v-model="loading"
+            :finished="finished"
+            finished-text="没有更多了"
+            @load="onLoad"
           >
-            <div class="footed_box_one">
-              <p class="footed_box_one_p1">{{ item.inspected_person }}</p>
-              <p class="footed_box_one_p2">{{ item.created_at }}</p>
-              <p class="footed_box_one_p4" v-if="item.status == 1">未验收</p>
-              <p class="footed_box_one_p3" v-if="item.status == 2">已验收</p>
-              <p class="footed_box_one_p5" v-if="item.status == 3">逾期</p>
-              <p class="footed_box_one_p5" v-if="item.status == 4">未通过</p>
-            </div>
-            <div class="footed_box_two">
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">风险点</span>
-                <span>{{ item.risk_point }}</span>
+            <div
+              class="footed_box"
+              v-for="(item, index) in TroubleshootData_list"
+              :key="index"
+            >
+              <div class="footed_box_one">
+                <p class="footed_box_one_p1">{{ item.inspected_person }}</p>
+                <p class="footed_box_one_p2">{{ item.created_at }}</p>
+                <p class="footed_box_one_p4" v-if="item.status == 1">未验收</p>
+                <p class="footed_box_one_p3" v-if="item.status == 2">已验收</p>
+                <p class="footed_box_one_p5" v-if="item.status == 3">逾期</p>
+                <p class="footed_box_one_p5" v-if="item.status == 4">未通过</p>
               </div>
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">检查专业</span>
-                <span>{{ item.inspection_specialty }}</span>
+              <div class="footed_box_two">
+                <div class="footed_box_two_div">
+                  <span class="footed_box_span1">风险点</span>
+                  <span>{{ item.risk_point }}</span>
+                </div>
+                <div class="footed_box_two_div">
+                  <span class="footed_box_span1">检查专业</span>
+                  <span>{{ item.inspection_specialty }}</span>
+                </div>
+                <div class="footed_box_two_div">
+                  <span class="footed_box_span1">责任单位</span>
+                  <span>{{ item.rectification_duty_unit }}</span>
+                </div>
               </div>
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">责任单位</span>
-                <span>{{ item.rectification_duty_unit }}</span>
+              <div class="footed_box_three" @click="dianji(item)">
+                <img src="../../../assets/images/meihuajing/信息.png" alt="" />
               </div>
             </div>
-            <div class="footed_box_three" @click="dianji(item)">
-              <img src="../../../assets/images/meihuajing/信息.png" alt="" />
-            </div>
-          </div>
+          </van-list>
         </van-tab>
         <van-tab title="我的检查" :badge="inspect">
-          <div
-            class="footed_box"
-            v-for="(item, index) in TroubleshootData_list"
-            :key="index"
+          <van-list
+            v-model="loading"
+            :finished="finished"
+            finished-text="没有更多了"
+            @load="onLoad"
           >
-            <div class="footed_box_one">
-              <p class="footed_box_one_p1">{{ item.inspected_person }}</p>
-              <!-- <p class="footed_box_one_p2">{{ item.created_at }}</p> -->
-              <p
-                class="footed_box_one_p6"
-                v-if="item.rectification_status == 0"
-              >
-                未整改
-              </p>
-              <p
-                class="footed_box_one_p6_2"
-                v-if="item.rectification_status == 1"
-              >
-                已整改
-              </p>
-              <p
-                class="footed_box_one_p6_3"
-                style="background: #fdaf00"
-                v-if="item.rectification_status == 2"
-              >
-                申请延期
-              </p>
-              <p
-                class="footed_box_one_p6_3"
-                v-if="item.rectification_status == 3"
-              >
-                逾期
-              </p>
-
-              <p class="footed_box_one_p4" v-if="item.status == 1">未验收</p>
-              <p class="footed_box_one_p3" v-if="item.status == 2">已验收</p>
-              <p class="footed_box_one_p5" v-if="item.status == 3">逾期</p>
-              <p class="footed_box_one_p5" v-if="item.status == 4">未通过</p>
-            </div>
-            <div class="footed_box_two">
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">风险点</span>
-                <span>{{ item.risk_point }}</span>
+            <div
+              class="footed_box"
+              v-for="(item, index) in TroubleshootData_list"
+              :key="index"
+            >
+              <div class="footed_box_one">
+                <p class="footed_box_one_p1">{{ item.inspected_person }}</p>
+                <!-- <p class="footed_box_one_p2">{{ item.created_at }}</p> -->
+                <p
+                  class="footed_box_one_p6"
+                  v-if="item.rectification_status == 0"
+                >
+                  未整改
+                </p>
+                <p
+                  class="footed_box_one_p6_2"
+                  v-if="item.rectification_status == 1"
+                >
+                  已整改
+                </p>
+                <p
+                  class="footed_box_one_p6_3"
+                  style="background: #fdaf00"
+                  v-if="item.rectification_status == 2"
+                >
+                  申请延期
+                </p>
+                <p
+                  class="footed_box_one_p6_3"
+                  v-if="item.rectification_status == 3"
+                >
+                  逾期
+                </p>
+
+                <p class="footed_box_one_p4" v-if="item.status == 1">未验收</p>
+                <p class="footed_box_one_p3" v-if="item.status == 2">已验收</p>
+                <p class="footed_box_one_p5" v-if="item.status == 3">逾期</p>
+                <p class="footed_box_one_p5" v-if="item.status == 4">未通过</p>
               </div>
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">检查专业</span>
-                <span>{{ item.inspection_specialty }}</span>
+              <div class="footed_box_two">
+                <div class="footed_box_two_div">
+                  <span class="footed_box_span1">风险点</span>
+                  <span>{{ item.risk_point }}</span>
+                </div>
+                <div class="footed_box_two_div">
+                  <span class="footed_box_span1">检查专业</span>
+                  <span>{{ item.inspection_specialty }}</span>
+                </div>
+                <div class="footed_box_two_div">
+                  <span class="footed_box_span1">责任单位</span>
+                  <span>{{ item.rectification_duty_unit }}</span>
+                </div>
               </div>
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">责任单位</span>
-                <span>{{ item.rectification_duty_unit }}</span>
+              <div class="footed_box_three" @click="dianji(item)">
+                <img src="../../../assets/images/meihuajing/信息.png" alt="" />
               </div>
             </div>
-            <div class="footed_box_three" @click="dianji(item)">
-              <img src="../../../assets/images/meihuajing/信息.png" alt="" />
-            </div>
-          </div>
+          </van-list>
         </van-tab>
         <van-tab title="我的整改" :badge="rectification">
-          <div
-            class="footed_box"
-            v-for="(item, index) in TroubleshootData_list"
-            :key="index"
+          <van-list
+            v-model="loading"
+            :finished="finished"
+            finished-text="没有更多了"
+            @load="onLoad"
           >
-            <div class="footed_box_one">
-              <p class="footed_box_one_p1">{{ item.inspected_person }}</p>
-              <p class="footed_box_one_p2">{{ item.created_at }}</p>
-              <p
-                class="footed_box_one_p6"
-                v-if="item.rectification_status == 0"
-              >
-                未整改
-              </p>
-              <p
-                class="footed_box_one_p6_2"
-                v-if="item.rectification_status == 1"
-              >
-                已整改
-              </p>
-              <p
-                class="footed_box_one_p6_3"
-                style="background: #fdaf00"
-                v-if="item.rectification_status == 2"
-              >
-                申请延期
-              </p>
-              <p
-                class="footed_box_one_p6_3"
-                v-if="item.rectification_status == 3"
-              >
-                逾期
-              </p>
-            </div>
-            <div class="footed_box_two">
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">风险点</span>
-                <span>{{ item.risk_point }}</span>
+            <div
+              class="footed_box"
+              v-for="(item, index) in TroubleshootData_list"
+              :key="index"
+            >
+              <div class="footed_box_one">
+                <p class="footed_box_one_p1">{{ item.inspected_person }}</p>
+                <p class="footed_box_one_p2">{{ item.created_at }}</p>
+                <p
+                  class="footed_box_one_p6"
+                  v-if="item.rectification_status == 0"
+                >
+                  未整改
+                </p>
+                <p
+                  class="footed_box_one_p6_2"
+                  v-if="item.rectification_status == 1"
+                >
+                  已整改
+                </p>
+                <p
+                  class="footed_box_one_p6_3"
+                  style="background: #fdaf00"
+                  v-if="item.rectification_status == 2"
+                >
+                  申请延期
+                </p>
+                <p
+                  class="footed_box_one_p6_3"
+                  v-if="item.rectification_status == 3"
+                >
+                  逾期
+                </p>
               </div>
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">检查专业</span>
-                <span>{{ item.inspection_specialty }}</span>
+              <div class="footed_box_two">
+                <div class="footed_box_two_div">
+                  <span class="footed_box_span1">风险点</span>
+                  <span>{{ item.risk_point }}</span>
+                </div>
+                <div class="footed_box_two_div">
+                  <span class="footed_box_span1">检查专业</span>
+                  <span>{{ item.inspection_specialty }}</span>
+                </div>
+                <div class="footed_box_two_div">
+                  <span class="footed_box_span1">责任单位</span>
+                  <span>{{ item.rectification_duty_unit }}</span>
+                </div>
               </div>
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">责任单位</span>
-                <span>{{ item.rectification_duty_unit }}</span>
+              <div class="footed_box_three" @click="dianji(item)">
+                <img src="../../../assets/images/meihuajing/信息.png" alt="" />
               </div>
             </div>
-            <div class="footed_box_three" @click="dianji(item)">
-              <img src="../../../assets/images/meihuajing/信息.png" alt="" />
-            </div>
-          </div>
+          </van-list>
         </van-tab>
       </van-tabs>
     </div>
@@ -330,6 +358,10 @@ import { getAllUrlParams } from "../../../plugins/url-encapsulation.js";
 export default {
   data() {
     return {
+      page: 1,
+      loading: false,
+      finished: false,
+
       shows: true, //tabber是否显示
       active: 0, //选择当前在我的发布，我的整改，全部
       value1: "", //责任单位
@@ -418,18 +450,33 @@ export default {
       if (name == 0) {
         // 我的督办
         this.type = 6;
+        this.page = 1;
+        this.TroubleshootData_list = [];
+
         this.getTroubleshootData();
       } else if (name == 1) {
         // 我的验收
         this.type = 3;
+        this.page = 1;
+
+        this.TroubleshootData_list = [];
+
         this.getTroubleshootData();
       } else if (name == 2) {
         // 我的检查
         this.type = 2;
+        this.page = 1;
+
+        this.TroubleshootData_list = [];
+
         this.getTroubleshootData();
       } else if (name == 3) {
         // 我的整改
         this.type = 1;
+        this.page = 1;
+
+        this.TroubleshootData_list = [];
+
         this.getTroubleshootData();
       }
     },
@@ -438,7 +485,7 @@ export default {
     //点击时需要传参
     dianji(item) {
       if (this.active == 2) {
-        this.inspect = " "
+        this.inspect = " ";
         // 我的检查
         if (item.rectification_status == 0 && item.status == 1) {
           //未整改 未验收
@@ -482,8 +529,7 @@ export default {
           );
         }
       } else if (this.active == 3) {
-
-        this.rectification = ""
+        this.rectification = "";
         // 我的整改
         if (item.rectification_status == 0) {
           // 未整改
@@ -507,7 +553,7 @@ export default {
           );
         }
       } else if (this.active == 1) {
-        this.check_accept = " "
+        this.check_accept = " ";
 
         // 我的验收
         if (item.status == 1) {
@@ -597,29 +643,80 @@ export default {
         });
     },
 
+    onLoad() {
+      this.getTroubleshootData();
+    },
     // 获取隐患排查列表
     getTroubleshootData() {
-      this.TroubleshootData_list = [];
       this.$toast.loading();
 
-      this.$http
-        .post(
-          "http://meihuajing.nxjiewei.com:8011/api/troubleshoot/getTroubleshootData",
-          {
-            type: this.type,
-
-            rectification_duty_unit: this.sectionArr_key,
-            rectification_duty_person: this.staffArr_key,
-            inspection_specialty: this.inspectionSpecialtyArr_key,
-          }
-        )
-        .then((res) => {
-          this.$toast.clear();
-          console.log(res);
-          console.log(res.data.data.data);
-
-          this.TroubleshootData_list = res.data.data.data;
-        });
+      if (this.type == 6) {
+        this.$http
+          .post(
+            "http://meihuajing.nxjiewei.com:8011/api/troubleshoot/getTroubleshootData",
+            {
+              type: this.type,
+              page: this.page,
+
+              rectification_duty_unit: this.sectionArr_key,
+              rectification_duty_person: this.staffArr_key,
+              inspection_specialty: this.inspectionSpecialtyArr_key,
+            }
+          )
+          .then((res) => {
+            this.$toast.clear();
+            console.log(res);
+            console.log(res.data.data);
+
+            // 加载状态结束
+            this.loading = false;
+            this.page++;
+
+            console.log(res.data.data.length);
+            // 数据全部加载完成
+            if (res.data.data.length < 10) {
+              this.finished = true;
+            }
+
+            // this.TroubleshootData_list = res.data.data.data;
+            this.TroubleshootData_list = this.TroubleshootData_list.concat(
+              res.data.data
+            );
+          });
+      } else {
+        this.$http
+          .post(
+            "http://meihuajing.nxjiewei.com:8011/api/troubleshoot/getTroubleshootData",
+            {
+              type: this.type,
+              page: this.page,
+
+              rectification_duty_unit: this.sectionArr_key,
+              rectification_duty_person: this.staffArr_key,
+              inspection_specialty: this.inspectionSpecialtyArr_key,
+            }
+          )
+          .then((res) => {
+            this.$toast.clear();
+            console.log(res);
+            console.log(res.data.data.data);
+
+            // 加载状态结束
+            this.loading = false;
+            this.page++;
+
+            console.log(res.data.data.data.length);
+            // 数据全部加载完成
+            if (res.data.data.data.length < 10) {
+              this.finished = true;
+            }
+
+            // this.TroubleshootData_list = res.data.data.data;
+            this.TroubleshootData_list = this.TroubleshootData_list.concat(
+              res.data.data.data
+            );
+          });
+      }
     },
 
     // 获取部门、人
@@ -664,16 +761,15 @@ export default {
         )
         .then((res) => {
           console.log(res.data.data);
-          if(res.data.data.check_accept != 0){
+          if (res.data.data.check_accept != 0) {
             this.check_accept = res.data.data.check_accept;
           }
-          if(res.data.data.inspect != 0){
+          if (res.data.data.inspect != 0) {
             this.inspect = res.data.data.inspect;
           }
-          if(res.data.data.rectification != 0){
+          if (res.data.data.rectification != 0) {
             this.rectification = res.data.data.rectification;
           }
-          
         });
     },
   },
@@ -692,7 +788,7 @@ export default {
     // 获取检查专业等筛选信息
     this.getRiskAndTroubleshootConfigData();
 
-    this.getTroubleshootData();
+    // this.getTroubleshootData();
     this.getSectionStaff();
     this.get_getDBNum();
   },

src/views/meihuajing/yinhuanpaicha/yinhuaninfo_duban.vue

@@ -1,54 +1,67 @@
 <template>
   <div>
     <div class="footed">
-      <div
-        class="footed_box"
-        v-for="(item, index) in TroubleshootData_list"
-        :key="index"
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
       >
-        <div class="footed_box_one">
-          <p class="footed_box_one_p1">{{ item.inspected_person }}</p>
-          <!-- <p class="footed_box_one_p2">{{item.created_at}}</p> -->
-          <p class="footed_box_one_p6" v-if="item.rectification_status == 0">
-            未整改
-          </p>
-          <p class="footed_box_one_p6_2" v-if="item.rectification_status == 1">
-            已整改
-          </p>
-          <p
-            class="footed_box_one_p6_3"
-            style="background: #fdaf00"
-            v-if="item.rectification_status == 2"
-          >
-            申请延期
-          </p>
-          <p class="footed_box_one_p6_3" v-if="item.rectification_status == 3">
-            逾期
-          </p>
+        <div
+          class="footed_box"
+          v-for="(item, index) in TroubleshootData_list"
+          :key="index"
+        >
+          <div class="footed_box_one">
+            <p class="footed_box_one_p1">{{ item.inspected_person }}</p>
+            <!-- <p class="footed_box_one_p2">{{item.created_at}}</p> -->
+            <p class="footed_box_one_p6" v-if="item.rectification_status == 0">
+              未整改
+            </p>
+            <p
+              class="footed_box_one_p6_2"
+              v-if="item.rectification_status == 1"
+            >
+              已整改
+            </p>
+            <p
+              class="footed_box_one_p6_3"
+              style="background: #fdaf00"
+              v-if="item.rectification_status == 2"
+            >
+              申请延期
+            </p>
+            <p
+              class="footed_box_one_p6_3"
+              v-if="item.rectification_status == 3"
+            >
+              逾期
+            </p>
 
-          <p class="footed_box_one_p4" v-if="item.status == 1">未验收</p>
-          <p class="footed_box_one_p3" v-if="item.status == 2">已验收</p>
-          <p class="footed_box_one_p5" v-if="item.status == 3">逾期</p>
-          <p class="footed_box_one_p5" v-if="item.status == 4">未通过</p>
-        </div>
-        <div class="footed_box_two">
-          <div class="footed_box_two_div">
-            <span class="footed_box_span1">风险点</span>
-            <span>{{ item.risk_point }}</span>
+            <p class="footed_box_one_p4" v-if="item.status == 1">未验收</p>
+            <p class="footed_box_one_p3" v-if="item.status == 2">已验收</p>
+            <p class="footed_box_one_p5" v-if="item.status == 3">逾期</p>
+            <p class="footed_box_one_p5" v-if="item.status == 4">未通过</p>
           </div>
-          <div class="footed_box_two_div">
-            <span class="footed_box_span1">检查专业</span>
-            <span>{{ item.inspection_specialty }}</span>
+          <div class="footed_box_two">
+            <div class="footed_box_two_div">
+              <span class="footed_box_span1">风险点</span>
+              <span>{{ item.risk_point }}</span>
+            </div>
+            <div class="footed_box_two_div">
+              <span class="footed_box_span1">检查专业</span>
+              <span>{{ item.inspection_specialty }}</span>
+            </div>
+            <div class="footed_box_two_div">
+              <span class="footed_box_span1">责任单位</span>
+              <span>{{ item.rectification_duty_unit }}</span>
+            </div>
           </div>
-          <div class="footed_box_two_div">
-            <span class="footed_box_span1">责任单位</span>
-            <span>{{ item.rectification_duty_unit }}</span>
+          <div class="footed_box_three" @click="dianji(item)">
+            <img src="../../../assets/images/meihuajing/信息.png" alt="" />
           </div>
         </div>
-        <div class="footed_box_three" @click="dianji(item)">
-          <img src="../../../assets/images/meihuajing/信息.png" alt="" />
-        </div>
-      </div>
+      </van-list>
     </div>
   </div>
 </template>
@@ -57,14 +70,20 @@
 export default {
   data() {
     return {
+      page: 1,
+      loading: false,
+      finished: false,
+
       // 隐患列表
       TroubleshootData_list: [],
     };
   },
   methods: {
+    onLoad() {
+      this.getTroubleshootData();
+    },
     // 获取隐患排查列表
     getTroubleshootData() {
-      this.TroubleshootData_list = [];
       this.$toast.loading();
 
       this.$http
@@ -72,14 +91,27 @@ export default {
           "http://meihuajing.nxjiewei.com:8011/api/troubleshoot/getTroubleshootData",
           {
             type: 4,
+            page: this.page,
           }
         )
         .then((res) => {
           this.$toast.clear();
           console.log(res);
-          console.log(res.data.data);
+          console.log(res.data.data.data);
+          // 加载状态结束
+          this.loading = false;
+          this.page++;
 
-          this.TroubleshootData_list = res.data.data;
+          console.log(res.data.data.data.length);
+          // 数据全部加载完成
+          if (res.data.data.data.length < 10) {
+            this.finished = true;
+          }
+
+          // this.TroubleshootData_list = res.data.data.data;
+          this.TroubleshootData_list = this.TroubleshootData_list.concat(
+            res.data.data.data
+          );
         });
     },
 
@@ -100,8 +132,6 @@ export default {
   },
   mounted() {
     document.body.style.backgroundColor = "#f0f0f0"; //背景色
-
-    this.getTroubleshootData();
   },
 };
 </script>

src/views/meihuajing/yinhuanpaicha/yinhuaninfo_gongshi.vue

@@ -1,54 +1,67 @@
 <template>
   <div>
     <div class="footed">
-      <div
-        class="footed_box"
-        v-for="(item, index) in TroubleshootData_list"
-        :key="index"
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
       >
-        <div class="footed_box_one">
-          <p class="footed_box_one_p1">{{ item.inspected_person }}</p>
-          <!-- <p class="footed_box_one_p2">{{item.created_at}}</p> -->
-          <p class="footed_box_one_p6" v-if="item.rectification_status == 0">
-            未整改
-          </p>
-          <p class="footed_box_one_p6_2" v-if="item.rectification_status == 1">
-            已整改
-          </p>
-          <p
-            class="footed_box_one_p6_3"
-            style="background: #fdaf00"
-            v-if="item.rectification_status == 2"
-          >
-            申请延期
-          </p>
-          <p class="footed_box_one_p6_3" v-if="item.rectification_status == 3">
-            逾期
-          </p>
+        <div
+          class="footed_box"
+          v-for="(item, index) in TroubleshootData_list"
+          :key="index"
+        >
+          <div class="footed_box_one">
+            <p class="footed_box_one_p1">{{ item.inspected_person }}</p>
+            <!-- <p class="footed_box_one_p2">{{item.created_at}}</p> -->
+            <p class="footed_box_one_p6" v-if="item.rectification_status == 0">
+              未整改
+            </p>
+            <p
+              class="footed_box_one_p6_2"
+              v-if="item.rectification_status == 1"
+            >
+              已整改
+            </p>
+            <p
+              class="footed_box_one_p6_3"
+              style="background: #fdaf00"
+              v-if="item.rectification_status == 2"
+            >
+              申请延期
+            </p>
+            <p
+              class="footed_box_one_p6_3"
+              v-if="item.rectification_status == 3"
+            >
+              逾期
+            </p>
 
-          <p class="footed_box_one_p4" v-if="item.status == 1">未验收</p>
-          <p class="footed_box_one_p3" v-if="item.status == 2">已验收</p>
-          <p class="footed_box_one_p5" v-if="item.status == 3">逾期</p>
-          <p class="footed_box_one_p5" v-if="item.status == 4">未通过</p>
-        </div>
-        <div class="footed_box_two">
-          <div class="footed_box_two_div">
-            <span class="footed_box_span1">风险点</span>
-            <span>{{ item.risk_point }}</span>
+            <p class="footed_box_one_p4" v-if="item.status == 1">未验收</p>
+            <p class="footed_box_one_p3" v-if="item.status == 2">已验收</p>
+            <p class="footed_box_one_p5" v-if="item.status == 3">逾期</p>
+            <p class="footed_box_one_p5" v-if="item.status == 4">未通过</p>
           </div>
-          <div class="footed_box_two_div">
-            <span class="footed_box_span1">检查专业</span>
-            <span>{{ item.inspection_specialty }}</span>
+          <div class="footed_box_two">
+            <div class="footed_box_two_div">
+              <span class="footed_box_span1">风险点</span>
+              <span>{{ item.risk_point }}</span>
+            </div>
+            <div class="footed_box_two_div">
+              <span class="footed_box_span1">检查专业</span>
+              <span>{{ item.inspection_specialty }}</span>
+            </div>
+            <div class="footed_box_two_div">
+              <span class="footed_box_span1">责任单位</span>
+              <span>{{ item.rectification_duty_unit }}</span>
+            </div>
           </div>
-          <div class="footed_box_two_div">
-            <span class="footed_box_span1">责任单位</span>
-            <span>{{ item.rectification_duty_unit }}</span>
+          <div class="footed_box_three" @click="dianji(item)">
+            <img src="../../../assets/images/meihuajing/信息.png" alt="" />
           </div>
         </div>
-        <div class="footed_box_three" @click="dianji(item)">
-          <img src="../../../assets/images/meihuajing/信息.png" alt="" />
-        </div>
-      </div>
+      </van-list>
     </div>
   </div>
 </template>
@@ -57,14 +70,21 @@
 export default {
   data() {
     return {
+      page: 1,
+      loading: false,
+      finished: false,
+
       // 隐患列表
       TroubleshootData_list: [],
     };
   },
   methods: {
+    onLoad() {
+      this.getTroubleshootData();
+    },
     // 获取隐患排查列表
     getTroubleshootData() {
-      this.TroubleshootData_list = [];
+
       this.$toast.loading();
 
       this.$http
@@ -72,14 +92,28 @@ export default {
           "http://meihuajing.nxjiewei.com:8011/api/troubleshoot/getTroubleshootData",
           {
             type: 5,
+            page: this.page,
           }
         )
         .then((res) => {
           this.$toast.clear();
           console.log(res);
           console.log(res.data.data.data);
+           // 加载状态结束
+          this.loading = false;
+          this.page++;
+
+          console.log(res.data.data.data.length)
+          // 数据全部加载完成
+          if (res.data.data.data.length < 10) {
+            this.finished = true;
+          }
+
+          // this.TroubleshootData_list = res.data.data.data;
+          this.TroubleshootData_list = this.TroubleshootData_list.concat(res.data.data.data)
+
 
-          this.TroubleshootData_list = res.data.data.data;
+         
         });
     },
 
@@ -125,7 +159,6 @@ export default {
   mounted() {
     document.body.style.backgroundColor = "#f0f0f0"; //背景色
 
-    this.getTroubleshootData();
   },
 };
 </script>