Merge branch 'dev-activity0829bug'

src/views/modules/communityParty/regionalParty/units.vue

@@ -166,18 +166,18 @@
                          label="在职党员数"
                          width="100">
         </el-table-column>
-        <el-table-column prop="satisfaction"
+        <!-- <el-table-column prop="satisfaction"
                          header-align="center"
                          align="center"
                          label="群众满意度"
                          width="100">
-        </el-table-column>
+        </el-table-column> -->
-        <el-table-column prop="score"
+        <!-- <el-table-column prop="score"
                          header-align="center"
                          align="center"
                          label="积分"
                          width="80">
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="remark"
                          header-align="center"
                          align="center"

src/views/modules/shequzhili/csgltc/csgl.vue

@@ -375,7 +375,7 @@ export default {
 
     handleAdd () {
       this.formTitle = '新增'
-      this.formShow = 'edit'
+      this.formShow = true
       this.$nextTick(() => {
         this.$refs.ref_form.initForm('add', null)
       })

src/views/modules/shequzhili/csgltc/csglDetail.vue

@@ -89,7 +89,10 @@ export default {
   },
   components: {},
   async mounted () {
-    await this.initMap()
+    if (!map) {
+      this.initMap()
+    }
+
   },
 
   methods: {
@@ -102,6 +105,7 @@ export default {
     async initForm (row) {
       this.startLoading()
       this.formData = { ...row }
+      console.log(map)
       map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
       this.setMarker(this.formData.latitude, this.formData.longitude)
 
@@ -111,6 +115,7 @@ export default {
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap () {
+      console.log('initMap')
       // 定义地图中心点坐标
       let { latitude, longitude } = this.$store.state.user;
       console.log('lat' + latitude + ',lon' + longitude)

src/views/modules/shequzhili/ggfwtc/ggfw.vue

@@ -411,7 +411,7 @@ export default {
 
     handleAdd () {
       this.formTitle = '新增'
-      this.formShow = 'edit'
+      this.formShow = true
       this.$nextTick(() => {
         this.$refs.ref_form.initForm('add', null)
       })

src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue

@@ -88,7 +88,10 @@ export default {
   },
   components: {},
   mounted () {
+    if (!map) {
       this.initMap()
+    }
+
   },
 
   methods: {
@@ -110,8 +113,14 @@ export default {
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap () {
+      let { latitude, longitude } = this.$store.state.user;
+      console.log('lat' + latitude + ',lon' + longitude)
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
       // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
+      var center = new window.TMap.LatLng(latitude, longitude);
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById('app'), {
         center: center, // 设置地图中心点坐标
@@ -135,7 +144,8 @@ export default {
         this.handleMoveCenter()
       })
       this.handleMoveCenter()
-      this.convert()
+      console.log('initMap')
+      // this.convert()
     },
 
     setMarker (lat, lng) {

src/views/modules/shequzhili/ggfwtc/ggfwForm.vue

@@ -301,8 +301,8 @@ export default {
       map.on('panend', () => {
         this.handleMoveCenter()
       })
-      // this.handleMoveCenter()
+      this.handleMoveCenter()
-      this.convert()
+      // this.convert()
     },
 
     setMarker (lat, lng) {