bonus
/
SafetyAlertSystem-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:be1c67fee90355338dcced0ec47fdde950e030cc
Branches Tags
bonus:master
..
compare: bonus:ea10a7646a682d5a9e162f15e50c0cf4b708b0de
Branches Tags
bonus:master

No commits in common. "be1c67fee90355338dcced0ec47fdde950e030cc" and "ea10a7646a682d5a9e162f15e50c0cf4b708b0de" have entirely different histories.
be1c67fee9 ... ea10a7646a

7 changed files with 11 additions and 66 deletions
Show Stats Expand all files Collapse all files

15
src/store/modules/user.js
View File

@ -1,4 +1,4 @@
import { login, logout, getInfo, refreshToken, getPhoneCode, isLogin,isAdmin} from '@/api/login' import { login, logout, getInfo, refreshToken, getPhoneCode, isLogin,isAdmin } from '@/api/login'
import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth' import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth'
// 更严格的手机号和邮箱正则表达式 // 更严格的手机号和邮箱正则表达式
@ -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,}$/ const emailPattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
// 构建 payload 函数 // 构建 payload 函数
const buildPayload = ({ loginMethod, username, password, uuid, code, mobile, verificationCode,phoneUuid }) => { const buildPayload = ({ loginMethod, username, password, uuid, code, mobile, verificationCode }) => {
let loginType = '' let loginType = ''
if (loginMethod === 'mobile') { if (loginMethod === 'mobile') {
loginType = phonePattern.test(mobile.trim()) ? 'PHONE_OTP' : emailPattern.test(mobile.trim()) ? 'EMAIL_OTP' : 'PHONE_OTP' loginType = phonePattern.test(mobile.trim()) ? 'PHONE_OTP' : emailPattern.test(mobile.trim()) ? 'EMAIL_OTP' : 'PHONE_OTP'
@ -15,8 +15,7 @@ const buildPayload = ({ loginMethod, username, password, uuid, code, mobile, ver
verificationCode, verificationCode,
uuid, uuid,
code, code,
loginType, loginType
phoneUuid
} }
} else { } else {
loginType = phonePattern.test(username.trim()) ? 'PHONE_PASSWORD' : emailPattern.test(username.trim()) ? 'EMAIL_PASSWORD' : 'USERNAME_PASSWORD' loginType = phonePattern.test(username.trim()) ? 'PHONE_PASSWORD' : emailPattern.test(username.trim()) ? 'EMAIL_PASSWORD' : 'USERNAME_PASSWORD'
@ -26,8 +25,7 @@ const buildPayload = ({ loginMethod, username, password, uuid, code, mobile, ver
verificationCode, verificationCode,
uuid, uuid,
code, code,
loginType, loginType
phoneUuid
} }
} }
} }
@ -97,11 +95,10 @@ const user = {
// 获取手机验证码 // 获取手机验证码
GetPhoneCode({ commit }, userInfo) { GetPhoneCode({ commit }, userInfo) {
const payload = { const payload = {
username: userInfo.mobile.trim(), mobile: userInfo.mobile.trim(),
uuid: userInfo.uuid, uuid: userInfo.uuid,
code: userInfo.code, code: userInfo.code,
phoneUuid: userInfo.phoneUuid, mobileCodeType: userInfo.mobileCodeType
verificationCodeType: userInfo.mobileCodeType
} }
return getPhoneCode(payload) return getPhoneCode(payload)
.then(res => res) .then(res => res)

4
src/views/base/crew/components/table-crew.vue
View File

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

2
src/views/base/crew/components/table-member.vue
View File

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

2
src/views/base/edgeInsert/components/form-insert.vue
View File

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

1
src/views/base/person/components/form-person.vue
View File

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

1
src/views/base/proj/components/form-project.vue
View File

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

52
src/views/base/warning/components/form-warning.vue
View File

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