Merge remote-tracking branch 'origin/dev_ljj_samll_adjust'

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

@@ -234,6 +234,22 @@ var geocoder // 新建一个正逆地址解析类
 let loading // 加载动画
 export default {
   data () {
+    let initFormData = () => {
+      let _form = {
+        unitName: '',
+        serviceMatterList: [],
+        type: '',
+        contact: '',
+        contactMobile: '',
+        memberCount: 0,
+        remark: '', //备注【最大500字】
+        address: '', //详细地址
+        longitude: this.$store.state.user.longitude, //经度
+        latitude: this.$store.state.user.latitude//纬度
+      }
+
+      return _form
+    }
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
 
@@ -241,22 +257,7 @@ export default {
 
       keyWords: '',
       activityId: '',
-      formData: {
+      formData: initFormData(),
-        gridId: '',
-        serviceMatter: '',//服务事项
-        serviceMatterList: [],
-        unitId: '',//单位ID
-        unitIdList: [],
-        title: '',//活动标题
-        target: '',//活动目标
-        content: '',//活动内容
-        activityTime: '',//活动时间
-        peopleCount: 0,//服务人数
-        result: '', //活动结果
-        address: '', //详细地址
-        longitude: 36.0722275, //经度
-        latitude: 120.38945519 //纬度
-      },
       serviceList: [],
       // gridList: [],
       agencyId: ''
@@ -274,23 +275,31 @@ export default {
     async initForm (type, activityId) {
       this.startLoading()
       this.$refs.ref_form.resetFields();
-      //     const { user } = this.$store.state
-      //     this.agencyId = user.agencyId
 
-      // await this.loadGrid()
 
       //获取服务事项
       await this.loadService()
 
+      let { latitude, longitude } = this.$store.state.user;
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
+
+      this.formData.latitude = latitude
+      this.formData.longitude = longitude
+
       this.formType = type
       if (activityId) {
         this.activityId = activityId
         this.formData.id = activityId
         await this.loadFormData()
       } else {
-        map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
+
-        this.setMarker(36.0722275, 120.38945519)
       }
+
+      map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+      this.setMarker(this.formData.latitude, this.formData.longitude)
       this.endLoading()
 
     },
@@ -353,8 +362,8 @@ export default {
 
         }
         console.log(this.formData.content)
-        map.setCenter(new TMap.LatLng(parseFloat(this.formData.latitude), parseFloat(this.formData.longitude)))
+        // map.setCenter(new TMap.LatLng(parseFloat(this.formData.latitude), parseFloat(this.formData.longitude)))
-        this.setMarker(this.formData.latitude, this.formData.longitude)
+        // this.setMarker(this.formData.latitude, this.formData.longitude)
       } else {
         this.$message.error(msg)
       }
@@ -519,20 +528,16 @@ export default {
       this.activityId = ''
       this.keyWords = ''
       this.formData = {
-        gridId: '',
+        unitName: '',
-        serviceMatter: '',//服务事项
         serviceMatterList: [],
-        unitId: '',//单位ID
+        type: '',
-        unitIdList: [],
+        contact: '',
-        title: '',//活动标题
+        contactMobile: '',
-        target: '',//活动目标
+        memberCount: 0,
-        content: '',//活动内容
+        remark: '', //备注【最大500字】
-        activityTime: '',//活动时间
-        peopleCount: 0,//服务人数
-        result: '', //活动结果
         address: '', //详细地址
-        longitude: 36.0722275, //经度
+        longitude: this.$store.state.user.longitude, //经度
-        latitude: 120.38945519 //纬度
+        latitude: this.$store.state.user.latitude//纬度
       }
     },
     // 开启加载动画

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

@@ -477,9 +477,10 @@ export default {
     },
 
     handleDetail (row) {
-      this.detailShow = true
+      this.formTitle = '详情'
+      this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_detail.initForm(row)
+        this.$refs.ref_form.initForm('detail', row.id)
       })
     },
 
@@ -501,7 +502,7 @@ export default {
 
     handleAdd () {
       this.formTitle = '新增'
-      this.formShow = 'edit'
+      this.formShow = true
       this.$nextTick(() => {
         this.$refs.ref_form.initForm('add', null)
       })
@@ -574,12 +575,12 @@ export default {
 
       if (code === 0) {
         if (data.type) {
-            this.$message({
+          this.$message({
-              type: "success",
+            type: "success",
-              message: data.msg || "同步成功"
+            message: data.msg || "同步成功"
-            });
+          });
-          
+
-            this.loadTable()
+          this.loadTable()
         } else {
           this.$message.error(data.msg)
         }

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

@@ -106,7 +106,7 @@ export default {
     }
   },
   components: {},
-  mounted () {
+  created () {
     this.initMap()
   },
 
@@ -118,6 +118,7 @@ export default {
     },
 
     async initForm (row) {
+
       this.startLoading()
       this.formData = { ...row }
       map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))

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

@@ -173,14 +173,8 @@ var geocoder // 新建一个正逆地址解析类
 let loading // 加载动画
 export default {
   data () {
-    return {
+    let initFormData = () => {
-      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      let _form = {
-
-      btnDisable: false,
-
-      unitId: '',
-      keyWords: '',
-      formData: {
         unitName: '',
         serviceMatterList: [],
         type: '',
@@ -189,15 +183,27 @@ export default {
         memberCount: 0,
         remark: '', //备注【最大500字】
         address: '', //详细地址
-        longitude: 36.0722275, //经度
+        longitude: this.$store.state.user.longitude, //经度
-        latitude: 120.38945519 //纬度
+        latitude: this.$store.state.user.latitude//纬度
-      },
+      }
+
+      return _form
+    }
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+
+      unitId: '',
+      keyWords: '',
+      formData: initFormData(),
       serviceList: [],//服务list
 
     }
   },
   components: {},
   mounted () {
+
     this.initMap()
   },
 
@@ -210,16 +216,27 @@ export default {
       //获取服务事项
       await this.loadService()
 
+      let { latitude, longitude } = this.$store.state.user;
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
+
+      this.formData.latitude = latitude
+      this.formData.longitude = longitude
+
       this.formType = type
       if (unitId) {
         this.unitId = unitId
         this.formData.id = unitId
         await this.loadFormData()
       } else {
-        map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
+
-        this.setMarker(36.0722275, 120.38945519)
       }
 
+      map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+      this.setMarker(this.formData.latitude, this.formData.longitude)
+
       this.endLoading()
 
     },
@@ -259,8 +276,8 @@ export default {
         }
 
         this.formData = { ...data }
-        map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+        // map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
-        this.setMarker(this.formData.latitude, this.formData.longitude)
+        // this.setMarker(this.formData.latitude, this.formData.longitude)
       } else {
         this.$message.error(msg)
       }
@@ -329,7 +346,7 @@ export default {
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap () {
       // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
+      var center = new window.TMap.LatLng(this.formData.latitude, this.formData.longitude)
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById('app'), {
         center: center, // 设置地图中心点坐标
@@ -450,8 +467,8 @@ export default {
         memberCount: 0,
         remark: '', //备注【最大500字】
         address: '', //详细地址
-        longitude: '', //经度
+        longitude: this.$store.state.user.longitude, //经度
-        latitude: '' //纬度
+        latitude: this.$store.state.user.latitude//纬度
       }
     },
     // 开启加载动画

src/views/modules/shequzhili/event/cpts/add.vue

@@ -402,10 +402,20 @@ export default {
   async mounted () {
     const { user } = this.$store.state
     this.agencyId = user.agencyId
+    let { latitude, longitude } = this.$store.state.user;
+    if (!latitude || latitude == "" || latitude == "0") {
+      latitude = 39.9088810666821;
+      longitude = 116.39743841556731;
+    }
+
+    this.formData.latitude = latitude
+    this.formData.longitude = longitude
+
+    this.initMap()
     this.loadGrid();
     this.getCategoryList()
 
-    this.initMap()
+
 
   },
 
@@ -597,7 +607,7 @@ export default {
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap () {
       // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
+      var center = new window.TMap.LatLng(this.formData.latitude, this.formData.longitude)
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById('app'), {
         center: center, // 设置地图中心点坐标