zhaoke 3 жил өмнө
parent
commit
8772721498

+ 2 - 1
src/views/authorityManagement/components/authorityAppAdd.vue

@@ -29,7 +29,7 @@
               </el-select>
               <!-- <el-input placeholder="请输入APPID" v-model="form.id"></el-input> -->
             </el-form-item>
-            <el-form-item label="参数类型">
+            <el-form-item prop="app" label="参数类型">
               <!-- <el-select v-model="form.app" placeholder="参数类型">
                 <el-option label="header" value="1"></el-option>
                 <el-option label="body" value="2"></el-option>
@@ -116,6 +116,7 @@ export default {
           // { required: true, message: "请输入描述", trigger: "blur" },
           { validator: lengthValidator, max: 128, message: '长度在 1 到 128 个字符', trigger: ['change', 'blur'] }
         ],
+        app: [{ validator: lengthValidator, max: 32, message: '长度在 1 到 32 个字符', trigger: ['change', 'blur'] }]
       },
       radio: "1",
       type: null, //参数类型

+ 2 - 1
src/views/authorityManagement/components/authorityAppEdit.vue

@@ -39,7 +39,7 @@
               </el-select>
               <!-- <el-input placeholder="请输入APPID" disabled v-model="form.id"></el-input> -->
             </el-form-item>
-            <el-form-item label="参数类型">
+            <el-form-item prop="app" label="参数类型">
               <el-input placeholder="请输入参数类型" v-model.trim="form.app"></el-input>
             </el-form-item>
           </div>
@@ -127,6 +127,7 @@ export default {
           // { required: true, message: "请输入描述", trigger: "blur" },
           { validator: lengthValidator, max: 128, message: '长度在 1到 128 个字符', trigger: ['change', 'blur'] }
         ],
+        app: [{ validator: lengthValidator, max: 32, message: '长度在 1 到 32 个字符', trigger: ['change', 'blur'] }]
       },
       radio: 1,
       AppId: null,

+ 32 - 96
src/views/systemManagement/EditSystem/index.vue

@@ -1,12 +1,6 @@
 <template>
   <div class="Box">
-    <el-form
-      :model="FormData"
-      :rules="rules"
-      ref="ruleForm"
-      label-width="100px"
-      class="demo-ruleForm"
-    >
+    <el-form :model="FormData" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
       <div class="topBox">
         <div class="titleBtn">
           <span class="titleStyle">策略信息编辑 </span>
@@ -18,51 +12,26 @@
         <div class="fristLine">
           <div class="inputBox">
             <el-form-item label="策略名称" prop="TacName">
-              <el-input
-                placeholder="请输入"
-                v-model.trim="FormData.TacName"
-              ></el-input>
+              <el-input placeholder="请输入" v-model.trim="FormData.TacName"></el-input>
             </el-form-item>
           </div>
           <div class="inputBox">
             <el-form-item label="IP类型" prop="IpType">
               <el-select v-model="FormData.IpType" placeholder="请选择类型">
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
           </div>
           <div class="block inputBox1">
             <el-form-item label="登录日期" prop="Date">
-              <el-date-picker
-                v-model="FormData.Date"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                @change="dataChange"
-                value-format="yyyy-MM-dd"
-              >
+              <el-date-picker v-model="FormData.Date" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="dataChange" value-format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
           </div>
           <div class="block inputBox1">
             <el-form-item label="登录时间" prop="Time">
-              <el-time-picker
-                is-range
-                v-model="FormData.Time"
-                range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                placeholder="选择时间范围"
-                @change="timeChange"
-                value-format="HH:mm:ss"
-              >
+              <el-time-picker is-range v-model="FormData.Time" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" placeholder="选择时间范围" @change="timeChange" value-format="HH:mm:ss">
               </el-time-picker>
             </el-form-item>
           </div>
@@ -71,20 +40,12 @@
         <div class="fristLine" style="margin-top: 24px">
           <div class="inputBox2">
             <el-form-item label="IP段" prop="IpList">
-              <el-input
-                placeholder="请输入IP,并以‘;’号隔开"
-                v-model.trim="FormData.IpList"
-                maxlength="256"
-              ></el-input>
+              <el-input placeholder="请输入IP,并以‘;’号隔开" v-model.trim="FormData.IpList"></el-input>
             </el-form-item>
           </div>
           <div class="inputBox3">
             <el-form-item label="描述" prop="TacDesc">
-              <el-input
-                placeholder="请输入"
-                maxlength="128"
-                v-model.trim="FormData.TacDesc"
-              ></el-input>
+              <el-input placeholder="请输入" v-model.trim="FormData.TacDesc"></el-input>
             </el-form-item>
           </div>
         </div>
