diff --git a/src/api/projectScreen/index.ts b/src/api/projectScreen/index.ts index ef4e94c..e790c62 100644 --- a/src/api/projectScreen/index.ts +++ b/src/api/projectScreen/index.ts @@ -5,7 +5,7 @@ import { AxiosPromise } from 'axios'; export const getScreenWeather = (projectId: number | string) => { return request({ url: '/project/big/screen/weather/' + projectId, - method: 'get', + method: 'get' }); }; @@ -13,7 +13,7 @@ export const getScreenWeather = (projectId: number | string) => { export const getScreenSafetyDay = (projectId: number | string) => { return request({ url: '/project/big/screen/safetyDay/' + projectId, - method: 'get', + method: 'get' }); }; @@ -21,7 +21,7 @@ export const getScreenSafetyDay = (projectId: number | string) => { export const getScreenNews = (projectId: number | string) => { return request({ url: '/project/big/screen/news/' + projectId, - method: 'get', + method: 'get' }); }; @@ -29,7 +29,7 @@ export const getScreenNews = (projectId: number | string) => { export const getScreenLand = (projectId: number | string) => { return request({ url: '/project/big/screen/' + projectId, - method: 'get', + method: 'get' }); }; @@ -37,7 +37,7 @@ export const getScreenLand = (projectId: number | string) => { export const getScreenImgProcess = (projectId: number | string) => { return request({ url: '/project/big/screen/imageProgress/' + projectId, - method: 'get', + method: 'get' }); }; @@ -45,15 +45,18 @@ export const getScreenImgProcess = (projectId: number | string) => { export const getScreenPeople = (projectId: number | string) => { return request({ url: '/project/big/screen/people/' + projectId, - method: 'get', + method: 'get' }); }; // 查询项目AI安全巡检 export const getScreenSafetyInspection = (projectId: number | string) => { return request({ - url: '/project/big/screen/safetyInspection/' + projectId, + url: '/project/big/screen/safetyInspection/', method: 'get', + params: { + projectId + } }); }; @@ -61,7 +64,7 @@ export const getScreenSafetyInspection = (projectId: number | string) => { export const getScreenGeneralize = (projectId: number | string) => { return request({ url: '/project/big/screen/generalize/' + projectId, - method: 'get', + method: 'get' }); }; @@ -76,7 +79,7 @@ export const getGps = (projectId) => { export const getSelectList = (params) => { return request({ url: '/project/big/screen/getList', - method: 'get', + method: 'get', params }); }; @@ -93,7 +96,7 @@ export const setSelect = (data) => { export const getModelList = (params) => { return request({ url: '/yjearth4.0/api/v1/source/list', - method: 'get', + method: 'get', params }); -}; \ No newline at end of file +}; diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue index f13f2c4..aa2337e 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/components/centerPage.vue @@ -53,6 +53,8 @@ const router = useRouter(); const getProjectGisData = async () => { try { const response = await projectGis(); + console.log(response, 111111111111); + if (response.code === 200) { // 过滤掉没有经纬度的项目 projectData.value = response.data.filter((item: any) => item.lng !== null && item.lat !== null && item.lng !== '' && item.lat !== ''); @@ -108,6 +110,7 @@ const initEcharts = () => { // 从接口数据生成散点数据 const scatterData = projectData.value.map((item) => ({ name: item.projectName, + id: item.id, value: [parseFloat(item.lng), parseFloat(item.lat)], // 转换为数值类型 shortName: item.shortName, projectSite: item.projectSite, @@ -200,15 +203,18 @@ const initEcharts = () => { myChart.setOption(option); // 添加点击事件监听 - 这是关键修改部分 myChart.on('click', function (params: any) { + console.log(params, 111111); // 检查点击的是散点图系列 if (params.componentType === 'series' && params.seriesType === 'scatter') { // 跳转到项目详情页 - navigateToProjectDetail(); + + navigateToProjectDetail(params.data); } }); }; -const navigateToProjectDetail = () => { - window.open('http://xny.yj-3d.com:7788/ProjectScreen', '_blank'); +const navigateToProjectDetail = (data) => { + window.open('http://localhost:7788/ProjectScreen?projectId=' + data.id + '&projectName=' + data.name, '_blank'); + //xny.yj-3d.com }; const risk_level_type1 = ref([]); const safety_inspection_type1 = ref([]); diff --git a/src/views/projectLarge/ProjectScreen/components/centerPage.vue b/src/views/projectLarge/ProjectScreen/components/centerPage.vue index 977ec74..e8aea76 100644 --- a/src/views/projectLarge/ProjectScreen/components/centerPage.vue +++ b/src/views/projectLarge/ProjectScreen/components/centerPage.vue @@ -5,7 +5,7 @@
- <img src="@/assets/projectLarge/robot.svg" alt="" height="20px" width="20px"> + <img src="@/assets/projectLarge/robot.svg" alt="" height="20px" width="20px" />
@@ -15,7 +15,7 @@
- 安全巡检 + 安全巡检
{{ item.createTime.slice(5, 16) }}
{{ item.label || '未佩戴安全帽' }}
@@ -31,14 +31,15 @@ \ No newline at end of file + diff --git a/src/views/projectLarge/ProjectScreen/components/rightPage.vue b/src/views/projectLarge/ProjectScreen/components/rightPage.vue index f583d02..224a8fe 100644 --- a/src/views/projectLarge/ProjectScreen/components/rightPage.vue +++ b/src/views/projectLarge/ProjectScreen/components/rightPage.vue @@ -16,30 +16,31 @@