diff --git a/src/components/gis-map/index.html b/src/components/gis-map/index.html
index 1c2a852..04f30be 100644
--- a/src/components/gis-map/index.html
+++ b/src/components/gis-map/index.html
@@ -1,9 +1,7 @@
-
+
-
-
-
+
{{ data.label }}
({{ data.children.length }})
diff --git a/src/components/gis-map/index.js b/src/components/gis-map/index.js
index 49adca2..e5d9aae 100644
--- a/src/components/gis-map/index.js
+++ b/src/components/gis-map/index.js
@@ -68,7 +68,7 @@ export default {
townBorderLayerName: "", // 乡镇边界图层名称
villageBorderLayerName: "", // 村边界图层名称
groupBorderLayerName: "", // 组边界图层名称
- addrOptions: [],
+ addrOptions: []
};
},
computed: {
@@ -200,7 +200,7 @@ export default {
} else {
mapCenterLocation = [116.391461, 39.902359];
}
- gis = new GisUtils('map')
+ gis = new GisUtils('map22222')
gis.addTianDiTuLayer()
gis.addAnnotationLayer()
if (dept.deptLevel === '5') {
@@ -229,7 +229,7 @@ export default {
}
// 添加坐标点图层
if (dept.children) {
- this.addDeptLayer(dept.children, 'yellow.png');
+ this.addDeptLayer(dept.children);
}
gis.getView().setCenter(fromLonLat(mapCenterLocation))
@@ -243,7 +243,6 @@ export default {
// 镇级:加载村级坐标点
if (feature.get('level') === 'deptPoint') {
let parentIds = [];
- console.log(feature.get('deptId'), 888);
this.findParentNodeIds(this.addrOptions, feature.get('deptId'), parentIds);
this.addrText = parentIds;
this.selectAddress(parentIds);
@@ -313,7 +312,7 @@ export default {
selectAddress (value, isLocated = true) { // isLocated 控制地图是否跳转
this.queryParams.deptId = value[value.length - 1];
this.getData(DEPT_CHANGED);
- let node = this.$refs["cascader"].panel.getNodeByValue(value);
+ let node = this.$refs["cascader2"].panel.getNodeByValue(value);
this.drawMap(node, isLocated);
},
diff --git a/src/components/gis-map/index.scss b/src/components/gis-map/index.scss
index c12beb0..d600fac 100644
--- a/src/components/gis-map/index.scss
+++ b/src/components/gis-map/index.scss
@@ -4,21 +4,35 @@
left: 0;
right: 0;
bottom: 0;
- z-index: -2;
+ z-index: 1;
+}
+
+/deep/ .el-cascader {
+ .el-input {
+ background-color: transparent !important;
+
+ .el-input__inner {
+ border: 0;
+ background-color: transparent !important;
+ color: white;
+ }
+ }
}
.mask {
z-index: 1;
width: 100%;
height: 100%;
- box-shadow: inset 0px 0px 100px 100px rgba(0, 0, 0, 0.59);
+ box-shadow: inset 350px 0px 400px 100px RGBA(3, 12, 27, 1), inset -350px 0 400px 100px RGBA(3, 12, 27, 1); // 左
/* 四周黑色 */
- pointer-events: none;
+ // pointer-events: none;
/* 允许地图事件穿透 */
}
.select_address {
- z-index: 10;
+ z-index: 22;
+ // cursor: pointer;
+ // pointer-events: none;
position: absolute;
left: 480px;
top: 112px;
diff --git a/src/style/_base.scss b/src/style/_base.scss
index c96773e..af057ea 100644
--- a/src/style/_base.scss
+++ b/src/style/_base.scss
@@ -23,11 +23,12 @@ body {
}
.page {
+ overflow: hidden;
position: relative;
width: 100vw;
- min-width: 1920px;
+ // min-width: 1920px;
height: 100vh;
- min-height: 1080px;
+ // min-height: 1080px;
.left_side {
position: absolute;
diff --git a/src/views/property/index.js b/src/views/property/index.js
index a513738..0cb8fab 100644
--- a/src/views/property/index.js
+++ b/src/views/property/index.js
@@ -101,10 +101,6 @@ export default {
return this.comps[this.tab]
}
},
- created () {
- },
- mounted () {
- },
methods: {
tabChange (info) {
this.tab = info.id;
diff --git a/src/views/property/main-gis/index.scss b/src/views/property/main-gis/index.scss
index 8ce3827..5ed64ed 100644
--- a/src/views/property/main-gis/index.scss
+++ b/src/views/property/main-gis/index.scss
@@ -9,7 +9,7 @@
z-index: 1;
width: 100%;
height: 100%;
- box-shadow: inset 0px 0px 100px 100px rgba(0, 0, 0, 0.59);
+ box-shadow: inset 350px 0px 400px 100px RGBA(3, 12, 27, 1), inset -350px 0 400px 100px RGBA(3, 12, 27, 1); // 左
/* 四周黑色 */
pointer-events: none;
/* 允许地图事件穿透 */
diff --git a/src/views/resources/main-gis/index.scss b/src/views/resources/main-gis/index.scss
index 8ce3827..5ed64ed 100644
--- a/src/views/resources/main-gis/index.scss
+++ b/src/views/resources/main-gis/index.scss
@@ -9,7 +9,7 @@
z-index: 1;
width: 100%;
height: 100%;
- box-shadow: inset 0px 0px 100px 100px rgba(0, 0, 0, 0.59);
+ box-shadow: inset 350px 0px 400px 100px RGBA(3, 12, 27, 1), inset -350px 0 400px 100px RGBA(3, 12, 27, 1); // 左
/* 四周黑色 */
pointer-events: none;
/* 允许地图事件穿透 */