zc

src/views/basicsModules/mine.vue

@@ -292,13 +292,34 @@ export default {
       }
     };
     const validatePass = (rule, value, callback) => {
-      let reg = /^(?![A-z0-9]+$)(?=.[^%&',;=?$\x22])(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9]).{8,16}$/
+      let reg = /^(?=.*[0-9\!@#\$%\^&\*])(?=.*[a-zA-Z]).{8,16}$/
+      // let reg = /^(?![A-z0-9]+$)(?=.[^%&',;=?$\x22])(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9]).{8,16}$/
       if(reg.test(value)){
-        callback()
+        const reg2 = /(\w)*(\w)\2{2}(\w)*/g
+        if (reg2.test(value)) {
+          return callback(new Error('请输入8-16位密码，不能输入纯数字或重复性的密码'));
+        }else{
+          callback()
+        }
       }else{
-        return callback(new Error('密码应在8-16位包括数字和字母与特殊字符'));
+        return callback(new Error('请输入8-16位密码，不能输入纯数字或重复性的密码'));
       }
     };
+    // 不能连续字符（如123、abc）连续3位或3位以上
+    const LxStr = (str) => {
+      let arr = str.split('')
+      let flag = true
+      for (let i = 1; i < arr.length - 1; i++) {
+        let firstIndex = arr[i - 1].charCodeAt()
+        let secondIndex = arr[i].charCodeAt()
+        let thirdIndex = arr[i + 1].charCodeAt()
+        thirdIndex - secondIndex == 1
+        secondIndex - firstIndex == 1
+        if ((thirdIndex - secondIndex == 1) && (secondIndex - firstIndex == 1)) {
+          flag = false
+        }
+      }
+    }
     return{
       buttonType:'1',
       uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/system/user/face/addOrUpdate", // 上传的图片服务器地址
@@ -336,13 +357,13 @@ export default {
           { required: true, message: "新密码不能为空", trigger: "blur" },
           { min: 8, max: 16, message: "长度在 8 到 16 个字符", trigger: "blur" },
           { required: true, validator: equalToPassword, trigger: "blur" },
-          { required: true, message: "请输入8-16位密码，不能输入连续性和重复性的密码，密码中需要包含：大写字母、小写字符、数字和字符", validator: validatePass, trigger: "blur" }
+          { required: true, message: "请输入8-16位密码，不能输入纯数字或重复性的密码", validator: validatePass, trigger: "blur" }
         ],
         confirmPassword: [
           { required: true, message: "确认密码不能为空", trigger: "blur" },
           { min: 8, max: 16, message: "长度在 8 到 16 个字符", trigger: "blur" },
           { required: true, validator: equalToPasswordTwo, trigger: "blur" },
-          { required: true, message: "请输入8-16位密码，不能输入连续性和重复性的密码，密码中需要包含：大写字母、小写字符、数字和字符", validator: validatePass, trigger: "blur" }
+          { required: true, message: "请输入8-16位密码，不能输入纯数字或重复性的密码", validator: validatePass, trigger: "blur" }
         ],
         mobile: [
           { required: true, message: "请输入11位手机号码", trigger: "blur" },

src/views/systemManagement/filePreview/index.vue

@@ -55,11 +55,12 @@
             </template>
           </el-table-column>
           <el-table-column label="上传人" align="center" prop="userName" show-overflow-tooltip width="170"/>
-          <el-table-column label="操作" align="center" prop="deptName" width="170">
+          <el-table-column label="操作" align="center" prop="deptName" width="170" v-if="tableButtonType">
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" @click="tableButton(scope.row)">预览</p>
+                <p class="table-button-p" @click="tableButton(scope.row)"
+                   v-hasPermiRouter="['system:files:detail']">预览</p>
                 <p class="table-button-null"></p>
               </div>
             </template>
@@ -97,6 +98,7 @@
     },
     data(){
       return{
+        tableButtonType:this.hasPermiDom(['system:files:detail']),
         loading:false,
         optionList:[],
         queryParams:{

src/views/systemManagement/organizationalStructure/index.vue

@@ -42,7 +42,8 @@
           </el-table-column>
           <el-table-column label="状态" align="left" prop="state" width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              <div v-if="scope.row.deptId != parentId">
+              <div v-if="scope.row.deptId != parentId"
+                   v-hasPermiRouter="['system:dept:edit']">
                 <el-switch
                   @click.native="tableButton(4,scope.row)"
                   class="switch captcha-img"
@@ -64,20 +65,20 @@
                 <p class="table-button-null"></p>
                 <p class="table-button-p"
                    @click="tableButton(1,scope.row)"
-                   v-hasPermiRouter="['demo:demo:detail']"
+                   v-hasPermiRouter="['system:dept:add']"
                 >新增</p>
                 <p class="table-button-p"
                    @click="tableButton(2,scope.row)"
-                   v-hasPermiRouter="['demo:demo:edit']"
+                   v-hasPermiRouter="['system:dept:edit']"
                 >编辑</p>
                 <p class="table-button-p"
                    v-if="scope.row.deptId != parentId "
                    @click="tableButton(3,scope.row)"
-                   v-hasPermiRouter="['demo:demo:del']"
+                   v-hasPermiRouter="['system:dept:del']"
                 >删除</p>
                 <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
                              v-if="scope.row.deptId != parentId "
-                             v-hasPermiRouter="['demo:demo:move']">
+                             v-hasPermiRouter="['system:dept:move']">
                   <p class="table-button-p">更多>></p>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item command="1">上移</el-dropdown-item>
@@ -180,7 +181,7 @@
     },
     data () {
       return {
-        tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
+        tableButtonType:this.hasPermiDom(['system:dept:add','system:dept:edit','system:dept:del','system:dept:move',]),
         //页面遮罩
         loading:false,
         // 部门树选项

src/views/systemManagement/parameterSetting/index.vue

@@ -36,7 +36,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table v-loading="loading" border :data="dataList">
+        <el-table class="table-box" v-loading="loading" border :data="dataList">
           <el-table-column label="参数名称" align="left" prop="configName" :show-overflow-tooltip="true" />
           <el-table-column label="参数键名" align="left" prop="configKey" :show-overflow-tooltip="true" />
           <el-table-column label="参数键值" align="left" prop="configValue" :show-overflow-tooltip="true"/>

src/views/systemManagement/roleManagement/index.vue

@@ -60,15 +60,15 @@
                 <!--&gt;复制</p>-->
                 <p class="table-button-p"
                    @click="handleUpdate(scope.row)"
-                   v-hasPermiRouter="['system:role:edit']"
+                   v-hasPermiRouter="['system:role:detail','system:role:edit']"
                 >编辑</p>
                 <p class="table-button-p"
                    @click="copyButton(2,scope.row)"
-                   v-hasPermiRouter="['system:role:edit']"
+                   v-hasPermiRouter="['system:role:perms']"
                 >PC权限配置</p>
                 <p class="table-button-p"
                    @click="copyButton(3,scope.row)"
-                   v-hasPermiRouter="['system:role:edit']"
+                   v-hasPermiRouter="['applet:role:perms']"
                 >小程序权限配置</p>
                 <p class="table-button-p"
                    @click="handleDelete(scope.row)"

src/views/systemManagement/systemUser/index.vue

@@ -102,13 +102,14 @@
                 <p class="table-button-null"></p>
                 <p class="table-button-p"
                    @click="handleUpdate(scope.row)"
-                   v-hasPermiRouter="['system:user:edit']"
+                   v-hasPermiRouter="['system:user:detail','system:user:edit']"
                 >修改</p>
                 <p class="table-button-p"
                    @click="handleDelete(scope.row)"
                    v-hasPermiRouter="['system:user:del']"
                 >删除</p>
-                <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
+                <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+                             v-hasPermiRouter="['system:user:reset']">
                   <span class="table-button-p">更多>></span>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item command="handleResetPwd">修改密码</el-dropdown-item>
@@ -249,7 +250,7 @@ export default {
       }
     };
     return {
-      tableButtonType:this.hasPermiDom(['system:user:edit','system:user:detail','system:user:del']),
+      tableButtonType:this.hasPermiDom(['system:user:edit','system:user:detail','system:user:del','system:user:reset']),
       // 遮罩层
       loading: true,
       // 选中数组