@@ -97,11 +58,7 @@
         </div>
         <div class="center-box fpBox">
           <el-row class="scCont" :gutter="16">
-            <el-col
-              :span="4"
-              v-for="(item, index) in FormData.UseList"
-              :key="index"
-            >
+            <el-col :span="4" v-for="(item, index) in FormData.UseList" :key="index">
               <el-card class="box-card">
                 <div class="lineTop"></div>
                 <div class="text item">
@@ -109,10 +66,7 @@
                     <div class="header-mid">
                       <span class="title">{{ item.UserName }}</span>
                     </div>
-                    <el-checkbox-group
-                      v-model="UncheckList"
-                      @change="UnchangeChecked(item, index)"
-                    >
+                    <el-checkbox-group v-model="UncheckList" @change="UnchangeChecked(item, index)">
                       <el-checkbox checked></el-checkbox>
                     </el-checkbox-group>
                   </div>
@@ -120,11 +74,7 @@
               </el-card>
             </el-col>
           </el-row>
-          <el-empty
-            v-if="FormData.UseList.length == 0"
-            description="没有选取"
-            style="margin: 0 auto"
-          ></el-empty>
+          <el-empty v-if="FormData.UseList.length == 0" description="没有选取" style="margin: 0 auto"></el-empty>
         </div>
       </div>
 
@@ -132,22 +82,13 @@
         <div class="titleBtn">
           <span class="titleStyle">选择职员 </span>
           <div class="searchBox">
-            <el-input
-              placeholder="请输入内容"
-              clearable
-              @clear="clearData"
-              v-model.trim="keyWords"
-            ></el-input>
+            <el-input placeholder="请输入内容" clearable @clear="clearData" v-model.trim="keyWords"></el-input>
             <el-button @click="queryData()">搜索</el-button>
           </div>
         </div>
         <div class="center-box">
           <el-row class="scCont" :gutter="16">
-            <el-col
-              :span="6"
-              v-for="(item, index) in FormData.Unuselist"
-              :key="index"
-            >
+            <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">
@@ -157,10 +98,7 @@
                         item.UserName
                       }}</span>
                     </div>
-                    <el-checkbox-group
-                      v-model="checkList"
-                      @change="changeChecked(item, index)"
-                    >
+                    <el-checkbox-group v-model="checkList" @change="changeChecked(item, index)">
                       <el-checkbox></el-checkbox>
                     </el-checkbox-group>
                   </div>
@@ -168,11 +106,7 @@
               </el-card>
             </el-col>
           </el-row>
-          <el-empty
-            v-if="FormData.Unuselist.length == 0"
-            description="没有内容"
-            style="margin: 0 auto"
-          ></el-empty>
+          <el-empty v-if="FormData.Unuselist.length == 0" description="没有内容" style="margin: 0 auto"></el-empty>
         </div>
       </div>
     </div>
@@ -182,13 +116,7 @@
         <div class="title1">删除策略</div>
         <div class="content">是否确认删除该策略?</div>
         <div class="foot right t30">
-          <el-button
-            size="medium"
-            @click="remove(item, index)"
-            type="danger"
-            class="r24"
-            >删除</el-button
-          >
+          <el-button size="medium" @click="remove(item, index)" type="danger" class="r24">删除</el-button>
           <el-button size="medium" @click="flag = false">取消</el-button>
         </div>
       </div>
