Commit f63552e9 authored by 程卓's avatar 程卓

merge

parents 4ba9f9e5 4cb02bc5
[
{
"name": "第一工作站",
"path": [
[-448.329953822261, -293.460812442785],
[-431.7521211874291, -671.2658974800385],
[-424.4347237401342, -721.1895650357069],
[-398.89824688593046, -803.6322429418965],
[-365.2547551197802, -867.1158334507442],
[-392.5813071687177, -874.8011678318296],
[-403.0902474574316, -1077.6749785273678],
[-353.7288206095779, -1071.1265279304666],
[-235.53838240578477, -1022.8565095154296],
[-110.56798272540209, -1153.1351229372399],
[-93.69249324525651, -1138.2894877772196],
[-68.09400454827903, -1119.6983373136686],
[108.32141989715319, -1078.5720831861604],
[162.94558513506695, -1051.8780519335146],
[319.4097326987787, -1005.952081175323],
[764.5059353911838, -763.8371763725968],
[632.5075268631167, -531.321704831237],
[456.02595645205906, -245.14531867638112],
[265.6661356282508, 118.08284918620457],
[171.38332987513922, 95.29556402830092],
[107.25481620144524, 61.96213147601915],
[43.56451955001853, 9.376088803933783],
[6.621997748308331, -34.25957789448293],
[-61.673711759777404, 39.489039654835494],
[-84.91161630850314, 43.66450373493032],
[-117.17844516507756, 35.95023049388385],
[-268.3674519701745, -19.099749397742613],
[-336.6383567411507, -44.7065063404232],
[-412.38375562778185, -44.284825809562136],
[-452.45167430528585, -55.794223828358156],
[-462.21647248071554, -56.90216875258136],
[-480.70426987297697, -84.93978993199039],
[-448.329953822261, -293.460812442785]
]
},
{
"name": "第二工作站",
"path": [
[62.564369398678764, 740.5887328698475],
[137.63177213765096, 581.9293660719472],
[265.9218724678516, 118.00636791345084],
[633.5446129216658, -540.7909132227782],
[1009.9399620665309, -314.1334937621058],
[1093.7138275309285, -280.9447555096293],
[964.1008078882224, 10.568783246614885],
[884.0476529902461, -20.486747614446926],
[826.2691520165776, 82.29581472151119],
[899.6994421063242, 120.57779232713301],
[826.2278107880617, 251.71216917922004],
[705.7015931731263, 615.2007867814553],
[689.5206363320461, 675.2447870777893],
[684.3364462761659, 756.2487902316288],
[534.3504692208784, 845.4714296144077],
[483.33539323239313, 867.770888275825],
[418.098934634476, 876.5269604754694],
[339.3025530833796, 879.3795052430589],
[278.7872627819655, 867.1094286195723],
[216.4694949172632, 843.7681709995571],
[158.20316744710817, 810.0089237935626],
[69.50142754362844, 745.9134831026813],
[62.564369398678764, 740.5887328698475],
]
},
{
"name": "第三工作站",
"path": [
[-827.6197677404292, 863.6615701613555],
[-708.507420140734, 529.087007783064],
[-544.6473267955473, 184.59055056098282],
[-523.8857618349174, 124.25716166503844],
[-451.3484422811116, -294.9842367135918],
[-152.79862643148, -277.8524316166481],
[-122.5120424208119, -268.7160201146585],
[-84.99074341988057, -211.12768879216264],
[-63.923253368233645, -138.51595502702844],
[-34.306397259521646, -87.17841745611986],
[38.478969665379054, 8.683623226294912],
[107.08887251018473, 60.05423378001592],
[158.0543390244511, 92.77168202741245],
[264.45839297839234, 119.5525298599415],
[171.40755583505143, 467.1165062378942],
[134.7709591243579, 587.717138064158],
[81.23406819640945, 702.8193864978215],
[60.116968670543656, 737.5046772225696],
[-52.52134254357884, 666.753298740646],
[-117.37746183915078, 641.493808117498],
[-151.4095611533494, 632.9609785518389],
[-186.334631003489, 628.7524414889315],
[-237.86233822557006, 637.5911961456075],
[-301.7758775109821, 657.7822521527194],
[-467.37230245383194, 765.9722471785428],
[-527.2261330989933, 795.6221762700677],
[-676.0132145273228, 855.6165670921827],
[-733.4857904099746, 866.563724403164],
[-791.5950212117696, 868.8044189887198],
[-827.6197677404292, 863.6615701613555],
]
}
]
\ No newline at end of file
...@@ -85,8 +85,9 @@ export default defineComponent({ ...@@ -85,8 +85,9 @@ export default defineComponent({
function addListener() { function addListener() {
// 触发地图点击事件 // 触发地图点击事件
map.on(SMap.MapEvent.click, (view: any, eventParamter: any) => { map.on(SMap.MapEvent.click, (view: any, eventParamter: any) => {
// const { x, y } = eventParamter.mapPoint const { x, y } = eventParamter.mapPoint
console.log(map.getZoom(), map.getCenter()) console.log([x, y])
// console.log(map.getZoom(), map.getCenter())
view.hitTest(eventParamter).then((res: any) => { view.hitTest(eventParamter).then((res: any) => {
if (res.results && res.results.length > 0) { if (res.results && res.results.length > 0) {
ctx.emit( ctx.emit(
......
...@@ -110,7 +110,8 @@ export default { ...@@ -110,7 +110,8 @@ export default {
[62.564369398678764, 740.5887328698475], [62.564369398678764, 740.5887328698475],
[137.63177213765096, 581.9293660719472], [137.63177213765096, 581.9293660719472],
[265.9218724678516, 118.00636791345084], [265.9218724678516, 118.00636791345084],
[633.5446129216658, -540.7909132227782], [455.7203121603603, -245.26520837748734],
[636.8424354723139, -539.6788343141142],
[1009.9399620665309, -314.1334937621058], [1009.9399620665309, -314.1334937621058],
[1093.7138275309285, -280.9447555096293], [1093.7138275309285, -280.9447555096293],
[964.1008078882224, 10.568783246614885], [964.1008078882224, 10.568783246614885],
...@@ -146,16 +147,20 @@ export default { ...@@ -146,16 +147,20 @@ export default {
[-708.507420140734, 529.087007783064], [-708.507420140734, 529.087007783064],
[-544.6473267955473, 184.59055056098282], [-544.6473267955473, 184.59055056098282],
[-523.8857618349174, 124.25716166503844], [-523.8857618349174, 124.25716166503844],
[-451.3484422811116, -294.9842367135918], [-480.70426987297697, -84.93978993199039],
[-152.79862643148, -277.8524316166481], [-462.21647248071554, -56.90216875258136],
[-122.5120424208119, -268.7160201146585], [-452.45167430528585, -55.794223828358156],
[-84.99074341988057, -211.12768879216264], [-412.38375562778185, -44.284825809562136],
[-63.923253368233645, -138.51595502702844], [-336.6383567411507, -44.7065063404232],
[-34.306397259521646, -87.17841745611986], [-268.3674519701745, -19.099749397742613],
[38.478969665379054, 8.683623226294912], [-117.17844516507756, 35.95023049388385],
[107.08887251018473, 60.05423378001592], [-84.91161630850314, 43.66450373493032],
[158.0543390244511, 92.77168202741245], [-61.673711759777404, 39.489039654835494],
[264.45839297839234, 119.5525298599415], [6.621997748308331, -34.25957789448293],
[43.56451955001853, 9.376088803933783],
[107.25481620144524, 61.96213147601915],
[171.38332987513922, 95.29556402830092],
[265.6661356282508, 118.08284918620457],
[171.40755583505143, 467.1165062378942], [171.40755583505143, 467.1165062378942],
[134.7709591243579, 587.717138064158], [134.7709591243579, 587.717138064158],
[81.23406819640945, 702.8193864978215], [81.23406819640945, 702.8193864978215],
......
...@@ -51,7 +51,12 @@ ...@@ -51,7 +51,12 @@
</template> </template>
</a-tooltip> </a-tooltip>
</div> </div>
<m-modal v-model="showMonitor" title="电瓶车入梯监控" width="50%"> <m-modal
v-model="showMonitor"
title="电瓶车入梯监控"
width="30%"
offset="-70%"
>
<div> <div>
<VideoComponent :video-src="video" /> <VideoComponent :video-src="video" />
<div class="alarm-btn" @click="handleAlarm">报警</div> <div class="alarm-btn" @click="handleAlarm">报警</div>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<img src="@/assets/images/play.png" /> <img src="@/assets/images/play.png" />
</div> </div>
</div> </div>
<m-modal v-model="showModal" title="视频" width="50%"> <m-modal v-model="showModal" title="视频" width="30%" offset="-70%">
<VideoComponent v-if="showModal" :video-src="src" /> <VideoComponent v-if="showModal" :video-src="src" />
</m-modal> </m-modal>
</div> </div>
......
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
<m-card mode="border"> <m-card mode="border">
<m-card title="小区档案" mode="3"> <m-card title="小区档案" mode="3">
<div class="info"> <div class="info">
<div><img src="@/assets/images/zhenxing.png" /></div> <div>
<div class="img" :style="`background-image:url(${communityPhoto})`" />
</div>
<div> <div>
<h3>{{ communityName }}</h3> <h3>{{ communityName }}</h3>
<div> <div>
...@@ -75,7 +77,7 @@ ...@@ -75,7 +77,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent, ref, watch } from 'vue' import { defineComponent, onMounted, ref, watch } from 'vue'
import Brief, { BriefProp } from '@/view/components/brief.vue' import Brief, { BriefProp } from '@/view/components/brief.vue'
import p1 from '@/assets/images/p1.png' import p1 from '@/assets/images/p1.png'
import p2 from '@/assets/images/p2.png' import p2 from '@/assets/images/p2.png'
...@@ -92,6 +94,9 @@ import type6 from '@/assets/images/type6.png' ...@@ -92,6 +94,9 @@ import type6 from '@/assets/images/type6.png'
import type7 from '@/assets/images/type7.png' import type7 from '@/assets/images/type7.png'
import store from '@/store' import store from '@/store'
import { ajax, api } from '@/ajax' import { ajax, api } from '@/ajax'
import { useRoute } from 'vue-router'
import zhenxing from '@/assets/images/zhenxing.png'
import weihailu from '@/assets/images/weihailu.png'
export default defineComponent({ export default defineComponent({
name: 'LeftSection', name: 'LeftSection',
...@@ -104,6 +109,13 @@ export default defineComponent({ ...@@ -104,6 +109,13 @@ export default defineComponent({
const addrList = ref([]) const addrList = ref([])
const communityName = ref('') const communityName = ref('')
const healthVal = ref(0) const healthVal = ref(0)
const communityPhoto = ref<any>(null)
onMounted(() => {
const route = useRoute()
const id =
(route && route.query.id) || store.state.communityOptions[0].type
communityPhoto.value = id === '527635870583459840' ? zhenxing : weihailu
})
watch( watch(
() => store.state.issueData, () => store.state.issueData,
...@@ -198,6 +210,7 @@ export default defineComponent({ ...@@ -198,6 +210,7 @@ export default defineComponent({
).icMember.sort((a: any, b: any) => +a.dirDuty - +b.dirDuty) || [] ).icMember.sort((a: any, b: any) => +a.dirDuty - +b.dirDuty) || []
} }
return { return {
communityPhoto,
healthVal, healthVal,
communityName, communityName,
summary, summary,
...@@ -219,7 +232,7 @@ export default defineComponent({ ...@@ -219,7 +232,7 @@ export default defineComponent({
.info .info
display flex display flex
min-height .8rem height .8rem
margin .05rem 0 margin .05rem 0
>div >div
flex 1 flex 1
...@@ -230,8 +243,11 @@ export default defineComponent({ ...@@ -230,8 +243,11 @@ export default defineComponent({
$center() $center()
background url('@/assets/images/border3.png') 50% 50% / 100% 100% no-repeat background url('@/assets/images/border3.png') 50% 50% / 100% 100% no-repeat
margin-right .1rem margin-right .1rem
> img > .img
width 88% width 90%
height @width
background-position center center
background-size cover
&:last-child &:last-child
display flex display flex
flex-direction column flex-direction column
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
/> />
</template> </template>
</div> </div>
<m-modal v-model="searchModal" title="搜索"> <m-modal v-model="searchModal" title="搜索" width="30%" offset="-70%">
<div id="modal-search-bar"> <div id="modal-search-bar">
<span class="edge left-top" /> <span class="edge left-top" />
<span class="edge right-top" /> <span class="edge right-top" />
...@@ -82,7 +82,7 @@ export default defineComponent({ ...@@ -82,7 +82,7 @@ export default defineComponent({
? { key: '3D', icon: d3 } ? { key: '3D', icon: d3 }
: { key: '2D', icon: d2 } : { key: '2D', icon: d2 }
const list = [ const list = [
{ key: 'search', icon: btn1 }, // { key: 'search', icon: btn1 },
{ key: 'full', icon: btn2 }, { key: 'full', icon: btn2 },
{ key: 'points', icon: btn6 }, { key: 'points', icon: btn6 },
{ key: 'polyline', icon: btn7 }, { key: 'polyline', icon: btn7 },
......
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