|
@@ -57,10 +57,6 @@
|
|
|
computed: {},
|
|
computed: {},
|
|
|
watch: {
|
|
watch: {
|
|
|
listData: function(val1, val2) {
|
|
listData: function(val1, val2) {
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
- // debugger
|
|
|
|
|
-=======
|
|
|
|
|
->>>>>>> 36b170beaf45cff59eafd7ca276e80ebc55f48f2
|
|
|
|
|
this.listData = val1
|
|
this.listData = val1
|
|
|
var that = this
|
|
var that = this
|
|
|
this.map = new AMap.Map('mapContainer', {
|
|
this.map = new AMap.Map('mapContainer', {
|
|
@@ -124,10 +120,6 @@
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function toGetList(e) {
|
|
function toGetList(e) {
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
- // debugger
|
|
|
|
|
-=======
|
|
|
|
|
->>>>>>> 36b170beaf45cff59eafd7ca276e80ebc55f48f2
|
|
|
|
|
// console.log(e.target.getExtData())
|
|
// console.log(e.target.getExtData())
|
|
|
|
|
|
|
|
that.$parent.getList(e.target.getExtData().id, 1)
|
|
that.$parent.getList(e.target.getExtData().id, 1)
|
zhongtianhaoyuan