Merge branch 'feature/dev_party_mange' into dev

src/views/modules/partymember/icpartyorg-add-or-update.vue

@@ -157,6 +157,7 @@
                 this.agencyId = localStorage.getItem('agencyId')
                 this.dataForm.customerId = localStorage.getItem('customerId')
                 this.dataForm.staffId = localStorage.getItem('staffId')
+                this.keyWords = ''
                 //设置党组织类型
                 
                 this.$nextTick(() => {

src/views/modules/visual/communityParty/community.vue

@@ -301,7 +301,7 @@ export default {
     this.getCateCount(this.agencyId)
     
 
-    await this.getWorkUserInfo()
+    // await this.getWorkUserInfo()
     // await this.getMapUnitList(this.agencyId)
   },
   watch: {
@@ -613,7 +613,7 @@ export default {
 
       if (code === 0) {
 
-        this.orgData = data
+        this.agencyInfo = data
         this.orgId = this.orgData.id
         this.orgLevel = this.orgData.level
         this.parentPolygon = []

src/views/modules/visual/communityParty/gridParty.vue

@@ -149,7 +149,6 @@ export default {
   async mounted() {
     await nextTick(100);
     // await this.getAgencyList()
-    await this.getWorkUserInfo()
     this.agencyId  = this.$store.state.user.agencyId
     this.getEduCount(this.$store.state.user.agencyId) // 饼状统计图
     this.getEduList() // 左下角列表数据
@@ -167,6 +166,7 @@ export default {
     await this.loadOrgData()
     // this.loadMap()
     this.getMapData()
+    await this.getWorkUserInfo()
     // this.isfirstInit = false
     // 地图相关end
   },
@@ -483,16 +483,26 @@ export default {
         params,
         (data, rspMsg) => {
           this.agencyInfo = data
-          if (!data.latitude) {
+          if (this.orgData.longitude) { // 中心点不从当前登录用户里面取，从mapOrg接口里面取
+            this.agencyInfo.longitude = this.orgData.longitude
+          }
+          if (this.orgData.latitude) { // 中心点不从当前登录用户里面取，从mapOrg接口里面取
+            this.agencyInfo.latitude = this.orgData.latitude
+          }
+          if (this.orgData.level) { // 中心点不从当前登录用户里面取，从mapOrg接口里面取
+            this.agencyInfo.agencyLevel = this.orgData.agencyLevel
+          }
+          if (!this.agencyInfo.latitude) {
             this.agencyInfo.latitude = 36.072227
           }
-          if (!data.longitude) {
+          if (!this.agencyInfo.longitude) {
             this.agencyInfo.longitude = 120.389455
           }
-          if (!data.level) {
+          if (!this.agencyInfo.level) {
             this.agencyInfo.level = 'street'
           }
-          this.agencyInfo.agencyLevel = this.agencyInfo.level
+          // this.agencyInfo.agencyLevel = this.agencyInfo.level
+          // console.log(JSON.stringify(this.agencyInfo))
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg)