diff --git a/.eslintrc.js b/.eslintrc.js index c9ab67e..cd30e0f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -48,7 +48,8 @@ module.exports = { 'camelcase': [0, { 'properties': 'always' }], - 'comma-dangle': [1, 'off'], + // 'comma-dangle': [1, 'off'], + "comma-dangle": ["error", "never"], 'comma-spacing': [2, { 'before': false, 'after': true diff --git a/src/views/dataV/layOutLand.vue b/src/views/dataV/layOutLand.vue index 0463c97..7646dd3 100644 --- a/src/views/dataV/layOutLand.vue +++ b/src/views/dataV/layOutLand.vue @@ -22,35 +22,31 @@
{{ title[0] }}
- +
{{ title[1] }}
- +
{{ title[2] }}
- +
-
-
- -
{{ title[3] }}
- +
{{ title[4] }}
- +
@@ -59,11 +55,6 @@
-
-
- -
-
@@ -110,11 +101,13 @@ export default { }); this.checkedlist = val ? list : []; this.isIndeterminate = false; + this.upLayersIds(this.checkedlist) }, doSingleChange(value) { let checkedCount = value.length; this.checkAll = checkedCount === this.options.length; this.isIndeterminate = checkedCount > 0 && checkedCount < this.options.length; + this.upLayersIds(this.checkedlist) }, }, }; diff --git a/src/views/dataV/mapland.js b/src/views/dataV/mapland.js index f76679a..4c1b449 100644 --- a/src/views/dataV/mapland.js +++ b/src/views/dataV/mapland.js @@ -132,9 +132,12 @@ const mapMixinLand = { devicePointList.push(marker); } }); - this.map.add(new this.AMap.OverlayGroup(devicePointList)); + this.map.add(new this.AMap.OverlayGroup(devicePointList)); this.loading = false; }, + upLayersIds(ids) { + console.info('upLayersIds**********',ids) + }, /** 获取地块中心点 */ getAreaCenter(location) { var total = location.length; diff --git a/src/views/dataV/pageLand/index.vue b/src/views/dataV/pageLand/index.vue index 9dfc21f..a224e51 100644 --- a/src/views/dataV/pageLand/index.vue +++ b/src/views/dataV/pageLand/index.vue @@ -1,20 +1,23 @@