修改bug

src/layout/index.vue

@@ -19,6 +19,7 @@
         <div class="message">
           <div class="m1"><span class="el-icon-s-opportunity mg"></span>密码长度：{{PwdLengthBegin}}-{{PwdLengthEnd}}位字符</div>
           <div class="m2">密码规则：必须包含{{PwdMessage}}</div>
+          <div class="m2">特殊字符：!、%、&、,、;、=、?、$、@、#、$、*、'</div>
         </div>
         <div class="content">
           <el-form :model="dataForm" :rules="dataRules" ref="dataForm" class="demo-dataForm">
@@ -188,7 +189,7 @@ export default {
         }
       }
       .content {
-        margin-top: 70px;
+        margin-top: 100px;
       }
       .message {
         position: absolute;
@@ -204,6 +205,7 @@ export default {
         }
         .m2 {
           padding-left: 22px;
+          margin-bottom: 8px;
         }
       }
     }

src/views/accountGroupManagement/components/accountGroupHome.vue

@@ -42,11 +42,11 @@
                         <div class="flex info">
                           <div class="icon">
                             <el-tooltip v-is="['grouptree_btn_update_group']" effect="dark" :content="`编辑${accountGroupType}`" placement="bottom">
-                              <span :title="`编辑${accountGroupType}`" class="cap cap-edit" @click="renderEdit(data)" v-if="data.GroupId != -1"></span>
+                              <span class="cap cap-edit" @click="renderEdit(data)" v-if="data.GroupId != -1"></span>
                             </el-tooltip>
 
                             <el-tooltip v-is="['grouptree_btn_add_group']" effect="dark" :content="`新增${accountGroupType}`" placement="bottom">
-                              <span :title="`新增${accountGroupType}`" class="cap cap-sub" @click="renderAdd(data)"></span>
+                              <span class="cap cap-sub" @click="renderAdd(data)"></span>
                             </el-tooltip>
                           </div>
                         </div>
@@ -131,11 +131,11 @@
                             ></el-tooltip> -->
 
                             <el-tooltip v-is="['grouptree_btn_update_group']" effect="dark" :content="`编辑${accountGroupType}`" placement="bottom">
-                              <span :title="`编辑${accountGroupType}`" class="cap cap-edit" @click.stop="renderEdit(data)" v-if="data.GroupId != -1"></span>
+                              <span class="cap cap-edit" @click.stop="renderEdit(data)" v-if="data.GroupId != -1"></span>
                             </el-tooltip>
 
                             <el-tooltip v-is="['grouptree_btn_add_group']" effect="dark" :content="`新增${accountGroupType}`" placement="bottom">
-                              <span :title="`新增${accountGroupType}`" class="cap cap-sub" @click.stop="renderAdd(data)"></span>
+                              <span class="cap cap-sub" @click.stop="renderAdd(data)"></span>
                             </el-tooltip>
                           </div>
                         </div>

src/views/authorityManagement/components/authorityAppAdd.vue

@@ -23,18 +23,18 @@
               <el-input placeholder="请输入应用名称" v-model.trim="form.name"></el-input>
             </el-form-item>
             <el-form-item label="请求类型">
-              <el-select v-model="form.id" placeholder="请求类型">
+              <el-select @change="typeChange" v-model="form.id" placeholder="请求类型">
                 <el-option label="get" :value="1"></el-option>
                 <el-option label="post" :value="2"></el-option>
               </el-select>
               <!-- <el-input placeholder="请输入APPID" v-model="form.id"></el-input> -->
             </el-form-item>
             <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>
-              </el-select> -->
-              <el-input placeholder="请输入参数类型" v-model.trim="form.app"></el-input>
+              <el-select :disabled="typeFlag" v-model="form.app" placeholder="参数类型">
+                <el-option label="application/json" value="application/json"></el-option>
+                <el-option label="application/text" value="application/text"></el-option>
+              </el-select>
+              <!-- <el-input placeholder="请输入参数类型" v-model.trim="form.app"></el-input> -->
             </el-form-item>
           </div>
           <el-form-item prop="url" class="url" label="应用地址">
@@ -45,7 +45,7 @@
           </el-form-item>
         </el-form>
         <div class="addApp-form-title domain-title flex">
-          <div class="title">参数管理</div>
+          <div class="title">入参管理</div>
           <div class="btn">
             <el-button @click="addDomain" type="primary">新增</el-button>
           </div>