@@ -202,7 +130,7 @@ import Dialog from "@/layout/components/Dialog";
 import { findarrays } from "@/utils/validate";
 import { lengthValidator } from "@/utils/validate";
 export default {
-  data() {
+  data () {
     return {
       flag: false,
       checkList: false,
@@ -259,6 +187,14 @@ export default {
             trigger: ["change", "blur"],
           },
         ],
+        IpList: [
+          {
+            validator: lengthValidator,
+            max: 256,
+            message: "长度在 1 到 256 个字符",
+            trigger: ["change", "blur"],
+          }
+        ]
       },
       editId: null,
     };
@@ -269,14 +205,14 @@ export default {
   },
   components: { Dialog },
   watch: {
-    keyWords() {
+    keyWords () {
       if (this.keyWords.length == 0) {
         this.getDetial(this.editId);
       }
     },
   },
   methods: {
-    queryData() {
+    queryData () {
       this.keyWords = this.keyWords.replace(/\s+/g, "");
       const search = this.keyWords;
       if (search) {
@@ -300,7 +236,7 @@ export default {
         /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
       return reg.test(ip);
     },
-    save() {
+    save () {
       let that = this;
       let ipArr = [];
       if (this.FormData.IpList) {
@@ -356,7 +292,7 @@ export default {
         }
       });
     },
-    getDetial(id) {
+    getDetial (id) {
       let that = this;
       return new Promise((resolve, reject) => {
         GetTacDetails({ TacId: id })
@@ -386,12 +322,12 @@ export default {
           });
       });
     },
-    changeChecked(val, index) {
+    changeChecked (val, index) {
       this.checkList = false;
       this.FormData.UseList.push(val);
       this.FormData.Unuselist.splice(index, 1);
     },
-    UnchangeChecked(val, index) {
+    UnchangeChecked (val, index) {
       this.UncheckList = true;
       this.FormData.Unuselist.push(val);
       this.FormData.UseList.splice(index, 1);
@@ -409,7 +345,7 @@ export default {
       }
     },
     //删除
-    remove() {
+    remove () {
       let that = this;
       return new Promise((resolve, reject) => {
         DeleteTac({ TacId: this.FormData.TacId })
@@ -429,7 +365,7 @@ export default {
           });
       });
     },
-    clearData() {
+    clearData () {
       this.FormData.Unuselist = this.boxArr;
     },
   },

+ 42 - 89
src/views/systemManagement/addSystem/index.vue

@@ -1,12 +1,6 @@
 <template>
   <div class="Box">
-    <el-form
-      :model="FormData"
-      :rules="rules"
-      ref="ruleForm"
-      label-width="100px"
-      class="demo-ruleForm"
-    >
+    <el-form :model="FormData" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
       <div class="topBox">
         <div class="titleBtn">
           <span class="titleStyle">策略信息新增 </span>
@@ -16,51 +10,26 @@
         <div class="fristLine">
           <div class="inputBox">
             <el-form-item label="策略名称" prop="TacName">
-              <el-input
-                placeholder="请输入"
-                v-model.trim="FormData.TacName"
-              ></el-input>
+              <el-input placeholder="请输入" v-model.trim="FormData.TacName"></el-input>
             </el-form-item>
           </div>
           <div class="inputBox">
             <el-form-item label="IP类型" prop="IpType">
               <el-select v-model="FormData.IpType" placeholder="请选择类型">
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
           </div>
           <div class="block inputBox1">
             <el-form-item label="登录日期" prop="Date">
-              <el-date-picker
-                v-model="FormData.Date"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                @change="dataChange"
-                value-format="yyyy-MM-dd"
-              >
+              <el-date-picker v-model="FormData.Date" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="dataChange" value-format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
           </div>
           <div class="block inputBox1">
             <el-form-item label="登录时间" prop="Time">
-              <el-time-picker
-                is-range
-                v-model="FormData.Time"
-                range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                placeholder="选择时间范围"
-                @change="timeChange"
-                value-format="HH:mm:ss"
-              >
+              <el-time-picker is-range v-model="FormData.Time" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" placeholder="选择时间范围" @change="timeChange" value-format="HH:mm:ss">
               </el-time-picker>
             </el-form-item>
           </div>
@@ -68,21 +37,13 @@
         <!-- 第二排 -->
         <div class="fristLine" style="margin-top: 24px">
           <div class="inputBox2">
-            <el-form-item label="IP段">
-              <el-input
-                placeholder="请输入IP,并以‘;’号隔开"
-                v-model.trim="FormData.IpList"
-                maxlength="256"
-              ></el-input>
+            <el-form-item prop="IpList" label="IP段">
+              <el-input placeholder="请输入IP,并以‘;’号隔开" v-model.trim="FormData.IpList"></el-input>
             </el-form-item>
           </div>
           <div class="inputBox3">
-            <el-form-item label="描述" prop="IpList">
-              <el-input
-                placeholder="请输入"
-                v-model.trim="FormData.TacDesc"
-                maxlength="128"
-              ></el-input>
+            <el-form-item label="描述" prop="TacDesc">
+              <el-input placeholder="请输入" v-model.trim="FormData.TacDesc"></el-input>
             </el-form-item>
           </div>
         </div>
@@ -96,11 +57,7 @@
         <div class="center-box">
           <el-row class="scCont" :gutter="16">
             <el-checkbox-group @change="UnchangeChecked" v-model="UncheckList">
-              <el-col
-                :span="4"
-                v-for="(item, index) in FormData.UseList"
-                :key="index"
-              >
+              <el-col :span="4" v-for="(item, index) in FormData.UseList" :key="index">
                 <el-card class="box-card">
                   <div class="lineTop"></div>
                   <div class="text item">
@@ -118,11 +75,7 @@
               </el-col>
             </el-checkbox-group>
           </el-row>
-          <el-empty
-            v-if="FormData.UseList.length == 0"
-            description="没有选取"
-            style="margin: 0 auto"
-          ></el-empty>
+          <el-empty v-if="FormData.UseList.length == 0" description="没有选取" style="margin: 0 auto"></el-empty>
         </div>
       </div>
 
@@ -130,22 +83,13 @@
         <div class="titleBtn">
           <span class="titleStyle">选择职员 </span>
           <div class="searchBox">
-            <el-input
-              placeholder="请输入内容"
-              clearable
-              @clear="clearData"
-              v-model.trim="keyWords"
-            ></el-input>
+            <el-input placeholder="请输入内容" clearable @clear="clearData" v-model.trim="keyWords"></el-input>
             <el-button @click="getUserData">搜索</el-button>
           </div>
         </div>
         <div class="center-box">
           <el-row class="scCont" :gutter="16">
-            <el-col
-              :span="6"
-              v-for="(item, index) in FormData.Unuselist"
-              :key="index"
-            >
+            <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">
@@ -155,10 +99,7 @@
                         item.UserName
                       }}</span>
                     </div>
-                    <el-checkbox-group
-                      v-model="checkList"
-                      @change="changeChecked(item, index)"
-                    >
+                    <el-checkbox-group v-model="checkList" @change="changeChecked(item, index)">
                       <el-checkbox></el-checkbox>
                     </el-checkbox-group>
                   </div>
@@ -166,11 +107,7 @@
               </el-card>
             </el-col>
           </el-row>
-          <el-empty
-            v-if="FormData.Unuselist.length == 0"
-            description="没有内容"
-            style="margin: 0 auto"
-          ></el-empty>
+          <el-empty v-if="FormData.Unuselist.length == 0" description="没有内容" style="margin: 0 auto"></el-empty>
         </div>
       </div>
     </div>
@@ -183,7 +120,7 @@ import { SaveTac } from "@/api/systemConfiguration";
 import { findarrays } from "@/utils/validate";
 import { lengthValidator } from "@/utils/validate";
 export default {
-  data() {
+  data () {
     return {
       keyWords: "",
       checkList: [],
@@ -230,6 +167,22 @@ export default {
         Time: [
           { required: true, message: "请选择登录时间", trigger: "change" },
         ],
+        TacDesc: [
+          {
+            validator: lengthValidator,
+            max: 128,
+            message: "长度在 1 到 128 个字符",
+            trigger: ["change", "blur"],
+          }
+        ],
+        IpList: [
+          {
+            validator: lengthValidator,
+            max: 256,
+            message: "长度在 1 到 256 个字符",
+            trigger: ["change", "blur"],
+          }
+        ]
       },
       pageNum: 1,
       PageSize: 50,
@@ -248,15 +201,15 @@ export default {
     });
   },
   computed: {
-    noMore() {
+    noMore () {
       return this.pageNum >= this.total;
     },
-    disabled() {
+    disabled () {
       return this.loading || this.noMore;
     },
   },
   watch: {
-    keyWords() {
+    keyWords () {
       if (this.keyWords.length == 0) {
         this.getUserList({
           QueryName: this.keyWords,
@@ -272,7 +225,7 @@ export default {
         /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
       return reg.test(ip);
     },
-    save() {
+    save () {
       let that = this;
       let ipArr = [];
       if (this.FormData.IpList) {
@@ -327,7 +280,7 @@ export default {
         }
       });
     },
-    getUserList(obj) {
+    getUserList (obj) {
       return new Promise((resolve, reject) => {
         this.loading = true;
         GetUserList(obj)
@@ -354,12 +307,12 @@ export default {
           });
       });
     },
-    changeChecked(val, index) {
+    changeChecked (val, index) {
       this.checkList = false;
       this.FormData.UseList.push(val);
       this.FormData.Unuselist.splice(index, 1);
     },
-    UnchangeChecked(val, index) {
+    UnchangeChecked (val, index) {
       this.UncheckList = true;
       this.FormData.Unuselist.push(val);
       this.FormData.UseList.splice(index, 1);
@@ -372,7 +325,7 @@ export default {
       this.FormData.TimeBegin = data[0];
       this.FormData.TimeEnd = data[1];
     },
-    load() {
+    load () {
       this.pageNum += 1;
       this.getUserList({
         QueryName: this.keyWords,
@@ -380,7 +333,7 @@ export default {
         PageIndex: this.pageNum,
       });
     },
-    getUserData(val) {
+    getUserData (val) {
       // this.arrList = [];
       // this.FormData.Unuselist = [];
       // this.pageNum = 1;
@@ -406,7 +359,7 @@ export default {
         // this.getWarningList();
       }
     },
-    clearData() {
+    clearData () {
       this.arrList = [];
       this.FormData.Unuselist = [];
       this.pageNum = 1;