Skip to content

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

加入高德坐标点

parent d5f5e676
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 39 deletions
dist/index.html
View file @ 0f371746
<!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><script language=javascript src="http://webapi.amap.com/maps?v=1.4.15&key=ee2b5d5c0c44c768f1d2593eb4a7dfa6&plugin=Map3D,AMap.DistrictSearch,AMap.ControlBar,ElasticMarker"></script><link href=./static/css/app.0a42f2e9b8b216f729cbf3c93d14794c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.fa3038923f93859c711c.js></script><script type=text/javascript src=./static/js/vendor.d11eae825e5c4a0e0bb2.js></script><script type=text/javascript src=./static/js/app.28569ee3b457ee5d4d64.js></script></body></html>
\ No newline at end of file
}</style><script src=./static/jquery.min.js></script><script language=javascript src="http://webapi.amap.com/maps?v=1.4.15&key=ee2b5d5c0c44c768f1d2593eb4a7dfa6&plugin=Map3D,AMap.DistrictSearch,AMap.ControlBar,ElasticMarker"></script><link href=./static/css/app.b1cb24af83f7482a4044d78b19ceb897.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f98ef542cf871a5c9dfd.js></script><script type=text/javascript src=./static/js/vendor.d11eae825e5c4a0e0bb2.js></script><script type=text/javascript src=./static/js/app.73bcab10348d10251ffb.js></script></body></html>
\ No newline at end of file
dist/static/css/app.0a42f2e9b8b216f729cbf3c93d14794c.css deleted 100644 → 0
View file @ d5f5e676
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.b1cb24af83f7482a4044d78b19ceb897.css 0 → 100644
View file @ 0f371746
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.3629fcd614230c5ca2fa.js 0 → 100644
View file @ 0f371746
This diff is collapsed.
dist/static/js/2.3629fcd614230c5ca2fa.js.map 0 → 100644
View file @ 0f371746
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.b956a254090d608c2539.js deleted 100644 → 0
View file @ d5f5e676
This diff is collapsed.
dist/static/js/2.b956a254090d608c2539.js.map deleted 100644 → 0
View file @ d5f5e676
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.28569ee3b457ee5d4d64.js deleted 100644 → 0
View file @ d5f5e676
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.28569ee3b457ee5d4d64.js.map deleted 100644 → 0
View file @ d5f5e676
This diff is collapsed.
dist/static/js/app.73bcab10348d10251ffb.js 0 → 100644
View file @ 0f371746
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.73bcab10348d10251ffb.js.map 0 → 100644
View file @ 0f371746
This diff is collapsed.
dist/static/js/manifest.fa3038923f93859c711c.js → dist/static/js/manifest.f98ef542cf871a5c9dfd.js
View file @ 0f371746
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,o){for(var f,b,d,i=0,u=[];i<r.length;i++)b=r[i],t[b]&&u.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);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)d=a(a.s=o[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],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:"b4ba89cb398e7ddd33d2",1:"80f3e7aa96153395fe1b",2:"b956a254090d608c2539",3:"858079b6f37c68e0f6a5",4:"5abb74ba424b54ffd832",5:"79501cbfbec9e7ca1a2b",6:"151dc3ea26d64d8986cf",7:"eaaa3330e850030e6f86",8:"5ad0f24b31031f7284b3",9:"fd7707babb1b38a1555a",10:"3bc8ba3be9d993618346",11:"e0d0852893a051f35f47",12:"b26fc350b53d2b30f1b4",13:"16cbe0e33860ff72d492",14:"92a81e60880a6ae73756",15:"f0fdcca849fc839cdb19",16:"71b39e7f56791784419e",17:"267ef980ea0c07fe9923",18:"f2a6183255aeb9176721",19:"1966c1eecf8c80e445be",20:"d18b679d14bc0ba80f28",23:"ab51b349f58994409b34",24:"f7914065b4d7bec4ccfb",25:"6b5f4749058978064562",26:"584ddfc7aad303eb351f"}[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.fa3038923f93859c711c.js.map
\ No newline at end of file
!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:"b4ba89cb398e7ddd33d2",1:"80f3e7aa96153395fe1b",2:"3629fcd614230c5ca2fa",3:"858079b6f37c68e0f6a5",4:"5abb74ba424b54ffd832",5:"79501cbfbec9e7ca1a2b",6:"151dc3ea26d64d8986cf",7:"eaaa3330e850030e6f86",8:"5ad0f24b31031f7284b3",9:"fd7707babb1b38a1555a",10:"3bc8ba3be9d993618346",11:"e0d0852893a051f35f47",12:"b26fc350b53d2b30f1b4",13:"16cbe0e33860ff72d492",14:"92a81e60880a6ae73756",15:"f0fdcca849fc839cdb19",16:"71b39e7f56791784419e",17:"267ef980ea0c07fe9923",18:"f2a6183255aeb9176721",19:"1966c1eecf8c80e445be",20:"d18b679d14bc0ba80f28",23:"30937e4d633b87411f49",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.f98ef542cf871a5c9dfd.js.map
\ No newline at end of file
src/assets/css/variables.styl
View file @ 0f371746
......@@ -31,7 +31,7 @@ $selected()
$fontColor = #70A7E0
$edgeColor = #00f2ff
// $cardBg = rgba(53, 119, 248, 0.15)
$cardBg = rgba(18, 34, 66, 0.8)
$cardBg = rgba(18, 34, 66, 0.3)
$cardBorder = 0.1rem solid #308bd8
$cardFontColor = #5bd5ff
src/components/MonitorComponents/MonitorCard/mode4.vue
View file @ 0f371746
......@@ -77,7 +77,8 @@ export default {
</script>
<style lang="stylus" scoped>
$color = #308bd8
$color = rgba(113,235,255,.5)
// $color = #308bd8
// $color = transparent
.card-wrapper
padding 0 !important
......
src/router/index.js
View file @ 0f371746
......@@ -11,7 +11,11 @@ export default new Router({
routes: [
{
path: '/',
name: 'main',
redirect: '/linyiercun',
},
{
path: '/nanmatou',
name: 'nanmatou',
component: Main,
},
{
......
src/store/actions.js
View file @ 0f371746
......@@ -215,7 +215,7 @@ export default {
},
{
title:'电梯',
num:'3',
num:'6',
unit: '部',
img: 'basic5.png'
},
......@@ -363,6 +363,9 @@ export default {
}).then(res => {
const sensorList = common.confirm(res, 'data.content', [])
sensorList.forEach(sensor => {
const {lon, lat} = common.gaodeLocation.find(item => item.id === sensor.sensorNo) || {lon: 121.510545, lat: 31.197238}
sensor.lon = lon
sensor.lat = lat
sensor._scene = common.getSensorScene(sensor.type)
sensor._status = sensor.state == '1' ? '报警' : '正常'
sensor.state == '1' ? sensor.icon = 'icon7.png' : null
......
src/util/common.js
View file @ 0f371746
/** 公共方法 */
export default {
gaodeLocation: [
{name: '烟雾感应器', id: '4F00BA0F', lon: 121.511187, lat: 31.19628},
{name: '烟雾感应器', id: '4F00B9E2', lon: 121.510922, lat: 31.196155},
{name: '烟雾感应器', id: '4F00B9F2', lon: 121.511107, lat: 31.196236},
{name: '烟雾感应器', id: '4F00B9EC', lon: 121.511001, lat: 31.196189},
{name: '温湿度传感器', id: '4F00E284', lon: 121.511173, lat: 31.196303},
{name: '温湿度传感器', id: '4F00E286', lon: 121.510993, lat: 31.19622},
{name: '温湿度传感器', id: '4F00E287', lon: 121.511115, lat: 31.196274},
{name: '温湿度传感器', id: '4F00E28A', lon: 121.510899, lat: 31.196179},
{name: '震动传感器', id: '4F00E290', lon: 121.510306, lat: 31.195458},
{name: '震动传感器', id: '4F00E291', lon: 121.509932, lat: 31.195557},
{name: '震动传感器', id: '4F00E292', lon: 121.511298, lat: 31.195026},
{name: '震动传感器', id: '4F00E293', lon: 121.510007, lat: 31.195328},
{name: '震动传感器', id: '4F00E294', lon: 121.510186, lat: 31.195674},
{name: '震动传感器', id: '4F00E295', lon: 121.51156, lat: 31.194614},
{name: '震动传感器', id: '4F00E296', lon: 121.511426, lat: 31.194818},
{name: '温湿度传感器', id: '4F00E285', lon: 121.509901, lat: 31.196354},
{name: '温湿度传感器', id: '4F00E288', lon: 121.510042, lat: 31.196404},
{name: '温湿度传感器', id: '4F00E289', lon: 121.509712, lat: 31.196273},
{name: '温湿度传感器', id: '4F00E28B', lon: 121.510672, lat: 31.196546},
{name: '人体感应传感器', id: '4F00E28C', lon: 121.509901, lat: 31.196354},
{name: '人体感应传感器', id: '4F00E28D', lon: 121.510672, lat: 31.196546},
{name: '人体感应传感器', id: '4F00E28E', lon: 121.509712, lat: 31.196273},
{name: '人体感应传感器', id: '4F00E28F', lon: 121.510042, lat: 31.196404},
{name: '水浸传感器', id: '4F00E297', lon: 121.509901, lat: 31.196354},
{name: '水浸传感器', id: '4F00E298', lon: 121.510042, lat: 31.196404},
{name: '水浸传感器', id: '4F00E299', lon: 121.510672, lat: 31.196546},
{name: '水浸传感器', id: '4F00E29A', lon: 121.509712, lat: 31.196273},
{name: '智能门磁感应器', id: '4F00AABD', lon: 121.509712, lat: 31.196273},
{name: '智能门磁感应器', id: '4F00AABF', lon: 121.510672, lat: 31.196546},
{name: '智能门磁感应器', id: '222238D5', lon: 121.509901, lat: 31.196354},
{name: '智能门磁感应器', id: '4F00AAC4', lon: 121.510042, lat: 31.196404},
{name: '超声波车检器', id: '4F00A512', lon: 121.511343, lat: 31.197095},
{name: '井盖异动检测器', id: '4F008717', lon: 121.511191, lat: 31.195338},
{name: '井盖异动检测器', id: '4F0087A4', lon: 121.511322, lat: 31.195105},
{name: '井盖异动检测器', id: '4F0088CD', lon: 121.510899, lat: 31.195242},
{name: '井盖异动检测器', id: '4F008977', lon: 121.510946, lat: 31.19668},
{name: '超声波车检器', id: '864162040644943', lon: 121.510097, lat: 31.196471},
{name: '超声波车检器', id: '864162040743323', lon: 121.510662, lat: 31.195084},
{name: '超声波车检器', id: '864162040676879', lon: 121.510825, lat: 31.196117},
{name: '超声波车检器', id: '864162040761416', lon: 121.510734, lat: 31.196155},
{name: '超声波车检器', id: '864162040630405 ', lon: 121.510949, lat: 31.195285},
{name: '超声波车检器', id: '868681046282354', lon: 121.510282, lat: 31.196054},
{name: '智能门磁感应器', id: '222253AC', lon: 121.510337, lat: 31.196592},
{name: '智能门磁感应器', id: '22225E97', lon: 121.510337, lat: 31.196592},
{name: '智能门磁感应器', id: '22225EB2', lon: 121.510337, lat: 31.196592},
{name: '智能门磁感应器', id: '2222558C', lon: 121.510337, lat: 31.196592},
{name: '震动传感器', id: '4F00E2A3', lon: 121.51057, lat: 31.197248},
{name: '震动传感器', id: '4F00E2A4', lon: 121.51057, lat: 31.197248},
{name: '震动传感器', id: '4F00E2A5', lon: 121.51057, lat: 31.197248},
{name: '震动传感器', id: '4F00E2A6', lon: 121.51057, lat: 31.197248},
{name: '震动传感器', id: '4F00E2A7', lon: 121.51057, lat: 31.197248},
{name: '震动传感器', id: '4F00E2A8', lon: 121.51057, lat: 31.197248},
{name: '震动传感器', id: '4F00E2A9', lon: 121.51057, lat: 31.197248},
{name: '震动传感器', id: '4F00E2AA', lon: 121.51057, lat: 31.197248},
{name: '震动传感器', id: '4F00E2AB', lon: 121.51057, lat: 31.197248},
{name: '震动传感器', id: '4F00E2AC', lon: 121.51057, lat: 31.197248},
{name: '震动传感器', id: '4F00E2AD', lon: 121.51057, lat: 31.197248},
{name: '电梯监控套装', id: '31103101152017110109', lon: 121.51023, lat: 31.196849},
{name: '电梯监控套装', id: '31103101152017110236', lon: 121.510249, lat: 31.196837},
{name: '电梯监控套装', id: '31103101152017110225', lon: 121.510572, lat: 31.197225},
{name: '电梯监控套装', id: '31103101152017110104', lon: 121.510545, lat: 31.197238},
],
/**
* 在深层数据结构中取值（为了替代类似 res && res.data && res.data.content这种写法）
* @param {Object} obj [必填-需要取值的目标对象（例：res）]
......
src/views/linyi.vue
View file @ 0f371746
......@@ -99,7 +99,7 @@
<m-modal v-model="showEleMap" width="90%" title="辅助应用">
<iframe v-if="showEleMap" style="width:100%;min-height:80vh;background:#fff;" :src="mapSrc" frameborder="0"/>
</m-modal>
<m-modal v-model="showEventModal" title="传感器列表" width="70%">
<m-modal v-model="showEventModal" @close="closeEventModal" title="传感器列表" width="70%">
<!-- <m-form v-for="data in eventData" :key="data.id" :title="data.addr" :label-width="6" :model="data" :layout="eventLayout"/> -->
<SensorList :data="eventData" />
</m-modal>
......@@ -121,7 +121,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="-21%">
<m-modal v-model="discoverModal" @close="closeEventModal" 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%">
......@@ -207,17 +207,18 @@ export default {
buildingAnimation:true, // 楼块出现是否带动画
expandZoomRange:true,
zooms: [10,20],
center: [121.511785, 31.196088],
center: [121.511200, 31.195000],
// center: [121.511785, 31.194485],
showIndoorMap: false,
mapStyle:'amap://styles/grey',
features: ['bg', 'road', 'building'],
},
markers: [],
timer: null,
curTitle: '',
complete: false,
showEleMap: false,
openIcon: false,
openIcon: true,
remindList: [
{key: 'linyi', title: '临沂二村', total: 17, detail: [
{title: '屋顶漏水', num: 6},
......@@ -754,15 +755,15 @@ export default {
})
})
this.map.add(polygon)
const marker = new AMap.Marker({
position: [121.509859, 31.196088],
zIndex: 99,
icon: new AMap.Icon({
size: [16 * this.sizeRate, 20 * this.sizeRate],
image: require('@/assets/images/no-warn.png'),
}),
})
this.map.add(marker)
// const marker = new AMap.Marker({
// position: [121.509859, 31.196088],
// zIndex: 99,
// icon: new AMap.Icon({
// size: [16 * this.sizeRate, 20 * this.sizeRate],
// image: require('@/assets/images/no-warn.png'),
// }),
// })
// this.map.add(marker)
// this.mapComplete()
},
......@@ -844,6 +845,7 @@ export default {
if (this.curScene == 'all') {
this.$store.commit('SET_CURSCENE', null)
}
this.addSensorMarkers(this.$store.state.sensorList)
this.addSensorPoints()
},
showVideo(name) {
......@@ -902,6 +904,55 @@ export default {
map.removePoint('sensor')
map.removePoint('discover')
},
addSensorMarkers(data) {
if (!this.map) return
this.map.remove(this.markers)
if (!this.openIcon) return
this.markers = data.map(item => {
const {state, lon, lat} = item
const marker = new AMap.Marker({
position: [lon, lat],
zIndex: 99,
icon: new AMap.Icon({
size: [16 * this.sizeRate, 20 * this.sizeRate],
image: require(`@/assets/images/${state == 1 ? 'warn' : 'no-warn'}.png`),
}),
extData: {...item},
}).on('click', () => {
this.map.setZoomAndCenter(18.5, [lon, lat])
this.handleEventModal([marker.getExtData()])
})
return marker
})
this.map.add(this.markers)
},
addDiscoverMarkers(data) {
if (!this.map) return
this.map.remove(this.markers)
this.markers = data.map(item => {
const {done_time, sensor_no} = item
const {lon, lat} = this.$com.gaodeLocation.find(item => item.id === sensor_no) || {lon: 121.510545, lat: 31.197238}
const marker = new AMap.Marker({
position: [lon, lat],
zIndex: 99,
icon: new AMap.Icon({
size: [16 * this.sizeRate, 20 * this.sizeRate],
image: require(`@/assets/images/${done_time ? 'discover-done' : 'discover-todo'}.png`),
}),
extData: {...item},
}).on('click', () => {
this.map.setZoomAndCenter(18.5, [lon, lat])
this.handleDiscoverEvent([marker.getExtData()])
})
return marker
})
this.map.add(this.markers)
},
closeEventModal() {
if (!this.map) return
const {zoom, center} = this.mapConfig
this.map.setZoomAndCenter(zoom, center)
},
...mapActions([
'initLinyiData',
'setDiscoverInfo',
......@@ -958,6 +1009,7 @@ export default {
setTimeout(() => {
map.addPoint({name: 'discover', key: 'id', size: 25, data: [...doneList, ...todoList], icon: 'icon9.png'})
map.focus(3706.690186, -4234.159912, 8.5)
this.addDiscoverMarkers([...doneList, ...todoList])
}, 1000)
}
},
......@@ -965,6 +1017,7 @@ export default {
handler(cur) {
this.clearPoints()
this.$refs.map.addPoint({name: 'sensor', key: 'id', size: 20, data: cur, icon: 'icon6.png'})
this.addSensorMarkers(cur)
}
},
}
......
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