diff --git a/src/page/jobSearch/searchPage.vue b/src/page/jobSearch/searchPage.vue
index 077e995..01176c6 100644
--- a/src/page/jobSearch/searchPage.vue
+++ b/src/page/jobSearch/searchPage.vue
@@ -267,13 +267,13 @@
           value: ''
         }]
         getAlarmContentType('1').then(response => {
-          // const supportDeviceTypes = this.$store.getters.deviceTypes
+          const supportDeviceTypes = this.$store.getters.deviceTypes
           for (const item of response.data.list) {
-            // if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
-            this.alarmContentList.push(item)
-            this.isLoading = false
-            // }
+            if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
+              this.alarmContentList.push(item)
+            }
           }
+          this.isLoading = false
         })
       },
       // 打开选择时间弹窗

diff --git a/src/page/jobSearch/searchPage.vue b/src/page/jobSearch/searchPage.vue
index 077e995..01176c6 100644
--- a/src/page/jobSearch/searchPage.vue
+++ b/src/page/jobSearch/searchPage.vue
@@ -267,13 +267,13 @@
           value: ''
         }]
         getAlarmContentType('1').then(response => {
-          // const supportDeviceTypes = this.$store.getters.deviceTypes
+          const supportDeviceTypes = this.$store.getters.deviceTypes
           for (const item of response.data.list) {
-            // if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
-            this.alarmContentList.push(item)
-            this.isLoading = false
-            // }
+            if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
+              this.alarmContentList.push(item)
+            }
           }
+          this.isLoading = false
         })
       },
       // 打开选择时间弹窗
diff --git a/src/page/wellManage/WellManage.vue b/src/page/wellManage/WellManage.vue
index fb12040..11051a2 100644
--- a/src/page/wellManage/WellManage.vue
+++ b/src/page/wellManage/WellManage.vue
@@ -218,7 +218,13 @@
       // 获取窨井类型
       fetchWellType() {
         getWellType(this.listQuery).then(response => {
-          this.wellTypeList = response.data
+          this.wellTypeList = []
+          const wellTypes = this.$store.getters.wellTypes
+          for (const wellType of response.data) {
+            if (wellTypes.indexOf(wellType.value) !== -1) {
+              this.wellTypeList.push(wellType)
+            }
+          }
           this.wellTypeList.unshift({name:'全部',value:''})
         })
       }

diff --git a/src/page/jobSearch/searchPage.vue b/src/page/jobSearch/searchPage.vue
index 077e995..01176c6 100644
--- a/src/page/jobSearch/searchPage.vue
+++ b/src/page/jobSearch/searchPage.vue
@@ -267,13 +267,13 @@
           value: ''
         }]
         getAlarmContentType('1').then(response => {
-          // const supportDeviceTypes = this.$store.getters.deviceTypes
+          const supportDeviceTypes = this.$store.getters.deviceTypes
           for (const item of response.data.list) {
-            // if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
-            this.alarmContentList.push(item)
-            this.isLoading = false
-            // }
+            if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
+              this.alarmContentList.push(item)
+            }
           }
+          this.isLoading = false
         })
       },
       // 打开选择时间弹窗
diff --git a/src/page/wellManage/WellManage.vue b/src/page/wellManage/WellManage.vue
index fb12040..11051a2 100644
--- a/src/page/wellManage/WellManage.vue
+++ b/src/page/wellManage/WellManage.vue
@@ -218,7 +218,13 @@
       // 获取窨井类型
       fetchWellType() {
         getWellType(this.listQuery).then(response => {
-          this.wellTypeList = response.data
+          this.wellTypeList = []
+          const wellTypes = this.$store.getters.wellTypes
+          for (const wellType of response.data) {
+            if (wellTypes.indexOf(wellType.value) !== -1) {
+              this.wellTypeList.push(wellType)
+            }
+          }
           this.wellTypeList.unshift({name:'全部',value:''})
         })
       }
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index efa8fd4..b3a16ff 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -6,7 +6,7 @@
 const app = {
   state: {
     device: 'phone',
-    version: '1.0.0',
+    version: '1.1.0',
     kaptcha: '',
     publicKey: getPublicKey(),
     sid: '',

diff --git a/src/page/jobSearch/searchPage.vue b/src/page/jobSearch/searchPage.vue
index 077e995..01176c6 100644
--- a/src/page/jobSearch/searchPage.vue
+++ b/src/page/jobSearch/searchPage.vue
@@ -267,13 +267,13 @@
           value: ''
         }]
         getAlarmContentType('1').then(response => {
-          // const supportDeviceTypes = this.$store.getters.deviceTypes
+          const supportDeviceTypes = this.$store.getters.deviceTypes
           for (const item of response.data.list) {
-            // if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
-            this.alarmContentList.push(item)
-            this.isLoading = false
-            // }
+            if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
+              this.alarmContentList.push(item)
+            }
           }
+          this.isLoading = false
         })
       },
       // 打开选择时间弹窗
diff --git a/src/page/wellManage/WellManage.vue b/src/page/wellManage/WellManage.vue
index fb12040..11051a2 100644
--- a/src/page/wellManage/WellManage.vue
+++ b/src/page/wellManage/WellManage.vue
@@ -218,7 +218,13 @@
       // 获取窨井类型
       fetchWellType() {
         getWellType(this.listQuery).then(response => {
-          this.wellTypeList = response.data
+          this.wellTypeList = []
+          const wellTypes = this.$store.getters.wellTypes
+          for (const wellType of response.data) {
+            if (wellTypes.indexOf(wellType.value) !== -1) {
+              this.wellTypeList.push(wellType)
+            }
+          }
           this.wellTypeList.unshift({name:'全部',value:''})
         })
       }
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index efa8fd4..b3a16ff 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -6,7 +6,7 @@
 const app = {
   state: {
     device: 'phone',
-    version: '1.0.0',
+    version: '1.1.0',
     kaptcha: '',
     publicKey: getPublicKey(),
     sid: '',
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 0d6d4cb..54111f0 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -28,7 +28,8 @@
     wellTypes: [], // 支持窨井类型
     deviceTypes: [], // 支持设备类型
     communications: [], // 支持通讯方式
-    area: '' // 默认地区
+    area: '', // 默认地区
+    resetPwd: false // 需要重置密码
   },
   mutations: {
     SET_TOKEN: (state, token) => {
@@ -79,6 +80,9 @@
     },
     SET_AREA: (state, area) => {
       state.area = area
+    },
+    SET_RESETPWD: (state, resetPwd) => {
+      state.resetPwd = resetPwd
     }
   },
 
@@ -123,6 +127,29 @@
           }
           commit('SET_NAME', data.name)
           commit('SET_PHONE', data.phone)
+          commit('SET_RESETPWD', data.sysData.resetPwd)
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+        getBizPerm().then(response => {
+          const data = response.data
+          if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
+            commit('SET_WELLTYPES', data.wellTypes)
+          } else {
+            reject('该用户不支持任何井类型')
+          }
+          if (data.deviceTypes && data.deviceTypes.length > 0) {
+            commit('SET_DEVICETYPES', data.deviceTypes)
+          } else {
+            reject('该用户不支持任何设备类型')
+          }
+          if (data.communications && data.communications.length > 0) {
+            commit('SET_COMMUNICATIONS', data.communications)
+          } else {
+            reject('该用户不支持任何通讯方式')
+          }
+          commit('SET_AREA', data.area)
           resolve(response)
         }).catch(error => {
           reject(error)