diff --git a/src/components/pannel/close.png b/src/components/pannel/close.png
new file mode 100644
index 0000000..371277f
Binary files /dev/null and b/src/components/pannel/close.png differ
diff --git a/src/components/pannel/index.html b/src/components/pannel/index.html
index a9ee2d9..3702176 100644
--- a/src/components/pannel/index.html
+++ b/src/components/pannel/index.html
@@ -11,6 +11,7 @@
diff --git a/src/components/pannel/index.js b/src/components/pannel/index.js
index 274effa..450729e 100644
--- a/src/components/pannel/index.js
+++ b/src/components/pannel/index.js
@@ -9,6 +9,13 @@ export default {
type: String,
default: 'bk_normal'
},
+ /**
+ * 是否可以伸缩
+ */
+ flexIble: {
+ type: Boolean,
+ default: false
+ },
// 定义跳转页面url
uri: {
type: String,
@@ -29,14 +36,19 @@ export default {
style: function () {
return {
height: this.height + 'px',
- width: this.width + 'px'
+ width: this.isOpen ? 1000 + 'px' : this.width + 'px'
};
}
},
data () {
return {
+ // 是否展开
+ isOpen: false
};
},
methods: {
+ open () {
+ this.isOpen = !this.isOpen
+ }
}
};
diff --git a/src/components/pannel/index.scss b/src/components/pannel/index.scss
index 6e81dc6..ee83976 100644
--- a/src/components/pannel/index.scss
+++ b/src/components/pannel/index.scss
@@ -33,6 +33,7 @@
margin-top: 2px;
height: 32px;
background: rgba(8, 33, 71, 1);
+ justify-content: space-between;
.title_bk {
// font-style: italic;
@@ -113,6 +114,21 @@
}
}
+.flexIble {
+ z-index: 4;
+ width: 16px;
+ height: 16px;
+ background: url('./close.png');
+ background-size: 100% 100%;
+}
+
+.flexIble_open {
+ width: 16px;
+ height: 16px;
+ background: url('./open.png') !important;
+ background-size: 100% 100%;
+}
+
@keyframes lightmove {
/* 动画关键帧 */
diff --git a/src/components/pannel/open.png b/src/components/pannel/open.png
new file mode 100644
index 0000000..6e25781
Binary files /dev/null and b/src/components/pannel/open.png differ
diff --git a/src/style/_base.scss b/src/style/_base.scss
index 737e436..308be54 100644
--- a/src/style/_base.scss
+++ b/src/style/_base.scss
@@ -36,6 +36,9 @@ body {
}
.right_side {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-end;
position: absolute;
right: 20px;
top: 100px;
diff --git a/src/views/property/comps/left/bottom/1/index.html b/src/views/property/comps/left/bottom/1/index.html
index 9889868..7fa37d7 100644
--- a/src/views/property/comps/left/bottom/1/index.html
+++ b/src/views/property/comps/left/bottom/1/index.html
@@ -1,4 +1,4 @@
-
+
diff --git a/src/views/property/comps/left/bottom/3/index.html b/src/views/property/comps/left/bottom/3/index.html
index baca20f..877cec9 100644
--- a/src/views/property/comps/left/bottom/3/index.html
+++ b/src/views/property/comps/left/bottom/3/index.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/views/property/comps/left/bottom/4/index.html b/src/views/property/comps/left/bottom/4/index.html
index 35cc40d..d2380db 100644
--- a/src/views/property/comps/left/bottom/4/index.html
+++ b/src/views/property/comps/left/bottom/4/index.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/views/property/comps/left/middle/3/index.html b/src/views/property/comps/left/middle/3/index.html
index 59e3098..eca4902 100644
--- a/src/views/property/comps/left/middle/3/index.html
+++ b/src/views/property/comps/left/middle/3/index.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/views/property/comps/left/top/3/index.html b/src/views/property/comps/left/top/3/index.html
index 8df72b1..a8f8a68 100644
--- a/src/views/property/comps/left/top/3/index.html
+++ b/src/views/property/comps/left/top/3/index.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/views/property/comps/right/bottom/3/index.html b/src/views/property/comps/right/bottom/3/index.html
index 5c56209..e5cd091 100644
--- a/src/views/property/comps/right/bottom/3/index.html
+++ b/src/views/property/comps/right/bottom/3/index.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/views/property/comps/right/bottom/4/index.html b/src/views/property/comps/right/bottom/4/index.html
index b68998c..77c80f7 100644
--- a/src/views/property/comps/right/bottom/4/index.html
+++ b/src/views/property/comps/right/bottom/4/index.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/views/property/comps/right/middle/3/index.html b/src/views/property/comps/right/middle/3/index.html
index f1d0bae..826480e 100644
--- a/src/views/property/comps/right/middle/3/index.html
+++ b/src/views/property/comps/right/middle/3/index.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/views/property/comps/right/top/3/index.html b/src/views/property/comps/right/top/3/index.html
index d47cd90..7046df9 100644
--- a/src/views/property/comps/right/top/3/index.html
+++ b/src/views/property/comps/right/top/3/index.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/views/property/main-gis/index.scss b/src/views/property/main-gis/index.scss
index 4a58c43..d8e9c7d 100644
--- a/src/views/property/main-gis/index.scss
+++ b/src/views/property/main-gis/index.scss
@@ -21,7 +21,6 @@
.legend_item {
display: flex;
justify-content: center;
- // border: 1px solid red;
align-items: center;
.icon {
diff --git a/src/views/resources/comps/left/bottom/1/index.html b/src/views/resources/comps/left/bottom/1/index.html
index 8b6800b..8b38f3e 100644
--- a/src/views/resources/comps/left/bottom/1/index.html
+++ b/src/views/resources/comps/left/bottom/1/index.html
@@ -1,4 +1,4 @@
-
+
diff --git a/src/views/resources/comps/left/bottom/2/index.html b/src/views/resources/comps/left/bottom/2/index.html
index a8cb0e7..1c15822 100644
--- a/src/views/resources/comps/left/bottom/2/index.html
+++ b/src/views/resources/comps/left/bottom/2/index.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/views/resources/comps/left/middle/2/index.html b/src/views/resources/comps/left/middle/2/index.html
index 59e3098..eca4902 100644
--- a/src/views/resources/comps/left/middle/2/index.html
+++ b/src/views/resources/comps/left/middle/2/index.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/views/resources/comps/left/top/2/index.html b/src/views/resources/comps/left/top/2/index.html
index 8df72b1..a8f8a68 100644
--- a/src/views/resources/comps/left/top/2/index.html
+++ b/src/views/resources/comps/left/top/2/index.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/views/resources/comps/right/bottom/2/index.html b/src/views/resources/comps/right/bottom/2/index.html
index 5c56209..e5cd091 100644
--- a/src/views/resources/comps/right/bottom/2/index.html
+++ b/src/views/resources/comps/right/bottom/2/index.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/views/resources/comps/right/middle/2/index.html b/src/views/resources/comps/right/middle/2/index.html
index f1d0bae..826480e 100644
--- a/src/views/resources/comps/right/middle/2/index.html
+++ b/src/views/resources/comps/right/middle/2/index.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/views/resources/comps/right/top/2/index.html b/src/views/resources/comps/right/top/2/index.html
index d47cd90..7046df9 100644
--- a/src/views/resources/comps/right/top/2/index.html
+++ b/src/views/resources/comps/right/top/2/index.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file