Commit 6db98d03 authored by 郭铭瑶's avatar 郭铭瑶 🤘

更新

parent be3ead9e
<!DOCTYPE html><html id=html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta http-equiv=X-UA-Compatible content="IE=edge, chrome=1"><title>南京东路街道数据平台</title><style>html { <!DOCTYPE html><html id=html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta http-equiv=X-UA-Compatible content="IE=edge, chrome=1"><title>南京东路街道数据平台</title><style>html {
font-size: 16vh; font-size: 16vh;
}</style><link href=./static/css/app.e1714e2946971c465588ec9c44f5ced4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.c347d568b739c6d4929f.js></script><script type=text/javascript src=./static/js/vendor.3771f2e5c5447f503b00.js></script><script type=text/javascript src=./static/js/app.41d129a34aab27d3133d.js></script></body><script src=./static/SMap.min.js></script><script src=./static/Plugins.min.js></script></html> }</style><link href=./static/css/app.1c5d69a517bd317a36ad11ee81995605.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.6451648df34b75f534e2.js></script><script type=text/javascript src=./static/js/vendor.64f49a750b0f66cbba6d.js></script><script type=text/javascript src=./static/js/app.5dac327d7a924e1cc29a.js></script></body><script src=./static/SMap.min.js></script><script src=./static/Plugins.min.js></script></html>
\ No newline at end of file \ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
webpackJsonp([16],{"jd+K":function(t,e){},xSxB:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s={name:"MonitorModal",props:{value:{type:Boolean,default:!1},width:{type:String,default:"30%"},offset:{type:String,default:"0"},enter:{type:String,default:"fadeInDown"},leave:{type:String,default:"fadeOutUp"},title:{type:String,default:"title"}},methods:{handleClose:function(){this.$emit("close"),this.$emit("input",!1)}}},i={render:function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("m-animate",{attrs:{enter:t.enter,leave:t.leave}},[t.value?s("div",{staticClass:"monitor-modal"},[s("div",{style:"min-width:"+t.width+";marginLeft:"+t.offset},[s("div",{staticClass:"title"},[s("p",[t._v("\n "+t._s(t.title)+"\n "),s("span",{staticClass:"left"}),t._v(" "),s("span",{staticClass:"right"})]),t._v(" "),s("div",[s("img",{staticClass:"flag",attrs:{src:a("f2fE")}}),t._v(" "),s("img",{staticClass:"close-btn",attrs:{src:a("4K8Q")},on:{click:t.handleClose}})]),t._v(" "),s("img",{staticClass:"left",attrs:{src:a("KMwb")}})]),t._v(" "),s("div",{staticClass:"content"},[s("div",[t._t("default")],2)])])]):t._e()])},staticRenderFns:[]};var n=a("VU/8")(s,i,!1,function(t){a("jd+K")},"data-v-12e6d05b",null);e.default=n.exports}});
//# sourceMappingURL=16.1fcc30181efffe81d795.js.map
\ No newline at end of file
webpackJsonp([17],{"9BkU":function(t,e){},CsfL:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s={name:"MonitorStep",props:{steps:{type:Array,required:!0},current:{type:[String,Number,Array],default:function(){return[0,!1]}},info:{type:Object},msg:{type:Array,default:function(){return[]}}},data:function(){return{setTop:null}},mounted:function(){var t=this;this.$nextTick(function(){t.setTop={top:"calc("+t.$refs.icon[0].offsetTop+"px + 0.035rem)"}})},computed:{linePercent:function(){var t=this.steps.length;return t>2?100/(t-1):100},doneWidth:function(){return Math.round(this.linePercent*Number(this.current))},notWidth:function(){return 100-this.doneWidth}},methods:{getInfo:function(t){var e=this.info;switch(t){case 0:return e.create_note||"暂无";case 2:return e.receive_note||"暂无";case 3:return e.done_note||"暂无";default:return"系统自动推送"}}}},r={render:function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("div",{staticClass:"monitor-step"},[s("div",{staticClass:"lines",style:t.setTop},[s("div",{staticClass:"line done",style:"width:"+t.doneWidth+"%"}),t._v(" "),s("div",{staticClass:"line",style:"width:"+t.notWidth+"%"})]),t._v(" "),t._l(t.steps,function(e,r){return s("div",{key:r,class:"item "+(r==t.current?"on":"")},[s("p",{attrs:{title:e.name}},[t._v(t._s(e.name))]),t._v(" "),r<=t.current?s("div",{ref:"icon",refInFor:!0,staticClass:"icon",style:"background-image:url("+n("RGwW")+")"}):s("div",{staticClass:"none"}),t._v(" "),s("span",{staticClass:"msg",attrs:{title:e.msg}},[t._v(t._s(t.msg[r]))]),t._v(" "),t.info?s("span",{staticClass:"msg info",attrs:{title:t.getInfo(r)}},[t._v(t._s(t.getInfo(r)))]):t._e()])})],2)},staticRenderFns:[]};var i=n("VU/8")(s,r,!1,function(t){n("9BkU")},"data-v-119a9a0e",null);e.default=i.exports}}); webpackJsonp([16],{"9BkU":function(t,e){},CsfL:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s={name:"MonitorStep",props:{steps:{type:Array,required:!0},current:{type:[String,Number,Array],default:function(){return[0,!1]}},info:{type:Object},msg:{type:Array,default:function(){return[]}}},data:function(){return{setTop:null}},mounted:function(){var t=this;this.$nextTick(function(){t.setTop={top:"calc("+t.$refs.icon[0].offsetTop+"px + 0.035rem)"}})},computed:{linePercent:function(){var t=this.steps.length;return t>2?100/(t-1):100},doneWidth:function(){return Math.round(this.linePercent*Number(this.current))},notWidth:function(){return 100-this.doneWidth}},methods:{getInfo:function(t){var e=this.info;switch(t){case 0:return e.create_note||"暂无";case 2:return e.receive_note||"暂无";case 3:return e.done_note||"暂无";default:return"系统自动推送"}}}},r={render:function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("div",{staticClass:"monitor-step"},[s("div",{staticClass:"lines",style:t.setTop},[s("div",{staticClass:"line done",style:"width:"+t.doneWidth+"%"}),t._v(" "),s("div",{staticClass:"line",style:"width:"+t.notWidth+"%"})]),t._v(" "),t._l(t.steps,function(e,r){return s("div",{key:r,class:"item "+(r==t.current?"on":"")},[s("p",{attrs:{title:e.name}},[t._v(t._s(e.name))]),t._v(" "),r<=t.current?s("div",{ref:"icon",refInFor:!0,staticClass:"icon",style:"background-image:url("+n("RGwW")+")"}):s("div",{staticClass:"none"}),t._v(" "),s("span",{staticClass:"msg",attrs:{title:e.msg}},[t._v(t._s(t.msg[r]))]),t._v(" "),t.info?s("span",{staticClass:"msg info",attrs:{title:t.getInfo(r)}},[t._v(t._s(t.getInfo(r)))]):t._e()])})],2)},staticRenderFns:[]};var i=n("VU/8")(s,r,!1,function(t){n("9BkU")},"data-v-119a9a0e",null);e.default=i.exports}});
//# sourceMappingURL=17.9aa84ade87504941c5c7.js.map //# sourceMappingURL=16.b2aa49fab74e7409d051.js.map
\ No newline at end of file \ No newline at end of file
webpackJsonp([17],{eTN5:function(t,e){},xSxB:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s={name:"MonitorModal",props:{value:{type:Boolean,default:!1},width:{type:String,default:"32%"},offset:{type:String,default:"0"},enter:{type:String,default:"fadeInDown"},leave:{type:String,default:"fadeOutUp"},title:{type:String,default:"title"}},methods:{handleClose:function(){this.$emit("close"),this.$emit("input",!1)}}},i={render:function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("m-animate",{attrs:{enter:t.enter,leave:t.leave}},[t.value?s("div",{staticClass:"monitor-modal"},[s("div",{style:"min-width:"+t.width+";marginLeft:"+t.offset},[s("div",{staticClass:"title"},[s("p",[t._v("\n "+t._s(t.title)+"\n "),s("span",{staticClass:"left"}),t._v(" "),s("span",{staticClass:"right"})]),t._v(" "),s("div",[s("img",{staticClass:"flag",attrs:{src:a("f2fE")}}),t._v(" "),s("img",{staticClass:"close-btn",attrs:{src:a("4K8Q")},on:{click:t.handleClose}})]),t._v(" "),s("img",{staticClass:"left",attrs:{src:a("KMwb")}})]),t._v(" "),s("div",{staticClass:"content"},[s("div",[t._t("default")],2)])])]):t._e()])},staticRenderFns:[]};var n=a("VU/8")(s,i,!1,function(t){a("eTN5")},"data-v-10665c46",null);e.default=n.exports}});
//# sourceMappingURL=17.20261f7c07e913c66b26.js.map
\ No newline at end of file
webpackJsonp([18],{OYsp:function(t,e){},TNmO:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=n("Dd8w"),s=n.n(i),o={name:"MonitorTitle",props:{bgImg:{type:String},hideDate:{type:Boolean,default:!1},hideTime:{type:Boolean,default:!1},editable:{type:Boolean,default:!1},color:{type:String},size:{type:String,default:"0.2rem"}},data:function(){return{openDatePicker:!1,timer:null,time:null,style:{}}},mounted:function(){var t=this;this.hideTime||(this.timer=setInterval(function(){t.time=t.$moment().format("dddd")+" "+t.$moment().format("LTS")},1e3)),this.style=s()({},this.style,{"font-size":this.size})},beforeDestroy:function(){clearInterval(this.timer),this.timer=null},computed:{curDate:function(){var t=this.$store.state.curDate;return t?this.$moment(t).format("YYYY-MM-DD"):this.$moment().format("YYYY-MM-DD")},options:function(){var t=this;return{disabledDate:function(e){return t.$moment(e).isAfter(t.$moment())}}}},methods:{handleDateChange:function(t){this.$store.commit("SET_CURDATE",t),this.openDatePicker=!1},closePage:function(){window.close()}}},a={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"monitor-title"},[t.hideTime?t._e():n("span",{staticClass:"moment time"},[t._v("\n "+t._s(t.curDate)+" "+t._s(t.time)+"\n ")]),t._v(" "),n("img",{staticClass:"bg",attrs:{src:t.bgImg,draggable:"false"}}),t._v(" "),n("p",{style:t.style},[t._t("default")],2)])},staticRenderFns:[]};var r=n("VU/8")(o,a,!1,function(t){n("OYsp")},"data-v-09752887",null);e.default=r.exports}});
//# sourceMappingURL=18.91c62f41cca1f27af8a8.js.map
\ No newline at end of file
webpackJsonp([18],{TNmO:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=n("Dd8w"),s=n.n(i),o={name:"MonitorTitle",props:{bgImg:{type:String},hideDate:{type:Boolean,default:!1},hideTime:{type:Boolean,default:!1},editable:{type:Boolean,default:!1},color:{type:String},size:{type:String,default:"0.2rem"}},data:function(){return{openDatePicker:!1,timer:null,time:null,style:{}}},mounted:function(){var t=this;this.hideTime||(this.timer=setInterval(function(){t.time=t.$moment().format("dddd")+" "+t.$moment().format("LTS")},1e3)),this.style=s()({},this.style,{"font-size":this.size})},beforeDestroy:function(){clearInterval(this.timer),this.timer=null},computed:{curDate:function(){var t=this.$store.state.curDate;return t?this.$moment(t).format("YYYY-MM-DD"):this.$moment().format("YYYY-MM-DD")},options:function(){var t=this;return{disabledDate:function(e){return t.$moment(e).isAfter(t.$moment())}}}},methods:{handleDateChange:function(t){this.$store.commit("SET_CURDATE",t),this.openDatePicker=!1},closePage:function(){window.close()}}},a={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"monitor-title"},[t.hideTime?t._e():n("span",{staticClass:"moment time"},[t._v("\n "+t._s(t.curDate)+" "+t._s(t.time)+"\n ")]),t._v(" "),n("img",{staticClass:"bg",attrs:{src:t.bgImg,draggable:"false"}}),t._v(" "),n("p",{style:t.style},[t._t("default")],2)])},staticRenderFns:[]};var r=n("VU/8")(o,a,!1,function(t){n("xyI3")},"data-v-0625e673",null);e.default=r.exports},xyI3:function(t,e){}});
//# sourceMappingURL=18.f9b57755f6b0a33bab2d.js.map
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,o){for(var f,b,i,u=0,d=[];u<r.length;u++)b=r[u],t[b]&&d.push(t[b][0]),t[b]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,o);d.length;)d.shift()();if(o)for(u=0;u<o.length;u++)i=a(a.s=o[u]);return i};var r={},t={25:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,a.nc&&o.setAttribute("nonce",a.nc),o.src=a.p+"static/js/"+e+"."+{0:"15052c7972c908a7760e",1:"3dab2f03f71b0f0b1713",2:"919bf0c5db0257269876",3:"7da23cdc74aa8deffad9",4:"ea5a775dfd7e9cccfcf4",5:"6b0030be18979ba7a58a",6:"7ba28aeaaa7cebc8ade0",7:"7baf3401350603470964",8:"b6e8b962b26570c80b85",9:"e1c22a74c9a60f150eb1",10:"4f6e41b9c4458237683b",11:"74bad2dc4b1385548b1a",12:"dc9e9b5e5751e4565952",13:"9c2fdff85b2573227713",14:"d4990f4a8237148ef7ef",15:"7655e368d63efa369118",16:"b2aa49fab74e7409d051",17:"20261f7c07e913c66b26",18:"f9b57755f6b0a33bab2d",21:"5fe24bc860088be1b528",22:"c26ff53165d90faf9c4f",23:"795fee1c52905a188792",24:"ec1d710a9e7c95e61e7b"}[e]+".js";var f=setTimeout(b,12e4);function b(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=b,c.appendChild(o),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="./",a.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.6451648df34b75f534e2.js.map
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,f){for(var o,b,i,u=0,d=[];u<r.length;u++)b=r[u],t[b]&&d.push(t[b][0]),t[b]=0;for(o in a)Object.prototype.hasOwnProperty.call(a,o)&&(e[o]=a[o]);for(n&&n(r,a,f);d.length;)d.shift()();if(f)for(u=0;u<f.length;u++)i=c(c.s=f[u]);return i};var r={},t={25:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});n[2]=r;var a=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,c.nc&&f.setAttribute("nonce",c.nc),f.src=c.p+"static/js/"+e+"."+{0:"15052c7972c908a7760e",1:"3dab2f03f71b0f0b1713",2:"b8bd398c4921ef36518f",3:"f311eb955efab545d5eb",4:"ea5a775dfd7e9cccfcf4",5:"6b0030be18979ba7a58a",6:"7ba28aeaaa7cebc8ade0",7:"7baf3401350603470964",8:"b6e8b962b26570c80b85",9:"e1c22a74c9a60f150eb1",10:"4f6e41b9c4458237683b",11:"74bad2dc4b1385548b1a",12:"dc9e9b5e5751e4565952",13:"9c2fdff85b2573227713",14:"d4990f4a8237148ef7ef",15:"7655e368d63efa369118",16:"1fcc30181efffe81d795",17:"9aa84ade87504941c5c7",18:"91c62f41cca1f27af8a8",21:"5fe24bc860088be1b528",22:"c26ff53165d90faf9c4f",23:"795fee1c52905a188792",24:"ec1d710a9e7c95e61e7b"}[e]+".js";var o=setTimeout(b,12e4);function b(){f.onerror=f.onload=null,clearTimeout(o);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return f.onerror=f.onload=b,a.appendChild(f),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.c347d568b739c6d4929f.js.map
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
...@@ -44,16 +44,14 @@ html, body ...@@ -44,16 +44,14 @@ html, body
overflow: hidden overflow: hidden
color #fff color #fff
position relative position relative
*
font-weight bold !important
&:before &:before
$mask() $mask()
width 16vw // width 16vw
left 0 left 0
background linear-gradient(to right, rgba(0,0,0,.9), rgba(0,0,0,.2)) background linear-gradient(to right, rgba(0,0,0,.9), rgba(0,0,0,.2))
&:after &:after
$mask() $mask()
width 49vw // width 49vw
right 0 right 0
background linear-gradient(to left, rgba(0,0,0,.9), rgba(0,0,0,.2)) background linear-gradient(to left, rgba(0,0,0,.9), rgba(0,0,0,.2))
......
...@@ -40,3 +40,17 @@ $color-main = #5BD5FF ...@@ -40,3 +40,17 @@ $color-main = #5BD5FF
&.ivu-select-item-selected &.ivu-select-item-selected
color $edgeColor color $edgeColor
font-weight bold font-weight bold
.ivu-tooltip-inner
max-width 3rem
min-height .2rem
padding .05rem .08rem
background $section-bg
$blur(.02rem)
.ivu-tree-title
font-size .1rem
color #fff
&:hover
background none
color $color-blue
.ivu-tree-arrow
width .1rem
...@@ -18,7 +18,7 @@ $layout(gap = 0.06rem) ...@@ -18,7 +18,7 @@ $layout(gap = 0.06rem)
display grid display grid
grid-gap gap grid-gap gap
padding gap padding gap
$blur(val = 0.03rem) $blur(val = 0.04rem)
backdrop-filter blur(val) backdrop-filter blur(val)
-webkit-backdrop-filter blur(val) -webkit-backdrop-filter blur(val)
$selected() $selected()
......
...@@ -24,19 +24,24 @@ export default { ...@@ -24,19 +24,24 @@ export default {
this.map = new SMap.Map('mapContainer', { this.map = new SMap.Map('mapContainer', {
viewMode: '2D', viewMode: '2D',
// center: [0,0], // center: [0,0],
// zooms: [6, 7], // zooms: [6, 9],
mapStyle: 'smap://styles/dark', mapStyle: 'smap://styles/dark',
}).on(SMap.MapEvent.maploaded, () => { }).on(SMap.MapEvent.maploaded, () => {
// this.map.hideXQ_Poly() // this.hideCommunity()
this.map.hideXQ_Point()
this.map.hideMPZ()
this.addListener() this.addListener()
// this.map.enableMouseEvent(false) // 禁用鼠标 // this.map.enableMouseEvent(false) // 禁用鼠标
this.$emit('complete') this.$emit('complete')
}) })
}, },
panTo(a, b) { hideCommunity() {
this.map.panTo(a, b) this.map.hideXQ_Poly()
this.map.hideXQ_Point()
this.map.hideMPZ()
},
showCommunity() {
this.map.showXQ_Poly()
this.map.showXQ_Point()
this.map.showMPZ()
}, },
addListener() { // 触发地图点击事件 addListener() { // 触发地图点击事件
this.map.on(SMap.MapEvent.click, (view, eventParamter) => { this.map.on(SMap.MapEvent.click, (view, eventParamter) => {
...@@ -71,9 +76,12 @@ export default { ...@@ -71,9 +76,12 @@ export default {
}, },
setFilter(arr) { setFilter(arr) {
const valid = arr.map(name => { const valid = arr.map(name => {
return `sect_guid = '${name}'` return `sect_name_ = '${name}'`
// return `sect_guid = '${name}'`
}) })
console.log('id---', valid.join(' or ')) // console.log('id---', valid.join(' or '))
this.map.setFilter('wg_gis_xq_point', valid.join(' or '))
this.map.setFilter('wg_gis_mpz', valid.join(' or '))
this.map.setFilter('wg_gis_xq_poly', valid.join(' or ')) this.map.setFilter('wg_gis_xq_poly', valid.join(' or '))
}, },
// 将数据转换为符合地图的点数组 // 将数据转换为符合地图的点数组
...@@ -138,6 +146,7 @@ export default { ...@@ -138,6 +146,7 @@ export default {
label, label,
}) })
this.map.add(polygon) this.map.add(polygon)
return polygon
}, },
// 添加线状覆盖物 // 添加线状覆盖物
addPolyLine({paths, attributes = {}, strokeColor = 'rgba(51,145,255,.6)', width = 2}) { addPolyLine({paths, attributes = {}, strokeColor = 'rgba(51,145,255,.6)', width = 2}) {
...@@ -151,6 +160,7 @@ export default { ...@@ -151,6 +160,7 @@ export default {
width, width,
}) })
this.map.add(polyline) this.map.add(polyline)
return polyline
}, },
// 添加边界 // 添加边界
addBoundary({name, weight = 10, count = 10, color = 'rgba(51,145,255,.6)', maskColor = [0, 0, 0, 0]}) { addBoundary({name, weight = 10, count = 10, color = 'rgba(51,145,255,.6)', maskColor = [0, 0, 0, 0]}) {
......
...@@ -34,7 +34,7 @@ export default { ...@@ -34,7 +34,7 @@ export default {
}, },
width: { width: {
type: String, type: String,
default: '30%', default: '32%',
}, },
offset: { offset: {
type: String, type: String,
......
...@@ -194,7 +194,7 @@ export default { ...@@ -194,7 +194,7 @@ export default {
width 100% width 100%
height 100% height 100%
top 0 top 0
left 0 left -6%
>p >p
background-clip text background-clip text
-webkit-background-clip text -webkit-background-clip text
......
...@@ -5,7 +5,7 @@ import Vue from 'vue' ...@@ -5,7 +5,7 @@ import Vue from 'vue'
import App from './App' import App from './App'
import router from './router' import router from './router'
import store from './store' import store from './store'
import {Row, Col, Select, Option, DatePicker, CarouselItem, Carousel} from 'view-design' import {Row, Col, Select, Option, DatePicker, CarouselItem, Carousel, Tree, Tooltip} from 'view-design'
import ajax from '@/server/ajax' import ajax from '@/server/ajax'
import api from '@/server/api' import api from '@/server/api'
import common from '@/util/common' import common from '@/util/common'
...@@ -28,6 +28,8 @@ Vue.component('Option', Option) ...@@ -28,6 +28,8 @@ Vue.component('Option', Option)
Vue.component('DatePicker', DatePicker) Vue.component('DatePicker', DatePicker)
Vue.component('Carousel', Carousel) Vue.component('Carousel', Carousel)
Vue.component('CarouselItem', CarouselItem) Vue.component('CarouselItem', CarouselItem)
Vue.component('Tree', Tree)
Vue.component('Tooltip', Tooltip)
/* eslint-disable no-new */ /* eslint-disable no-new */
new Vue({ new Vue({
el: '#app', el: '#app',
......
...@@ -41,6 +41,7 @@ const request = ({ method, url, params = {}, contentType = 'application/json;cha ...@@ -41,6 +41,7 @@ const request = ({ method, url, params = {}, contentType = 'application/json;cha
url, url,
headers: { headers: {
'X-Requested-With': 'XMLHttpRequest', 'X-Requested-With': 'XMLHttpRequest',
'Access-Control-Allow-Origin': '*',
'Content-Type': contentType, 'Content-Type': contentType,
}, },
} }
......
...@@ -9,4 +9,5 @@ default: ...@@ -9,4 +9,5 @@ default:
export default { export default {
BASE_URL, BASE_URL,
GET_COMMUNITY_LIST: '/service-basicdatasync-ddd/communities', GET_COMMUNITY_LIST: '/service-basicdatasync-ddd/communities',
GET_NON_LIVING: '/service-basicdatasync-ddd/nonResidents',
} }
// import ajax from '@/server/ajax' import ajax from '@/server/ajax'
// import api from '@/server/api' import api from '@/server/api'
// import com from '@/util/common' import com from '@/util/common'
export default { export default {
initData({dispatch}) {
dispatch('getNonLiving')
},
async getNonLiving({commit}) {
const yi = await ajax.get({
url: api.GET_NON_LIVING,
params: {
'488439151152132096': '衣',
'488439152448172032': '第一工作站',
pageSize: 1000,
}
})
const shi = await ajax.get({
url: api.GET_NON_LIVING,
params: {
'488439151152132096': '食',
'488439152448172032': '第一工作站',
pageSize: 1000,
}
})
const zhu = await ajax.get({
url: api.GET_NON_LIVING,
params: {
'488439151152132096': '住',
'488439152448172032': '第一工作站',
pageSize: 1000,
}
})
const xing = await ajax.get({
url: api.GET_NON_LIVING,
params: {
'488439151152132096': '行',
'488439152448172032': '第一工作站',
pageSize: 1000,
}
})
const result = [
...com.confirm(yi, 'data.content', []).map(item => {
item.icon = 'tip3.png'
return item
}),
...com.confirm(shi, 'data.content', []).map(item => {
item.icon = 'tip4.png'
return item
}),
...com.confirm(zhu, 'data.content', []).map(item => {
item.icon = 'tip5.png'
return item
}),
...com.confirm(xing, 'data.content', []).map(item => {
item.icon = 'tip6.png'
return item
}),
]
commit('SET_NON_LIVING', result)
},
} }
...@@ -8,4 +8,7 @@ export default { ...@@ -8,4 +8,7 @@ export default {
SET_THEME_NAME(state, name) { SET_THEME_NAME(state, name) {
state.themeName = name state.themeName = name
}, },
SET_NON_LIVING(state, data) {
state.nonLivingList = data
},
} }
This diff is collapsed.
<template> <template>
<div class="building"> <div class="building">
<div v-for="item in list" :key="item.name" :style="`background-image: url(${require('@/assets/images/'+item.img)})`"> <div v-for="item in list" :key="item.name" :style="`background-image: url(${require('@/assets/images/'+item.img)})`">
<p>{{item.name}}</p> <!-- <p>{{item.name}}</p> -->
</div> </div>
</div> </div>
</template> </template>
...@@ -12,10 +12,10 @@ export default { ...@@ -12,10 +12,10 @@ export default {
data() { data() {
return { return {
list: [ list: [
{name: '和平饭店', img: 'building1.png'}, {name: '和平饭店', img: 'building1.jpg'},
{name: '慈安里大楼', img: 'building2.png'}, {name: '慈安里大楼', img: 'building2.jpg'},
{name: '美伦大厦', img: 'building3.png'}, {name: '美伦大厦', img: 'building3.jpg'},
{name: '上海虹庙', img: 'building4.png'}, {name: '上海虹庙', img: 'building4.jpg'},
], ],
} }
}, },
......
<template> <template>
<div class="map-btns" :class="{isFull: value}"> <div class="map-btns" :class="{isFull: value}">
<template v-for="btn in btns">
<Tooltip v-if="btn.name === 'home'" placement="top-end" :key="btn.name">
<img :src="require(`@/assets/images/${btn.img}`)" />
<div slot="content">
<Tree :data="data" show-checkbox @on-check-change="handleChange"/>
</div>
</Tooltip>
<img <img
v-for="btn in btns" v-else
:key="btn.name" :key="btn.name"
@click="$emit(btn.name, btn.name == 'input' ? !value : null)" @click="$emit(btn.name, btn.name == 'input' ? !value : null)"
:src="require(`@/assets/images/${btn.img}`)" /> :src="require(`@/assets/images/${btn.img}`)" />
</template>
</div> </div>
</template> </template>
...@@ -21,13 +29,80 @@ export default { ...@@ -21,13 +29,80 @@ export default {
btns: [ btns: [
{name: 'input', img: 'btn1.png'}, {name: 'input', img: 'btn1.png'},
// {name: 'zoomin', img: 'btn2.png'}, // {name: 'zoomin', img: 'btn2.png'},
{name: 'zoomout', img: 'btn3.png'}, {name: 'home', img: 'btn3.png'},
{name: 'info', img: 'btn4.png'}, {name: 'info', img: 'btn4.png'},
{name: 'sensor', img: 'btn5.png'}, {name: 'sensor', img: 'btn5.png'},
{name: 'position', img: 'btn6.png'}, {name: 'position', img: 'btn6.png'},
],
data: [
{
title: '居住',
expand: true,
children: [
{
title: '商品房、二级旧里、直管公房',
tipEvent: 'community',
checked: true
},
]
},
{
title: '非居',
expand: true,
children: [
{
title: '衣、食、住、行',
tipEvent: 'life',
checked: true
},
{
title: '为老服务站',
tipEvent: 'old',
checked: true
},
{
title: '地标性建筑',
tipEvent: 'sign',
checked: true
},
{
title: '历史保护建筑',
tipEvent: 'history',
checked: true
},
{
title: '便民设施',
tipEvent: 'convenient',
checked: true
},
{
title: '地铁站点',
tipEvent: 'subway',
checked: true
},
{
title: '微型消防站',
tipEvent: 'micfire',
checked: true
},
]
},
] ]
} }
}, },
methods: {
handleChange(data) {
if (data.length < 0) return
const result = data.map((item) => {
if (item.tipEvent) {
return item.tipEvent
} else {
return ''
}
})
this.$emit('point', result)
},
},
} }
</script> </script>
...@@ -38,7 +113,6 @@ export default { ...@@ -38,7 +113,6 @@ export default {
bottom .1rem bottom .1rem
transition right .5s ease-in-out transition right .5s ease-in-out
z-index 999 z-index 999
font-weight normal !important
&.isFull &.isFull
right .05rem right .05rem
img img
......
<template> <template>
<div class="map-tips" :class="{isFull}"> <div class="map-tips" :class="{isFull}">
<p>标识说明</p> <p>
<img src="@/assets/images/map1.png"/>
标识说明
</p>
<!-- <div v-if="theme === '智慧养老'"> <!-- <div v-if="theme === '智慧养老'">
<div> <div>
<p v-for="tip in olds1" :key="tip.name"> <p v-for="tip in olds1" :key="tip.name">
...@@ -150,13 +153,26 @@ export default { ...@@ -150,13 +153,26 @@ export default {
bottom .1rem bottom .1rem
transition right .5s ease-in-out transition right .5s ease-in-out
z-index 999 z-index 999
font-weight normal !important transform translateY(93%)
transition transform .3s ease-in-out
background $section-bg
$blur(0.02rem)
padding .05rem .08rem
border-radius .03rem
&:hover
transform translateY(0)
&.isFull &.isFull
right .4rem right .4rem
>p >p
font-size .12rem font-size .12rem
font-weight bold font-weight bold
margin-bottom .05rem margin-bottom .05rem
display flex
align-items center
>img
width .15rem
height @width
margin-right .05rem
>div >div
display flex display flex
>div >div
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div class="info"> <div class="info">
<div v-for="item in convenient" :key="item.name"> <div v-for="item in convenient" :key="item.name">
<p>{{item.name}}</p> <p>{{item.name}}</p>
<m-count class="count" :value="item.value" /> <span class="unit"></span> <m-count class="count" :value="item.value" /> <span class="unit"></span>
</div> </div>
</div> </div>
</m-card> </m-card>
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
<m-count class="count" :value="item.value" /> <span class="unit"></span> <m-count class="count" :value="item.value" /> <span class="unit"></span>
</div> </div>
</div> </div>
<Carousel v-model="photo" loop autoplay> <Carousel loop autoplay>
<CarouselItem v-for="photo in photos" :key="photo"> <CarouselItem v-for="(photo, i) in photos" :key="i">
<div class="photo-wrapper"> <div class="photo-wrapper">
<div class="photo" :style="`background-image:url(${require('@/assets/images/'+ photo[0])})`" /> <div class="photo" :style="`background-image:url(${require('@/assets/images/'+ photo[0])})`" />
<div class="photo" :style="`background-image:url(${require('@/assets/images/'+ photo[1])})`" /> <div class="photo" :style="`background-image:url(${require('@/assets/images/'+ photo[1])})`" />
...@@ -85,20 +85,19 @@ export default { ...@@ -85,20 +85,19 @@ export default {
}, },
data() { data() {
return { return {
photo: 1,
photos: [ photos: [
['photo1.jpg', 'photo2.jpg'], // ['photo1.jpg', 'photo2.jpg'],
['photo3.jpg', 'photo4.jpg'], // ['photo3.jpg', 'photo4.jpg'],
['photo5.jpg', 'photo6.jpg'], // ['photo5.jpg', 'photo6.jpg'],
['photo7.jpg', 'photo8.jpg'], ['photo7.jpg', 'photo8.jpg'],
['photo9.jpg', 'photo10.jpg'], ['photo9.jpg', 'photo10.jpg'],
['photo11.jpg', 'photo12.jpg'], ['photo11.jpg', 'photo12.jpg'],
['photo13.jpg', 'photo14.jpg'], ['photo13.jpg', 'photo14.jpg'],
], ],
beauty: [ beauty: [
{name: '2018年完成数', value: 12, key: 2018}, {name: '2018年', value: 12, key: 2018},
{name: '2019年完成数', value: 8, key: 2019}, {name: '2019年', value: 8, key: 2019},
{name: '2020年完成数', value: 2, key: 2020}, {name: '2020年', value: 2, key: 2020},
], ],
convenient: [ convenient: [
{name: '便利店', value: 6}, {name: '便利店', value: 6},
......
...@@ -18,6 +18,18 @@ ...@@ -18,6 +18,18 @@
<p class="title">居民区</p> <p class="title">居民区</p>
<m-brief v-for="item in committee" :key="item.label" :label="item.label">{{item.content}}</m-brief> <m-brief v-for="item in committee" :key="item.label" :label="item.label">{{item.content}}</m-brief>
</div> </div>
<div>
<p class="title">区域化单位</p>
<div class="flex-box">
<p v-for="item in area" :key="item">{{item}}</p>
</div>
</div>
<div>
<p class="title">社会力量</p>
<div class="flex-box">
<p v-for="item in social" :key="item">{{item}}</p>
</div>
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -29,9 +41,9 @@ export default { ...@@ -29,9 +41,9 @@ export default {
return { return {
departs: [ departs: [
{label: '派出所', content: '朱洪元(副所长)、于冰(警长) 警力25人'}, {label: '派出所', content: '朱洪元(副所长)、于冰(警长) 警力25人'},
{label: '市场', content: '王绍良、陈蕾、张敏'}, {label: '市场', content: '王绍良、陈蕾、张敏'},
{label: '城管中队', content: '尤懿(副队长)、城管队员8人'}, {label: '城管中队', content: '尤懿(副队长)、城管队员8人'},
{label: '网格中心', content: '许俊'}, {label: '网格中心', content: '顾蓉蓉'},
{label: '绿化市容所', content: '殷文、张沁园'}, {label: '绿化市容所', content: '殷文、张沁园'},
{label: '房管办', content: '车姝敏、杨姝敏'}, {label: '房管办', content: '车姝敏、杨姝敏'},
{label: '党建联络员', content: '方雅婷、秦雯、郭强'}, {label: '党建联络员', content: '方雅婷、秦雯、郭强'},
...@@ -51,6 +63,19 @@ export default { ...@@ -51,6 +63,19 @@ export default {
{label: '振兴居委', content: '李苏爱(主任)'}, {label: '振兴居委', content: '李苏爱(主任)'},
{label: '均乐居委', content: '顾怡(书记) 陈慧仪(主任)'}, {label: '均乐居委', content: '顾怡(书记) 陈慧仪(主任)'},
], ],
area: [
'上海市统计局',
'国家统计局上海市城调队',
'市政府发展研究中心',
'长征医院',
'上海博物馆',
'轨交人民广场站',
],
social: [
'新社会阶层联谊会',
'商居睦邻会',
'食品联盟',
],
} }
}, },
} }
...@@ -62,16 +87,28 @@ export default { ...@@ -62,16 +87,28 @@ export default {
height 100% height 100%
.wrapper .wrapper
width 100% width 100%
height 3rem height 5rem
display flex display flex
flex-direction column flex-direction column
align-items space-around align-items space-around
flex-wrap wrap flex-wrap wrap
>div >div
width 49% width 49%
>div
margin-bottom .04rem
.title .title
font-size .12rem font-size .12rem
color $color-blue color $color-blue
border-bottom .01rem solid $cardBorder border-bottom .01rem solid $color-map()
padding .03rem 0
margin-bottom .05rem
.flex-box
display flex
flex-wrap wrap
>p
text-align center
background rgba(71,179,255,.1)
width 48%
margin .025rem
padding .05rem 0 padding .05rem 0
</style> </style>
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment