diff --git a/.env.production b/.env.production index ed8a601..5d328b3 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index ed8a601..5d328b3 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/api/page/page.ts b/src/api/page/page.ts index ef6f6ad..024a447 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -40,6 +40,14 @@ data: params, }) } +// 占压数据分析 +export function getDatabase(params: any) { + return request({ + url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} // 风险耦合分析列表 export function getAnalyse(params: any) { return request({ diff --git a/.env.production b/.env.production index ed8a601..5d328b3 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/api/page/page.ts b/src/api/page/page.ts index ef6f6ad..024a447 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -40,6 +40,14 @@ data: params, }) } +// 占压数据分析 +export function getDatabase(params: any) { + return request({ + url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} // 风险耦合分析列表 export function getAnalyse(params: any) { return request({ diff --git a/src/components.d.ts b/src/components.d.ts index b324544..4242305 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -29,6 +29,7 @@ ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] + Database: typeof import('./components/map/components/database.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] diff --git a/.env.production b/.env.production index ed8a601..5d328b3 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/api/page/page.ts b/src/api/page/page.ts index ef6f6ad..024a447 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -40,6 +40,14 @@ data: params, }) } +// 占压数据分析 +export function getDatabase(params: any) { + return request({ + url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} // 风险耦合分析列表 export function getAnalyse(params: any) { return request({ diff --git a/src/components.d.ts b/src/components.d.ts index b324544..4242305 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -29,6 +29,7 @@ ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] + Database: typeof import('./components/map/components/database.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] diff --git a/src/components/map/Map.vue b/src/components/map/Map.vue index 3ae77f2..dc4cfbc 100644 --- a/src/components/map/Map.vue +++ b/src/components/map/Map.vue @@ -98,7 +98,7 @@ // if (pointArr.length) { // map.value.setCenter(pointArr[0]) // } - map.value.setFitView() + const AMap = AMapRef.value // 标记点绘制 for (let i = 0; i < arr.length; i++) { @@ -139,6 +139,7 @@ // 将标记点添加到地图 map.value.add([marker]) + map.value.setFitView() } } // 绘制折线(轨迹) diff --git a/.env.production b/.env.production index ed8a601..5d328b3 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/api/page/page.ts b/src/api/page/page.ts index ef6f6ad..024a447 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -40,6 +40,14 @@ data: params, }) } +// 占压数据分析 +export function getDatabase(params: any) { + return request({ + url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} // 风险耦合分析列表 export function getAnalyse(params: any) { return request({ diff --git a/src/components.d.ts b/src/components.d.ts index b324544..4242305 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -29,6 +29,7 @@ ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] + Database: typeof import('./components/map/components/database.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] diff --git a/src/components/map/Map.vue b/src/components/map/Map.vue index 3ae77f2..dc4cfbc 100644 --- a/src/components/map/Map.vue +++ b/src/components/map/Map.vue @@ -98,7 +98,7 @@ // if (pointArr.length) { // map.value.setCenter(pointArr[0]) // } - map.value.setFitView() + const AMap = AMapRef.value // 标记点绘制 for (let i = 0; i < arr.length; i++) { @@ -139,6 +139,7 @@ // 将标记点添加到地图 map.value.add([marker]) + map.value.setFitView() } } // 绘制折线(轨迹) diff --git a/src/components/map/components/database.vue b/src/components/map/components/database.vue new file mode 100644 index 0000000..42cc42a --- /dev/null +++ b/src/components/map/components/database.vue @@ -0,0 +1,213 @@ + + + + + + diff --git a/.env.production b/.env.production index ed8a601..5d328b3 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/api/page/page.ts b/src/api/page/page.ts index ef6f6ad..024a447 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -40,6 +40,14 @@ data: params, }) } +// 占压数据分析 +export function getDatabase(params: any) { + return request({ + url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} // 风险耦合分析列表 export function getAnalyse(params: any) { return request({ diff --git a/src/components.d.ts b/src/components.d.ts index b324544..4242305 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -29,6 +29,7 @@ ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] + Database: typeof import('./components/map/components/database.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] diff --git a/src/components/map/Map.vue b/src/components/map/Map.vue index 3ae77f2..dc4cfbc 100644 --- a/src/components/map/Map.vue +++ b/src/components/map/Map.vue @@ -98,7 +98,7 @@ // if (pointArr.length) { // map.value.setCenter(pointArr[0]) // } - map.value.setFitView() + const AMap = AMapRef.value // 标记点绘制 for (let i = 0; i < arr.length; i++) { @@ -139,6 +139,7 @@ // 将标记点添加到地图 map.value.add([marker]) + map.value.setFitView() } } // 绘制折线(轨迹) diff --git a/src/components/map/components/database.vue b/src/components/map/components/database.vue new file mode 100644 index 0000000..42cc42a --- /dev/null +++ b/src/components/map/components/database.vue @@ -0,0 +1,213 @@ + + + + + + diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue index 36f021e..46514ba 100644 --- a/src/components/map/infoDialog.vue +++ b/src/components/map/infoDialog.vue @@ -9,6 +9,7 @@ import taskDetail from './components/taskDetail.vue' import analyse from './components/analyse.vue' import recognition from './components/recognition.vue' +import database from './components/database.vue' const overlay = ref() const infoWindow = ref() // 节点信息 @@ -47,6 +48,7 @@ + @@ -80,6 +82,11 @@ height: 280px !important; } +.database { + width: 840px !important; + height: 270px !important; +} + .container { color: #fff; width: 470px; diff --git a/.env.production b/.env.production index ed8a601..5d328b3 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/api/page/page.ts b/src/api/page/page.ts index ef6f6ad..024a447 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -40,6 +40,14 @@ data: params, }) } +// 占压数据分析 +export function getDatabase(params: any) { + return request({ + url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} // 风险耦合分析列表 export function getAnalyse(params: any) { return request({ diff --git a/src/components.d.ts b/src/components.d.ts index b324544..4242305 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -29,6 +29,7 @@ ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] + Database: typeof import('./components/map/components/database.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] diff --git a/src/components/map/Map.vue b/src/components/map/Map.vue index 3ae77f2..dc4cfbc 100644 --- a/src/components/map/Map.vue +++ b/src/components/map/Map.vue @@ -98,7 +98,7 @@ // if (pointArr.length) { // map.value.setCenter(pointArr[0]) // } - map.value.setFitView() + const AMap = AMapRef.value // 标记点绘制 for (let i = 0; i < arr.length; i++) { @@ -139,6 +139,7 @@ // 将标记点添加到地图 map.value.add([marker]) + map.value.setFitView() } } // 绘制折线(轨迹) diff --git a/src/components/map/components/database.vue b/src/components/map/components/database.vue new file mode 100644 index 0000000..42cc42a --- /dev/null +++ b/src/components/map/components/database.vue @@ -0,0 +1,213 @@ + + + + + + diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue index 36f021e..46514ba 100644 --- a/src/components/map/infoDialog.vue +++ b/src/components/map/infoDialog.vue @@ -9,6 +9,7 @@ import taskDetail from './components/taskDetail.vue' import analyse from './components/analyse.vue' import recognition from './components/recognition.vue' +import database from './components/database.vue' const overlay = ref() const infoWindow = ref() // 节点信息 @@ -47,6 +48,7 @@ + @@ -80,6 +82,11 @@ height: 280px !important; } +.database { + width: 840px !important; + height: 270px !important; +} + .container { color: #fff; width: 470px; diff --git a/src/views/home/components/statistics.vue b/src/views/home/components/statistics.vue index 3763b85..2d35733 100644 --- a/src/views/home/components/statistics.vue +++ b/src/views/home/components/statistics.vue @@ -93,7 +93,46 @@ MianHeight.value = height / 3 console.log(height, 'height') }) +const trendXdata1 = ref([]) +const trendData1 = ref([]) +const trendData2 = ref([]) +const legend = { + show: true, + icon: 'circle', + orient: 'horizontal', // 图例方向 + align: 'left', // 图例标记和文本的对齐，默认自动 + top: 5, + right: 20, + itemWidth: 12, + itemHeight: 12, + padding: [0, 0, 0, 120], +} onMounted(() => { + trendXdata1.value = ['2023-10-01', '2023-10-02', '2023-10-03', '2023-10-04', '2023-10-05', '2023-10-06', '2023-10-07'] + trendData1.value = [{ + name: '低风险', + data: [5, 9, 7, 3, 4, 5, 1], + }, + { + name: '一般风险', + data: [1, 2, 7, 6, 1, 5, 4], + }, + { + name: '较高风险', + data: [4, 4, 1, 7, 2, 8, 8], + }] + trendData2.value = [{ + name: '低风险', + data: [0, 0, 1, 2, 1, 5, 0], + }, + { + name: '一般风险', + data: [1, 1, 0, 6, 1, 5, 0], + }, + { + name: '较高风险', + data: [0, 4, 1, 0, 2, 8, 0], + }] fetchInspection() fetchCarInfo() fetchTrend() @@ -151,7 +190,7 @@ 第三方施工智能识别分析
- + 周 @@ -165,7 +204,7 @@
- +
@@ -175,7 +214,7 @@ 风险耦合分析
- + 周 @@ -189,7 +228,7 @@
- +
@@ -209,6 +248,7 @@ .chart-container { width: 100%; padding: 10px 20px; + overflow: hidden; .chart-top { display: flex; @@ -271,7 +311,8 @@ right: 0; z-index: 999; border-radius: 10px; - transition: all 0.5s; + // transition: all 0.5s; + overflow: hidden; &:hover { .close-dashboard { diff --git a/.env.production b/.env.production index ed8a601..5d328b3 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ NODE_ENV = production # 页面标题 -VITE_APP_TITLE = 标题 +VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/api/page/page.ts b/src/api/page/page.ts index ef6f6ad..024a447 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -40,6 +40,14 @@ data: params, }) } +// 占压数据分析 +export function getDatabase(params: any) { + return request({ + url: '/system/busPipeOverstock/listPage?offset=1&limit=20', + method: 'post', + data: params, + }) +} // 风险耦合分析列表 export function getAnalyse(params: any) { return request({ diff --git a/src/components.d.ts b/src/components.d.ts index b324544..4242305 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -29,6 +29,7 @@ ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] + Database: typeof import('./components/map/components/database.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] DetailBlock: typeof import('./components/DetailPage/DetailBlock.vue')['default'] DetailBlockSwitch: typeof import('./components/DetailPage/DetailBlockSwitch.vue')['default'] diff --git a/src/components/map/Map.vue b/src/components/map/Map.vue index 3ae77f2..dc4cfbc 100644 --- a/src/components/map/Map.vue +++ b/src/components/map/Map.vue @@ -98,7 +98,7 @@ // if (pointArr.length) { // map.value.setCenter(pointArr[0]) // } - map.value.setFitView() + const AMap = AMapRef.value // 标记点绘制 for (let i = 0; i < arr.length; i++) { @@ -139,6 +139,7 @@ // 将标记点添加到地图 map.value.add([marker]) + map.value.setFitView() } } // 绘制折线(轨迹) diff --git a/src/components/map/components/database.vue b/src/components/map/components/database.vue new file mode 100644 index 0000000..42cc42a --- /dev/null +++ b/src/components/map/components/database.vue @@ -0,0 +1,213 @@ + + + + + + diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue index 36f021e..46514ba 100644 --- a/src/components/map/infoDialog.vue +++ b/src/components/map/infoDialog.vue @@ -9,6 +9,7 @@ import taskDetail from './components/taskDetail.vue' import analyse from './components/analyse.vue' import recognition from './components/recognition.vue' +import database from './components/database.vue' const overlay = ref() const infoWindow = ref() // 节点信息 @@ -47,6 +48,7 @@ + @@ -80,6 +82,11 @@ height: 280px !important; } +.database { + width: 840px !important; + height: 270px !important; +} + .container { color: #fff; width: 470px; diff --git a/src/views/home/components/statistics.vue b/src/views/home/components/statistics.vue index 3763b85..2d35733 100644 --- a/src/views/home/components/statistics.vue +++ b/src/views/home/components/statistics.vue @@ -93,7 +93,46 @@ MianHeight.value = height / 3 console.log(height, 'height') }) +const trendXdata1 = ref([]) +const trendData1 = ref([]) +const trendData2 = ref([]) +const legend = { + show: true, + icon: 'circle', + orient: 'horizontal', // 图例方向 + align: 'left', // 图例标记和文本的对齐，默认自动 + top: 5, + right: 20, + itemWidth: 12, + itemHeight: 12, + padding: [0, 0, 0, 120], +} onMounted(() => { + trendXdata1.value = ['2023-10-01', '2023-10-02', '2023-10-03', '2023-10-04', '2023-10-05', '2023-10-06', '2023-10-07'] + trendData1.value = [{ + name: '低风险', + data: [5, 9, 7, 3, 4, 5, 1], + }, + { + name: '一般风险', + data: [1, 2, 7, 6, 1, 5, 4], + }, + { + name: '较高风险', + data: [4, 4, 1, 7, 2, 8, 8], + }] + trendData2.value = [{ + name: '低风险', + data: [0, 0, 1, 2, 1, 5, 0], + }, + { + name: '一般风险', + data: [1, 1, 0, 6, 1, 5, 0], + }, + { + name: '较高风险', + data: [0, 4, 1, 0, 2, 8, 0], + }] fetchInspection() fetchCarInfo() fetchTrend() @@ -151,7 +190,7 @@ 第三方施工智能识别分析
- + 周 @@ -165,7 +204,7 @@
- +
@@ -175,7 +214,7 @@ 风险耦合分析
- + 周 @@ -189,7 +228,7 @@
- +
@@ -209,6 +248,7 @@ .chart-container { width: 100%; padding: 10px 20px; + overflow: hidden; .chart-top { display: flex; @@ -271,7 +311,8 @@ right: 0; z-index: 999; border-radius: 10px; - transition: all 0.5s; + // transition: all 0.5s; + overflow: hidden; &:hover { .close-dashboard { diff --git a/src/views/home/index.vue b/src/views/home/index.vue index d73b679..30436a4 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -34,7 +34,10 @@ import recognition3 from '@/assets/images/点位图标/点位图标/识别/一般风险.png' import recognition4 from '@/assets/images/点位图标/点位图标/识别/较高风险.png' import recognition5 from '@/assets/images/点位图标/点位图标/识别/严重风险.png' -import { getAnalyse, getCarList, getGasList, getRecognition, getTaskList } from '@/api/page/page' +import database1 from '@/assets/images/点位图标/点位图标/占压/一般风险.png' +import database2 from '@/assets/images/点位图标/点位图标/占压/较高风险.png' +import database3 from '@/assets/images/点位图标/点位图标/占压/严重风险.png' +import { getAnalyse, getCarList, getDatabase, getGasList, getRecognition, getTaskList } from '@/api/page/page' const mapRef = ref() // 地图实例 const mapStore = useMapStore() // 地图仓库 watch(() => mapStore.detailList, (newVal) => { @@ -49,7 +52,6 @@ }) const center = ref([116.26759100, 39.91563500]) // 地图中心 const zoom = ref(17) // 地图显示的缩放级别 -const pegeLoading = ref(false) // 日期选择组件实例 const dateRef = ref() // 日期选择top距离 @@ -144,17 +146,17 @@ // }, { name: '较小隐患', - value: '2', + value: '较小隐患', color: '#FFD800', }, { name: '一般隐患', - value: '3', + value: '一般隐患', color: '#D98200', }, { name: '重大隐患', - value: '4', + value: '重大隐患', color: '#9F1919', }, ], @@ -200,9 +202,6 @@ // 切换菜单 const change = (index: number) => { - if (pegeLoading.value) { - return - } if (index === 5) { preSelect.value = select.value const ele = document.getElementById('menu-item5') @@ -223,9 +222,6 @@ }) // 改变条件菜单 const cchange = (value: string) => { - if (pegeLoading.value) { - return - } if (cselect.value.includes(value)) { cselect.value = cselect.value.filter((item: string) => item !== value) } @@ -242,7 +238,6 @@ const fetchHome = async () => { // 获取车辆列表 const fetchCar = async () => { - pegeLoading.value = true const res1 = await getCarList({}) console.log(res1, '车') const data1 = res1.data.map((item: any) => { @@ -259,12 +254,10 @@ }).filter((item: any) => item.lat && item.lng) // 绘制标记点 // mapRef.value.drawPonit(data1) - pegeLoading.value = false return data1 } // 获取任务列表 const fetchTask = async () => { - pegeLoading.value = true const res2 = await getTaskList({ beginDate: dateRef.value?.dateActive, endDate: dayjs().format('YYYY-MM-DD HH:mm:ss'), @@ -281,7 +274,6 @@ }).filter((item: any) => item.lat && item.lng) // 绘制标记点 // mapRef.value.drawPonit(data2) - pegeLoading.value = false return data2 } // 车0 任务1 @@ -321,7 +313,6 @@ } // 获取甲烷数据 const fetchGas = () => { - pegeLoading.value = true getGasList({ alarmType: '1', alarmStatus: cselect.value.length === 2 ? '' : cselect.value[0], // 报警状态 @@ -344,14 +335,10 @@ } // 绘制标记点 mapRef.value.drawPonit(data) - pegeLoading.value = false - }).catch(() => { - pegeLoading.value = false }) } // 获取第三方智能识别 const fetchRecognition = () => { - pegeLoading.value = true getRecognition({ beginDate: dateRef.value?.dateActive, // 报警开始时间 endDate: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 报警结束时间 @@ -381,8 +368,8 @@ ...item, // lat: item.latitude, // lng: item.longitude, - // lat: '39.914193', - // lng: '116.265982', + lat: '39.914193', + lng: '116.265982', icon, dialog: 'recognition', // alarmPicture: '2023-11\\e9109d1dc73c453b9f4cf47c6e0c90da.png', @@ -400,14 +387,56 @@ } // 绘制标记点 mapRef.value.drawPonit(Filter) - pegeLoading.value = false - }).catch(() => { - pegeLoading.value = false + }) +} +// 获取占压数据 +const fetchDatabase = () => { + getDatabase({ + beginDate: dateRef.value?.dateActive, // 报警开始时间 + endDate: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 报警结束时间 + }).then((res) => { + console.log(res.data, '占压') + const data = res.data.rows.map((item: any) => { + let icon = '' + switch (item.hiddenDangerLevel) { + case '较小隐患': + icon = database1 + break + case '一般隐患': + icon = database2 + break + case '重大隐患': + icon = database3 + break + } + return { + ...item, + lat: item.latitude, + lng: item.longitude, + icon, + dialog: 'database', + position: item.location, + } + }) + let Filter = [] + console.log(cselect.value, 'cselect.value') + if (cselect.value.length === 3) { + Filter = data + } + else { + Filter = data.filter(item => cselect.value.includes(item.hiddenDangerLevel)) + } + console.log(Filter, 'FilterFilter') + if (!Filter.length) { + ElMessage.warning('暂无占压数据') + return + } + // 绘制标记点 + mapRef.value.drawPonit(Filter) }) } // 获取耦合数据 const fetchAnalyse = () => { - pegeLoading.value = true getAnalyse({ beginDate: dateRef.value?.dateActive, // 开始时间 endDate: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 结束时间 @@ -431,8 +460,8 @@ } return { ...item, - lat: item.latitude, - lng: item.longitude, + lat: item.latitude.trim(), + lng: item.longitude.trim(), icon, dialog: 'analyse', } @@ -449,9 +478,6 @@ } // 绘制标记点 mapRef.value.drawPonit(Filter) - pegeLoading.value = false - }).catch(() => { - pegeLoading.value = false }) } // 获取点位数据 @@ -481,6 +507,7 @@ console.log('识别') break case 3: + fetchDatabase() console.log('占压') break case 4: @@ -513,7 +540,7 @@
-
+
清空轨迹
-
+
{{ child.name }}
@@ -578,6 +605,10 @@ .menu-item { margin-top: 10px; position: relative; + + &:hover { + cursor: pointer; + } } } @@ -596,6 +627,9 @@ font-weight: 700; border-radius: 8px; + &:hover { + cursor: pointer; + } } }