Browse Source

Merge branch 'dev-activity0829bug'

feature
jiangyy 3 years ago
parent
commit
0862c82300
  1. 8
      src/views/modules/communityParty/regionalParty/units.vue
  2. 2
      src/views/modules/shequzhili/csgltc/csgl.vue
  3. 7
      src/views/modules/shequzhili/csgltc/csglDetail.vue
  4. 2
      src/views/modules/shequzhili/ggfwtc/ggfw.vue
  5. 16
      src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
  6. 4
      src/views/modules/shequzhili/ggfwtc/ggfwForm.vue

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

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

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

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

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

@ -89,7 +89,10 @@ export default {
}, },
components: {}, components: {},
async mounted () { async mounted () {
await this.initMap() if (!map) {
this.initMap()
}
}, },
methods: { methods: {
@ -102,6 +105,7 @@ export default {
async initForm (row) { async initForm (row) {
this.startLoading() this.startLoading()
this.formData = { ...row } this.formData = { ...row }
console.log(map)
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)
@ -111,6 +115,7 @@ export default {
// init // init
initMap () { initMap () {
console.log('initMap')
// //
let { latitude, longitude } = this.$store.state.user; let { latitude, longitude } = this.$store.state.user;
console.log('lat' + latitude + ',lon' + longitude) console.log('lat' + latitude + ',lon' + longitude)

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

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

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

@ -88,7 +88,10 @@ export default {
}, },
components: {}, components: {},
mounted () { mounted () {
this.initMap() if (!map) {
this.initMap()
}
}, },
methods: { methods: {
@ -110,8 +113,14 @@ export default {
// init // init
initMap () { 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 TMap.Map()
map = new window.TMap.Map(document.getElementById('app'), { map = new window.TMap.Map(document.getElementById('app'), {
center: center, // center: center, //
@ -135,7 +144,8 @@ export default {
this.handleMoveCenter() this.handleMoveCenter()
}) })
this.handleMoveCenter() this.handleMoveCenter()
this.convert() console.log('initMap')
// this.convert()
}, },
setMarker (lat, lng) { setMarker (lat, lng) {

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

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

Loading…
Cancel
Save