From fa5fd9d4f9c1ba33f26a343942a7941003cc601c Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期一, 28 十一月 2022 17:40:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/systemSetting/device/point/index.vue |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/systemSetting/device/point/index.vue b/src/views/systemSetting/device/point/index.vue
index 09180d7..0faebc1 100644
--- a/src/views/systemSetting/device/point/index.vue
+++ b/src/views/systemSetting/device/point/index.vue
@@ -171,7 +171,7 @@
 ::v-deep .el-tree-node__label {
   line-height: 30px;
   font-size: 14px;
-  color: rgb(75, 155, 183);
+  // color: rgb(75, 155, 183);
 }
 </style>
 <script>
@@ -190,6 +190,7 @@
       pageSize: 10,
       videoData: [],
       value: "",
+      searchData: null,
     };
   },
   methods: {
@@ -213,19 +214,21 @@
         .catch((err) => this.$message.error(err));
     },
     selectedDepartment(data) {
-      this.currentPage = 1;
+   
       if (!data.children) {
+        this.searchData = data;
         this.getVideoPointList(data);
       } else {
         data.parentId = data.id;
         data.id = null;
+        this.searchData = data;
         this.getVideoPointList(data);
       }
+      this.currentPage = 1;
     },
     current_change(e) {
       this.currentPage = e;
-
-      this.getVideoPointList();
+      this.getVideoPointList(this.searchData);
     },
   },
 };

--
Gitblit v1.8.0