Commit 2ac5f03e authored by 郭铭瑶's avatar 郭铭瑶 🤘

完善

parent f9ea073f
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<link rel="icon" href="/bigscreen/favicon.ico" /> <link rel="icon" href="/bigscreen/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>南京东路街道</title> <title>南京东路街道</title>
<script type="module" crossorigin src="/bigscreen/assets/index.84eaf793.js"></script> <script type="module" crossorigin src="/bigscreen/assets/index.7f8c3816.js"></script>
<link rel="modulepreload" href="/bigscreen/assets/vendor.0a2bc783.js"> <link rel="modulepreload" href="/bigscreen/assets/vendor.0a2bc783.js">
<link rel="stylesheet" href="/bigscreen/assets/index.9f522eb0.css"> <link rel="stylesheet" href="/bigscreen/assets/index.9f522eb0.css">
</head> </head>
......
...@@ -33,51 +33,51 @@ export default function useSwitchMap(map: any): any { ...@@ -33,51 +33,51 @@ export default function useSwitchMap(map: any): any {
store.commit('SET_MAP_TYPE', '2D') store.commit('SET_MAP_TYPE', '2D')
} }
) )
let boundary: any = null const boundary: any = null
// 根据条件显示小区点和添加边界 // 根据条件显示小区点和添加边界
function setPointsAndBoundary(type: string) { function setPointsAndBoundary(type: string) {
if (!map.value) return if (!map.value) return
boundary && boundary.remove() // boundary && boundary.remove()
const show = store.state.showCommunityPoints // const show = store.state.showCommunityPoints
switch (type) { // switch (type) {
case 'work1': // case 'work1':
show && showPoints({ gridId: store.state.workArea1.id }) // // show && showPoints({ gridId: store.state.workArea1.id })
boundary = map.value.addBoundary({ // // boundary = map.value.addBoundary({
type: 'jwh_boundary', // // type: 'jwh_boundary',
name: '第一', // // name: '第一',
color: 'rgba(0,0,0,0)', // // color: 'rgba(0,0,0,0)',
}) // // })
map.value.focus(...store.state.workArea1.center, 8) // // map.value.focus(...store.state.workArea1.center, 8)
break // break
case 'work2': // case 'work2':
show && showPoints({ gridId: store.state.workArea2.id }) // // show && showPoints({ gridId: store.state.workArea2.id })
boundary = map.value.addBoundary({ // // boundary = map.value.addBoundary({
type: 'jwh_boundary', // // type: 'jwh_boundary',
name: '第二', // // name: '第二',
color: 'rgba(0,0,0,0)', // // color: 'rgba(0,0,0,0)',
}) // // })
map.value.focus(...store.state.workArea2.center, 8) // // map.value.focus(...store.state.workArea2.center, 8)
break // break
case 'work3': // case 'work3':
show && showPoints({ gridId: store.state.workArea3.id }) // // show && showPoints({ gridId: store.state.workArea3.id })
boundary = map.value.addBoundary({ // // boundary = map.value.addBoundary({
type: 'jwh_boundary', // // type: 'jwh_boundary',
name: '第三', // // name: '第三',
color: 'rgba(0,0,0,0)', // // color: 'rgba(0,0,0,0)',
}) // // })
map.value.focus(...store.state.workArea3.center, 8) // // map.value.focus(...store.state.workArea3.center, 8)
break // break
case 'street': // case 'street':
show && showPoints() // // show && showPoints()
boundary = map.value.addBoundary({ // // boundary = map.value.addBoundary({
name: '南京东路街道', // // name: '南京东路街道',
color: 'rgba(0,0,0,0)', // // color: 'rgba(0,0,0,0)',
}) // // })
map.value.focus(207.9006154792994, 71.67111885454233, 8) // // map.value.focus(207.9006154792994, 71.67111885454233, 8)
break // break
default: // default:
break // break
} // }
} }
async function showPoints(params = {}) { async function showPoints(params = {}) {
const { content } = ( const { content } = (
......
...@@ -432,6 +432,11 @@ export default defineComponent({ ...@@ -432,6 +432,11 @@ export default defineComponent({
z: 30, z: 30,
style: 'color:gold;font-weight:bold;', style: 'color:gold;font-weight:bold;',
}) })
setTimeout(function () {
document.querySelectorAll('._building-btn')?.forEach(function (el) {
el.addEventListener('click', addEvent)
})
}, 1000)
} }
const buildingInfo = ref<any>({}) const buildingInfo = ref<any>({})
async function fetchBuildingInfo(sectId: string) { async function fetchBuildingInfo(sectId: string) {
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<div <div
:style="`background-image: url(${ :style="`background-image: url(${
item.alarmPic item.alarmPic
? 'data:image/png;base64' + item.alarmPic ? 'data:image/png;base64,' + item.alarmPic
: noneImg : noneImg
})`" })`"
@click="viewImage(item.alarmPic)" @click="viewImage(item.alarmPic)"
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<div <div
:style="`background-image: url(${ :style="`background-image: url(${
item.donePic item.donePic
? 'data:image/png;base64' + item.donePic ? 'data:image/png;base64,' + item.donePic
: noneImg : noneImg
})`" })`"
@click="viewImage(item.donePic)" @click="viewImage(item.donePic)"
...@@ -227,6 +227,7 @@ const transName = (type: string) => { ...@@ -227,6 +227,7 @@ const transName = (type: string) => {
const curImgSrc = ref('') const curImgSrc = ref('')
const showImgageModal = ref(false) const showImgageModal = ref(false)
const viewImage = (src: string) => { const viewImage = (src: string) => {
if (!src) return
curImgSrc.value = src curImgSrc.value = src
showImgageModal.value = true showImgageModal.value = 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