Skip to content

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

更新

parent 550f97f6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 27 deletions
dist/index.html
View file @ 2a2be64a
<!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.aec136f25a6d15eb6a79ddb3ba240bc6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.cb7e472fd5cd83264a41.js></script><script type=text/javascript src=./static/js/vendor.dc1ed2d0549b6d6f959d.js></script><script type=text/javascript src=./static/js/app.afc780c9c9da483a6739.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.2650c57147eb8e9c240976623561077c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.8e1d5dd11233834019da.js></script><script type=text/javascript src=./static/js/vendor.dc1ed2d0549b6d6f959d.js></script><script type=text/javascript src=./static/js/app.6210d8da2b542d0ace3d.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/0.1dc5c050e1ed64617ca6.js.map deleted 100644 → 0
View file @ 550f97f6
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.1dc5c050e1ed64617ca6.js → dist/static/js/0.4eec49971b357d354e79.js
View file @ 2a2be64a
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.4eec49971b357d354e79.js.map 0 → 100644
View file @ 2a2be64a
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.6210d8da2b542d0ace3d.js.map 0 → 100644
View file @ 2a2be64a
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.afc780c9c9da483a6739.js.map deleted 100644 → 0
View file @ 550f97f6
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.cb7e472fd5cd83264a41.js → dist/static/js/manifest.8e1d5dd11233834019da.js
View file @ 2a2be64a
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){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 c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[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],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"1dc5c050e1ed64617ca6"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),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:"4eec49971b357d354e79"}[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.cb7e472fd5cd83264a41.js.map //# sourceMappingURL=manifest.8e1d5dd11233834019da.js.map
\ No newline at end of file \ No newline at end of file
src/store/actions.js
View file @ 2a2be64a
...@@ -14,13 +14,13 @@ export default { ...@@ -14,13 +14,13 @@ export default {
GET_COMMUNITY_LIST({commit}, data = {}) { GET_COMMUNITY_LIST({commit}, data = {}) {
ajax.post({ ajax.post({
url: api.POST_COMMUNITY_LIST, url: api.POST_COMMUNITY_LIST,
params: {isPublish: 0, ...data}, params: {isPublish: 0, pageNo: 1, pageSize: 10000, ...data},
showLoading: false, showLoading: false,
}).then(res => { }).then(res => {
const checkedData = common.confirm(res, 'data.content', []) const checkedData = common.confirm(res, 'data.content', [])
ajax.post({ ajax.post({
url: api.POST_COMMUNITY_LIST, url: api.POST_COMMUNITY_LIST,
params: {isPublish: 1, ...data}, params: {isPublish: 1, pageNo: 1, pageSize: 10000, ...data},
showLoading: false, showLoading: false,
}).then(res => { }).then(res => {
const rectifyData = common.confirm(res, 'data.content', []) const rectifyData = common.confirm(res, 'data.content', [])
......
src/util/common.js
View file @ 2a2be64a
...@@ -106,7 +106,8 @@ export default { ...@@ -106,7 +106,8 @@ export default {
labelsymbol: { labelsymbol: {
symbol: { symbol: {
type: 'text', type: 'text',
color: '#00f2ff', color: '#47B3FF',
// color: '#00f2ff',
haloSize: 0, haloSize: 0,
haloColor: 'white', haloColor: 'white',
}, },
......
src/views/main.vue
View file @ 2a2be64a
...@@ -300,7 +300,7 @@ export default { ...@@ -300,7 +300,7 @@ export default {
}) })
}) })
}, },
addGifPoint({name, data, labelKey, icon, size = 200}) { addGifPoint({name, data, labelKey, icon, size = 200, color = '#00FFFF'}) {
if(!this.map) return if(!this.map) return
if (!Array.isArray(data)) { if (!Array.isArray(data)) {
data = [data] data = [data]
...@@ -313,7 +313,7 @@ export default { ...@@ -313,7 +313,7 @@ export default {
name: labelKey ? item[labelKey] : null, name: labelKey ? item[labelKey] : null,
value: size, value: size,
corrd: [item.X, item.Y], corrd: [item.X, item.Y],
color: '#00FFFF', color: color,
} }
}), }),
symbol: icon ? ('image://' + this.$api.MAP_ICON_BASE + icon) : 'circle', symbol: icon ? ('image://' + this.$api.MAP_ICON_BASE + icon) : 'circle',
...@@ -348,9 +348,11 @@ export default { ...@@ -348,9 +348,11 @@ export default {
}, },
handlePersonSelect(data) { handlePersonSelect(data) {
this.removeGifPoint('selected-point') this.removeGifPoint('selected-point')
this.addGifPoint({name: 'selected-point', key: 'OPER_ID', data: data, icon: 'person-bg2.png', size: 250}) this.removeGifPoint('path-points')
this.addGifPoint({name: 'selected-point', key: 'OPER_ID', data: data, icon: 'person1.png', size: 300})
const {OPER_ID, TASK_ID, X, Y} = data const {OPER_ID, TASK_ID, X, Y} = data
this.gotoPosition(X, Y, 8) this.gotoPosition(X, Y, 10)
// 获取人员详情 // 获取人员详情
this.$ajax.post({ this.$ajax.post({
url: this.$api.POST_PERSON_DETAIL, url: this.$api.POST_PERSON_DETAIL,
...@@ -364,7 +366,6 @@ export default { ...@@ -364,7 +366,6 @@ export default {
}) })
// 获取人员轨迹 // 获取人员轨迹
const today = this.$moment().format('YYYY-MM-DD') const today = this.$moment().format('YYYY-MM-DD')
this.removeGifPoint('path-points')
this.$ajax.post({ this.$ajax.post({
url: this.$api.POST_PERSON_PATH, url: this.$api.POST_PERSON_PATH,
params: { params: {
...@@ -382,7 +383,7 @@ export default { ...@@ -382,7 +383,7 @@ export default {
Y: item.y, Y: item.y,
} }
}) })
this.addGifPoint({name: 'path-points', key: 'index', data: pathData, size: 50}) this.addGifPoint({name: 'path-points', key: 'index', data: pathData, size: 60, color: '#82DF12'})
}) })
}, },
closePersonModal() { closePersonModal() {
...@@ -423,7 +424,7 @@ export default { ...@@ -423,7 +424,7 @@ export default {
} }
}) })
communityData.TE_NAME = (followers.length > 0 && followers.join(',')) || '无' communityData.TE_NAME = (followers.length > 0 && followers.join(',')) || '无'
communityData.IS_PUBLISH = this.communityData.IS_PUBLISH == '1' ? '是' : '否' communityData.IS_PUBLISH = communityData.IS_PUBLISH == '1' ? '是' : '否'
const communityTableData = this.$com.confirm(item, 'data.content.indexList', []) const communityTableData = this.$com.confirm(item, 'data.content.indexList', [])
this.communityData.push(communityData) this.communityData.push(communityData)
this.communityTableData.push(communityTableData) this.communityTableData.push(communityTableData)
...@@ -434,15 +435,14 @@ export default { ...@@ -434,15 +435,14 @@ export default {
}, },
closeCommunityModal() { closeCommunityModal() {
this.removeGifPoint('selected-point') this.removeGifPoint('selected-point')
this.removeGifPoint('path-points')
this.$refs.community.reset() this.$refs.community.reset()
this.$refs.community2.reset() this.$refs.community2.reset()
this.showCommunityModal = false this.showCommunityModal = false
this.curTab = 0 this.curTab = 0
}, },
handleThemeSelect(TASK_ID, {START_DATE, END_DATE}) { handleThemeSelect(TASK_ID, {START_DATE, END_DATE}) {
this.removeGifPoint('selected-point') this.clearPoints()
this.removePoint('checked-points')
this.removePoint('rectify-points')
this.showCommunityModal = false this.showCommunityModal = false
this.showPersonModal = false this.showPersonModal = false
// TODO START_DATE, END_DATE看获取检查人列表是否需要用到 // TODO START_DATE, END_DATE看获取检查人列表是否需要用到
...@@ -460,15 +460,18 @@ export default { ...@@ -460,15 +460,18 @@ export default {
} }
}) })
}, },
handleReset() { clearPoints() {
this.closeCommunityModal()
this.closePersonModal()
this.$refs.theme.reset()
this.removeGifPoint('selected-point') this.removeGifPoint('selected-point')
this.removeGifPoint('path-points') this.removeGifPoint('path-points')
this.removePoint('checked-points') this.removePoint('checked-points')
this.removePoint('rectify-points') this.removePoint('rectify-points')
this.removePoint('person-points') this.removePoint('person-points')
},
handleReset() {
this.closeCommunityModal()
this.closePersonModal()
this.$refs.theme.reset()
this.clearPoints()
this.initData() this.initData()
this.gotoPosition(1, 1, 2) this.gotoPosition(1, 1, 2)
}, },
...@@ -486,7 +489,7 @@ export default { ...@@ -486,7 +489,7 @@ export default {
// }, // },
'$store.state.personList': { '$store.state.personList': {
handler(cur, past) { handler(cur, past) {
this.addPoint({name:'person-points', key: 'OPER_ID', labelKey: 'TE_NAME', data: cur, icon: 'person-bg2.png', size: 30}) this.addPoint({name:'person-points', key: 'OPER_ID', labelKey: 'TE_NAME', data: cur, icon: 'person1.png', size: 30})
} }
}, },
} }
......
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