Merge branch 'master' of http://120.26.64.82:3000/BFFE/Foshan4A4.0

src/views/systemManagement/EditSystem/index.vue

@@ -144,7 +144,6 @@
             <el-input
               placeholder="请输入内容"
               clearable
-              @clear="clearData"
               v-model.trim="keyWords"
               @keyup.enter.native="queryData"
             ></el-input>
@@ -244,6 +243,7 @@ export default {
         UseList: [],
         UseLists: [],
         Unuselist: [],
+        Unuselists: [],
         Date: [],
         Time: [],
       },
@@ -291,7 +291,7 @@ export default {
   watch: {
     keyWords() {
       if (this.keyWords.length == 0) {
-        this.getDetial(this.editId);
+        this.FormData.Unuselist = this.FormData.Unuselists;
       }
     },
     keyWordsUp() {
@@ -424,6 +424,7 @@ export default {
               that.FormData.Unuselist.forEach((res, index) => {
                 res.indexname = index;
               });
+              that.FormData.Unuselists = that.FormData.Unuselist;
               that.Unuselist = that.FormData.Unuselist;
               that.boxArr = _.cloneDeep(that.FormData.Unuselist);
             }
@@ -439,6 +440,7 @@ export default {
       this.FormData.UseList.push(val);
       this.FormData.UseLists = this.FormData.UseList;
       this.FormData.Unuselist.splice(index, 1);
+      this.FormData.Unuselists.splice(index, 1);
     },
 
     UnchangeChecked(val, index) {

src/views/systemManagement/LoginPolicy/index.vue

@@ -200,10 +200,10 @@ export default {
               this.tacList.forEach((element) => {
                 if (element.LoginDateBegin) {
                   element.LoginDateBegins =
-                    element.LoginDateBegin.split("T")[0];
+                    element.LoginDateBegin.split(" ")[0];
                 }
                 if (element.LoginDateEnd) {
-                  element.LoginDateEnds = element.LoginDateEnd.split("T")[0];
+                  element.LoginDateEnds = element.LoginDateEnd.split(" ")[0];
                 }
                 if (element.LoginTimeBegin) {
                   element.LoginTimeBegins =

src/views/systemManagement/addSystem/index.vue

@@ -142,7 +142,6 @@
             <el-input
               placeholder="请输入内容"
               clearable
-              @clear="clearData"
               v-model.trim="keyWords"
               @keyup.enter.native="getUserData"
             ></el-input>
@@ -223,6 +222,7 @@ export default {
         UseList: [],
         UseLists: [],
         Unuselist: [],
+        Unuselists: [],
         Date: null,
         Time: null,
       },
@@ -287,11 +287,7 @@ export default {
   watch: {
     keyWords() {
       if (this.keyWords.length == 0) {
-        this.getUserList({
-          QueryName: this.keyWords,
-          PageSize: this.PageSize,
-          PageIndex: this.pageNum,
-        });
+        this.FormData.Unuselist = this.FormData.Unuselists;
       }
     },
     keyWordsUp() {
@@ -373,13 +369,22 @@ export default {
               const arrs = this.arrList.flat();
               const msgs = _.unionBy(arrs, "UserId");
               this.FormData.Unuselist = msgs;
+              this.FormData.Unuselists = msgs;
               this.copyList = msgs;
               this.FormData.Unuselist = this.FormData.Unuselist.filter(
                 (i) => i.UserName
               );
+
               this.FormData.Unuselist.forEach((res, index) => {
                 res.indexname = index;
               });
+              this.FormData.Unuselists = this.FormData.Unuselists.filter(
+                (i) => i.UserName
+              );
+
+              this.FormData.Unuselists.forEach((res, index) => {
+                res.indexname = index;
+              });
               this.dataList = msgs;
               this.total = num;
               this.loading = false;
@@ -397,6 +402,10 @@ export default {
       this.FormData.UseList.push(val);
       this.FormData.UseLists = this.FormData.UseList;
       this.FormData.Unuselist.splice(index, 1);
+      this.FormData.Unuselists.splice(index, 1);
+      // this.FormData.Unuselists = this.FormData.Unuselists.filter(
+      //   (i) => i.UserName !== val.UserName
+      // );
     },
     compare(property) {
       return function (a, b) {
@@ -412,10 +421,10 @@ export default {
         this.compare("indexname")
       );
       this.FormData.UseList.splice(index, 1);
-      // this.FormData.UseLists.splice(index, 1);
-      this.FormData.UseLists = this.FormData.UseLists.filter(
-        (i) => i.UserName !== val.UserName
-      );
+      this.FormData.UseLists.splice(index, 1);
+      // this.FormData.UseLists = this.FormData.UseLists.filter(
+      //   (i) => i.UserName !== val.UserName
+      // );
     },
     dataChange: function (data) {
       this.FormData.DateBegin = data[0];
@@ -447,14 +456,6 @@ export default {
       }
     },
     getUserData(val) {
-      // this.arrList = [];
-      // this.FormData.Unuselist = [];
-      // this.pageNum = 1;
-      // this.getUserList({
-      //   QueryName: this.keyWords,
-      //   PageSize: this.PageSize,
-      //   PageIndex: this.pageNum,
-      // });
       this.keyWords = this.keyWords.replace(/\s+/g, "");
       const search = this.keyWords;
       if (search) {
@@ -463,13 +464,6 @@ export default {
           "UserName",
           search
         );
-      } else {
-        this.getUserList({
-          QueryName: this.keyWords,
-          PageSize: this.PageSize,
-          PageIndex: this.pageNum,
-        });
-        // this.getWarningList();
       }
     },
     clearData() {