Skip to content

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

更新

parent 2a2be64a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 49 deletions
dist/index.html
View file @ e0e08e97
<!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.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> }</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>
\ No newline at end of file \ No newline at end of file
dist/static/css/app.0b27d6fd5335da3b41b7e332bc1f8c47.css 0 → 100644
View file @ e0e08e97
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.0b27d6fd5335da3b41b7e332bc1f8c47.css.map 0 → 100644
View file @ e0e08e97
This diff is collapsed.
dist/static/css/app.2650c57147eb8e9c240976623561077c.css deleted 100644 → 0
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.07285486a6a3eabf30ce.js 0 → 100644
View file @ e0e08e97
This diff is collapsed.
dist/static/js/0.07285486a6a3eabf30ce.js.map 0 → 100644
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.4eec49971b357d354e79.js deleted 100644 → 0
View file @ 2a2be64a
This diff is collapsed.
dist/static/js/0.4eec49971b357d354e79.js.map deleted 100644 → 0
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 deleted 100644 → 0
View file @ 2a2be64a
This diff is collapsed.
dist/static/js/app.6210d8da2b542d0ace3d.js.map deleted 100644 → 0
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.84d3824e5677bc669428.js 0 → 100644
View file @ e0e08e97
This diff is collapsed.
dist/static/js/app.84d3824e5677bc669428.js.map 0 → 100644
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.8e1d5dd11233834019da.js → dist/static/js/manifest.7431c3063c9644c91b2c.js
View file @ e0e08e97
!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}}([]); !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}}([]);
//# sourceMappingURL=manifest.8e1d5dd11233834019da.js.map //# sourceMappingURL=manifest.7431c3063c9644c91b2c.js.map
\ No newline at end of file \ No newline at end of file
src/components/MonitorDrawer/monitor-drawer.vue
View file @ e0e08e97
...@@ -44,7 +44,7 @@ export default { ...@@ -44,7 +44,7 @@ export default {
z-index 1000 z-index 1000
width 23.8vw width 23.8vw
padding 1rem 0 padding 1rem 0
background $color-map(0.1) background $cardBg
color #ccc color #ccc
.content .content
height 100% height 100%
......
src/store/actions.js
View file @ e0e08e97
...@@ -5,7 +5,7 @@ export default { ...@@ -5,7 +5,7 @@ export default {
GET_THEME_LIST({commit}, data = {}) { GET_THEME_LIST({commit}, data = {}) {
ajax.post({ ajax.post({
url: api.POST_THEME_LIST, url: api.POST_THEME_LIST,
params: data, params: {pageNo: 1, pageSize: 10000, ...data},
showLoading: false, showLoading: false,
}).then(res => { }).then(res => {
commit('SET_THEME_LIST', common.confirm(res, 'data.content', [])) commit('SET_THEME_LIST', common.confirm(res, 'data.content', []))
......
src/views/components/community-list.vue
View file @ e0e08e97
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
@click="handleClick(item)" @click="handleClick(item)"
> >
<div class="dot" /> <div class="dot" />
<b :title="item.COMMUNITYNAME">{{item.COMMUNITYNAME | check}}</b> <b :title="item.COMMUNITYNAME">{{item.COMMUNITYNAME}}</b>
</div> </div>
</template> </template>
<template v-else> <template v-else>
...@@ -50,15 +50,6 @@ export default { ...@@ -50,15 +50,6 @@ export default {
this.curCommunity = null this.curCommunity = null
} }
}, },
filters: {
check(val) {
if (val && val.length > 7) {
return ([].slice.call(val, 0, 7)).join('') + '...'
} else {
return val
}
},
}
} }
</script> </script>
...@@ -84,6 +75,12 @@ export default { ...@@ -84,6 +75,12 @@ export default {
height 3rem height 3rem
margin 0 0.3rem margin 0 0.3rem
cursor pointer cursor pointer
b
display inline-block
flex 1
overflow hidden
white-space nowrap
text-overflow ellipsis
&.row-even &.row-even
background rgba(0,0,0,0.2) background rgba(0,0,0,0.2)
.dot .dot
......
src/views/components/theme-list.vue
View file @ e0e08e97
...@@ -48,15 +48,6 @@ export default { ...@@ -48,15 +48,6 @@ export default {
this.curId = null this.curId = null
}, },
}, },
// filters: {
// check(val) {
// if (val && val.length > 13) {
// return ([].slice.call(val, 0, 13)).join('') + '...'
// } else {
// return val
// }
// },
// }
} }
</script> </script>
......
src/views/main.vue
View file @ e0e08e97
...@@ -224,15 +224,15 @@ export default { ...@@ -224,15 +224,15 @@ export default {
}, },
}, },
methods: { methods: {
initData(themeId = null, startDate = '2020-01-07 00:00:00', endDate) { initData(themeId = null, startDate, endDate) {
let today = this.$moment().format('YYYYMMDD') let today = this.$moment().format('YYYYMMDD')
if(this.$route.query.date) { if(this.$route.query.date) {
today = this.$moment(this.$route.query.date).format('YYYYMMDD') today = this.$moment(this.$route.query.date).format('YYYYMMDD')
} }
const defaultDay = this.$moment().format('YYYY-MM-DD HH:MM:SS') // 检查人员列表默认开始、结束时间 const defaultDay = this.$moment().format('YYYY-MM-DD') // 检查人员列表默认开始、结束时间
const communityParams = {someday: today} const communityParams = {someday: today}
// const personParams = {startDate: defaultDay, endDate: defaultDay} // const personParams = {startDate: defaultDay, endDate: defaultDay}
const personParams = {startDate: startDate || defaultDay, endDate: endDate || defaultDay} const personParams = {startDate: startDate || `${defaultDay} 00:00:00`, endDate: endDate || `${defaultDay} 24:00:00`}
if (themeId) { if (themeId) {
communityParams.taskId = themeId communityParams.taskId = themeId
personParams.taskId = themeId personParams.taskId = themeId
...@@ -349,10 +349,9 @@ export default { ...@@ -349,10 +349,9 @@ export default {
handlePersonSelect(data) { handlePersonSelect(data) {
this.removeGifPoint('selected-point') this.removeGifPoint('selected-point')
this.removeGifPoint('path-points') 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, 10) this.gotoPosition(X, Y, 10)
this.addGifPoint({name: 'selected-point', key: 'OPER_ID', data: data, icon: 'person1.png', size: 300})
// 获取人员详情 // 获取人员详情
this.$ajax.post({ this.$ajax.post({
url: this.$api.POST_PERSON_DETAIL, url: this.$api.POST_PERSON_DETAIL,
...@@ -398,13 +397,12 @@ export default { ...@@ -398,13 +397,12 @@ export default {
if (!Array.isArray(data)) { if (!Array.isArray(data)) {
data = [data] data = [data]
} }
this.gotoPosition(data[0].X, data[0].Y)
this.removeGifPoint('selected-point') this.removeGifPoint('selected-point')
this.removeGifPoint('path-points') this.removeGifPoint('path-points')
this.addGifPoint({name: 'selected-point', key: 'COMMUNITYID', labelKey: 'COMMUNITYNAME', data: data[0], icon: `${iconName}.png`}) this.addGifPoint({name: 'selected-point', key: 'COMMUNITYID', labelKey: 'COMMUNITYNAME', data: data[0], icon: `${iconName}.png`})
let location = []
this.$ajax.all(...data.map(item => { this.$ajax.all(...data.map(item => {
const {COMMUNITYID, CHECKID, X, Y} = item const {COMMUNITYID, CHECKID} = item
location = [X, Y]
return this.$ajax.post({ return this.$ajax.post({
url: this.$api.POST_COMMUNITY_DETAIL, url: this.$api.POST_COMMUNITY_DETAIL,
params: { params: {
...@@ -429,7 +427,6 @@ export default { ...@@ -429,7 +427,6 @@ export default {
this.communityData.push(communityData) this.communityData.push(communityData)
this.communityTableData.push(communityTableData) this.communityTableData.push(communityTableData)
}) })
this.gotoPosition(...location)
this.showCommunityModal = true this.showCommunityModal = true
}) })
}, },
......
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