Merge branch 'develop' of http://gitlab.maxrocky.com/html/jinmao-community-platform into develop

src/components/common/Header.vue

@@ -177,9 +177,9 @@ export default {
 				this.showAlert('请输入新密码~')
 				return false
 			}
-			var reg = /^[0-9a-zA-Z]+$/
-			if (this.formData.newPassword && (this.formData.newPassword.length < 6 || !reg.test(this.formData.newPassword))) {
-				this.showAlert('新密码不能少于6位数并且不能输入中文~')
+			var reg = /^1[0-9]+[a-zA-Z]+[0-9a-zA-Z]*|[a-zA-Z]+[0-9]+[0-9a-zA-Z]*/
+			if (this.formData.newPassword && (this.formData.newPassword.length < 10 || !reg.test(this.formData.newPassword))) {
+				this.showAlert('新密码不能少于10位数的字母、数字组合，且不能输入中文~')
 				return false
 			}
 			if (!this.formData.confirmPassword) {

src/components/page/equipment/deviceAlert.vue

@@ -155,7 +155,7 @@ export default {
   }),
   created () {
 		this.projectId = window.sessionStorage.getItem('projectId')
-		this.projectId = 'beijing61'
+		// this.projectId = 'beijing61'
 		this.height = (document.documentElement.clientHeight - 270 ) + 'px'
 		this.getTypeList(this.projectId)
 		this.getData()