Merge remote-tracking branch 'origin/master'

src/store/modules/user.js

@@ -6,7 +6,7 @@ const phonePattern = /^(\+86)?1[3-9]\d{9}$/ // 支持前缀 +86
 const emailPattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
 
 // 构建 payload 函数
-const buildPayload = ({ loginMethod, username, password, uuid, code, mobile, verificationCode }) => {
+const buildPayload = ({ loginMethod, username, password, uuid, code, mobile, verificationCode,phoneUuid }) => {
   let loginType = ''
   if (loginMethod === 'mobile') {
     loginType = phonePattern.test(mobile.trim()) ? 'PHONE_OTP' : emailPattern.test(mobile.trim()) ? 'EMAIL_OTP' : 'PHONE_OTP'
@@ -15,7 +15,8 @@ const buildPayload = ({ loginMethod, username, password, uuid, code, mobile, ver
       verificationCode,
       uuid,
       code,
-      loginType
+      loginType,
+      phoneUuid
     }
   } else {
     loginType = phonePattern.test(username.trim()) ? 'PHONE_PASSWORD' : emailPattern.test(username.trim()) ? 'EMAIL_PASSWORD' : 'USERNAME_PASSWORD'
@@ -25,7 +26,8 @@ const buildPayload = ({ loginMethod, username, password, uuid, code, mobile, ver
       verificationCode,
       uuid,
       code,
-      loginType
+      loginType,
+      phoneUuid
     }
   }
 }
@@ -95,10 +97,11 @@ const user = {
     // 获取手机验证码
     GetPhoneCode({ commit }, userInfo) {
       const payload = {
-        mobile: userInfo.mobile.trim(),
+        username: userInfo.mobile.trim(),
         uuid: userInfo.uuid,
         code: userInfo.code,
-        mobileCodeType: userInfo.mobileCodeType
+        phoneUuid: userInfo.phoneUuid,
+        verificationCodeType: userInfo.mobileCodeType
       }
       return getPhoneCode(payload)
         .then(res => res)

src/views/base/crew/components/table-crew.vue

@@ -26,8 +26,8 @@
           <el-button
             type="danger"
             size="mini"
-            v-if="data.devName === null && data.teamId !== null"
             @click="handleRemove(data.id)"
+            v-if="data.relId !== data.id"
           >移出班组</el-button
           >
         </template>
@@ -44,7 +44,7 @@
           {{ data.relName }}
           <el-tag
             style="margin-left: 3px"
-            v-if="data.teamId === null"
+            v-if="data.relId === data.id"
             size="mini"
             type="success"
           >班组长</el-tag>

src/views/base/crew/components/table-member.vue

@@ -20,7 +20,7 @@
         <el-button
           @click="
             () => {
-                this.$emit('closeHat', true)
+                this.$emit('closeMember', true)
             }
         "
         >取消</el-button

src/views/base/edgeInsert/components/form-insert.vue

@@ -289,7 +289,7 @@ export default {
       });
     },
     projChange(e) {
-      this.projRange.forEach((item) => {
+      this.projRange.forEach(item => {
         if (e === item.value) {
           this.projectParams.proName = item.label;
         }

src/views/base/person/components/form-person.vue

@@ -98,6 +98,7 @@ export default {
 
     },
     mounted() {
+        console.log(this.editParams, 'edit')
         if (this.editParams) {
             Object.assign(this.projectParams, this.editParams)
             // 查询未脱敏数据

src/views/base/proj/components/form-project.vue

@@ -53,7 +53,6 @@
                   v-model="projectParams.relId"
                   clearable
                   filterable
-                  allow-create
                   placeholder="请选择"
                 >
                   <el-option

src/views/base/warning/components/form-warning.vue

@@ -325,6 +325,7 @@ export default {
                 {
                   required: true,
                   message: '请输入温度阈值',
+                  validator: this.validateNum,
                   trigger: 'blur',
                 },
               ],
@@ -332,6 +333,8 @@ export default {
                 {
                   required: true,
                   message: '请输入温度阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -339,6 +342,8 @@ export default {
                 {
                   required: true,
                   message: '请输入湿度阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -346,6 +351,8 @@ export default {
                 {
                   required: true,
                   message: '请输入湿度阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -353,6 +360,8 @@ export default {
                 {
                   required: true,
                   message: '请输入噪声阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -360,6 +369,8 @@ export default {
                 {
                   required: true,
                   message: '请输入噪声阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -367,6 +378,8 @@ export default {
                 {
                   required: true,
                   message: '请输入PM2.5阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -374,6 +387,8 @@ export default {
                 {
                   required: true,
                   message: '请输入PM2.5阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -381,6 +396,8 @@ export default {
                 {
                   required: true,
                   message: '请输入PM10阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -388,6 +405,8 @@ export default {
                 {
                   required: true,
                   message: '请输入PM10阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -404,6 +423,8 @@ export default {
                 {
                   required: true,
                   message: '请输入倾角阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -411,6 +432,8 @@ export default {
                 {
                   required: true,
                   message: '请输入倾角阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -427,6 +450,8 @@ export default {
                 {
                   required: true,
                   message: '请输入拉力阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -434,6 +459,8 @@ export default {
                 {
                   required: true,
                   message: '请输入拉力阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -450,6 +477,8 @@ export default {
                 {
                   required: true,
                   message: '请输入含氧量阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -457,6 +486,8 @@ export default {
                 {
                   required: true,
                   message: '请输入含氧量阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -464,6 +495,8 @@ export default {
                 {
                   required: true,
                   message: '请输入一氧化碳阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -471,6 +504,8 @@ export default {
                 {
                   required: true,
                   message: '请输入一氧化碳阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -478,6 +513,8 @@ export default {
                 {
                   required: true,
                   message: '请输入可燃气体阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -485,6 +522,8 @@ export default {
                 {
                   required: true,
                   message: '请输入可燃气体阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -492,6 +531,8 @@ export default {
                 {
                   required: true,
                   message: '请输入硫化氢阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -499,6 +540,8 @@ export default {
                 {
                   required: true,
                   message: '请输入硫化氢阈值',
+                  validator: this.validateNum,
+
                   trigger: 'blur',
                 },
               ],
@@ -507,9 +550,18 @@ export default {
             projRange: [],
             provinceRange: [],
             typeRange: [],
+            numReg: /^\d+$/
         }
     },
     methods: {
+        /** 校验数字 */
+        validateNum(rule, value, callback) {
+          if(!this.numReg.test(value)) {
+            callback(new Error('请输入数字'))
+          } else {
+            callback()
+          }
+        },
         /** 改变树结构 */
         changeTree(leaf) {
           leaf.map(item => {