diff --git a/public/config/config.json b/public/config/config.json index 975e46a..4fe0577 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -15,6 +15,5 @@ "lineColor": "#1aa034", "fontSize": "18px", "fontColor": "#1aa034", - "preventReclick": 2000, - "tempCameraIndexCode": "111111" + "preventReclick": 2000 } diff --git a/public/config/config.json b/public/config/config.json index 975e46a..4fe0577 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -15,6 +15,5 @@ "lineColor": "#1aa034", "fontSize": "18px", "fontColor": "#1aa034", - "preventReclick": 2000, - "tempCameraIndexCode": "111111" + "preventReclick": 2000 } diff --git a/src/main.ts b/src/main.ts index df7fcbe..242d916 100644 --- a/src/main.ts +++ b/src/main.ts @@ -47,7 +47,6 @@ window.localStorage.setItem('fontColor', result.data.fontColor) // 网关集成几秒允许点击一次 window.localStorage.setItem('preventReclick', result.data.preventReclick) - window.localStorage.setItem('tempCameraIndexCode', result.data.tempCameraIndexCode) window.localStorage.setItem('zoom', result.data.zoom) const app = createApp(App) diff --git a/public/config/config.json b/public/config/config.json index 975e46a..4fe0577 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -15,6 +15,5 @@ "lineColor": "#1aa034", "fontSize": "18px", "fontColor": "#1aa034", - "preventReclick": 2000, - "tempCameraIndexCode": "111111" + "preventReclick": 2000 } diff --git a/src/main.ts b/src/main.ts index df7fcbe..242d916 100644 --- a/src/main.ts +++ b/src/main.ts @@ -47,7 +47,6 @@ window.localStorage.setItem('fontColor', result.data.fontColor) // 网关集成几秒允许点击一次 window.localStorage.setItem('preventReclick', result.data.preventReclick) - window.localStorage.setItem('tempCameraIndexCode', result.data.tempCameraIndexCode) window.localStorage.setItem('zoom', result.data.zoom) const app = createApp(App) diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts index 5d45895..f5f0190 100644 --- a/src/router/modules/monitor.ts +++ b/src/router/modules/monitor.ts @@ -22,8 +22,8 @@ // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路 // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路 // import('@/views/monitor/realTime/index-isc-single.vue'), // isc - import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路 - // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国 + // import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路 + import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国 meta: { title: '实时监控', auth: '/realTime', diff --git a/public/config/config.json b/public/config/config.json index 975e46a..4fe0577 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -15,6 +15,5 @@ "lineColor": "#1aa034", "fontSize": "18px", "fontColor": "#1aa034", - "preventReclick": 2000, - "tempCameraIndexCode": "111111" + "preventReclick": 2000 } diff --git a/src/main.ts b/src/main.ts index df7fcbe..242d916 100644 --- a/src/main.ts +++ b/src/main.ts @@ -47,7 +47,6 @@ window.localStorage.setItem('fontColor', result.data.fontColor) // 网关集成几秒允许点击一次 window.localStorage.setItem('preventReclick', result.data.preventReclick) - window.localStorage.setItem('tempCameraIndexCode', result.data.tempCameraIndexCode) window.localStorage.setItem('zoom', result.data.zoom) const app = createApp(App) diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts index 5d45895..f5f0190 100644 --- a/src/router/modules/monitor.ts +++ b/src/router/modules/monitor.ts @@ -22,8 +22,8 @@ // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路 // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路 // import('@/views/monitor/realTime/index-isc-single.vue'), // isc - import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路 - // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国 + // import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路 + import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国 meta: { title: '实时监控', auth: '/realTime', diff --git a/src/views/bigScreen/components/deptVideoPoint.vue b/src/views/bigScreen/components/deptVideoPoint.vue index 5b6cbe2..8aef451 100644 --- a/src/views/bigScreen/components/deptVideoPoint.vue +++ b/src/views/bigScreen/components/deptVideoPoint.vue @@ -15,7 +15,7 @@ if (res.data.y && res.data.y.length) { const toConnectList = res.data.y.find((item: { name: string }) => item.name === '计划接入').data const connectList = res.data.y.find((item: { name: string }) => item.name === '实际接入').data - dangerTimeLineData.value = [{ name: '实际接入', data: toConnectList }, { name: '计划接入', data: connectList, seriesType: 'bar' }] + dangerTimeLineData.value = [{ name: '实际接入', data: connectList }, { name: '计划接入', data: toConnectList, seriesType: 'bar' }] } } }) diff --git a/public/config/config.json b/public/config/config.json index 975e46a..4fe0577 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -15,6 +15,5 @@ "lineColor": "#1aa034", "fontSize": "18px", "fontColor": "#1aa034", - "preventReclick": 2000, - "tempCameraIndexCode": "111111" + "preventReclick": 2000 } diff --git a/src/main.ts b/src/main.ts index df7fcbe..242d916 100644 --- a/src/main.ts +++ b/src/main.ts @@ -47,7 +47,6 @@ window.localStorage.setItem('fontColor', result.data.fontColor) // 网关集成几秒允许点击一次 window.localStorage.setItem('preventReclick', result.data.preventReclick) - window.localStorage.setItem('tempCameraIndexCode', result.data.tempCameraIndexCode) window.localStorage.setItem('zoom', result.data.zoom) const app = createApp(App) diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts index 5d45895..f5f0190 100644 --- a/src/router/modules/monitor.ts +++ b/src/router/modules/monitor.ts @@ -22,8 +22,8 @@ // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路 // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路 // import('@/views/monitor/realTime/index-isc-single.vue'), // isc - import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路 - // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国 + // import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路 + import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国 meta: { title: '实时监控', auth: '/realTime', diff --git a/src/views/bigScreen/components/deptVideoPoint.vue b/src/views/bigScreen/components/deptVideoPoint.vue index 5b6cbe2..8aef451 100644 --- a/src/views/bigScreen/components/deptVideoPoint.vue +++ b/src/views/bigScreen/components/deptVideoPoint.vue @@ -15,7 +15,7 @@ if (res.data.y && res.data.y.length) { const toConnectList = res.data.y.find((item: { name: string }) => item.name === '计划接入').data const connectList = res.data.y.find((item: { name: string }) => item.name === '实际接入').data - dangerTimeLineData.value = [{ name: '实际接入', data: toConnectList }, { name: '计划接入', data: connectList, seriesType: 'bar' }] + dangerTimeLineData.value = [{ name: '实际接入', data: connectList }, { name: '计划接入', data: toConnectList, seriesType: 'bar' }] } } }) diff --git a/src/views/bigScreen/components/focusObject.vue b/src/views/bigScreen/components/focusObject.vue index ccde59d..b62486d 100644 --- a/src/views/bigScreen/components/focusObject.vue +++ b/src/views/bigScreen/components/focusObject.vue @@ -15,22 +15,30 @@ const tempList: any = [] getAlarmInfo({ videoNos: params }).then((res) => { res.data.forEach((item: any) => { - item.riskDTOList.forEach((i: any) => { - let pictureUrl = '' - const findIndex = configData.findIndex((e: any) => item.cameraIndexCode === e.cameraIndexCode) - if (findIndex !== -1) { - pictureUrl = `${window.localStorage.getItem('baseURL')}/picture/download/${configData[findIndex].url}?token=${window.localStorage.getItem('token')}` - } - tempList.push({ - ...i, - alarmNum: item.alarmNum, - cameraIndexCode: item.cameraIndexCode, - monitorId: item.monitorId, - monitorName: item.monitorName, - pictureUrl, + if (item.riskDTOList.length) { + item.riskDTOList.forEach((i: any) => { + let pictureUrl = '' + const findIndex = configData.findIndex((e: any) => item.cameraIndexCode === e.cameraIndexCode) + if (findIndex !== -1) { + pictureUrl = `${window.localStorage.getItem('baseURL')}/picture/download/${configData[findIndex].url}?token=${window.localStorage.getItem('token')}` + } + tempList.push({ + ...i, + alarmNum: item.alarmNum, + cameraIndexCode: item.cameraIndexCode, + monitorId: item.monitorId, + monitorName: item.monitorName, + pictureUrl, + }) }) - }) + } + else { + tempList.push({ + ...item, + }) + } }) + console.log('tempList', tempList) list.value = tempList loading.value = false }).catch(() => { @@ -65,17 +73,17 @@
-
+
危险点： - {{item.riskName}} + {{item.riskName || '--'}}
-
+
伤害种类： - {{item.nature}} + {{item.nature || '--'}}
-
+
关注对象： - {{item.attention}} + {{item.attention || '--'}}
diff --git a/public/config/config.json b/public/config/config.json index 975e46a..4fe0577 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -15,6 +15,5 @@ "lineColor": "#1aa034", "fontSize": "18px", "fontColor": "#1aa034", - "preventReclick": 2000, - "tempCameraIndexCode": "111111" + "preventReclick": 2000 } diff --git a/src/main.ts b/src/main.ts index df7fcbe..242d916 100644 --- a/src/main.ts +++ b/src/main.ts @@ -47,7 +47,6 @@ window.localStorage.setItem('fontColor', result.data.fontColor) // 网关集成几秒允许点击一次 window.localStorage.setItem('preventReclick', result.data.preventReclick) - window.localStorage.setItem('tempCameraIndexCode', result.data.tempCameraIndexCode) window.localStorage.setItem('zoom', result.data.zoom) const app = createApp(App) diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts index 5d45895..f5f0190 100644 --- a/src/router/modules/monitor.ts +++ b/src/router/modules/monitor.ts @@ -22,8 +22,8 @@ // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路 // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路 // import('@/views/monitor/realTime/index-isc-single.vue'), // isc - import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路 - // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国 + // import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路 + import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国 meta: { title: '实时监控', auth: '/realTime', diff --git a/src/views/bigScreen/components/deptVideoPoint.vue b/src/views/bigScreen/components/deptVideoPoint.vue index 5b6cbe2..8aef451 100644 --- a/src/views/bigScreen/components/deptVideoPoint.vue +++ b/src/views/bigScreen/components/deptVideoPoint.vue @@ -15,7 +15,7 @@ if (res.data.y && res.data.y.length) { const toConnectList = res.data.y.find((item: { name: string }) => item.name === '计划接入').data const connectList = res.data.y.find((item: { name: string }) => item.name === '实际接入').data - dangerTimeLineData.value = [{ name: '实际接入', data: toConnectList }, { name: '计划接入', data: connectList, seriesType: 'bar' }] + dangerTimeLineData.value = [{ name: '实际接入', data: connectList }, { name: '计划接入', data: toConnectList, seriesType: 'bar' }] } } }) diff --git a/src/views/bigScreen/components/focusObject.vue b/src/views/bigScreen/components/focusObject.vue index ccde59d..b62486d 100644 --- a/src/views/bigScreen/components/focusObject.vue +++ b/src/views/bigScreen/components/focusObject.vue @@ -15,22 +15,30 @@ const tempList: any = [] getAlarmInfo({ videoNos: params }).then((res) => { res.data.forEach((item: any) => { - item.riskDTOList.forEach((i: any) => { - let pictureUrl = '' - const findIndex = configData.findIndex((e: any) => item.cameraIndexCode === e.cameraIndexCode) - if (findIndex !== -1) { - pictureUrl = `${window.localStorage.getItem('baseURL')}/picture/download/${configData[findIndex].url}?token=${window.localStorage.getItem('token')}` - } - tempList.push({ - ...i, - alarmNum: item.alarmNum, - cameraIndexCode: item.cameraIndexCode, - monitorId: item.monitorId, - monitorName: item.monitorName, - pictureUrl, + if (item.riskDTOList.length) { + item.riskDTOList.forEach((i: any) => { + let pictureUrl = '' + const findIndex = configData.findIndex((e: any) => item.cameraIndexCode === e.cameraIndexCode) + if (findIndex !== -1) { + pictureUrl = `${window.localStorage.getItem('baseURL')}/picture/download/${configData[findIndex].url}?token=${window.localStorage.getItem('token')}` + } + tempList.push({ + ...i, + alarmNum: item.alarmNum, + cameraIndexCode: item.cameraIndexCode, + monitorId: item.monitorId, + monitorName: item.monitorName, + pictureUrl, + }) }) - }) + } + else { + tempList.push({ + ...item, + }) + } }) + console.log('tempList', tempList) list.value = tempList loading.value = false }).catch(() => { @@ -65,17 +73,17 @@
-
+
危险点： - {{item.riskName}} + {{item.riskName || '--'}}
-
+
伤害种类： - {{item.nature}} + {{item.nature || '--'}}
-
+
关注对象： - {{item.attention}} + {{item.attention || '--'}}
diff --git a/src/views/system/bsConfig/index.vue b/src/views/system/bsConfig/index.vue index 8b61dec..7dd3f04 100644 --- a/src/views/system/bsConfig/index.vue +++ b/src/views/system/bsConfig/index.vue @@ -138,6 +138,13 @@ getConfig().then((res) => { if (res.data) { configData.value = JSON.parse(res.data) + configData.value = configData.value.map((item: any) => { + return { + ...item, + picture: `${window.localStorage.getItem('baseURL')}/picture/download/${item.url}?token=${window.localStorage.getItem('token')}`, + } + }) + console.log('pppppp', configData.value) } }) } diff --git a/public/config/config.json b/public/config/config.json index 975e46a..4fe0577 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -15,6 +15,5 @@ "lineColor": "#1aa034", "fontSize": "18px", "fontColor": "#1aa034", - "preventReclick": 2000, - "tempCameraIndexCode": "111111" + "preventReclick": 2000 } diff --git a/src/main.ts b/src/main.ts index df7fcbe..242d916 100644 --- a/src/main.ts +++ b/src/main.ts @@ -47,7 +47,6 @@ window.localStorage.setItem('fontColor', result.data.fontColor) // 网关集成几秒允许点击一次 window.localStorage.setItem('preventReclick', result.data.preventReclick) - window.localStorage.setItem('tempCameraIndexCode', result.data.tempCameraIndexCode) window.localStorage.setItem('zoom', result.data.zoom) const app = createApp(App) diff --git a/src/router/modules/monitor.ts b/src/router/modules/monitor.ts index 5d45895..f5f0190 100644 --- a/src/router/modules/monitor.ts +++ b/src/router/modules/monitor.ts @@ -22,8 +22,8 @@ // import('@/views/monitor/realTime/index-noPlugin-single.vue'), // SDK单路 // import('@/views/monitor/realTime/index-noPlugin.vue'), // SDK4路 // import('@/views/monitor/realTime/index-isc-single.vue'), // isc - import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路 - // import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国 + // import('@/views/monitor/realTime/index-media-single.vue'), // 商流媒体单路 + import('@/views/monitor/realTime/index-new-gm-plugin.vue'), // 国 meta: { title: '实时监控', auth: '/realTime', diff --git a/src/views/bigScreen/components/deptVideoPoint.vue b/src/views/bigScreen/components/deptVideoPoint.vue index 5b6cbe2..8aef451 100644 --- a/src/views/bigScreen/components/deptVideoPoint.vue +++ b/src/views/bigScreen/components/deptVideoPoint.vue @@ -15,7 +15,7 @@ if (res.data.y && res.data.y.length) { const toConnectList = res.data.y.find((item: { name: string }) => item.name === '计划接入').data const connectList = res.data.y.find((item: { name: string }) => item.name === '实际接入').data - dangerTimeLineData.value = [{ name: '实际接入', data: toConnectList }, { name: '计划接入', data: connectList, seriesType: 'bar' }] + dangerTimeLineData.value = [{ name: '实际接入', data: connectList }, { name: '计划接入', data: toConnectList, seriesType: 'bar' }] } } }) diff --git a/src/views/bigScreen/components/focusObject.vue b/src/views/bigScreen/components/focusObject.vue index ccde59d..b62486d 100644 --- a/src/views/bigScreen/components/focusObject.vue +++ b/src/views/bigScreen/components/focusObject.vue @@ -15,22 +15,30 @@ const tempList: any = [] getAlarmInfo({ videoNos: params }).then((res) => { res.data.forEach((item: any) => { - item.riskDTOList.forEach((i: any) => { - let pictureUrl = '' - const findIndex = configData.findIndex((e: any) => item.cameraIndexCode === e.cameraIndexCode) - if (findIndex !== -1) { - pictureUrl = `${window.localStorage.getItem('baseURL')}/picture/download/${configData[findIndex].url}?token=${window.localStorage.getItem('token')}` - } - tempList.push({ - ...i, - alarmNum: item.alarmNum, - cameraIndexCode: item.cameraIndexCode, - monitorId: item.monitorId, - monitorName: item.monitorName, - pictureUrl, + if (item.riskDTOList.length) { + item.riskDTOList.forEach((i: any) => { + let pictureUrl = '' + const findIndex = configData.findIndex((e: any) => item.cameraIndexCode === e.cameraIndexCode) + if (findIndex !== -1) { + pictureUrl = `${window.localStorage.getItem('baseURL')}/picture/download/${configData[findIndex].url}?token=${window.localStorage.getItem('token')}` + } + tempList.push({ + ...i, + alarmNum: item.alarmNum, + cameraIndexCode: item.cameraIndexCode, + monitorId: item.monitorId, + monitorName: item.monitorName, + pictureUrl, + }) }) - }) + } + else { + tempList.push({ + ...item, + }) + } }) + console.log('tempList', tempList) list.value = tempList loading.value = false }).catch(() => { @@ -65,17 +73,17 @@
-
+
危险点： - {{item.riskName}} + {{item.riskName || '--'}}
-
+
伤害种类： - {{item.nature}} + {{item.nature || '--'}}
-
+
关注对象： - {{item.attention}} + {{item.attention || '--'}}
diff --git a/src/views/system/bsConfig/index.vue b/src/views/system/bsConfig/index.vue index 8b61dec..7dd3f04 100644 --- a/src/views/system/bsConfig/index.vue +++ b/src/views/system/bsConfig/index.vue @@ -138,6 +138,13 @@ getConfig().then((res) => { if (res.data) { configData.value = JSON.parse(res.data) + configData.value = configData.value.map((item: any) => { + return { + ...item, + picture: `${window.localStorage.getItem('baseURL')}/picture/download/${item.url}?token=${window.localStorage.getItem('token')}`, + } + }) + console.log('pppppp', configData.value) } }) } diff --git a/src/views/system/bsConfig/showPhoto.vue b/src/views/system/bsConfig/showPhoto.vue deleted file mode 100644 index b52a98c..0000000 --- a/src/views/system/bsConfig/showPhoto.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - - -