diff --git a/src/views/resources/main-gis/asset-details/close.png b/src/views/resources/main-gis/asset-details/close.png
index 0a8337d..6f536c6 100644
Binary files a/src/views/resources/main-gis/asset-details/close.png and b/src/views/resources/main-gis/asset-details/close.png differ
diff --git a/src/views/resources/main-gis/asset-details/index.html b/src/views/resources/main-gis/asset-details/index.html
index fd34566..b78cadf 100644
--- a/src/views/resources/main-gis/asset-details/index.html
+++ b/src/views/resources/main-gis/asset-details/index.html
@@ -1,8 +1,8 @@
-
{{resourceDetail.name}}
-
+
{{resourceDetail.name}}
+
\ No newline at end of file
+
diff --git a/src/views/resources/main-gis/asset-details/index.js b/src/views/resources/main-gis/asset-details/index.js
index 3d28186..a9c83c6 100644
--- a/src/views/resources/main-gis/asset-details/index.js
+++ b/src/views/resources/main-gis/asset-details/index.js
@@ -22,6 +22,11 @@ export default {
mounted () {
},
methods: {
+ openImage (url) {
+ this.$emit('openImage',url)
+ // this.dialogImageUrl = url;
+ // this.dialogVisible = true;
+ },
close () {
this.$emit('close')
}
diff --git a/src/views/resources/main-gis/asset-details/index.scss b/src/views/resources/main-gis/asset-details/index.scss
index 5e98e8a..d175fb4 100644
--- a/src/views/resources/main-gis/asset-details/index.scss
+++ b/src/views/resources/main-gis/asset-details/index.scss
@@ -1,19 +1,36 @@
.gl_pop_cash {
background: rgba(10, 25, 47, 0.8);
position: absolute;
- padding: 0 10px;
+ border: 2px solid #3181f6;
+ box-shadow: 0 0 5px #3181f6;
+ border-radius: 0 0 100px 0;
+ padding: 0!important;
+ // border-left: 0.15vw solid #357dfa;
z-index: 11;
.head_main {
- height: 40px;
+ height: 60px;
display: flex;
align-items: center;
position: relative;
justify-content: space-between;
-
+ padding: 0 20px;
+ background: linear-gradient(to right, rgba(49, 129, 246, .8), rgba(49, 129, 246, 0));
.title {
color: #ffad00;
- font-size: 16px !important;
+ font-size: 20px !important;
+ display: flex;
+ align-items: center;
+ line-height: 1;
+ text-shadow: 0 0 15px #3181f6;
+ i{
+ display: block;
+ width: 20px;
+ height: 20px;
+ background: url("tt_icon.png") no-repeat center;
+ background-size: 100% 100%;
+ margin-right: 10px;
+ }
}
.close {
@@ -127,18 +144,18 @@
.pop_statistical_desc {
width: 600px;
margin: 0;
- left: 480px !important;
- top: 180px !important;
+ left: 480px;
+ top: 180px;
padding-bottom: 1.04vw !important;
.head_main {
+
.title {
color: #fff;
}
}
.echarts_main {
- overflow-y: auto;
margin-top: 16px;
div {
@@ -146,25 +163,22 @@
align-items: center;
&:nth-child(even) {
- background: rgba(32, 89, 188, 0.2);
+ //background: rgba(32, 89, 188, 0.2);
}
p {
+ font-size: 16px;
&:nth-child(1) {
width: 8vw;
- padding-left: 1vw;
+ padding-right: 1vw;
+ text-align: right;
flex-shrink: 0;
+ color: #b0cfec;
}
-
- &:nth-child(2) {
- color: #ffad00;
- }
-
margin: 0;
color: #ffffff;
- font-size:1.33vh;
line-height: 3.92vh;
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/views/resources/main-gis/asset-details/tt_icon.png b/src/views/resources/main-gis/asset-details/tt_icon.png
new file mode 100644
index 0000000..59f4001
Binary files /dev/null and b/src/views/resources/main-gis/asset-details/tt_icon.png differ
diff --git a/src/views/resources/main-gis/index.html b/src/views/resources/main-gis/index.html
index ac86f7c..7c5eb6e 100644
--- a/src/views/resources/main-gis/index.html
+++ b/src/views/resources/main-gis/index.html
@@ -7,7 +7,7 @@
-
+
@@ -21,5 +21,10 @@
+
+
+
+
![]()
+
diff --git a/src/views/resources/main-gis/index.js b/src/views/resources/main-gis/index.js
index 48d102a..4eee445 100644
--- a/src/views/resources/main-gis/index.js
+++ b/src/views/resources/main-gis/index.js
@@ -184,6 +184,8 @@ export default {
checkStrictly: true,
},
addrOptions: [],
+ dialogImageUrl: '',
+ dialogVisible: false,
//资产信息详情弹窗
showResourceDetail: false,
mapGeoServerUrl: "", // geoserver地址
@@ -267,6 +269,11 @@ export default {
})
},
methods: {
+ openImage (url) {
+ console.log(url)
+ this.dialogImageUrl = url;
+ this.dialogVisible = true;
+ },
// 获取村边界的图层名称
getVillageBorderLayerName () {
getConfigKey("geoserver.layer.villageBorder").then(response => {
diff --git a/src/views/resources/main-gis/index.scss b/src/views/resources/main-gis/index.scss
index 1f4cac6..d190543 100644
--- a/src/views/resources/main-gis/index.scss
+++ b/src/views/resources/main-gis/index.scss
@@ -220,7 +220,28 @@
}
-.pop_statistical_desc {
+.imgBox{
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 999999;
+ width: 100vw;
+ height: 100%;
+ .box_bg{
+ background-color: rgba(0,0,0,0.5);
+ width: 100%;
+ height: 100%;
+ }
+ img{
+ height: 60vh;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%,-50%);
+ }
+}
+
+.a .pop_statistical_desc {
width: 20.2vw;
margin: 0;
right: 23vw;