diff --git a/src/api/monitor.js b/src/api/monitor.js index f38c57e..f907bc5 100644 --- a/src/api/monitor.js +++ b/src/api/monitor.js @@ -1,5 +1,30 @@ import request from './request' +export function getTrafficEventsApi() { + return request({ + url: '/fjtcc-api/api/largeScreen/monitor/trafficEvents', + method: 'get' + }) +} +export function getVideoEventApi(scenicSpotId) { + return request({ + url: '/fjtcc-api/api/largeScreen/monitor/videoEvents?scenicSpotId='+scenicSpotId, + method: 'get' + }) +} +export function getVideoEventObjImgApi(objId) { + return request({ + url: '/fjtcc-api/api/largeScreen/monitor/videoEventsImg/'+objId, + method: 'get' + }) +} +export function getPreviewUrlSubApi(data) { + return request({ + url: '/fjtcc-api/api/largeScreen/video/getPreviewUrlSub', + method: 'post', + data + }) +} // 安全页面视频类型 export function getVideoTypeApi(data) { return request({ diff --git a/src/assets/images/imgloading.png b/src/assets/images/imgloading.png new file mode 100644 index 0000000..9c4a0bc Binary files /dev/null and b/src/assets/images/imgloading.png differ diff --git a/src/components/ImageDialog/index.vue b/src/components/ImageDialog/index.vue new file mode 100644 index 0000000..15c9dce --- /dev/null +++ b/src/components/ImageDialog/index.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/src/utils/config.js b/src/utils/config.js index 0bfb1e5..50bf75e 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -1,7 +1,7 @@ -export const baseUrl = 'http://192.168.77.209:81' +export const baseUrl = 'http://127.0.0.1:81' export const proBaseUrl = 'http://192.168.77.200' -export const socketBaseUrl = 'ws://192.168.77.209:81/fjtcc-api' +export const socketBaseUrl = 'ws://127.0.0.1:81/fjtcc-api' export const proSocketBaseUrl = 'ws://192.168.77.200:8060' export const mode = 'pro' // 测试 dev 正式 pro diff --git a/src/views/home/components/box-2.vue b/src/views/home/components/box-2.vue index a863f39..bbb5197 100644 --- a/src/views/home/components/box-2.vue +++ b/src/views/home/components/box-2.vue @@ -47,85 +47,73 @@
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -169,22 +157,114 @@ map.value.setMapStyleV2({ styleId: 'd1e61f575b3ef4e2df71ab6a5690ddab' // 23c9fb8e1c604995f97f0f1cebd7036fF }) - map.value.setTrafficOn() - // res.data.list.map((item) => { - // item.map((i) => { - // // 创建折线 - // let arr = [] - // i.path.map((j) => { - // arr.push(new BMapGL.Point(j[0], j[1])) - // }) - // var polyline = new BMapGL.Polyline(arr, { - // strokeColor: '#9AFF02', - // strokeWeight: 8, - // strokeOpacity: 0.8 - // }) - // map.value.addOverlay(polyline) - // }) - // }) + const allData = [ + [ + 109.57843364485261,31.050783420337332 + ], + [ + 109.5763185309496,31.042512315044785 + ], + [ + 109.578438523583,31.041253717253543 + ], + [ + 109.58480087476947,31.041557307017047 + ], + [ + 109.58971689758278,31.04091104021125 + ], + [ + 109.59452326321068,31.04025926587977 + ], + [ + 109.60838415909252,31.035555713566687 + ], + [ + 109.60995055557738,31.032199123538422 + ], + [ + 109.62156263671656,31.018465302840454 + ], + [ + 109.62534994444817,31.016071773573458 + ], + [ + 109.62877486684926,31.01814529506191 + ], + [ + 109.63464468590746,31.027249858930684 + ], + [ + 109.6405129788155,31.029770289201934 + ], + [ + 109.65561363054604,31.038740966425156 + ], + [ + 109.65665229650565,31.042456954560258 + ], + [ + 109.65365673982508,31.045094749902372 + ], + [ + 109.65079175912291,31.04683943792912 + ], + [ + 109.6471467686651,31.04454011173439 + ], + [ + 109.64258701251156,31.04402745793725 + ], + [ + 109.63436954572919,31.043833122861844 + ], + [ + 109.6279668506477,31.044815504006518 + ], + [ + 109.6198507320364,31.046067463158575 + ], + [ + 109.61224510312262,31.045350944237523 + ], + [ + 109.60633406560694,31.05148153531427 + ], + [ + 109.6048887477277,31.052512113965893 + ], + [ + 109.59660938015361,31.050968484315057 + ], + [ + 109.590694912004,31.050620057176253 + ], + [ + 109.58255014801492,31.053206076638133 + ], + [ + 109.58176241763722,31.05377630574891 + ], + [ + 109.57821941737987,31.053703848067492 + ], + [ + 109.57848246902094,31.050563464855543 + ] + ]; + let arr = [] + allData.map((item) => { + // 创建折线 + arr.push(new BMapGL.Point(item[0], item[1])) + }) + console.log(arr) + var polyline = new BMapGL.Polyline(arr, { + strokeColor: '#9C9C9C', + strokeStyle: 'dashed', + strokeWeight: 3, + strokeOpacity: 0.8 + }) + map.value.addOverlay(polyline) // timter = setInterval(() => { // getBaiduMapCrowded() // }, 5000) @@ -270,7 +350,7 @@ onMounted(() => { getSpotList() - + }) @@ -291,7 +371,7 @@ } .map { width: 100%; - height: vh(810); + height: vh(710); background-color: transparent; } .box-3 { diff --git a/src/views/monitor/components/box-1.vue b/src/views/monitor/components/box-1.vue index 100ecb8..a369649 100644 --- a/src/views/monitor/components/box-1.vue +++ b/src/views/monitor/components/box-1.vue @@ -17,8 +17,8 @@ :end-val="aiAnalyzeData.allAnalysisPoints" /> -
- 异常点位 +
+ 异常点位
@@ -28,11 +28,11 @@ 核心景区分析点位 -
+
异常点位
-
+
异常告警
@@ -67,11 +67,11 @@ :end-val="trafficAiAnalyzeData.coreMonitoringPoints" />
-
+
拥堵点位
-
+
拥堵告警
@@ -130,7 +130,7 @@ :end-val="pointAlarmData.analysisPoints" />
-
+
异常点位
-
- +
+
-
+
当前告警
异常告警 -
已解除告警
@@ -190,13 +188,16 @@
+ + + + diff --git a/src/views/monitor/components/warnList.vue b/src/views/monitor/components/warnList.vue new file mode 100644 index 0000000..e16223c --- /dev/null +++ b/src/views/monitor/components/warnList.vue @@ -0,0 +1,280 @@ + + + + +