Skip to content

W
wuye-monitor
Commit 60f1d667 authored by 郭铭瑶's avatar 郭铭瑶 🤘
Browse files
Options

更新

parent e0e08e97
Expand all Show whitespace changes
Inline Side-by-side
Showing with 101 additions and 23 deletions
dist/index.html
View file @ 60f1d667
<!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: 1.6vh; font-size: 1.6vh;
}</style><script src=./static/jquery.min.js></script><script type=text/javascript src=http://www.962121.net/gis_system/smimap/mapdebug/ShsmiGis.Bridge.js></script><link href=./static/css/app.0b27d6fd5335da3b41b7e332bc1f8c47.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.7431c3063c9644c91b2c.js></script><script type=text/javascript src=./static/js/vendor.dc1ed2d0549b6d6f959d.js></script><script type=text/javascript src=./static/js/app.84d3824e5677bc669428.js></script></body></html> }</style><script src=./static/jquery.min.js></script><script type=text/javascript src=http://www.962121.net/gis_system/smimap/mapdebug/ShsmiGis.Bridge.js></script><link href=./static/css/app.612480f99c35c5fb757373e095abdf5b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.2d51efcf4498b2dc7117.js></script><script type=text/javascript src=./static/js/vendor.c3fecf18c935a520466c.js></script><script type=text/javascript src=./static/js/app.080b43b49e0d528a9eac.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/css/app.612480f99c35c5fb757373e095abdf5b.css.map 0 → 100644
View file @ 60f1d667
This diff is collapsed.
dist/static/js/0.07285486a6a3eabf30ce.js.map deleted 100644 → 0
View file @ e0e08e97
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.07285486a6a3eabf30ce.js → dist/static/js/0.803668ec8b04c1220e89.js
View file @ 60f1d667
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.803668ec8b04c1220e89.js.map 0 → 100644
View file @ 60f1d667
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.080b43b49e0d528a9eac.js.map 0 → 100644
View file @ 60f1d667
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.84d3824e5677bc669428.js.map deleted 100644 → 0
View file @ e0e08e97
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.7431c3063c9644c91b2c.js → dist/static/js/manifest.2d51efcf4498b2dc7117.js
View file @ 60f1d667
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(n&&n(r,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=o(o.s=c[s]);return f};var r={},t={3:0};function o(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,o),t.l=!0,t.exports}o.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,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"07285486a6a3eabf30ce"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]); !function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,i){for(var u,a,f,s=0,l=[];s<r.length;s++)a=r[s],t[a]&&l.push(t[a][0]),t[a]=0;for(u in c)Object.prototype.hasOwnProperty.call(c,u)&&(e[u]=c[u]);for(n&&n(r,c,i);l.length;)l.shift()();if(i)for(s=0;s<i.length;s++)f=o(o.s=i[s]);return f};var r={},t={3:0};function o(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,o),t.l=!0,t.exports}o.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,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,o.nc&&i.setAttribute("nonce",o.nc),i.src=o.p+"static/js/"+e+"."+{0:"803668ec8b04c1220e89"}[e]+".js";var u=setTimeout(a,12e4);function a(){i.onerror=i.onload=null,clearTimeout(u);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return i.onerror=i.onload=a,c.appendChild(i),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.7431c3063c9644c91b2c.js.map //# sourceMappingURL=manifest.2d51efcf4498b2dc7117.js.map
\ No newline at end of file \ No newline at end of file
dist/static/js/vendor.c3fecf18c935a520466c.js.map 0 → 100644
View file @ 60f1d667
This diff is collapsed.
dist/static/js/vendor.dc1ed2d0549b6d6f959d.js.map deleted 100644 → 0
View file @ e0e08e97
This diff is collapsed.
src/store/actions.js
View file @ 60f1d667
...@@ -18,6 +18,7 @@ export default { ...@@ -18,6 +18,7 @@ export default {
showLoading: false, showLoading: false,
}).then(res => { }).then(res => {
const checkedData = common.confirm(res, 'data.content', []) const checkedData = common.confirm(res, 'data.content', [])
commit('SET_ORIGIN_CHECKED_LIST', JSON.parse(JSON.stringify(checkedData)))
ajax.post({ ajax.post({
url: api.POST_COMMUNITY_LIST, url: api.POST_COMMUNITY_LIST,
params: {isPublish: 1, pageNo: 1, pageSize: 10000, ...data}, params: {isPublish: 1, pageNo: 1, pageSize: 10000, ...data},
......
src/store/mutations.js
View file @ 60f1d667
...@@ -10,12 +10,15 @@ export default { ...@@ -10,12 +10,15 @@ export default {
state.personList = data state.personList = data
state.situation[1].count = data.length state.situation[1].count = data.length
}, },
SET_ORIGIN_CHECKED_LIST(state, data) {
state.originCheckedList = data
},
SET_CHECKED_LIST(state, data) { SET_CHECKED_LIST(state, data) {
state.checkedCommunityList = data state.checkedList = data
state.situation[2].count = data.length state.situation[2].count = data.length
}, },
SET_RECTIFY_LIST(state, data) { SET_RECTIFY_LIST(state, data) {
state.rectifyCommunityList = data state.rectifyList = data
state.situation[3].count = data.length state.situation[3].count = data.length
}, },
} }
src/store/state.js
View file @ 60f1d667
export default { export default {
showLoading: false, showLoading: false,
themeList: [], themeList: [],
checkedCommunityList: [], originCheckedList: [],
rectifyCommunityList: [], checkedList: [],
rectifyList: [],
personList: [], personList: [],
situation: [ situation: [
{ {
......
src/views/components/map-operate-top.vue
View file @ 60f1d667
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<img class="top-right" src="@/assets/images/top-right.png" draggable="false"/> <img class="top-right" src="@/assets/images/top-right.png" draggable="false"/>
<div class="map-menu"> <div class="map-menu">
<img class="menu-btn" src="@/assets/images/list-btn.png" draggable="false"/> <img class="menu-btn" src="@/assets/images/list-btn.png" draggable="false"/>
<div class="menu"> <!-- <div class="menu">
<div <div
v-for="item in mapTypes" v-for="item in mapTypes"
:key="item" :key="item"
...@@ -14,6 +14,17 @@ ...@@ -14,6 +14,17 @@
> >
{{item}} {{item}}
</div> </div>
</div> -->
<div class="point-menu">
<div
v-for="item in points"
:key="item.key"
:class="`${curPoints.indexOf(item.key) >= 0 ? 'on' : ''}`"
@click="choicePoint(item.key)"
>
<input type="checkbox" :checked="curPoints.indexOf(item.key) >= 0"/>
<b>{{item.name}}</b>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -27,12 +38,30 @@ export default { ...@@ -27,12 +38,30 @@ export default {
return { return {
mapTypes: ['暗色地图', '政务地图', '航空影像', '2.5维地图', '简易地形图'], mapTypes: ['暗色地图', '政务地图', '航空影像', '2.5维地图', '简易地形图'],
curMapType: '暗色地图', curMapType: '暗色地图',
points: [
{key: 'person', name: '检查人员'},
{key: 'checked', name: '完成检查小区'},
{key: 'rectify', name: '开具整改单小区'},
],
curPoints: ['person', 'checked', 'rectify'],
} }
}, },
methods: { methods: {
choiceMapType(type) { choiceMapType(type) {
this.curMapType = type this.curMapType = type
}, },
choicePoint(key) {
const index = this.curPoints.findIndex(el => el == key)
if (index >= 0) {
this.curPoints.splice(index, 1)
} else {
this.curPoints.push(key)
}
this.$emit('select', this.curPoints)
},
resetPoint() {
this.curPoints = ['person', 'checked', 'rectify']
},
} }
} }
</script> </script>
...@@ -57,6 +86,8 @@ $theme-selected() ...@@ -57,6 +86,8 @@ $theme-selected()
&:hover &:hover
>.menu >.menu
display block display block
>.point-menu
display block
.menu-btn .menu-btn
width 2rem width 2rem
cursor pointer cursor pointer
...@@ -83,6 +114,27 @@ $theme-selected() ...@@ -83,6 +114,27 @@ $theme-selected()
&.on &.on
background $color-map() background $color-map()
color $edgeColor color $edgeColor
.point-menu
display none
position absolute
top 2rem
right 0
min-width 12rem
padding 0.5rem
border 0.1rem solid $color-map(0.5)
margin-top 0.5rem
background $color-map(0.2)
>div
display flex
align-items center
cursor pointer
color #ccc
line-height 2.4rem
&.on
color $edgeColor
input
margin 0 0.5rem
cursor pointer
>img >img
position absolute position absolute
width 18% width 18%
......
src/views/main.vue
View file @ 60f1d667
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<ThemeTitle class="title"> <ThemeTitle class="title">
物业督查实时专题图 物业督查实时专题图
</ThemeTitle> </ThemeTitle>
<MapOperateTop class="map-top" v-show="!fullScreen"/> <MapOperateTop @select="handlePointSelect" class="map-top" ref="mapTop" v-show="!fullScreen"/>
<MapOperateBottom @zoom="handleZoom" @fullscreen="handleFullscreen" @reset="handleReset" class="map-bottom"/> <MapOperateBottom @zoom="handleZoom" @fullscreen="handleFullscreen" @reset="handleReset" class="map-bottom"/>
<div class="box1" > <div class="box1" >
<m-card title="当日检查情况" v-show="!fullScreen" enter="fadeInLeft" leave="fadeOutLeft"> <m-card title="当日检查情况" v-show="!fullScreen" enter="fadeInLeft" leave="fadeOutLeft">
...@@ -214,10 +214,10 @@ export default { ...@@ -214,10 +214,10 @@ export default {
}, },
computed: { computed: {
checkedList() { checkedList() {
return this.$store.state.checkedCommunityList return this.$store.state.checkedList
}, },
rectifyList() { rectifyList() {
return this.$store.state.rectifyCommunityList return this.$store.state.rectifyList
}, },
showDrawer() { showDrawer() {
return this.showPersonModal || this.showCommunityModal return this.showPersonModal || this.showCommunityModal
...@@ -439,6 +439,7 @@ export default { ...@@ -439,6 +439,7 @@ export default {
this.curTab = 0 this.curTab = 0
}, },
handleThemeSelect(TASK_ID, {START_DATE, END_DATE}) { handleThemeSelect(TASK_ID, {START_DATE, END_DATE}) {
this.$refs.mapTop.resetPoint()
this.clearPoints() this.clearPoints()
this.showCommunityModal = false this.showCommunityModal = false
this.showPersonModal = false this.showPersonModal = false
...@@ -470,16 +471,32 @@ export default { ...@@ -470,16 +471,32 @@ export default {
this.$refs.theme.reset() this.$refs.theme.reset()
this.clearPoints() this.clearPoints()
this.initData() this.initData()
this.gotoPosition(1, 1, 2) this.gotoPosition(1, 1, 3)
},
handlePointSelect(types) {
this.closeCommunityModal()
this.closePersonModal()
this.clearPoints()
if (types.indexOf('checked') >= 0 && types.indexOf('rectify') >= 0) {
this.addPoint({name: 'checked-points', key: 'COMMUNITYID', data: this.$store.state.checkedList, icon: 'blue.png'})
} else if (types.indexOf('checked') >= 0 && types.indexOf('rectify') < 0) {
this.addPoint({name: 'checked-points', key: 'COMMUNITYID', data: this.$store.state.originCheckedList, icon: 'blue.png'})
} else if (types.indexOf('checked') < 0 && types.indexOf('rectify') >= 0) {
this.addPoint({name:'rectify-points', key: 'COMMUNITYID', data: this.$store.state.rectifyList, icon: 'red.png'})
}
if (types.indexOf('person') >= 0) {
this.addPoint({name:'person-points', key: 'OPER_ID', labelKey: 'TE_NAME', data: this.$store.state.personList, icon: 'person1.png', size: 30})
}
this.gotoPosition(1, 1, 3)
}, },
}, },
watch: { watch: {
'$store.state.checkedCommunityList': { '$store.state.checkedList': {
handler(cur, past) { handler(cur, past) {
this.addPoint({name: 'checked-points', key: 'COMMUNITYID', data: cur, icon: 'blue.png'}) this.addPoint({name: 'checked-points', key: 'COMMUNITYID', data: cur, icon: 'blue.png'})
} }
}, },
// '$store.state.rectifyCommunityList': { // '$store.state.rectifyList': {
// handler(cur, past) { // handler(cur, past) {
// this.addPoint({name:'rectify-points', key: 'COMMUNITYID', data: cur, icon: 'red.png'}) // this.addPoint({name:'rectify-points', key: 'COMMUNITYID', data: cur, icon: 'red.png'})
// } // }
......
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