@@ -54,14 +54,22 @@
           <el-form :model="dynamicValidateForm" ref="dynamicValidateForm" label-width="85px" class="demo-dynamic">
             <div class="flex" v-for="(domain, index) in dynamicValidateForm.domains" :key="index">
               <div class="flex-wrap">
-                <el-form-item label="参数名称" :prop="'domains.' + index + '.name'">
+                <el-form-item label="入参名称" :prop="'domains.' + index + '.name'">
                   <el-input placeholder="请输入最大64位参数名称" maxlength="64" v-model.trim="domain.AppInputName"></el-input>
                 </el-form-item>
-                <el-form-item label="参数类型" :prop="'domains.' + index + '.type'">
-                  <el-input placeholder="请输入最大8位参数类型" maxlength="8" v-model.trim="domain.AppInputType"></el-input>
+                <el-form-item label="入参类型" :prop="'domains.' + index + '.type'">
+                  <el-select v-model="domain.AppInputType" :disabled="typeFlag" placeholder="参数类型">
+                    <el-option label="string" value="string"></el-option>
+                    <el-option label="int" value="int"></el-option>
+                  </el-select>
+                  <!-- <el-input placeholder="请输入最大8位参数类型" maxlength="8" v-model.trim="domain.AppInputType"></el-input> -->
                 </el-form-item>
-                <el-form-item label="参数位置" :prop="'domains.' + index + '.place'">
-                  <el-input placeholder="请输入最大8位参数位置" maxlength="8" v-model.trim="domain.AppInputSite"></el-input>
+                <el-form-item label="入参位置" :prop="'domains.' + index + '.place'">
+                  <el-select v-model="domain.AppInputSite" placeholder="参数位置">
+                    <el-option label="header" value="header"></el-option>
+                    <el-option label="body" value="body"></el-option>
+                  </el-select>
+                  <!-- <el-input placeholder="请输入最大8位参数位置" maxlength="8" v-model.trim="domain.AppInputSite"></el-input> -->
                 </el-form-item>
               </div>
               <div>
@@ -129,6 +137,7 @@ export default {
           AppInputSite: ''
         }]
       },
+      typeFlag: false
     };
   },
   methods: {
@@ -182,11 +191,32 @@ export default {
       }
     },
     addDomain () {
-      this.dynamicValidateForm.domains.push({
-        AppInputName: '',
-        AppInputType: '',
-        AppInputSite: ''
-      });
+      const { id } = this.form
+      if (id == 1) {
+        this.dynamicValidateForm.domains.push({
+          AppInputName: '',
+          AppInputType: 'string',
+          AppInputSite: ''
+        });
+      } else {
+        this.dynamicValidateForm.domains.push({
+          AppInputName: '',
+          AppInputType: '',
+          AppInputSite: ''
+        });
+      }
+    },
+    typeChange (val) {
+      const datas = this.dynamicValidateForm.domains
+      if (val == 1) {
+        this.typeFlag = true;
+        this.form.app = '';
+        datas.forEach(item => {
+          item.AppInputType = 'string';
+        })
+      } else {
+        this.typeFlag = false;
+      }
     }
   },
 };

src/views/authorityManagement/components/authorityAppEdit.vue

@@ -33,14 +33,18 @@
               <el-input placeholder="请输入应用名称" v-model.trim="form.name"></el-input>
             </el-form-item>
             <el-form-item label="请求类型">
-              <el-select v-model="form.id" placeholder="请求类型">
+              <el-select @change="typeChange" v-model="form.id" placeholder="请求类型">
                 <el-option label="get" :value="1"></el-option>
                 <el-option label="post" :value="2"></el-option>
               </el-select>
               <!-- <el-input placeholder="请输入APPID" disabled v-model="form.id"></el-input> -->
             </el-form-item>
             <el-form-item prop="app" label="参数类型">
-              <el-input placeholder="请输入参数类型" v-model.trim="form.app"></el-input>
+              <el-select :disabled="typeFlag" v-model="form.app" placeholder="参数类型">
+                <el-option label="application/json" value="application/json"></el-option>
+                <el-option label="application/text" value="application/text"></el-option>
+              </el-select>
+              <!-- <el-input placeholder="请输入参数类型" v-model.trim="form.app"></el-input> -->
             </el-form-item>
           </div>
           <el-form-item class="url" prop="url" label="应用地址">
@@ -60,14 +64,22 @@
           <el-form :model="dynamicValidateForm" ref="dynamicValidateForm" label-width="85px" class="demo-dynamic">
             <div class="flex" v-for="(domain, index) in dynamicValidateForm.domains" :key="index">
               <div class="flex-wrap">
