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

src/views/systemManagement/EditSystem/index.vue

@@ -74,6 +74,7 @@
               <el-input
                 placeholder="请输入IP,并以‘；’号隔开"
                 v-model.trim="FormData.IpList"
+                maxlength="256"
               ></el-input>
             </el-form-item>
           </div>
@@ -81,6 +82,7 @@
             <el-form-item label="描述" prop="TacDesc">
               <el-input
                 placeholder="请输入"
+                maxlength="128"
                 v-model.trim="FormData.TacDesc"
               ></el-input>
             </el-form-item>
@@ -198,7 +200,7 @@
 import { EditTac, GetTacDetails, DeleteTac } from "@/api/systemConfiguration";
 import Dialog from "@/layout/components/Dialog";
 import { findarrays } from "@/utils/validate";
-import { lengthValidator } from '@/utils/validate'
+import { lengthValidator } from "@/utils/validate";
 export default {
   data() {
     return {
@@ -236,7 +238,12 @@ export default {
       rules: {
         TacName: [
           { required: true, message: "请输入策略名称", trigger: "blur" },
-          { validator: lengthValidator, max: 16, message: "长度在 1 到 16 个字符", trigger: ['change', 'blur'] },
+          {
+            validator: lengthValidator,
+            max: 16,
+            message: "长度在 1 到 16 个字符",
+            trigger: ["change", "blur"],
+          },
         ],
         Date: [
           { required: true, message: "请选择登录日期", trigger: "change" },
@@ -245,7 +252,12 @@ export default {
           { required: true, message: "请选择登录时间", trigger: "change" },
         ],
         TacDesc: [
-          { validator: lengthValidator, max: 128, message: "长度在 1 到 128 个字符", trigger: ['change', 'blur'] },
+          {
+            validator: lengthValidator,
+            max: 128,
+            message: "长度在 1 到 128 个字符",
+            trigger: ["change", "blur"],
+          },
         ],
       },
       editId: null,
@@ -303,7 +315,7 @@ export default {
           }
         });
       } else {
-        if (this.isValidIP(ipArr[0]) == false) {
+        if (this.isValidIP(ipArr[0]) == false && ipArr.length) {
           this.$message.error("请输入正确IP段，并以;号隔开");
           isSave = false;
         }

src/views/systemManagement/addSystem/index.vue

@@ -68,10 +68,11 @@
         <!-- 第二排 -->
         <div class="fristLine" style="margin-top: 24px">
           <div class="inputBox2">
-            <el-form-item label="IP段" prop="IpList">
+            <el-form-item label="IP段">
               <el-input
                 placeholder="请输入IP,并以‘；’号隔开"
                 v-model.trim="FormData.IpList"
+                maxlength="256"
               ></el-input>
             </el-form-item>
           </div>
@@ -80,6 +81,7 @@
               <el-input
                 placeholder="请输入"
                 v-model.trim="FormData.TacDesc"
+                maxlength="128"
               ></el-input>
             </el-form-item>
           </div>
@@ -138,40 +140,32 @@
           </div>
         </div>
         <div class="center-box">
-          <el-row
-            v-infinite-scroll="load"
-            :infinite-scroll-distance="20"
-            infinite-scroll-disabled="disabled"
-            class="scCont scrollbar"
-            :gutter="16"
-          >
-            <el-checkbox-group @change="changeChecked" v-model="checkList">
-              <el-col
-                :span="6"
-                v-for="(item, index) in FormData.Unuselist"
-                :key="index"
-              >
-                <el-card class="box-card">
-                  <div class="lineTop"></div>
-                  <div class="text item">
-                    <div class="header-top">
-                      <div class="header-mid flex">
-                        <span class="title">{{ item.UserName }}</span>
-                        <el-checkbox :label="index"></el-checkbox>
-                      </div>
-                      <!-- <el-checkbox-group v-model="checkList" @change="changeChecked(item, index)">
-                    <el-checkbox></el-checkbox>
-                  </el-checkbox-group> -->
+          <el-row class="scCont" :gutter="16">
+            <el-col
+              :span="6"
+              v-for="(item, index) in FormData.Unuselist"
+              :key="index"
+            >
+              <el-card class="box-card">
+                <div class="lineTop"></div>
+                <div class="text item">
+                  <div class="header-top flex">
+                    <div class="header-mid">
+                      <span :title="item.UserName" class="title">{{
+                        item.UserName
+                      }}</span>
                     </div>
+                    <el-checkbox-group
+                      v-model="checkList"
+                      @change="changeChecked(item, index)"
+                    >
+                      <el-checkbox></el-checkbox>
+                    </el-checkbox-group>
                   </div>
-                </el-card>
-              </el-col>
-            </el-checkbox-group>
+                </div>
+              </el-card>
+            </el-col>
           </el-row>
-          <template v-if="total > 1">
-            <p class="center" v-if="loading">加载中...</p>
-            <p class="center" v-if="noMore">没有更多数据了~</p>
-          </template>
           <el-empty
             v-if="FormData.Unuselist.length == 0"
             description="没有内容"
@@ -187,7 +181,7 @@
 import { GetUserList } from "@/api/apiAuthority";
 import { SaveTac } from "@/api/systemConfiguration";
 import { findarrays } from "@/utils/validate";
-import { lengthValidator } from '@/utils/validate'
+import { lengthValidator } from "@/utils/validate";
 export default {
   data() {
     return {
@@ -223,7 +217,12 @@ export default {
       rules: {
         TacName: [
           { required: true, message: "请输入策略名称", trigger: "blur" },
-          { validator: lengthValidator, max: 16, message: "长度在 1 到 16 个字符", trigger: ['change', 'blur'] },
+          {
+            validator: lengthValidator,
+            max: 16,
+            message: "长度在 1 到 16 个字符",
+            trigger: ["change", "blur"],
+          },
         ],
         Date: [
           { required: true, message: "请选择登录日期", trigger: "change" },
@@ -288,7 +287,7 @@ export default {
           }
         });
       } else {
-        if (this.isValidIP(ipArr[0]) == false) {
+        if (this.isValidIP(ipArr[0]) == false && ipArr.length) {
           this.$message.error("请输入正确IP段，并以;号隔开");
           isSave = false;
         }
@@ -355,18 +354,10 @@ export default {
           });
       });
     },
-    changeChecked(arr) {
-      const datas = this.dataList;
-      datas.forEach((item, index) => {
-        arr.forEach((p) => {
-          if (index == p) {
-            this.checkData.push(item);
-            this.FormData.Unuselist.splice(index, 1);
-          }
-        });
-      });
-      this.FormData.UseList = this.checkData;
-      this.checkList = [];
+    changeChecked(val, index) {
+      this.checkList = false;
+      this.FormData.UseList.push(val);
+      this.FormData.Unuselist.splice(index, 1);
     },
     UnchangeChecked(val, index) {
       this.UncheckList = true;