新建用户限制修改

src/utils/reg.ts

@@ -4,6 +4,7 @@ export const regPhone = () => /^1[3456789]\d{9}$/ // 手机号码验证
 export const regEmail = () => /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/ // 邮箱验证
 export const regPassword = () => /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9!@#$%&+-]{8,16}$/ // 密码强度验证
 //export const regUserName = () => /^[a-zA-Z0-9_-]{4,16}$/ // 用户姓名正则
+export const regNewUserName = () => /^[A-Za-z0-9_]+$/ // 用户姓名正则 限制字符、数字、下划线
 export const regUserName = () => /^[A-Za-z0-9]+$/ // 用户姓名正则 限制字符、数字
 export const regRealName = () => /^[\u4e00-\u9fa5]{2,6}$/ // 人名正则
 export const floatNum = () => /^\d+(\.\d+)?$/ // 浮点数正则

src/views/currentSystem/authorityManagement/userRights/mergeUser/index.vue

@@ -33,7 +33,7 @@
             :options="company"
             :props="{ expandTrigger: 'hover', label: 'name', value: 'id', checkStrictly: true }"
             size="small"
-            style="width:100%"
+            style="width: 100%"
             filterable
             clearable
             @change="copyRole = []"
@@ -93,9 +93,7 @@
             <img v-if="form.avatar" :src="form.avatar" class="avatar" />
             <i v-else class="el-icon-plus avatar-uploader-icon el-upload" />
           </el-upload>
-          <div class="msg">
-            ⚠️注意：上传图片只能是 JPG或png 格式!单张图片大小不能超过 2MB!
-          </div>
+          <div class="msg">⚠️注意：上传图片只能是 JPG或png 格式!单张图片大小不能超过 2MB!</div>
         </el-form-item>
       </el-col>
     </el-row>
@@ -106,7 +104,7 @@
 import { Vue, Prop, Component, Watch } from 'vue-property-decorator'
 import { addUser, editUser, getDeptUserList, getUserList } from '@/api/base'
 import { getRemoteImg } from '@/api/ftp'
-import { regUserName, regPhone, regEmail } from '@/utils/reg'
+import { regNewUserName, regPhone, regEmail } from '@/utils/reg'
 import { ElForm } from 'element-ui/types/form'
 
 const sha1Hex = require('sha1-hex')
@@ -139,7 +137,7 @@ export default class MergeUser extends Vue {
     username: [
       { required: true, message: '请输入登录名', trigger: 'blur' },
       {
-        pattern: regUserName(),
+        pattern: regNewUserName(),
         message: '登录名只能输入英文、数字',
         trigger: 'blur'
       }
@@ -149,7 +147,7 @@ export default class MergeUser extends Vue {
       { min: 6, max: 12, message: '长度在 6 到 12 个字符', trigger: 'blur' }
     ],
     realName: [{ required: true, message: '请输入用户姓名', trigger: 'blur' }],
-    phone: [{ pattern: regPhone(), message: '请输入正确联系手机号', trigger: 'blur' }],
+    phone: [{ required: true, pattern: regPhone(), message: '请输入正确联系手机号', trigger: 'blur' }],
     email: [{ pattern: regEmail(), message: '请输入正确邮箱', trigger: 'blur' }],
     departmentId: [{ required: true, message: '请选择部门', trigger: 'change' }],
     roles: [{ required: true, message: '请选择角色', trigger: 'change' }]
@@ -193,7 +191,7 @@ export default class MergeUser extends Vue {
     const _this = this
     const reader = new FileReader()
     // 转base64
-    reader.onload = function(e) {
+    reader.onload = function (e) {
       type === 'sign'
         ? (_this.form.signPic = e.target.result.toString())
         : (_this.form.avatar = e.target.result.toString()) // 将图片路径赋值给src

src/views/groupPage/districtPageModules/commonModules/SearchBox.vue

@@ -110,7 +110,8 @@ export default class SearchBox extends Vue {
   searchDeviceList = []
   mounted() {
     let target = this.$refs['widget-SearchBox'] as any
-    target.style.setProperty('--left', '2.34375rem')
+    if (this.$store.state.bigScreen.currentActive) target.style.setProperty('--left', '2.34375rem')
+    else target.style.setProperty('--left', '.10417rem')
   }
   viewer
   get prjId() {