-                <el-form-item label="参数名称" :prop="'domains.' + index + '.name'">
+                <el-form-item label="入参名称" :prop="'domains.' + index + '.name'">
                   <el-input placeholder="请输入最大64位参数名称" maxlength="64" v-model.trim="domain.AppInputName"></el-input>
                 </el-form-item>
-                <el-form-item label="参数类型" :prop="'domains.' + index + '.type'">
-                  <el-input placeholder="请输入最大8位参数类型" maxlength="8" v-model.trim="domain.AppInputType"></el-input>
+                <el-form-item label="入参类型" :prop="'domains.' + index + '.type'">
+                  <el-select v-model="domain.AppInputType" :disabled="typeFlag" placeholder="参数类型">
+                    <el-option label="string" value="string"></el-option>
+                    <el-option label="int" value="int"></el-option>
+                  </el-select>
+                  <!-- <el-input placeholder="请输入最大8位参数类型" maxlength="8" v-model.trim="domain.AppInputType"></el-input> -->
                 </el-form-item>
-                <el-form-item label="参数位置" :prop="'domains.' + index + '.place'">
-                  <el-input placeholder="请输入最大8位参数位置" maxlength="8" v-model.trim="domain.AppInputSite"></el-input>
+                <el-form-item label="入参位置" :prop="'domains.' + index + '.place'">
+                  <el-select v-model="domain.AppInputSite" placeholder="参数位置">
+                    <el-option label="header" value="header"></el-option>
+                    <el-option label="body" value="body"></el-option>
+                  </el-select>
+                  <!-- <el-input placeholder="请输入最大8位参数位置" maxlength="8" v-model.trim="domain.AppInputSite"></el-input> -->
                 </el-form-item>
               </div>
               <div>
@@ -141,6 +153,7 @@ export default {
           AppInputSite: ''
         }]
       },
+      typeFlag: false
     };
   },
   created () {
@@ -174,6 +187,7 @@ export default {
           this.form.desc = AppDesc;
           this.form.url = AppUrl;
           this.dynamicValidateForm.domains = Inputs;
+          this.typeFlag = this.form.id;
         } else {
           this.$message.error(res.message);
         }
@@ -260,6 +274,18 @@ export default {
         AppInputSite: '',
         AppId: this.AppId
       });
+    },
+    typeChange (val) {
+      const datas = this.dynamicValidateForm.domains
+      if (val == 1) {
+        this.typeFlag = true;
+        this.form.app = '';
+        datas.forEach(item => {
+          item.AppInputType = 'string';
+        })
+      } else {
+        this.typeFlag = false;
+      }
     }
   },
 };

src/views/noPower/index.vue

@@ -14,6 +14,7 @@
         <div class="message">
           <div class="m1"><span class="el-icon-s-opportunity mg"></span>密码长度：{{PwdLengthBegin}}-{{PwdLengthEnd}}位字符</div>
           <div class="m2">密码规则：必须包含{{PwdMessage}}</div>
+          <div class="m2">特殊字符：!、%、&、,、;、=、?、$、@、#、$、*、'</div>
         </div>
         <div class="content">
           <el-form :model="dataForm" :rules="dataRules" ref="dataForm" class="demo-dataForm">
@@ -193,7 +194,7 @@ export default {
         }
       }
       .content {
-        margin-top: 70px;
+        margin-top: 100px;
       }
       .message {
         position: absolute;
@@ -209,6 +210,7 @@ export default {
         }
         .m2 {
           padding-left: 22px;
+          margin-bottom: 8px;
         }
       }
     }

src/views/staffManagement/compontents/staffEdit.vue

@@ -299,7 +299,7 @@ export default {
           this.isMainJob = false;
           this.AppId = OrganId;
           this.Status = Status;
-          this.getJobListByOrgan(OrganId);
+          //this.getJobListByOrgan(OrganId);
           if (this.OpenAuthData) {
             this.roleType = 'account';
           }
@@ -328,6 +328,7 @@ export default {
             })
             this.userGroupKeys = datas;
             this.GroupIds = datas;
+            this.roleType = 'q';
           } else {
             this.roleType = 'q';
           }
@@ -392,7 +393,7 @@ export default {
     getOrgan (arr) {
       const { OrganId } = arr[0];
       this.AppId = OrganId;
-      this.getJobListByOrgan(OrganId);
+      //this.getJobListByOrgan(OrganId);
     },
     //获取组织选中的数据-多选
     getTreeDataDuo (arr) {