diff --git a/public/index.html b/public/index.html
index 75f227d..dd4ea9f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -11,9 +11,9 @@
-
-
-
+
diff --git a/src/assets/picture/icon_householder.png b/src/assets/picture/icon_householder.png
new file mode 100644
index 0000000..4784b63
Binary files /dev/null and b/src/assets/picture/icon_householder.png differ
diff --git a/src/components/MapScroll.vue b/src/components/MapScroll.vue
index da5c749..6d9e2e3 100644
--- a/src/components/MapScroll.vue
+++ b/src/components/MapScroll.vue
@@ -114,7 +114,10 @@ export default {
.carousel_box_left_picture {
flex: 1;
height: 8vh;
- background-color: #fcbebe;
+ // background-color: #fcbebe;
+ background-image: url('@/assets/picture/icon_householder.png');
+ background-repeat: no-repeat;
+ background-size: 100% auto;
}
.carousel_box_left_text {
diff --git a/src/utils/esresize.js b/src/utils/esresize.js
index 89cab28..f50baf0 100644
--- a/src/utils/esresize.js
+++ b/src/utils/esresize.js
@@ -1,105 +1,114 @@
var EleResize = {
- _handleResize: function (e) {
- var ele = e.target || e.srcElement
- var trigger = ele.__resizeTrigger__
- if (trigger) {
- var handlers = trigger.__z_resizeListeners
- if (handlers) {
- var size = handlers.length
- for (var i = 0; i < size; i++) {
- var h = handlers[i]
- var handler = h.handler
- var context = h.context
- handler.apply(context, [e])
- }
- }
+ _handleResize: function (e) {
+ var ele = e.target || e.srcElement
+ var trigger = ele.__resizeTrigger__
+ if (trigger) {
+ var handlers = trigger.__z_resizeListeners
+ if (handlers) {
+ var size = handlers.length
+ for (var i = 0; i < size; i++) {
+ var h = handlers[i]
+ var handler = h.handler
+ var context = h.context
+ handler.apply(context, [e])
}
- },
- _removeHandler: function (ele, handler, context) {
- var handlers = ele.__z_resizeListeners
- if (handlers) {
- var size = handlers.length
- for (var i = 0; i < size; i++) {
- var h = handlers[i]
- if (h.handler === handler && h.context === context) {
- handlers.splice(i, 1)
- return
- }
- }
+ }
+ }
+ },
+ _removeHandler: function (ele, handler, context) {
+ var handlers = ele.__z_resizeListeners
+ if (handlers) {
+ var size = handlers.length
+ for (var i = 0; i < size; i++) {
+ var h = handlers[i]
+ if (h.handler === handler && h.context === context) {
+ handlers.splice(i, 1)
+ return
}
- },
- _createResizeTrigger: function (ele) {
- var obj = document.createElement('object')
- obj.setAttribute('style',
- 'display: block; position: absolute; top: 0; left: 0; height: 100%; width: 100%; overflow: hidden;opacity: 0; pointer-events: none; z-index: -1;')
- obj.onload = EleResize._handleObjectLoad
- obj.type = 'text/html'
- ele.appendChild(obj)
- obj.data = 'about:blank'
- return obj
- },
- _handleObjectLoad: function () {
- this.contentDocument.defaultView.__resizeTrigger__ = this.__resizeElement__
- this.contentDocument.defaultView.addEventListener('resize', EleResize._handleResize)
+ }
}
+ },
+ _createResizeTrigger: function (ele) {
+ var obj = document.createElement('object')
+ obj.setAttribute(
+ 'style',
+ 'display: block; position: absolute; top: 0; left: 0; height: 100%; width: 100%; overflow: hidden;opacity: 0; pointer-events: none; z-index: -1;'
+ )
+ obj.onload = EleResize._handleObjectLoad
+ obj.type = 'text/html'
+ ele.appendChild(obj)
+ obj.data = 'about:blank'
+ return obj
+ },
+ _handleObjectLoad: function () {
+ this.contentDocument.defaultView.__resizeTrigger__ = this.__resizeElement__
+ this.contentDocument.defaultView.addEventListener(
+ 'resize',
+ EleResize._handleResize
+ )
+ }
}
-if (document.attachEvent) { // ie9-10
- EleResize.on = function (ele, handler, context) {
- var handlers = ele.__z_resizeListeners
- if (!handlers) {
- handlers = []
- ele.__z_resizeListeners = handlers
- ele.__resizeTrigger__ = ele
- ele.attachEvent('onresize', EleResize._handleResize)
- }
- handlers.push({
- handler: handler,
- context: context
- })
+if (document.attachEvent) {
+ // ie9-10
+ EleResize.on = function (ele, handler, context) {
+ var handlers = ele.__z_resizeListeners
+ if (!handlers) {
+ handlers = []
+ ele.__z_resizeListeners = handlers
+ ele.__resizeTrigger__ = ele
+ ele.attachEvent('onresize', EleResize._handleResize)
}
- EleResize.off = function (ele, handler, context) {
- var handlers = ele.__z_resizeListeners
- if (handlers) {
- EleResize._removeHandler(ele, handler, context)
- if (handlers.length === 0) {
- ele.detachEvent('onresize', EleResize._handleResize)
- delete ele.__z_resizeListeners
- }
- }
+ handlers.push({
+ handler: handler,
+ context: context
+ })
+ }
+ EleResize.off = function (ele, handler, context) {
+ var handlers = ele.__z_resizeListeners
+ if (handlers) {
+ EleResize._removeHandler(ele, handler, context)
+ if (handlers.length === 0) {
+ ele.detachEvent('onresize', EleResize._handleResize)
+ delete ele.__z_resizeListeners
+ }
}
+ }
} else {
- EleResize.on = function (ele, handler, context) {
- var handlers = ele.__z_resizeListeners
- if (!handlers) {
- handlers = []
- ele.__z_resizeListeners = handlers
+ EleResize.on = function (ele, handler, context) {
+ var handlers = ele.__z_resizeListeners
+ if (!handlers) {
+ handlers = []
+ ele.__z_resizeListeners = handlers
- if (getComputedStyle(ele, null).position === 'static') {
- ele.style.position = 'relative'
- }
- var obj = EleResize._createResizeTrigger(ele)
- ele.__resizeTrigger__ = obj
- obj.__resizeElement__ = ele
- }
- handlers.push({
- handler: handler,
- context: context
- })
+ if (getComputedStyle(ele, null).position === 'static') {
+ ele.style.position = 'relative'
+ }
+ var obj = EleResize._createResizeTrigger(ele)
+ ele.__resizeTrigger__ = obj
+ obj.__resizeElement__ = ele
}
- EleResize.off = function (ele, handler, context) {
- var handlers = ele.__z_resizeListeners
- if (handlers) {
- EleResize._removeHandler(ele, handler, context)
- if (handlers.length === 0) {
- var trigger = ele.__resizeTrigger__
- if (trigger) {
- trigger.contentDocument.defaultView.removeEventListener('resize', EleResize._handleResize)
- ele.removeChild(trigger)
- delete ele.__resizeTrigger__
- }
- delete ele.__z_resizeListeners
- }
+ handlers.push({
+ handler: handler,
+ context: context
+ })
+ }
+ EleResize.off = function (ele, handler, context) {
+ var handlers = ele.__z_resizeListeners
+ if (handlers) {
+ EleResize._removeHandler(ele, handler, context)
+ if (handlers.length === 0) {
+ var trigger = ele.__resizeTrigger__
+ if (trigger) {
+ trigger.contentDocument.defaultView.removeEventListener(
+ 'resize',
+ EleResize._handleResize
+ )
+ ele.removeChild(trigger)
+ delete ele.__resizeTrigger__
}
+ delete ele.__z_resizeListeners
+ }
}
+ }
}
export default EleResize
diff --git a/src/views/coastalMap/components/keyInformantion.vue b/src/views/coastalMap/components/keyInformantion.vue
index 4ecda9e..be3529b 100644
--- a/src/views/coastalMap/components/keyInformantion.vue
+++ b/src/views/coastalMap/components/keyInformantion.vue
@@ -777,7 +777,7 @@ export default {
.card_picture {
width: 4vw;
height: 14vh;
- background-color: #fff;
+ // background-color: #fff;
position: relative;
margin-top: 0.5vh;
.card_picture_look {
@@ -795,7 +795,10 @@ export default {
.image {
width: 4vw;
height: 12.5vh;
- background-color: pink;
+ // background-color: pink;
+ background-image: url('@/assets/picture/icon_householder.png');
+ background-repeat: no-repeat;
+ background-size: 100% auto;
}
}
.card_picture_right {
@@ -821,12 +824,12 @@ export default {
}
}
.card_picture_right_cate {
- height: 2.5vh;
+ display: flex;
width: 4vw;
+ height: 2.5vh;
background-color: #009cfe;
align-items: center;
justify-content: center;
- display: flex;
color: #fff;
}
}
diff --git a/src/views/coastalMap/components/keyPerson.vue b/src/views/coastalMap/components/keyPerson.vue
index c2362ba..33c4090 100644
--- a/src/views/coastalMap/components/keyPerson.vue
+++ b/src/views/coastalMap/components/keyPerson.vue
@@ -69,7 +69,7 @@
@@ -77,10 +77,10 @@
@@ -67,32 +78,54 @@ export default {
// }
// }
- .under_btn {
- position: absolute;
- bottom: 1vh;
- left: 35vw;
- width: 30vw;
- height: 7vh;
- // background: #33a59f;
- display: flex;
- z-index: 2;
+ // .under_btn {
+ // position: absolute;
+ // bottom: 1vh;
+ // left: 35vw;
+ // width: 30vw;
+ // height: 7vh;
+ // // background: #33a59f;
+ // display: flex;
+ // z-index: 2;
- // .under_btn_item {
- // width: 10vw;
- // height: 7vh;
- // // border: 1px solid#b1335d;
- // display: flex;
- // justify-content: center;
- // align-items: center;
+ // .under_btn_item {
+ // width: 10vw;
+ // height: 7vh;
+ // // border: 1px solid#b1335d;
+ // display: flex;
+ // justify-content: center;
+ // align-items: center;
- // .item_check {
- // width: 3.5vw;
- // height: 6.5vh;
- // background-image: url("../../assets/首页_slices/icon_home_sel.png");
- // background-repeat: no-repeat;
- // background-size: cover;
- // }
- // }
- }
+ // // * 导航样式
+ // .item_check {
+ // width: 3.5vw;
+ // height: 6.5vh;
+ // background-image: url('@/assets/picture/icon_home_nor.png');
+ // background-repeat: no-repeat;
+ // background-size: 100% auto;
+
+ // &:hover {
+ // background-image: url('@/assets/picture/icon_home_sel.png');
+ // background-repeat: no-repeat;
+ // background-size: 100% auto;
+ // }
+ // }
+
+ // .item_check_back {
+ // width: 3.5vw;
+ // height: 6.5vh;
+ // background-image: url('@/assets/picture/under_button.png');
+ // background-repeat: no-repeat;
+ // background-size: 100% auto;
+ // font-size: 0.8rem;
+ // font-family: PingFangSC, PingFang SC;
+ // font-weight: 500;
+ // color: #ecf4f9;
+ // line-height: 6.5vh;
+ // text-shadow: 0px 0px 9px #00a2ff;
+ // text-align: center;
+ // }
+ // }
+ // }
}
diff --git a/src/views/sensingDevice/components/carEcharts.vue b/src/views/sensingDevice/components/carEcharts.vue
index 7ce610f..13c4b43 100644
--- a/src/views/sensingDevice/components/carEcharts.vue
+++ b/src/views/sensingDevice/components/carEcharts.vue
@@ -1,166 +1,53 @@
-
+