Merge branch 'xy-ly' into fly

src/views/alarmHandling/components/historyimg.vue

@@ -28,15 +28,17 @@ export default {
       page: 1, // 当前页数
       pageSize: 10, // 每页数量
       total: 0, //总条数
+      selectnr: "", //获取当前数据内容
     };
   },
   mounted() {},
   methods: {
     //获取图片数据
     getdataform(val) {
+      this.selectnr = val;
       getHistoryList({
-        channelId: val.channelId,
-        termId: val.termId,
+        channelId: this.selectnr.channelId,
+        termId: this.selectnr.termId,
         pageindex: this.page,
         pagesize: this.pageSize,
       }).then((res) => {
@@ -47,6 +49,18 @@ export default {
     //下一页
     changebtn(e) {
       console.log(e);
+      if (Math.floor(e / 9) == 1) {
+        this.page++;
+        getHistoryList({
+          channelId: this.selectnr.channelId,
+          termId: this.selectnr.termId,
+          pageindex: this.page,
+          pagesize: this.pageSize,
+        }).then((res) => {
+          this.imglist.push(res.data.list);
+          this.total = res.data.total;
+        });
+      }
     },
     display() {
       this.isShow = true;