合并

src/views/systemManagement/EditSystem/index.vue

@@ -292,16 +292,18 @@ export default {
     keyWords: {
       handler(val) {
         if (val.length == 0) {
-          this.FormData.Unuselist = this.FormData.Unuselists;
+          const res = this.FormData.Unuselists;
+          this.FormData.Unuselist = res;
         }
-      }
+      },
     },
     keyWordsUp: {
       handler(val) {
         if (val.length == 0) {
-          this.FormData.UseList = this.FormData.UseLists;
+          const res = this.FormData.UseLists;
+          this.FormData.UseList = res;
         }
-      }
+      },
     },
   },
   methods: {
@@ -445,7 +447,8 @@ export default {
     changeChecked(val, index) {
       this.checkList = false;
       this.FormData.UseList.push(val);
-      this.FormData.UseLists = this.FormData.UseList;
+      const res = this.FormData.UseList;
+      this.FormData.UseLists = res;
       this.FormData.Unuselist.splice(index, 1);
       this.FormData.Unuselists = this.FormData.Unuselists.filter(
         (i) => i.UserId !== val.UserId

src/views/systemManagement/LoginPolicy/index.vue

@@ -279,6 +279,18 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::-webkit-scrollbar-track-piece {
+  background: #d3dce6;
+}
+
+::-webkit-scrollbar {
+  width: 6px;
+}
+
+::-webkit-scrollbar-thumb {
+  background: #99a9bf;
+  border-radius: 20px;
+}
 .loger {
   width: 24px;
   height: 24px;

src/views/systemManagement/addSystem/index.vue

@@ -148,7 +148,12 @@
             <el-button @click="getUserData">搜索</el-button>
           </div>
         </div>
-        <div class="center-box scrollbar" v-infinite-scroll="load" :infinite-scroll-distance="20" infinite-scroll-disabled="disabled">
+        <div
+          class="center-box scrollbar"
+          v-infinite-scroll="load"
+          :infinite-scroll-distance="20"
+          infinite-scroll-disabled="disabled"
+        >
           <el-row class="scCont" :gutter="16">
             <el-col
               :span="6"
@@ -264,7 +269,7 @@ export default {
         ],
       },
       pageNum: 1,
-      PageSize: 50,
+      PageSize: 40,
       loading: false,
       total: null,
       arrList: [],
@@ -291,12 +296,14 @@ export default {
   watch: {
     keyWords(val) {
       if (this.keyWords.length == 0) {
-        this.FormData.Unuselist = this.FormData.Unuselists;
+        const res = this.FormData.Unuselists;
+        this.FormData.Unuselist = res;
       }
     },
     keyWordsUp() {
       if (this.keyWordsUp.length == 0) {
-        this.FormData.UseList = this.FormData.UseLists;
+        const res = this.FormData.UseLists;
+        this.FormData.UseList = res;
       }
     },
   },
@@ -402,7 +409,8 @@ export default {
     changeChecked(val, index) {
       this.checkList = false;
       this.FormData.UseList.push(val);
-      this.FormData.UseLists = this.FormData.UseList;
+      const res = this.FormData.UseList;
+      this.FormData.UseLists = res;
       this.FormData.Unuselist.splice(index, 1);
       // this.FormData.Unuselists.splice(index, 1);
       this.FormData.Unuselists = this.FormData.Unuselists.filter(
@@ -420,7 +428,6 @@ export default {
       this.UncheckList = true;
       this.FormData.Unuselist.push(val);
       // this.FormData.Unuselists.push(val);
-      console.log(this.FormData.Unuselists);
       this.FormData.Unuselist = this.FormData.Unuselist.sort(
         this.compare("indexname")
       );
@@ -465,6 +472,11 @@ export default {
     getUserData(val) {
       this.keyWords = this.keyWords.replace(/\s+/g, "");
       const search = this.keyWords;
+      // this.getUserList({
+      //   QueryName: this.keyWords,
+      //   PageSize: this.PageSize,
+      //   PageIndex: this.pageNum,
+      // });
       if (search) {
         this.FormData.Unuselist = findarrays(
           this.FormData.Unuselist,