From 236097d1c315e83786ab628a5bdb35c5fd1112fe Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Mon, 15 Nov 2021 14:05:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?NEZ-1237=20fix:=20asset=20=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=97=B6=E8=87=AA=E5=8A=A8=E6=B7=BB=E5=8A=A0=E7=9A=84?=
 =?UTF-8?q?=20dc=20=E5=9B=A0=E6=B2=A1=E6=9C=89=20longitude=EF=BC=8Clatitud?=
 =?UTF-8?q?e=20=E5=86=85=E5=AE=B9=E5=AF=BC=E8=87=B4=E7=BC=96=E8=BE=91=20dc?=
 =?UTF-8?q?=20=E6=97=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/dcBox.vue  |  7 ++++---
 .../page/config/profileChangePin.vue          | 21 +++++--------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue
index 58944dd31..ac63c8dcc 100644
--- a/nezha-fronted/src/components/common/rightBox/dcBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue
@@ -70,7 +70,8 @@ import latlngPicker from '../latlngPicker'
 import editRigthBox from '../mixin/editRigthBox'
 import { noSpecialChar, latlng } from '@/components/common/js/validate'
 
-const regNum = /^[0-9]+.?[0-9]*/
+const latitudeNum = /^[\-\+]?([1-8]?\d{1}\.\d{1,7}|90\.0{1,7}|[1-8]?\d{1}|90)$/ // 纬度正则验证
+const longitudeNum = /^[\-\+]?(0?\d{1,2}\.\d{1,7}|1[0-7]?\d{1}\.\d{1,7}|180\.0{1,7}|0?\d{1,2}|1[0-7]?\d{1}|180)$/ // 经度正则验证
 
 export default {
   name: 'dcBox',
@@ -139,10 +140,10 @@ export default {
             const attr = this.$refs.latlngPicker.getAttribute()
             param.latitude = attr.latitude
             param.longitude = attr.longitude
-            if (!regNum.test(param.longitude)) {
+            if (!longitudeNum.test(param.longitude)) {
               param.longitude = null
             }
-            if (!regNum.test(param.latitude)) {
+            if (!latitudeNum.test(param.latitude)) {
               param.latitude = null
             }
             this.$post('/dc', param).then(response => {
diff --git a/nezha-fronted/src/components/page/config/profileChangePin.vue b/nezha-fronted/src/components/page/config/profileChangePin.vue
index 222e7638c..058733a3d 100644
--- a/nezha-fronted/src/components/page/config/profileChangePin.vue
+++ b/nezha-fronted/src/components/page/config/profileChangePin.vue
@@ -32,10 +32,6 @@
 <script>
 export default {
   name: 'changePin',
-  props: {
-    curUser: { type: String },
-    showDialog: { type: Boolean, default: false }
-  },
   data () {
     const temp = this
     const validatePass = (rule, value, callback) => {
@@ -54,12 +50,11 @@ export default {
     }
     return {
       user: {
-        username: '',
         pin: '',
         newPin: '',
         confirmPin: ''
       },
-      sysUser: sessionStorage.getItem('nz-username'),
+      userId: localStorage.getItem('nz-user-id'),
       rules: {
         pin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
         newPin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }, { validator: validatePass, trigger: 'blur' }],
@@ -68,9 +63,7 @@ export default {
       visible: false
     }
   },
-  created () {
-    this.user.username = this.curUser && this.curUser != '' ? this.curUser : sessionStorage.getItem('nz-username')
-  },
+  created () {},
   methods: {
     dialogOpened: function () {
       if (this.$refs.changePinForm) {
@@ -88,9 +81,10 @@ export default {
         if (valid) {
           const paramObj = {
             pin: this.user.pin,
-            newPin: this.user.newPin
+            newPin: this.user.newPin,
+            id: this.userId
           }
-          this.$put('/sys/user/pin?oldPin=' + paramObj.pin + '&newPin=' + paramObj.newPin).then(response => {
+          this.$put('/sys/user/pin?oldPin=' + paramObj.pin + '&newPin=' + paramObj.newPin + '&id=' + paramObj.id).then(response => {
             if (response && response.code == 200) {
               this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
               this.user.pin = ''
@@ -103,11 +97,6 @@ export default {
         }
       })
     }
-  },
-  watch: {
-    showDialog: function (n, o) {
-      this.visible = n
-    }
   }
 }
 </script>

From 7e81fcde6661b844de443da33761b1a8ca5d55c2 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Mon, 15 Nov 2021 14:28:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20latlngPicker=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/js/validate.js   | 4 ++--
 nezha-fronted/src/components/common/latlngPicker.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/js/validate.js b/nezha-fronted/src/components/common/js/validate.js
index 4433fd9f6..24f1af46b 100644
--- a/nezha-fronted/src/components/common/js/validate.js
+++ b/nezha-fronted/src/components/common/js/validate.js
@@ -87,8 +87,8 @@ export function noSpecialChar (rule, value, callback) {
 }
 
 export function latlng (rule, value, callback) {
-  const lngReg = /^[\-\+]?(0?\d{1,2}\.\d{1,7}|1[0-7]?\d{1}\.\d{1,7}|180\.0{1,7})$/
-  const latReg = /^[\-\+]?([1-8]?\d{1}\.\d{1,7}|90\.0{1,7})$/
+  const lngReg = /^[\-\+]?(0?\d{1,2}\.\d{1,7}|1[0-7]?\d{1}\.\d{1,7}|180\.0{1,7}|0?\d{1,2}|1[0-7]?\d{1}|180)$/ // 经度正则验证
+  const latReg = /^[\-\+]?([1-8]?\d{1}\.\d{1,7}|90\.0{1,7}|[1-8]?\d{1}|90)$/ // 纬度正则验证
   setTimeout(() => {
     const lnglat = value.split(',')
     if (!lnglat || lnglat.length !== 2) {
diff --git a/nezha-fronted/src/components/common/latlngPicker.vue b/nezha-fronted/src/components/common/latlngPicker.vue
index 8f188d9f5..224599a5e 100644
--- a/nezha-fronted/src/components/common/latlngPicker.vue
+++ b/nezha-fronted/src/components/common/latlngPicker.vue
@@ -136,8 +136,8 @@ export default {
         this.$message.error(this.$t('tip.lnglatError'))
         return false
       }
-      const lngReg = /^[\-\+]?(0?\d{1,2}\.\d{0,7}|1[0-7]?\d{1}\.\d{1,7}|180\.0{0,7})$/
-      const latReg = /^[\-\+]?([0-8]?\d{1}\.\d{0,7}|90\.0{0,7})$/
+      const lngReg = /^[\-\+]?(0?\d{1,2}\.\d{1,7}|1[0-7]?\d{1}\.\d{1,7}|180\.0{1,7}|0?\d{1,2}|1[0-7]?\d{1}|180)$/ // 经度正则验证
+      const latReg = /^[\-\+]?([1-8]?\d{1}\.\d{1,7}|90\.0{1,7}|[1-8]?\d{1}|90)$/ // 纬度正则验证
       if (!lngReg.test(lnglat[0]) || !latReg.test(lnglat[1])) {
         // this.lnglat = this.oldlnglat
         this.$message.error(this.$t('tip.lnglatError'))