diff --git a/999.zip b/999.zip deleted file mode 100644 index 09ba15a..0000000 --- a/999.zip +++ /dev/null Binary files differ diff --git a/999.zip b/999.zip deleted file mode 100644 index 09ba15a..0000000 --- a/999.zip +++ /dev/null Binary files differ diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts new file mode 100644 index 0000000..132d029 --- /dev/null +++ b/src/api/home/force/index.ts @@ -0,0 +1,21 @@ +/** + * 放外力破坏监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getForceListPage(data: any) { + return request({ + url: `/monitor/damage/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getForceList(data: any) { + return request({ + url: `/monitor/damage/list`, + method: 'post', + data, + }) +} diff --git a/999.zip b/999.zip deleted file mode 100644 index 09ba15a..0000000 --- a/999.zip +++ /dev/null Binary files differ diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts new file mode 100644 index 0000000..132d029 --- /dev/null +++ b/src/api/home/force/index.ts @@ -0,0 +1,21 @@ +/** + * 放外力破坏监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getForceListPage(data: any) { + return request({ + url: `/monitor/damage/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getForceList(data: any) { + return request({ + url: `/monitor/damage/list`, + method: 'post', + data, + }) +} diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 14f1cfc..e41ba6a 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -98,6 +98,11 @@ type: Boolean, default: false, }, + // 当前行的 class 可以用来修改样式 + tableRowClassName: { + type: Function, + default: () => '' + } }) const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'rowDisabled', 'handleClickFollowLink', 'sortChange']) // -------定义数据-------------- @@ -343,7 +348,9 @@ :data="data" :height="height" :border="border" stripe :size="size" style="width: 100%;" :row-key="(row) => { return JSON.stringify(row) }" :span-method="mergeTableRow" @selection-change="handleSelectionChange" @select="selectClick" @row-click="rowClick" @row-dblclick="rowDbClick" - @filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"> + @filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick" + :row-class-name="props.tableRowClassName" + > diff --git a/999.zip b/999.zip deleted file mode 100644 index 09ba15a..0000000 --- a/999.zip +++ /dev/null Binary files differ diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts new file mode 100644 index 0000000..132d029 --- /dev/null +++ b/src/api/home/force/index.ts @@ -0,0 +1,21 @@ +/** + * 放外力破坏监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getForceListPage(data: any) { + return request({ + url: `/monitor/damage/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getForceList(data: any) { + return request({ + url: `/monitor/damage/list`, + method: 'post', + data, + }) +} diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 14f1cfc..e41ba6a 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -98,6 +98,11 @@ type: Boolean, default: false, }, + // 当前行的 class 可以用来修改样式 + tableRowClassName: { + type: Function, + default: () => '' + } }) const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'rowDisabled', 'handleClickFollowLink', 'sortChange']) // -------定义数据-------------- @@ -343,7 +348,9 @@ :data="data" :height="height" :border="border" stripe :size="size" style="width: 100%;" :row-key="(row) => { return JSON.stringify(row) }" :span-method="mergeTableRow" @selection-change="handleSelectionChange" @select="selectClick" @row-click="rowClick" @row-dblclick="rowDbClick" - @filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"> + @filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick" + :row-class-name="props.tableRowClassName" + > diff --git a/src/components/map/index.vue b/src/components/map/index.vue index 2f82737..8007858 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -490,7 +490,11 @@ var massMarks = new AMap.value.MassMarks(data.path, { zIndex: data.zIndex, // 海量点图层叠加的顺序 zooms: data.zooms || [], // 在指定地图缩放级别范围内展示海量点图层 - style: data.style, // 设置样式对象 + style: data.style.map((item: any) => ({ + ...item, + anchor: new AMap.value.Pixel(0, 0), + size: new AMap.value.Size(25, 25) + })), // 设置样式对象 }) massMarksAllList.value.push(massMarks) massMarks.setMap(map.value) @@ -593,7 +597,11 @@ }, ] if (styleList) { - style = styleList + style = styleList.map((item: any) => ({ + ...item, + anchor: new AMap.value.Pixel(0, 0), + size: new AMap.value.Size(25, 25) + })) } const markerHtml = `` var offset = new AMap.value.Pixel(-9, -9) @@ -629,69 +637,69 @@ console.log(points, 'points') var district = { '北京': { - "adcode" : "110000", - "center" : "116.405285,39.904989", - // "center" : "117.939152,40.976204", + "adcode": "110000", + "center": "116.405285,39.904989", + // "center" : "117.939152,40.976204", }, '亦庄开发区': { - "center": "116.506647,39.795337", + "center": "116.506647,39.795337", }, '密云区': { - "adcode" : "110118", - "center" : "116.843352,40.377362", + "adcode": "110118", + "center": "116.843352,40.377362", }, '怀柔区': { - "adcode" : "110116", - "center" : "116.637122,40.324272", + "adcode": "110116", + "center": "116.637122,40.324272", }, '门头沟区': { - "adcode" : "110109", - "center" : "116.105381,39.937183", + "adcode": "110109", + "center": "116.105381,39.937183", }, '顺义区': { - "adcode" : "110113", - "center" : "116.653525,40.128936", + "adcode": "110113", + "center": "116.653525,40.128936", }, '朝阳区': { - "adcode" : "110105", - "center" : "116.486409,39.921489", + "adcode": "110105", + "center": "116.486409,39.921489", }, '通州区': { - "adcode" : "110112", - "center" : "116.658603,39.902486", + "adcode": "110112", + "center": "116.658603,39.902486", }, '大兴区': { - "adcode" : "110115", - "center" : "116.338033,39.728908", + "adcode": "110115", + "center": "116.338033,39.728908", }, '昌平区': { - "adcode" : "110114", - "center" : "116.235906,40.218085", + "adcode": "110114", + "center": "116.235906,40.218085", }, '西城区': { - "adcode" : "110102", - "center" : "116.366794,39.915309", + "adcode": "110102", + "center": "116.366794,39.915309", }, '东城区': { - "adcode" : "110101", - "center" : "116.418757,39.917544", + "adcode": "110101", + "center": "116.418757,39.917544", }, '房山区': { - "adcode" : "110111", - "center" : "116.139157,39.735535", + "adcode": "110111", + "center": "116.139157,39.735535", }, '石景山区': { - "adcode" : "110107", - "center" : "116.195445,39.914601", + "adcode": "110107", + "center": "116.195445,39.914601", }, '海淀区': { - "adcode" : "110108", - "center" : "116.310316,39.956074", + "adcode": "110108", + "center": "116.310316,39.956074", }, '丰台区': { - "center": "116.286968,39.863642", + "center": "116.286968,39.863642", }, -}; + }; var clusterIndexSet = { city: { minZoom: 2, @@ -796,8 +804,6 @@ } // ------------------------------------------------------------------------------------------------ onMounted(() => { - // console.log(document.getElementById('map'), '地图容器') - // setTimeout(() => { loading.value = true const height = document.getElementById('map-container-only')?.offsetHeight if (height) { @@ -807,8 +813,16 @@ } } initMap() - // console.log - // }) + // // 检测地图是否加载失败 + // setTimeout(() => { + // // 地图canvas + // const canvas = document.getElementsByClassName('amap-layer')[0] + // const height = canvas.getBoundingClientRect().height + // if(height) { + // // 地图加载失败(报错类型) + // console.log('地图加载失败(报错类型)') + // } + // }, 1000 * 15) }) onUnmounted(() => { if (xunteng.value) { diff --git a/999.zip b/999.zip deleted file mode 100644 index 09ba15a..0000000 --- a/999.zip +++ /dev/null Binary files differ diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts new file mode 100644 index 0000000..132d029 --- /dev/null +++ b/src/api/home/force/index.ts @@ -0,0 +1,21 @@ +/** + * 放外力破坏监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getForceListPage(data: any) { + return request({ + url: `/monitor/damage/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getForceList(data: any) { + return request({ + url: `/monitor/damage/list`, + method: 'post', + data, + }) +} diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 14f1cfc..e41ba6a 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -98,6 +98,11 @@ type: Boolean, default: false, }, + // 当前行的 class 可以用来修改样式 + tableRowClassName: { + type: Function, + default: () => '' + } }) const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'rowDisabled', 'handleClickFollowLink', 'sortChange']) // -------定义数据-------------- @@ -343,7 +348,9 @@ :data="data" :height="height" :border="border" stripe :size="size" style="width: 100%;" :row-key="(row) => { return JSON.stringify(row) }" :span-method="mergeTableRow" @selection-change="handleSelectionChange" @select="selectClick" @row-click="rowClick" @row-dblclick="rowDbClick" - @filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"> + @filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick" + :row-class-name="props.tableRowClassName" + > diff --git a/src/components/map/index.vue b/src/components/map/index.vue index 2f82737..8007858 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -490,7 +490,11 @@ var massMarks = new AMap.value.MassMarks(data.path, { zIndex: data.zIndex, // 海量点图层叠加的顺序 zooms: data.zooms || [], // 在指定地图缩放级别范围内展示海量点图层 - style: data.style, // 设置样式对象 + style: data.style.map((item: any) => ({ + ...item, + anchor: new AMap.value.Pixel(0, 0), + size: new AMap.value.Size(25, 25) + })), // 设置样式对象 }) massMarksAllList.value.push(massMarks) massMarks.setMap(map.value) @@ -593,7 +597,11 @@ }, ] if (styleList) { - style = styleList + style = styleList.map((item: any) => ({ + ...item, + anchor: new AMap.value.Pixel(0, 0), + size: new AMap.value.Size(25, 25) + })) } const markerHtml = `` var offset = new AMap.value.Pixel(-9, -9) @@ -629,69 +637,69 @@ console.log(points, 'points') var district = { '北京': { - "adcode" : "110000", - "center" : "116.405285,39.904989", - // "center" : "117.939152,40.976204", + "adcode": "110000", + "center": "116.405285,39.904989", + // "center" : "117.939152,40.976204", }, '亦庄开发区': { - "center": "116.506647,39.795337", + "center": "116.506647,39.795337", }, '密云区': { - "adcode" : "110118", - "center" : "116.843352,40.377362", + "adcode": "110118", + "center": "116.843352,40.377362", }, '怀柔区': { - "adcode" : "110116", - "center" : "116.637122,40.324272", + "adcode": "110116", + "center": "116.637122,40.324272", }, '门头沟区': { - "adcode" : "110109", - "center" : "116.105381,39.937183", + "adcode": "110109", + "center": "116.105381,39.937183", }, '顺义区': { - "adcode" : "110113", - "center" : "116.653525,40.128936", + "adcode": "110113", + "center": "116.653525,40.128936", }, '朝阳区': { - "adcode" : "110105", - "center" : "116.486409,39.921489", + "adcode": "110105", + "center": "116.486409,39.921489", }, '通州区': { - "adcode" : "110112", - "center" : "116.658603,39.902486", + "adcode": "110112", + "center": "116.658603,39.902486", }, '大兴区': { - "adcode" : "110115", - "center" : "116.338033,39.728908", + "adcode": "110115", + "center": "116.338033,39.728908", }, '昌平区': { - "adcode" : "110114", - "center" : "116.235906,40.218085", + "adcode": "110114", + "center": "116.235906,40.218085", }, '西城区': { - "adcode" : "110102", - "center" : "116.366794,39.915309", + "adcode": "110102", + "center": "116.366794,39.915309", }, '东城区': { - "adcode" : "110101", - "center" : "116.418757,39.917544", + "adcode": "110101", + "center": "116.418757,39.917544", }, '房山区': { - "adcode" : "110111", - "center" : "116.139157,39.735535", + "adcode": "110111", + "center": "116.139157,39.735535", }, '石景山区': { - "adcode" : "110107", - "center" : "116.195445,39.914601", + "adcode": "110107", + "center": "116.195445,39.914601", }, '海淀区': { - "adcode" : "110108", - "center" : "116.310316,39.956074", + "adcode": "110108", + "center": "116.310316,39.956074", }, '丰台区': { - "center": "116.286968,39.863642", + "center": "116.286968,39.863642", }, -}; + }; var clusterIndexSet = { city: { minZoom: 2, @@ -796,8 +804,6 @@ } // ------------------------------------------------------------------------------------------------ onMounted(() => { - // console.log(document.getElementById('map'), '地图容器') - // setTimeout(() => { loading.value = true const height = document.getElementById('map-container-only')?.offsetHeight if (height) { @@ -807,8 +813,16 @@ } } initMap() - // console.log - // }) + // // 检测地图是否加载失败 + // setTimeout(() => { + // // 地图canvas + // const canvas = document.getElementsByClassName('amap-layer')[0] + // const height = canvas.getBoundingClientRect().height + // if(height) { + // // 地图加载失败(报错类型) + // console.log('地图加载失败(报错类型)') + // } + // }, 1000 * 15) }) onUnmounted(() => { if (xunteng.value) { diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts index 3ee5aac..8289351 100644 --- a/src/router/modules/pc.ts +++ b/src/router/modules/pc.ts @@ -223,16 +223,16 @@ }, }, { - path: 'monitor/detail', + path: 'detail', component: () => import('@/views/home/temporary/components/detail.vue'), - name: 'TemporaryMonitorDetail', + name: 'TemporaryMonitorDetail1', meta: { title: '监测详情', icon: 'ep:key', sidebar: false, - breadcrumb: false, + breadcrumb: true, activeMenu: '/temporary', - auth: '/temporary/detail/menu', + // auth: '/temporary/detail/menu', }, }, ], diff --git a/999.zip b/999.zip deleted file mode 100644 index 09ba15a..0000000 --- a/999.zip +++ /dev/null Binary files differ diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts new file mode 100644 index 0000000..132d029 --- /dev/null +++ b/src/api/home/force/index.ts @@ -0,0 +1,21 @@ +/** + * 放外力破坏监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getForceListPage(data: any) { + return request({ + url: `/monitor/damage/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getForceList(data: any) { + return request({ + url: `/monitor/damage/list`, + method: 'post', + data, + }) +} diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 14f1cfc..e41ba6a 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -98,6 +98,11 @@ type: Boolean, default: false, }, + // 当前行的 class 可以用来修改样式 + tableRowClassName: { + type: Function, + default: () => '' + } }) const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'rowDisabled', 'handleClickFollowLink', 'sortChange']) // -------定义数据-------------- @@ -343,7 +348,9 @@ :data="data" :height="height" :border="border" stripe :size="size" style="width: 100%;" :row-key="(row) => { return JSON.stringify(row) }" :span-method="mergeTableRow" @selection-change="handleSelectionChange" @select="selectClick" @row-click="rowClick" @row-dblclick="rowDbClick" - @filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"> + @filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick" + :row-class-name="props.tableRowClassName" + > diff --git a/src/components/map/index.vue b/src/components/map/index.vue index 2f82737..8007858 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -490,7 +490,11 @@ var massMarks = new AMap.value.MassMarks(data.path, { zIndex: data.zIndex, // 海量点图层叠加的顺序 zooms: data.zooms || [], // 在指定地图缩放级别范围内展示海量点图层 - style: data.style, // 设置样式对象 + style: data.style.map((item: any) => ({ + ...item, + anchor: new AMap.value.Pixel(0, 0), + size: new AMap.value.Size(25, 25) + })), // 设置样式对象 }) massMarksAllList.value.push(massMarks) massMarks.setMap(map.value) @@ -593,7 +597,11 @@ }, ] if (styleList) { - style = styleList + style = styleList.map((item: any) => ({ + ...item, + anchor: new AMap.value.Pixel(0, 0), + size: new AMap.value.Size(25, 25) + })) } const markerHtml = `` var offset = new AMap.value.Pixel(-9, -9) @@ -629,69 +637,69 @@ console.log(points, 'points') var district = { '北京': { - "adcode" : "110000", - "center" : "116.405285,39.904989", - // "center" : "117.939152,40.976204", + "adcode": "110000", + "center": "116.405285,39.904989", + // "center" : "117.939152,40.976204", }, '亦庄开发区': { - "center": "116.506647,39.795337", + "center": "116.506647,39.795337", }, '密云区': { - "adcode" : "110118", - "center" : "116.843352,40.377362", + "adcode": "110118", + "center": "116.843352,40.377362", }, '怀柔区': { - "adcode" : "110116", - "center" : "116.637122,40.324272", + "adcode": "110116", + "center": "116.637122,40.324272", }, '门头沟区': { - "adcode" : "110109", - "center" : "116.105381,39.937183", + "adcode": "110109", + "center": "116.105381,39.937183", }, '顺义区': { - "adcode" : "110113", - "center" : "116.653525,40.128936", + "adcode": "110113", + "center": "116.653525,40.128936", }, '朝阳区': { - "adcode" : "110105", - "center" : "116.486409,39.921489", + "adcode": "110105", + "center": "116.486409,39.921489", }, '通州区': { - "adcode" : "110112", - "center" : "116.658603,39.902486", + "adcode": "110112", + "center": "116.658603,39.902486", }, '大兴区': { - "adcode" : "110115", - "center" : "116.338033,39.728908", + "adcode": "110115", + "center": "116.338033,39.728908", }, '昌平区': { - "adcode" : "110114", - "center" : "116.235906,40.218085", + "adcode": "110114", + "center": "116.235906,40.218085", }, '西城区': { - "adcode" : "110102", - "center" : "116.366794,39.915309", + "adcode": "110102", + "center": "116.366794,39.915309", }, '东城区': { - "adcode" : "110101", - "center" : "116.418757,39.917544", + "adcode": "110101", + "center": "116.418757,39.917544", }, '房山区': { - "adcode" : "110111", - "center" : "116.139157,39.735535", + "adcode": "110111", + "center": "116.139157,39.735535", }, '石景山区': { - "adcode" : "110107", - "center" : "116.195445,39.914601", + "adcode": "110107", + "center": "116.195445,39.914601", }, '海淀区': { - "adcode" : "110108", - "center" : "116.310316,39.956074", + "adcode": "110108", + "center": "116.310316,39.956074", }, '丰台区': { - "center": "116.286968,39.863642", + "center": "116.286968,39.863642", }, -}; + }; var clusterIndexSet = { city: { minZoom: 2, @@ -796,8 +804,6 @@ } // ------------------------------------------------------------------------------------------------ onMounted(() => { - // console.log(document.getElementById('map'), '地图容器') - // setTimeout(() => { loading.value = true const height = document.getElementById('map-container-only')?.offsetHeight if (height) { @@ -807,8 +813,16 @@ } } initMap() - // console.log - // }) + // // 检测地图是否加载失败 + // setTimeout(() => { + // // 地图canvas + // const canvas = document.getElementsByClassName('amap-layer')[0] + // const height = canvas.getBoundingClientRect().height + // if(height) { + // // 地图加载失败(报错类型) + // console.log('地图加载失败(报错类型)') + // } + // }, 1000 * 15) }) onUnmounted(() => { if (xunteng.value) { diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts index 3ee5aac..8289351 100644 --- a/src/router/modules/pc.ts +++ b/src/router/modules/pc.ts @@ -223,16 +223,16 @@ }, }, { - path: 'monitor/detail', + path: 'detail', component: () => import('@/views/home/temporary/components/detail.vue'), - name: 'TemporaryMonitorDetail', + name: 'TemporaryMonitorDetail1', meta: { title: '监测详情', icon: 'ep:key', sidebar: false, - breadcrumb: false, + breadcrumb: true, activeMenu: '/temporary', - auth: '/temporary/detail/menu', + // auth: '/temporary/detail/menu', }, }, ], diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts index 36bad18..c270e8c 100644 --- a/src/utils/sessionData.ts +++ b/src/utils/sessionData.ts @@ -79,7 +79,7 @@ // 泄露 export const fetchCacheLeak= () => { getLeakageList({}).then(res => { - console.log(res.data, '泄露') + // console.log(res.data, '泄露') indexDBHandler('all-leakage-list', JSON.stringify(res.data)) }) } diff --git a/999.zip b/999.zip deleted file mode 100644 index 09ba15a..0000000 --- a/999.zip +++ /dev/null Binary files differ diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts new file mode 100644 index 0000000..132d029 --- /dev/null +++ b/src/api/home/force/index.ts @@ -0,0 +1,21 @@ +/** + * 放外力破坏监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getForceListPage(data: any) { + return request({ + url: `/monitor/damage/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getForceList(data: any) { + return request({ + url: `/monitor/damage/list`, + method: 'post', + data, + }) +} diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 14f1cfc..e41ba6a 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -98,6 +98,11 @@ type: Boolean, default: false, }, + // 当前行的 class 可以用来修改样式 + tableRowClassName: { + type: Function, + default: () => '' + } }) const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'rowDisabled', 'handleClickFollowLink', 'sortChange']) // -------定义数据-------------- @@ -343,7 +348,9 @@ :data="data" :height="height" :border="border" stripe :size="size" style="width: 100%;" :row-key="(row) => { return JSON.stringify(row) }" :span-method="mergeTableRow" @selection-change="handleSelectionChange" @select="selectClick" @row-click="rowClick" @row-dblclick="rowDbClick" - @filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"> + @filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick" + :row-class-name="props.tableRowClassName" + > diff --git a/src/components/map/index.vue b/src/components/map/index.vue index 2f82737..8007858 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -490,7 +490,11 @@ var massMarks = new AMap.value.MassMarks(data.path, { zIndex: data.zIndex, // 海量点图层叠加的顺序 zooms: data.zooms || [], // 在指定地图缩放级别范围内展示海量点图层 - style: data.style, // 设置样式对象 + style: data.style.map((item: any) => ({ + ...item, + anchor: new AMap.value.Pixel(0, 0), + size: new AMap.value.Size(25, 25) + })), // 设置样式对象 }) massMarksAllList.value.push(massMarks) massMarks.setMap(map.value) @@ -593,7 +597,11 @@ }, ] if (styleList) { - style = styleList + style = styleList.map((item: any) => ({ + ...item, + anchor: new AMap.value.Pixel(0, 0), + size: new AMap.value.Size(25, 25) + })) } const markerHtml = `` var offset = new AMap.value.Pixel(-9, -9) @@ -629,69 +637,69 @@ console.log(points, 'points') var district = { '北京': { - "adcode" : "110000", - "center" : "116.405285,39.904989", - // "center" : "117.939152,40.976204", + "adcode": "110000", + "center": "116.405285,39.904989", + // "center" : "117.939152,40.976204", }, '亦庄开发区': { - "center": "116.506647,39.795337", + "center": "116.506647,39.795337", }, '密云区': { - "adcode" : "110118", - "center" : "116.843352,40.377362", + "adcode": "110118", + "center": "116.843352,40.377362", }, '怀柔区': { - "adcode" : "110116", - "center" : "116.637122,40.324272", + "adcode": "110116", + "center": "116.637122,40.324272", }, '门头沟区': { - "adcode" : "110109", - "center" : "116.105381,39.937183", + "adcode": "110109", + "center": "116.105381,39.937183", }, '顺义区': { - "adcode" : "110113", - "center" : "116.653525,40.128936", + "adcode": "110113", + "center": "116.653525,40.128936", }, '朝阳区': { - "adcode" : "110105", - "center" : "116.486409,39.921489", + "adcode": "110105", + "center": "116.486409,39.921489", }, '通州区': { - "adcode" : "110112", - "center" : "116.658603,39.902486", + "adcode": "110112", + "center": "116.658603,39.902486", }, '大兴区': { - "adcode" : "110115", - "center" : "116.338033,39.728908", + "adcode": "110115", + "center": "116.338033,39.728908", }, '昌平区': { - "adcode" : "110114", - "center" : "116.235906,40.218085", + "adcode": "110114", + "center": "116.235906,40.218085", }, '西城区': { - "adcode" : "110102", - "center" : "116.366794,39.915309", + "adcode": "110102", + "center": "116.366794,39.915309", }, '东城区': { - "adcode" : "110101", - "center" : "116.418757,39.917544", + "adcode": "110101", + "center": "116.418757,39.917544", }, '房山区': { - "adcode" : "110111", - "center" : "116.139157,39.735535", + "adcode": "110111", + "center": "116.139157,39.735535", }, '石景山区': { - "adcode" : "110107", - "center" : "116.195445,39.914601", + "adcode": "110107", + "center": "116.195445,39.914601", }, '海淀区': { - "adcode" : "110108", - "center" : "116.310316,39.956074", + "adcode": "110108", + "center": "116.310316,39.956074", }, '丰台区': { - "center": "116.286968,39.863642", + "center": "116.286968,39.863642", }, -}; + }; var clusterIndexSet = { city: { minZoom: 2, @@ -796,8 +804,6 @@ } // ------------------------------------------------------------------------------------------------ onMounted(() => { - // console.log(document.getElementById('map'), '地图容器') - // setTimeout(() => { loading.value = true const height = document.getElementById('map-container-only')?.offsetHeight if (height) { @@ -807,8 +813,16 @@ } } initMap() - // console.log - // }) + // // 检测地图是否加载失败 + // setTimeout(() => { + // // 地图canvas + // const canvas = document.getElementsByClassName('amap-layer')[0] + // const height = canvas.getBoundingClientRect().height + // if(height) { + // // 地图加载失败(报错类型) + // console.log('地图加载失败(报错类型)') + // } + // }, 1000 * 15) }) onUnmounted(() => { if (xunteng.value) { diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts index 3ee5aac..8289351 100644 --- a/src/router/modules/pc.ts +++ b/src/router/modules/pc.ts @@ -223,16 +223,16 @@ }, }, { - path: 'monitor/detail', + path: 'detail', component: () => import('@/views/home/temporary/components/detail.vue'), - name: 'TemporaryMonitorDetail', + name: 'TemporaryMonitorDetail1', meta: { title: '监测详情', icon: 'ep:key', sidebar: false, - breadcrumb: false, + breadcrumb: true, activeMenu: '/temporary', - auth: '/temporary/detail/menu', + // auth: '/temporary/detail/menu', }, }, ], diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts index 36bad18..c270e8c 100644 --- a/src/utils/sessionData.ts +++ b/src/utils/sessionData.ts @@ -79,7 +79,7 @@ // 泄露 export const fetchCacheLeak= () => { getLeakageList({}).then(res => { - console.log(res.data, '泄露') + // console.log(res.data, '泄露') indexDBHandler('all-leakage-list', JSON.stringify(res.data)) }) } diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index 5d151d6..679778a 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -63,26 +63,26 @@ const style = [ { url: `${publicPath}/image/well/well-normal.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-error.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-off.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-will.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, ] @@ -135,26 +135,26 @@ const style = [ { url: `${publicPath}/image/well/well-normal.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-error.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-off.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-will.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, ] @@ -1208,38 +1208,38 @@ const style = [ { url: `${publicPath}/image/well/well-normal.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, }, { url: `${publicPath}/image/station/station-normal.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, }, { url: `${publicPath}/image/other/tyx.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, }, { url: `${publicPath}/image/other/ranqi.png`, - anchor: new mapRef.value.AMap.Pixel(4, 25), - size: new mapRef.value.AMap.Size(25, 25), + // anchor: new mapRef.value.AMap.Pixel(4, 25), + // size: new mapRef.value.AMap.Size(25, 25), zIndex: 99, }, { url: `${publicPath}/image/other/yuntai.png`, - anchor: new mapRef.value.AMap.Pixel(4, 25), - size: new mapRef.value.AMap.Size(25, 25), + // anchor: new mapRef.value.AMap.Pixel(4, 25), + // size: new mapRef.value.AMap.Size(25, 25), zIndex: 99, }, { url: `${publicPath}/image/other/shaobing.png`, - anchor: new mapRef.value.AMap.Pixel(4, 25), - size: new mapRef.value.AMap.Size(25, 25), + // anchor: new mapRef.value.AMap.Pixel(4, 25), + // size: new mapRef.value.AMap.Size(25, 25), zIndex: 99, }, ] diff --git a/999.zip b/999.zip deleted file mode 100644 index 09ba15a..0000000 --- a/999.zip +++ /dev/null Binary files differ diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts new file mode 100644 index 0000000..132d029 --- /dev/null +++ b/src/api/home/force/index.ts @@ -0,0 +1,21 @@ +/** + * 放外力破坏监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getForceListPage(data: any) { + return request({ + url: `/monitor/damage/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getForceList(data: any) { + return request({ + url: `/monitor/damage/list`, + method: 'post', + data, + }) +} diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 14f1cfc..e41ba6a 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -98,6 +98,11 @@ type: Boolean, default: false, }, + // 当前行的 class 可以用来修改样式 + tableRowClassName: { + type: Function, + default: () => '' + } }) const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'rowDisabled', 'handleClickFollowLink', 'sortChange']) // -------定义数据-------------- @@ -343,7 +348,9 @@ :data="data" :height="height" :border="border" stripe :size="size" style="width: 100%;" :row-key="(row) => { return JSON.stringify(row) }" :span-method="mergeTableRow" @selection-change="handleSelectionChange" @select="selectClick" @row-click="rowClick" @row-dblclick="rowDbClick" - @filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"> + @filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick" + :row-class-name="props.tableRowClassName" + > diff --git a/src/components/map/index.vue b/src/components/map/index.vue index 2f82737..8007858 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -490,7 +490,11 @@ var massMarks = new AMap.value.MassMarks(data.path, { zIndex: data.zIndex, // 海量点图层叠加的顺序 zooms: data.zooms || [], // 在指定地图缩放级别范围内展示海量点图层 - style: data.style, // 设置样式对象 + style: data.style.map((item: any) => ({ + ...item, + anchor: new AMap.value.Pixel(0, 0), + size: new AMap.value.Size(25, 25) + })), // 设置样式对象 }) massMarksAllList.value.push(massMarks) massMarks.setMap(map.value) @@ -593,7 +597,11 @@ }, ] if (styleList) { - style = styleList + style = styleList.map((item: any) => ({ + ...item, + anchor: new AMap.value.Pixel(0, 0), + size: new AMap.value.Size(25, 25) + })) } const markerHtml = `` var offset = new AMap.value.Pixel(-9, -9) @@ -629,69 +637,69 @@ console.log(points, 'points') var district = { '北京': { - "adcode" : "110000", - "center" : "116.405285,39.904989", - // "center" : "117.939152,40.976204", + "adcode": "110000", + "center": "116.405285,39.904989", + // "center" : "117.939152,40.976204", }, '亦庄开发区': { - "center": "116.506647,39.795337", + "center": "116.506647,39.795337", }, '密云区': { - "adcode" : "110118", - "center" : "116.843352,40.377362", + "adcode": "110118", + "center": "116.843352,40.377362", }, '怀柔区': { - "adcode" : "110116", - "center" : "116.637122,40.324272", + "adcode": "110116", + "center": "116.637122,40.324272", }, '门头沟区': { - "adcode" : "110109", - "center" : "116.105381,39.937183", + "adcode": "110109", + "center": "116.105381,39.937183", }, '顺义区': { - "adcode" : "110113", - "center" : "116.653525,40.128936", + "adcode": "110113", + "center": "116.653525,40.128936", }, '朝阳区': { - "adcode" : "110105", - "center" : "116.486409,39.921489", + "adcode": "110105", + "center": "116.486409,39.921489", }, '通州区': { - "adcode" : "110112", - "center" : "116.658603,39.902486", + "adcode": "110112", + "center": "116.658603,39.902486", }, '大兴区': { - "adcode" : "110115", - "center" : "116.338033,39.728908", + "adcode": "110115", + "center": "116.338033,39.728908", }, '昌平区': { - "adcode" : "110114", - "center" : "116.235906,40.218085", + "adcode": "110114", + "center": "116.235906,40.218085", }, '西城区': { - "adcode" : "110102", - "center" : "116.366794,39.915309", + "adcode": "110102", + "center": "116.366794,39.915309", }, '东城区': { - "adcode" : "110101", - "center" : "116.418757,39.917544", + "adcode": "110101", + "center": "116.418757,39.917544", }, '房山区': { - "adcode" : "110111", - "center" : "116.139157,39.735535", + "adcode": "110111", + "center": "116.139157,39.735535", }, '石景山区': { - "adcode" : "110107", - "center" : "116.195445,39.914601", + "adcode": "110107", + "center": "116.195445,39.914601", }, '海淀区': { - "adcode" : "110108", - "center" : "116.310316,39.956074", + "adcode": "110108", + "center": "116.310316,39.956074", }, '丰台区': { - "center": "116.286968,39.863642", + "center": "116.286968,39.863642", }, -}; + }; var clusterIndexSet = { city: { minZoom: 2, @@ -796,8 +804,6 @@ } // ------------------------------------------------------------------------------------------------ onMounted(() => { - // console.log(document.getElementById('map'), '地图容器') - // setTimeout(() => { loading.value = true const height = document.getElementById('map-container-only')?.offsetHeight if (height) { @@ -807,8 +813,16 @@ } } initMap() - // console.log - // }) + // // 检测地图是否加载失败 + // setTimeout(() => { + // // 地图canvas + // const canvas = document.getElementsByClassName('amap-layer')[0] + // const height = canvas.getBoundingClientRect().height + // if(height) { + // // 地图加载失败(报错类型) + // console.log('地图加载失败(报错类型)') + // } + // }, 1000 * 15) }) onUnmounted(() => { if (xunteng.value) { diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts index 3ee5aac..8289351 100644 --- a/src/router/modules/pc.ts +++ b/src/router/modules/pc.ts @@ -223,16 +223,16 @@ }, }, { - path: 'monitor/detail', + path: 'detail', component: () => import('@/views/home/temporary/components/detail.vue'), - name: 'TemporaryMonitorDetail', + name: 'TemporaryMonitorDetail1', meta: { title: '监测详情', icon: 'ep:key', sidebar: false, - breadcrumb: false, + breadcrumb: true, activeMenu: '/temporary', - auth: '/temporary/detail/menu', + // auth: '/temporary/detail/menu', }, }, ], diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts index 36bad18..c270e8c 100644 --- a/src/utils/sessionData.ts +++ b/src/utils/sessionData.ts @@ -79,7 +79,7 @@ // 泄露 export const fetchCacheLeak= () => { getLeakageList({}).then(res => { - console.log(res.data, '泄露') + // console.log(res.data, '泄露') indexDBHandler('all-leakage-list', JSON.stringify(res.data)) }) } diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index 5d151d6..679778a 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -63,26 +63,26 @@ const style = [ { url: `${publicPath}/image/well/well-normal.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-error.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-off.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-will.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, ] @@ -135,26 +135,26 @@ const style = [ { url: `${publicPath}/image/well/well-normal.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-error.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-off.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-will.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, ] @@ -1208,38 +1208,38 @@ const style = [ { url: `${publicPath}/image/well/well-normal.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, }, { url: `${publicPath}/image/station/station-normal.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, }, { url: `${publicPath}/image/other/tyx.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, }, { url: `${publicPath}/image/other/ranqi.png`, - anchor: new mapRef.value.AMap.Pixel(4, 25), - size: new mapRef.value.AMap.Size(25, 25), + // anchor: new mapRef.value.AMap.Pixel(4, 25), + // size: new mapRef.value.AMap.Size(25, 25), zIndex: 99, }, { url: `${publicPath}/image/other/yuntai.png`, - anchor: new mapRef.value.AMap.Pixel(4, 25), - size: new mapRef.value.AMap.Size(25, 25), + // anchor: new mapRef.value.AMap.Pixel(4, 25), + // size: new mapRef.value.AMap.Size(25, 25), zIndex: 99, }, { url: `${publicPath}/image/other/shaobing.png`, - anchor: new mapRef.value.AMap.Pixel(4, 25), - size: new mapRef.value.AMap.Size(25, 25), + // anchor: new mapRef.value.AMap.Pixel(4, 25), + // size: new mapRef.value.AMap.Size(25, 25), zIndex: 99, }, ] diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue index dba1d86..baa9363 100644 --- a/src/views/home/dashboard/components/eventMap.vue +++ b/src/views/home/dashboard/components/eventMap.vue @@ -135,43 +135,43 @@ const style = [ { url: `${publicPath}/image/other/one.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, type: '一级', }, { url: `${publicPath}/image/other/two.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, type: '二级', }, { url: `${publicPath}/image/other/three.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, type: '三级', }, { url: `${publicPath}/image/other/other.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, type: '其他', }, { url: `${publicPath}/image/other/one.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, type: '报警', }, { url: `${publicPath}/image/other/two.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, type: '预警', }, diff --git a/999.zip b/999.zip deleted file mode 100644 index 09ba15a..0000000 --- a/999.zip +++ /dev/null Binary files differ diff --git a/src/api/home/force/index.ts b/src/api/home/force/index.ts new file mode 100644 index 0000000..132d029 --- /dev/null +++ b/src/api/home/force/index.ts @@ -0,0 +1,21 @@ +/** + * 放外力破坏监测 + */ +import request from '@/api/index' + +// 列表 分页 +export function getForceListPage(data: any) { + return request({ + url: `/monitor/damage/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 列表 地图用 +export function getForceList(data: any) { + return request({ + url: `/monitor/damage/list`, + method: 'post', + data, + }) +} diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 14f1cfc..e41ba6a 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -98,6 +98,11 @@ type: Boolean, default: false, }, + // 当前行的 class 可以用来修改样式 + tableRowClassName: { + type: Function, + default: () => '' + } }) const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'rowDisabled', 'handleClickFollowLink', 'sortChange']) // -------定义数据-------------- @@ -343,7 +348,9 @@ :data="data" :height="height" :border="border" stripe :size="size" style="width: 100%;" :row-key="(row) => { return JSON.stringify(row) }" :span-method="mergeTableRow" @selection-change="handleSelectionChange" @select="selectClick" @row-click="rowClick" @row-dblclick="rowDbClick" - @filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick"> + @filter-change="filterChange" @row-contextmenu="contextmenu" @sort-change="sortClick" + :row-class-name="props.tableRowClassName" + > diff --git a/src/components/map/index.vue b/src/components/map/index.vue index 2f82737..8007858 100644 --- a/src/components/map/index.vue +++ b/src/components/map/index.vue @@ -490,7 +490,11 @@ var massMarks = new AMap.value.MassMarks(data.path, { zIndex: data.zIndex, // 海量点图层叠加的顺序 zooms: data.zooms || [], // 在指定地图缩放级别范围内展示海量点图层 - style: data.style, // 设置样式对象 + style: data.style.map((item: any) => ({ + ...item, + anchor: new AMap.value.Pixel(0, 0), + size: new AMap.value.Size(25, 25) + })), // 设置样式对象 }) massMarksAllList.value.push(massMarks) massMarks.setMap(map.value) @@ -593,7 +597,11 @@ }, ] if (styleList) { - style = styleList + style = styleList.map((item: any) => ({ + ...item, + anchor: new AMap.value.Pixel(0, 0), + size: new AMap.value.Size(25, 25) + })) } const markerHtml = `` var offset = new AMap.value.Pixel(-9, -9) @@ -629,69 +637,69 @@ console.log(points, 'points') var district = { '北京': { - "adcode" : "110000", - "center" : "116.405285,39.904989", - // "center" : "117.939152,40.976204", + "adcode": "110000", + "center": "116.405285,39.904989", + // "center" : "117.939152,40.976204", }, '亦庄开发区': { - "center": "116.506647,39.795337", + "center": "116.506647,39.795337", }, '密云区': { - "adcode" : "110118", - "center" : "116.843352,40.377362", + "adcode": "110118", + "center": "116.843352,40.377362", }, '怀柔区': { - "adcode" : "110116", - "center" : "116.637122,40.324272", + "adcode": "110116", + "center": "116.637122,40.324272", }, '门头沟区': { - "adcode" : "110109", - "center" : "116.105381,39.937183", + "adcode": "110109", + "center": "116.105381,39.937183", }, '顺义区': { - "adcode" : "110113", - "center" : "116.653525,40.128936", + "adcode": "110113", + "center": "116.653525,40.128936", }, '朝阳区': { - "adcode" : "110105", - "center" : "116.486409,39.921489", + "adcode": "110105", + "center": "116.486409,39.921489", }, '通州区': { - "adcode" : "110112", - "center" : "116.658603,39.902486", + "adcode": "110112", + "center": "116.658603,39.902486", }, '大兴区': { - "adcode" : "110115", - "center" : "116.338033,39.728908", + "adcode": "110115", + "center": "116.338033,39.728908", }, '昌平区': { - "adcode" : "110114", - "center" : "116.235906,40.218085", + "adcode": "110114", + "center": "116.235906,40.218085", }, '西城区': { - "adcode" : "110102", - "center" : "116.366794,39.915309", + "adcode": "110102", + "center": "116.366794,39.915309", }, '东城区': { - "adcode" : "110101", - "center" : "116.418757,39.917544", + "adcode": "110101", + "center": "116.418757,39.917544", }, '房山区': { - "adcode" : "110111", - "center" : "116.139157,39.735535", + "adcode": "110111", + "center": "116.139157,39.735535", }, '石景山区': { - "adcode" : "110107", - "center" : "116.195445,39.914601", + "adcode": "110107", + "center": "116.195445,39.914601", }, '海淀区': { - "adcode" : "110108", - "center" : "116.310316,39.956074", + "adcode": "110108", + "center": "116.310316,39.956074", }, '丰台区': { - "center": "116.286968,39.863642", + "center": "116.286968,39.863642", }, -}; + }; var clusterIndexSet = { city: { minZoom: 2, @@ -796,8 +804,6 @@ } // ------------------------------------------------------------------------------------------------ onMounted(() => { - // console.log(document.getElementById('map'), '地图容器') - // setTimeout(() => { loading.value = true const height = document.getElementById('map-container-only')?.offsetHeight if (height) { @@ -807,8 +813,16 @@ } } initMap() - // console.log - // }) + // // 检测地图是否加载失败 + // setTimeout(() => { + // // 地图canvas + // const canvas = document.getElementsByClassName('amap-layer')[0] + // const height = canvas.getBoundingClientRect().height + // if(height) { + // // 地图加载失败(报错类型) + // console.log('地图加载失败(报错类型)') + // } + // }, 1000 * 15) }) onUnmounted(() => { if (xunteng.value) { diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts index 3ee5aac..8289351 100644 --- a/src/router/modules/pc.ts +++ b/src/router/modules/pc.ts @@ -223,16 +223,16 @@ }, }, { - path: 'monitor/detail', + path: 'detail', component: () => import('@/views/home/temporary/components/detail.vue'), - name: 'TemporaryMonitorDetail', + name: 'TemporaryMonitorDetail1', meta: { title: '监测详情', icon: 'ep:key', sidebar: false, - breadcrumb: false, + breadcrumb: true, activeMenu: '/temporary', - auth: '/temporary/detail/menu', + // auth: '/temporary/detail/menu', }, }, ], diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts index 36bad18..c270e8c 100644 --- a/src/utils/sessionData.ts +++ b/src/utils/sessionData.ts @@ -79,7 +79,7 @@ // 泄露 export const fetchCacheLeak= () => { getLeakageList({}).then(res => { - console.log(res.data, '泄露') + // console.log(res.data, '泄露') indexDBHandler('all-leakage-list', JSON.stringify(res.data)) }) } diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue index 5d151d6..679778a 100644 --- a/src/views/home/dashboard/components/controlMap.vue +++ b/src/views/home/dashboard/components/controlMap.vue @@ -63,26 +63,26 @@ const style = [ { url: `${publicPath}/image/well/well-normal.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-error.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-off.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-will.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, ] @@ -135,26 +135,26 @@ const style = [ { url: `${publicPath}/image/well/well-normal.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-error.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-off.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, { url: `${publicPath}/image/well/well-will.png`, // 图标地址 - anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 - size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 + // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角 + // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸 zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前 }, ] @@ -1208,38 +1208,38 @@ const style = [ { url: `${publicPath}/image/well/well-normal.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, }, { url: `${publicPath}/image/station/station-normal.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, }, { url: `${publicPath}/image/other/tyx.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, }, { url: `${publicPath}/image/other/ranqi.png`, - anchor: new mapRef.value.AMap.Pixel(4, 25), - size: new mapRef.value.AMap.Size(25, 25), + // anchor: new mapRef.value.AMap.Pixel(4, 25), + // size: new mapRef.value.AMap.Size(25, 25), zIndex: 99, }, { url: `${publicPath}/image/other/yuntai.png`, - anchor: new mapRef.value.AMap.Pixel(4, 25), - size: new mapRef.value.AMap.Size(25, 25), + // anchor: new mapRef.value.AMap.Pixel(4, 25), + // size: new mapRef.value.AMap.Size(25, 25), zIndex: 99, }, { url: `${publicPath}/image/other/shaobing.png`, - anchor: new mapRef.value.AMap.Pixel(4, 25), - size: new mapRef.value.AMap.Size(25, 25), + // anchor: new mapRef.value.AMap.Pixel(4, 25), + // size: new mapRef.value.AMap.Size(25, 25), zIndex: 99, }, ] diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue index dba1d86..baa9363 100644 --- a/src/views/home/dashboard/components/eventMap.vue +++ b/src/views/home/dashboard/components/eventMap.vue @@ -135,43 +135,43 @@ const style = [ { url: `${publicPath}/image/other/one.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, type: '一级', }, { url: `${publicPath}/image/other/two.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, type: '二级', }, { url: `${publicPath}/image/other/three.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, type: '三级', }, { url: `${publicPath}/image/other/other.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, type: '其他', }, { url: `${publicPath}/image/other/one.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, type: '报警', }, { url: `${publicPath}/image/other/two.png`, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(18, 18), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(18, 18), zIndex: 99, type: '预警', }, diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue index c35510b..c72584c 100644 --- a/src/views/home/dashboard/deviceMonitor.vue +++ b/src/views/home/dashboard/deviceMonitor.vue @@ -39,6 +39,11 @@ calcHeight() }) +window.addEventListener('resize', calcHeight) + +onBeforeUnmount(() => { + window.removeEventListener('resize', calcHeight) +}) // --------------------------列表操作------------------------- @@ -49,10 +54,10 @@ { id: '1', value: '1', label: '闸井', pid: '0' }, { id: '2', value: '2', label: '场站', pid: '0' }, { id: '3', value: '3', label: '管线', pid: '0' }, - { id: '6', value: '-2,3,4', label: '隐患点', pid: '0' }, - { id: '7', value: '-2', label: '穿越缺陷点', pid: '6' }, - { id: '8', value: '-3', label: '占压隐患点', pid: '6' }, - { id: '9', value: '-4', label: '应急监测点', pid: '6' }, + { id: '6', value: '-1,2,3', label: '隐患点', pid: '0' }, + { id: '7', value: '-1', label: '穿越缺陷点', pid: '6' }, + { id: '8', value: '-2', label: '占压隐患点', pid: '6' }, + { id: '9', value: '-3', label: '应急监测点', pid: '6' }, ] as any[] monitorObjectList.value = toTreeList(initMonitorObjectList) const loadingTable = ref(false) @@ -71,6 +76,15 @@ { text: '监控状态', value: 'onlineStateName', align: 'center', width: '120', isCustom: true, }, { text: '最新时间', value: 'logTime', align: 'center', width: '160' }, ]) +const tableRowClassName = ({ row }) => { + // console.log(row, '111') + if (row.onlineState !== '1') { + return 'alarm-row-device-monitor' + } + else { + return '' + } +} // const columnsVirtual: Column[] = // [ // { @@ -193,7 +207,8 @@ } getDeviceMonitorList({ ...listQuery.value, - locationType: listQuery.value.watchType.includes('-') ? listQuery.value.watchType.split('-')[1] : '' + locationType: listQuery.value.watchObject.includes('-') ? listQuery.value.watchObject.split('-')[1] : '', + watchObject: listQuery.value.watchObject.includes('-') ? '' : listQuery.value.watchObject }).then(res => { const data = res.data.rows.map((item: any, index: number) => ({ ...item, @@ -245,6 +260,38 @@ } fetchData() } + +// 根据位号跳转 +// const $router = useRouter() +// const toWatchObj = (row: any) => { +// console.log(row, 'row') +// if (row.locationType) { +// // 隐患监测 +// $router.push({ +// name: 'TemporaryMonitorDetail', +// query: { +// id: row.id, +// deviceCode: row.devcode, +// typeName: row.typeName, +// }, +// }) +// } +// else { +// if (row.watchObject === '1') { +// // 闸井 +// $router.push({ +// path: `/well/detail`, +// query: { +// id: row.id, +// row: JSON.stringify(row), +// }, +// }) +// } +// else if(row.watchObject === '2') { +// // 场站 +// } +// } +// } // ---------------------地图------------------ const mapRef = ref() const showMap = ref('') // district point @@ -527,8 +574,8 @@ // 1 闸井 2 场站 3 管线 5 外力破坏 7 穿越缺陷点 8 占压隐患点 9 应急监测点 const style = getIconStyle().map((item: any) => ({ ...item, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(20, 20), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(20, 20), })) const styleDict = { '1-1': 0, // 闸井-正常 @@ -623,8 +670,8 @@ mapRef.value.removeMassMarks() const style = getIconStyle().map((item: any) => ({ ...item, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(20, 20), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(20, 20), })) // 根据操作的不同图例操作 if (type === 'status') { @@ -638,16 +685,16 @@ pointData.value = pointData.value.filter((item: any) => legendShowData.value.includes(item.onlineState)) } if (pointData.value.length > 400) { - mapRef.value.addCluster(pointData.value, style, clusterOptions) - } - else { - mapRef.value.addMassMarks({ - path: pointData.value, - zIndex: 111, - zooms: [3, 20], - style: style, - }) - } + mapRef.value.addCluster(pointData.value, style, clusterOptions) + } + else { + mapRef.value.addMassMarks({ + path: pointData.value, + zIndex: 111, + zooms: [3, 20], + style: style, + }) + } } const clickLegend = (type: string) => { if (legendShowData.value.includes(type)) { @@ -802,11 +849,11 @@ if (pointData.value.length) { // 如果点 大于200 聚合 否则不聚合 if (pointAllData.value.length > 400) { - // if (selectTree.value.includes('1') || selectTree.value.includes('2') || selectTree.value.includes('3')) { + // if (selectTree.value.includes('1') || selectTree.value.includes('2') || selectTree.value.includes('3')) { mapRef.value.addCluster(pointAllData.value, getIconStyle().map((item: any) => ({ ...item, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(20, 20), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(20, 20), })), clusterOptions) } else { @@ -816,8 +863,8 @@ zooms: [3, 20], style: getIconStyle().map((item: any) => ({ ...item, - anchor: new mapRef.value.AMap.Pixel(4, 4), - size: new mapRef.value.AMap.Size(20, 20), + // anchor: new mapRef.value.AMap.Pixel(4, 4), + // size: new mapRef.value.AMap.Size(20, 20), })), }) } @@ -858,7 +905,7 @@ :style="{ width: `${expandDistrict ? '400' : '198'}px` }"> + :header-cell-style="tableHeaderStyle">