Skip to content

W
wisdom-property
Commit 0accc305 authored by 郭铭瑶's avatar 郭铭瑶 🤘
Browse files
Options

智能发现场景点击事件分离

parent 02674a51
Expand all Show whitespace changes
Inline Side-by-side
Showing with 102 additions and 121 deletions
dist/index.html
View file @ 0accc305
<!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;
}</style><script src=./static/jquery.min.js></script><link href=./static/css/app.dde60779af67a84809f483e0529be80a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.d848d643d823f3f679b7.js></script><script type=text/javascript src=./static/js/vendor.d11eae825e5c4a0e0bb2.js></script><script type=text/javascript src=./static/js/app.e159accde558377c35e6.js></script></body></html>
\ No newline at end of file
}</style><script src=./static/jquery.min.js></script><link href=./static/css/app.9c0eaf2277f75cc4f5150819c0ebacef.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.26429f5c3ad800f27832.js></script><script type=text/javascript src=./static/js/vendor.d11eae825e5c4a0e0bb2.js></script><script type=text/javascript src=./static/js/app.5fec3beb6cdfea06ae97.js></script></body></html>
\ No newline at end of file
dist/static/css/app.9c0eaf2277f75cc4f5150819c0ebacef.css.map 0 → 100644
View file @ 0accc305
This diff is collapsed.
dist/static/js/0.68a7eb4d1ee6c9d42323.js.map 0 → 100644
View file @ 0accc305
This diff is collapsed.
dist/static/js/0.9b243be4ae27c7d15cf0.js.map deleted 100644 → 0
View file @ 02674a51
This diff is collapsed.
dist/static/js/2.024b277ce39d339e3a6e.js deleted 100644 → 0
View file @ 02674a51
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.024b277ce39d339e3a6e.js.map deleted 100644 → 0
View file @ 02674a51
This diff is collapsed.
dist/static/js/2.ddc887f3d5deca2d5116.js 0 → 100644
View file @ 0accc305
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.ddc887f3d5deca2d5116.js.map 0 → 100644
View file @ 0accc305
This diff is collapsed.
dist/static/js/4.154382b606f901e9435b.js.map deleted 100644 → 0
View file @ 02674a51
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/4.fdc60db3ebf2654e4461.js.map 0 → 100644
View file @ 0accc305
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.5fec3beb6cdfea06ae97.js.map 0 → 100644
View file @ 0accc305
This diff is collapsed.
dist/static/js/app.e159accde558377c35e6.js.map deleted 100644 → 0
View file @ 02674a51
This diff is collapsed.
dist/static/js/manifest.d848d643d823f3f679b7.js → dist/static/js/manifest.26429f5c3ad800f27832.js
View file @ 0accc305
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,f){for(var o,b,d,i=0,u=[];i<r.length;i++)b=r[i],t[b]&&u.push(t[b][0]),t[b]=0;for(o in c)Object.prototype.hasOwnProperty.call(c,o)&&(e[o]=c[o]);for(n&&n(r,c,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=a(a.s=f[i]);return d};var r={},t={27: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],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,a.nc&&f.setAttribute("nonce",a.nc),f.src=a.p+"static/js/"+e+"."+{0:"9b243be4ae27c7d15cf0",1:"80f3e7aa96153395fe1b",2:"024b277ce39d339e3a6e",3:"858079b6f37c68e0f6a5",4:"154382b606f901e9435b",5:"79501cbfbec9e7ca1a2b",6:"151dc3ea26d64d8986cf",7:"ae0723e8fa6bf8aefb76",8:"5ad0f24b31031f7284b3",9:"fd7707babb1b38a1555a",10:"ab925f8bb0245e505ca6",11:"573ef14b9d19f5d8b630",12:"469c013fd842cd20882f",13:"16cbe0e33860ff72d492",14:"92a81e60880a6ae73756",15:"f0fdcca849fc839cdb19",16:"71b39e7f56791784419e",17:"12d3154154339a1bfdfd",18:"f2a6183255aeb9176721",19:"fe54e6ac48d20178b64b",20:"783e458e49d4f1c92bbb",23:"c49427055066dcb3d1ef",24:"f7914065b4d7bec4ccfb",25:"6b5f4749058978064562",26:"584ddfc7aad303eb351f"}[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,c.appendChild(f),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.d848d643d823f3f679b7.js.map
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,f,a){for(var o,d,b,i=0,u=[];i<r.length;i++)d=r[i],t[d]&&u.push(t[d][0]),t[d]=0;for(o in f)Object.prototype.hasOwnProperty.call(f,o)&&(e[o]=f[o]);for(n&&n(r,f,a);u.length;)u.shift()();if(a)for(i=0;i<a.length;i++)b=c(c.s=a[i]);return b};var r={},t={27: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 f=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.p+"static/js/"+e+"."+{0:"68a7eb4d1ee6c9d42323",1:"80f3e7aa96153395fe1b",2:"ddc887f3d5deca2d5116",3:"858079b6f37c68e0f6a5",4:"fdc60db3ebf2654e4461",5:"79501cbfbec9e7ca1a2b",6:"151dc3ea26d64d8986cf",7:"ae0723e8fa6bf8aefb76",8:"5ad0f24b31031f7284b3",9:"fd7707babb1b38a1555a",10:"ab925f8bb0245e505ca6",11:"573ef14b9d19f5d8b630",12:"469c013fd842cd20882f",13:"16cbe0e33860ff72d492",14:"92a81e60880a6ae73756",15:"f0fdcca849fc839cdb19",16:"71b39e7f56791784419e",17:"12d3154154339a1bfdfd",18:"f2a6183255aeb9176721",19:"fe54e6ac48d20178b64b",20:"783e458e49d4f1c92bbb",23:"c49427055066dcb3d1ef",24:"f7914065b4d7bec4ccfb",25:"6b5f4749058978064562",26:"584ddfc7aad303eb351f"}[e]+".js";var o=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(o);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=d,f.appendChild(a),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.26429f5c3ad800f27832.js.map
\ No newline at end of file
src/store/actions.js
View file @ 0accc305
......@@ -356,9 +356,10 @@ export default {
commit('SET_HANDLELIST', data)
})
},
setSensorList({commit}) {
setSensorList({commit}, params = {}) {
ajax.get({
url: api.GET_SENSOR,
params,
}).then(res => {
const sensorList = common.confirm(res, 'data.content', [])
sensorList.forEach(sensor => {
......
src/views/components/discovery.vue
View file @ 0accc305
......@@ -18,13 +18,12 @@
:class="`d-l-card ${data.key == key ? 'on' : ''}`"
v-for="data in $store.state.foundList"
:key="data.key"
@click="handleClick(data)"
>
<span class="title">
<span class="title" @click="handleSensorClick(data)">
<img :src="require(`@/assets/images/${data.img}`)" />
{{data.title}}
</span>
<span :style="+data.num !== 0 ? 'color:gold' : ''">{{data.num}}</span>
<span @click="handleSceneClick(data)" :style="+data.num !== 0 ? 'color:gold' : ''">{{data.num}}</span>
</div>
</div>
</div>
......@@ -47,22 +46,20 @@ export default {
this.$emit('summary', key)
},
handleCountClick(key) {
console.log('count', key)
if (key == 'total') return
this.$store.commit('SET_CURSCENE', 'all')
},
handleClick({key, num}) {
if (this.key == key) {
handleSensorClick({key}) {
this.$store.commit('SET_CURSCENE', null)
} else {
this.$store.dispatch('setSensorList', {type: key})
},
handleSceneClick({key}) {
this.$store.commit('SET_CURSCENE', key)
// if (num == '0') {
// const data = this.$store.state.handleList.find(item => item.types && (item.types == key))
// if (data) {
// this.$emit('select', data)
// }
// if (this.key == key) {
// this.$store.commit('SET_CURSCENE', null)
// } else {
// this.$store.commit('SET_CURSCENE', key)
// }
}
},
},
}
......@@ -89,7 +86,7 @@ export default {
display flex
justify-content space-between
align-items center
cursor pointer
// cursor pointer
&:hover
background-color rgba(0,0,0,0.7)
&.on
......@@ -99,6 +96,7 @@ export default {
color #fff
font-weight 700
font-size 1.2rem
cursor pointer
&.title
display flex
align-items center
......@@ -106,6 +104,8 @@ export default {
color #fff
font-size 1rem
font-weight normal
&:hover
color $color-blue
>img
width 1.25rem
height 1.25rem
......
src/views/linyi.vue
View file @ 0accc305
......@@ -40,7 +40,6 @@
</m-card>
<m-card v-show="complete" area="box5" title="智能发现" mode="4">
<Discovery
@select="(data) => {this.handleDetail = data;this.showHandleDetail = true;}"
@summary="handleDiscoverSummary"
/>
</m-card>
......@@ -114,7 +113,7 @@
<m-modal v-model="$store.state.discoverModal" @close="$store.commit('SET_DISCOVERMODAL', false)" title="传感器设备阀值设置" width="70%">
<m-table :layout="discoverModalLayout" :model="discoverModalList" />
</m-modal>
<m-modal v-model="discoverModal" title="智能发现清单" width="70%" offset="-23%">
<m-modal v-model="discoverModal" title="智能发现清单" width="70%" offset="-21%">
<m-table :layout="discoverLayout" :model="discoverList" clickable @row-click="(data) => {this.handleDetail = data;this.showHandleDetail = true;}"/>
</m-modal>
<m-modal v-model="showHandleDetail" title="联勤联动动态流程" width="60%">
......@@ -128,9 +127,9 @@
/>
</div>
</m-modal>
<!-- <m-modal v-model="showRepairDetail" title="投诉报修详情" width="70%">
<m-modal v-model="showRepairDetail" title="投诉报修详情" width="70%">
<m-form title="投诉报修信息" :label-width="6" :model="repairDetail" :layout="repairLayout"/>
</m-modal> -->
</m-modal>
<m-modal v-model="showCommand" title="指挥体系">
<m-table :layout="commandLayout" :model="commandList"/>
</m-modal>
......@@ -359,50 +358,50 @@ export default {
}
],
discoverList: [],
// showRepairDetail: false,
// repairLayout: [
// {
// street: {
// label: '街镇',
// width: 8,
// format: (val) => '南码头街道',
// },
// communityName: {
// label: '小区',
// width: 8,
// format: (val) => '临沂二村',
// },
// address: {
// label: '地址',
// width: 8,
// },
// },
// {
// troubleType: {
// label: '类型',
// width: 8,
// },
// reportContent: {
// label: '反映问题',
// width: 8,
// },
// status: {
// label: '状态',
// width: 8,
// },
// },
// {
// acceptTime: {
// label: '受理时间',
// width: 8,
// },
// feedBackDate: {
// label: '反馈时间',
// width: 8,
// },
// }
// ],
// repairDetail: [],
showRepairDetail: false,
repairLayout: [
{
street: {
label: '街镇',
width: 8,
format: (val) => '南码头街道',
},
communityName: {
label: '小区',
width: 8,
format: (val) => '临沂二村',
},
address: {
label: '地址',
width: 8,
},
},
{
troubleType: {
label: '类型',
width: 8,
},
reportContent: {
label: '反映问题',
width: 8,
},
status: {
label: '状态',
width: 8,
},
},
{
acceptTime: {
label: '受理时间',
width: 8,
},
feedBackDate: {
label: '反馈时间',
width: 8,
},
}
],
repairDetail: [],
showCommand: false,
commandLayout: [
{
......@@ -586,7 +585,7 @@ export default {
},
startTimer() {
this.addPoints()
// this.timer = setInterval(this.addPoints, 1000 * 60 * 3)
this.timer = setInterval(this.addPoints, 1000 * 60 * 3)
},
addBuildingIcon() {
this.$refs.map.removePoint('building')
......@@ -654,7 +653,6 @@ export default {
this.videoModal = true
},
addSensorPoints() {
this.$refs.map.removePoint('sensor')
if (this.openIcon && !this.curScene) {
this.setSensorList()
}
......@@ -700,6 +698,11 @@ export default {
})
}
},
clearPoints() {
const {map} = this.$refs
map.removePoint('sensor')
map.removePoint('discover')
},
...mapActions([
'initLinyiData',
'setDiscoverInfo',
......@@ -712,12 +715,8 @@ export default {
'$store.state.curRepair': {
handler(cur) {
const {map} = this.$refs
// map.removePoint('sensor')
// map.removePoint('discover')
if (!cur) {
// map.removePoint('repair')
map.focus(3706.690186, -4234.159912, 8.5)
// this.addSensorPoints()
return
}
this.$store.commit('SET_CURSCENE', null)
......@@ -727,17 +726,13 @@ export default {
const repairList = this.$com.confirm(res, 'data.content', [])
this.$store.commit('SET_REPAIRHANDLE', repairList)
this.handleRepairEvent(repairList)
// map.addPoint({name:'repair', key: 'id', size:25, data: repairList, icon: 'repair.png'})
// map.focus(3706.690186, -4234.159912, 8.5)
})
},
},
'$store.state.curScene': {
handler(cur) {
const {map} = this.$refs
map.removePoint('sensor')
map.removePoint('repair')
map.removePoint('discover')
this.clearPoints()
if (!cur) {
map.focus(3706.690186, -4234.159912, 8.5)
this.addSensorPoints()
......@@ -760,23 +755,16 @@ export default {
item.icon = 'discover-todo.png'
todoList.push(item)
}
// if (item.done_time) {
// item.icon = 'discover-done.png'
// } else {
// item.icon = 'discover-todo.png'
// }
// return item
})
setTimeout(() => {
// map.addPoint({name: 'discover', key: 'id', size: 25, data: result})
map.addPoint({name: 'discover', key: 'id', size: 25, data: [...doneList, ...todoList], icon: 'discover-done.png'})
// map.addPoint({name: 'discover', key: 'id', size: 25, data: todoList, icon: 'discover-todo.png',remove: false})
map.focus(3706.690186, -4234.159912, 8.5)
}, 1000)
}
},
'$store.state.sensorList': {
handler(cur) {
this.clearPoints()
this.$refs.map.addPoint({name: 'sensor', key: 'id', size: 25, data: cur, icon: 'no-warn.png'})
}
},
......
src/views/main.vue
View file @ 0accc305
......@@ -76,7 +76,6 @@
</m-card>
<m-card v-show="complete" area="box5" title="智能发现" mode="4">
<Discovery
@select="(data) => {this.handleDetail = data;this.showHandleDetail = true;}"
@summary="handleDiscoverSummary"
/>
</m-card>
......@@ -132,7 +131,7 @@
<m-modal v-model="$store.state.discoverModal" @close="$store.commit('SET_DISCOVERMODAL', false)" title="传感器设备阀值设置" width="70%">
<m-table :layout="discoverModalLayout" :model="discoverModalList" />
</m-modal>
<m-modal v-model="discoverModal" title="智能发现清单" width="70%" offset="-23%">
<m-modal v-model="discoverModal" title="智能发现清单" width="70%" offset="-21%">
<m-table :layout="discoverLayout" :model="discoverList" clickable @row-click="(data) => {this.handleDetail = data;this.showHandleDetail = true;}"/>
</m-modal>
<m-modal v-model="showHandleDetail" title="联勤联动动态流程" width="60%">
......@@ -497,7 +496,7 @@ export default {
},
startTimer() {
this.addPoints()
// this.timer = setInterval(this.addPoints, 1000 * 60 * 3)
this.timer = setInterval(this.addPoints, 1000 * 60 * 3)
},
addBuildingIcon() {
this.$refs.map.removePoint('building')
......@@ -590,7 +589,6 @@ export default {
this.addSensorPoints()
},
addSensorPoints() {
this.$refs.map.removePoint('sensor')
if (this.openIcon && !this.curScene) {
this.setSensorList()
}
......@@ -635,6 +633,11 @@ export default {
})
}
},
clearPoints() {
const {map} = this.$refs
map.removePoint('sensor')
map.removePoint('discover')
},
...mapActions([
'initNanmatouData',
'setDiscoverInfo',
......@@ -646,12 +649,8 @@ export default {
'$store.state.curRepair': {
handler(cur) {
const {map} = this.$refs
// map.removePoint('sensor')
// map.removePoint('discover')
if (!cur) {
// map.removePoint('repair')
map.focus(3706.690186, -4234.159912, 8.5)
// this.addSensorPoints()
return
}
this.$store.commit('SET_CURSCENE', null)
......@@ -661,17 +660,13 @@ export default {
const repairList = this.$com.confirm(res, 'data.content', [])
this.$store.commit('SET_REPAIRHANDLE', repairList)
this.handleRepairEvent(repairList)
// map.addPoint({name:'repair', key: 'id', size:25, data: repairList, icon: 'repair.png'})
// map.focus(3706.690186, -4234.159912, 8.5)
})
},
},
'$store.state.curScene': {
handler(cur) {
const {map} = this.$refs
map.removePoint('sensor')
map.removePoint('repair')
map.removePoint('discover')
this.clearPoints()
if (!cur) {
this.$refs.map.focus(4039.44281, -4712.403381, 6)
this.addSensorPoints()
......@@ -694,25 +689,16 @@ export default {
item.icon = 'discover-todo.png'
todoList.push(item)
}
// if (item.done_time) {
// item.icon = 'discover-done.png'
// } else {
// item.icon = 'discover-todo.png'
// }
// return item
})
console.log(doneList, todoList, handleList)
setTimeout(() => {
// map.addPoint({name: 'discover', key: 'id', size: 25, data: result})
map.addPoint({name: 'discover', key: 'id', size: 25, data: [...doneList, ...todoList], icon: 'discover-done.png'})
// map.addPoint({name: 'discover', key: 'id', size: 25, data: todoList, icon: 'discover-todo.png'})
map.focus(3706.690186, -4234.159912, 8.5)
}, 1000)
}
},
'$store.state.sensorList': {
handler(cur) {
this.clearPoints()
this.$refs.map.addPoint({name: 'sensor', key: 'id', size: 25, data: cur, icon: 'no-warn.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