diff --git a/src/utils/ws/useSocket.js b/src/utils/ws/useSocket.js index db1a1af..eb184d8 100644 --- a/src/utils/ws/useSocket.js +++ b/src/utils/ws/useSocket.js @@ -9,11 +9,19 @@ export default function useSocket(path) { // window.location.host // '58.51.132.86:8102' + // 192.168.16.135:13000 + // 192.168.16.254:13002 + // mess_notice + // ws://server2.wh-nf.cn:8088/prod-api/mess_notice let url = import.meta.env.VITE_APP_ENV == 'development' - ? 'ws://192.168.16.254:13002/' + '/mess_notice' - : 'ws://' + window.location.host + '/' + path; + ? 'ws://192.168.16.135:13002/' + '/mess_notice' + : 'ws://server2.wh-nf.cn:8088/prod-api/mess_notice'; + // let url = + // import.meta.env.VITE_APP_ENV == 'development' + // ? 'ws://192.168.16.254:13002/' + '/mess_notice' + // : 'ws://' + window.location.host + '/' + path; const { status, message, error, connect, disconnect } = useWebSocket({ url, heartBeatData: 'ping', diff --git a/src/utils/ws/useSocket.js b/src/utils/ws/useSocket.js index db1a1af..eb184d8 100644 --- a/src/utils/ws/useSocket.js +++ b/src/utils/ws/useSocket.js @@ -9,11 +9,19 @@ export default function useSocket(path) { // window.location.host // '58.51.132.86:8102' + // 192.168.16.135:13000 + // 192.168.16.254:13002 + // mess_notice + // ws://server2.wh-nf.cn:8088/prod-api/mess_notice let url = import.meta.env.VITE_APP_ENV == 'development' - ? 'ws://192.168.16.254:13002/' + '/mess_notice' - : 'ws://' + window.location.host + '/' + path; + ? 'ws://192.168.16.135:13002/' + '/mess_notice' + : 'ws://server2.wh-nf.cn:8088/prod-api/mess_notice'; + // let url = + // import.meta.env.VITE_APP_ENV == 'development' + // ? 'ws://192.168.16.254:13002/' + '/mess_notice' + // : 'ws://' + window.location.host + '/' + path; const { status, message, error, connect, disconnect } = useWebSocket({ url, heartBeatData: 'ping', diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue index 29f98ba..3f2a0a3 100644 --- a/src/views/DialogTabs/component/GongDanPaiFa.vue +++ b/src/views/DialogTabs/component/GongDanPaiFa.vue @@ -44,7 +44,7 @@ import useUserStore from '@/store/modules/user'; const userStore = useUserStore(); -console.log('🚀 ~ userStore:----------', userStore.userInfo); +// console.log('🚀 ~ userStore:----------', userStore.userInfo); const props = defineProps({ // 数据id @@ -61,7 +61,7 @@ 'work_order_source', 'warn_level' ); -console.log('🚀 ~ module_type,order_type:', module_type, order_type, work_order_source); +// console.log('🚀 ~ module_type,order_type:', module_type, order_type, work_order_source); const AllData = reactive({ form: { // GDType: '预警工单', @@ -200,22 +200,22 @@ onMounted(() => { console.log(123123123, props.dataID); getWarningData(); - if (props.dataID == '001') { - form.value.FZYP = '压力监测异常波动,可能是设施故障'; - } else if (props.dataID == '002') { - form.value.FZYP = '燃气管道压力过大,会存在燃气爆管风险'; - } else if (props.dataID == '003') { - form.value.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险'; - } else if (props.dataID == '004') { - form.value.FXWZ = '东大街管网'; - form.value.FZYP = '高水位，水深250mm'; - } else if (props.dataID == '005') { - form.value.FXWZ = '枣园南路与枣园五路管网'; - form.value.FZYP = '满管，水深400mm'; - } else if (props.dataID == '006') { - form.value.FXWZ = '王家坪旧址门口'; - form.value.FZYP = '积水，水深120mm'; - } + // if (props.dataID == '001') { + // form.value.FZYP = '压力监测异常波动,可能是设施故障'; + // } else if (props.dataID == '002') { + // form.value.FZYP = '燃气管道压力过大,会存在燃气爆管风险'; + // } else if (props.dataID == '003') { + // form.value.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险'; + // } else if (props.dataID == '004') { + // form.value.FXWZ = '东大街管网'; + // form.value.FZYP = '高水位，水深250mm'; + // } else if (props.dataID == '005') { + // form.value.FXWZ = '枣园南路与枣园五路管网'; + // form.value.FZYP = '满管，水深400mm'; + // } else if (props.dataID == '006') { + // form.value.FXWZ = '王家坪旧址门口'; + // form.value.FZYP = '积水，水深120mm'; + // } }); diff --git a/src/utils/ws/useSocket.js b/src/utils/ws/useSocket.js index db1a1af..eb184d8 100644 --- a/src/utils/ws/useSocket.js +++ b/src/utils/ws/useSocket.js @@ -9,11 +9,19 @@ export default function useSocket(path) { // window.location.host // '58.51.132.86:8102' + // 192.168.16.135:13000 + // 192.168.16.254:13002 + // mess_notice + // ws://server2.wh-nf.cn:8088/prod-api/mess_notice let url = import.meta.env.VITE_APP_ENV == 'development' - ? 'ws://192.168.16.254:13002/' + '/mess_notice' - : 'ws://' + window.location.host + '/' + path; + ? 'ws://192.168.16.135:13002/' + '/mess_notice' + : 'ws://server2.wh-nf.cn:8088/prod-api/mess_notice'; + // let url = + // import.meta.env.VITE_APP_ENV == 'development' + // ? 'ws://192.168.16.254:13002/' + '/mess_notice' + // : 'ws://' + window.location.host + '/' + path; const { status, message, error, connect, disconnect } = useWebSocket({ url, heartBeatData: 'ping', diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue index 29f98ba..3f2a0a3 100644 --- a/src/views/DialogTabs/component/GongDanPaiFa.vue +++ b/src/views/DialogTabs/component/GongDanPaiFa.vue @@ -44,7 +44,7 @@ import useUserStore from '@/store/modules/user'; const userStore = useUserStore(); -console.log('🚀 ~ userStore:----------', userStore.userInfo); +// console.log('🚀 ~ userStore:----------', userStore.userInfo); const props = defineProps({ // 数据id @@ -61,7 +61,7 @@ 'work_order_source', 'warn_level' ); -console.log('🚀 ~ module_type,order_type:', module_type, order_type, work_order_source); +// console.log('🚀 ~ module_type,order_type:', module_type, order_type, work_order_source); const AllData = reactive({ form: { // GDType: '预警工单', @@ -200,22 +200,22 @@ onMounted(() => { console.log(123123123, props.dataID); getWarningData(); - if (props.dataID == '001') { - form.value.FZYP = '压力监测异常波动,可能是设施故障'; - } else if (props.dataID == '002') { - form.value.FZYP = '燃气管道压力过大,会存在燃气爆管风险'; - } else if (props.dataID == '003') { - form.value.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险'; - } else if (props.dataID == '004') { - form.value.FXWZ = '东大街管网'; - form.value.FZYP = '高水位，水深250mm'; - } else if (props.dataID == '005') { - form.value.FXWZ = '枣园南路与枣园五路管网'; - form.value.FZYP = '满管，水深400mm'; - } else if (props.dataID == '006') { - form.value.FXWZ = '王家坪旧址门口'; - form.value.FZYP = '积水，水深120mm'; - } + // if (props.dataID == '001') { + // form.value.FZYP = '压力监测异常波动,可能是设施故障'; + // } else if (props.dataID == '002') { + // form.value.FZYP = '燃气管道压力过大,会存在燃气爆管风险'; + // } else if (props.dataID == '003') { + // form.value.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险'; + // } else if (props.dataID == '004') { + // form.value.FXWZ = '东大街管网'; + // form.value.FZYP = '高水位，水深250mm'; + // } else if (props.dataID == '005') { + // form.value.FXWZ = '枣园南路与枣园五路管网'; + // form.value.FZYP = '满管，水深400mm'; + // } else if (props.dataID == '006') { + // form.value.FXWZ = '王家坪旧址门口'; + // form.value.FZYP = '积水，水深120mm'; + // } }); diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue index 00a30ef..cd3aaeb 100644 --- a/src/views/oneMap/BIM/WangJiaPIng.vue +++ b/src/views/oneMap/BIM/WangJiaPIng.vue @@ -174,7 +174,7 @@ icon: '/Three/icon/jsdj_icon.png', data: [], show: false, - pointCode: '111', + pointCode: 'nS34TXN', dataTime: '', toP: { x: -2.6309215167693845, @@ -203,7 +203,7 @@ icon: '/Three/icon/jsdj_icon.png', data: [], show: false, - pointCode: '111', + pointCode: 'a60toBt', dataTime: '', toP: { x: -2.6309215167693845, @@ -232,7 +232,7 @@ icon: '/Three/icon/fsfx_icon.png', data: [], show: false, - pointCode: '112', + pointCode: 'W5gfQor', dataTime: '', toP: { x: -58.221584999469584, @@ -261,19 +261,19 @@ icon: '/Three/icon/lfj_mx.png', data: [], show: false, - pointCode: '113', + pointCode: 'tbd1HZw', dataTime: '', toP: { - x: -58.221584999469584, - y: 6.590211176632594, - z: 9.665579736149148, + x: -57.02391699702596, + y: 4.679545725497521, + z: 12.416539848914276, duration: 2, ease: 'power4.out', }, toC: { - x: 1, - y: 1, - z: -20, + x: 2.197668002974112, + y: -0.9106652745024885, + z: -17.24904015108576, duration: 2, ease: 'power4.out', }, @@ -607,8 +607,8 @@ LabelRenderer.value.render(Scene, Camera.value); const delta = clock.getDelta(); // 如需调试请打开这个获取Camera,Controls 的值 - // console.log('Camera.value', Camera.value); - // console.log('Controls.value', Controls.value); + console.log('Camera.value', Camera.value); + console.log('Controls.value', Controls.value); }; // 创建气泡窗 @@ -682,16 +682,16 @@ }); } else if (data.name.includes('加速度计')) { gsap.to(Camera.value.position, { - x: -52.91501071801578, - y: 7.683177659311091, - z: 13.794583117848436, + x: -11.465032004199559, + y: 5.053503359128684, + z: 15.647675383755246, duration: 3, ease: 'power4.out', }); gsap.to(Controls.value.target, { - x: -0.08589571801577686, - y: 0.40105465931109363, - z: -16.870063882151577, + x: 12.070445610968184, + y: -0.5540312430818636, + z: -12.12358097277393, duration: 3, ease: 'power4.out', }); @@ -712,16 +712,16 @@ }); } else if (data.name.includes('裂缝计')) { gsap.to(Camera.value.position, { - x: -58.221584999469584, - y: 6.590211176632594, - z: 9.665579736149148, + x: -57.02391699702596, + y: 4.679545725497521, + z: 12.416539848914276, duration: 3, ease: 'power4.out', }); gsap.to(Controls.value.target, { - x: 1, - y: 1, - z: -20, + x: 2.197668002974112, + y: -0.9106652745024885, + z: -17.24904015108576, duration: 3, ease: 'power4.out', }); diff --git a/src/utils/ws/useSocket.js b/src/utils/ws/useSocket.js index db1a1af..eb184d8 100644 --- a/src/utils/ws/useSocket.js +++ b/src/utils/ws/useSocket.js @@ -9,11 +9,19 @@ export default function useSocket(path) { // window.location.host // '58.51.132.86:8102' + // 192.168.16.135:13000 + // 192.168.16.254:13002 + // mess_notice + // ws://server2.wh-nf.cn:8088/prod-api/mess_notice let url = import.meta.env.VITE_APP_ENV == 'development' - ? 'ws://192.168.16.254:13002/' + '/mess_notice' - : 'ws://' + window.location.host + '/' + path; + ? 'ws://192.168.16.135:13002/' + '/mess_notice' + : 'ws://server2.wh-nf.cn:8088/prod-api/mess_notice'; + // let url = + // import.meta.env.VITE_APP_ENV == 'development' + // ? 'ws://192.168.16.254:13002/' + '/mess_notice' + // : 'ws://' + window.location.host + '/' + path; const { status, message, error, connect, disconnect } = useWebSocket({ url, heartBeatData: 'ping', diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue index 29f98ba..3f2a0a3 100644 --- a/src/views/DialogTabs/component/GongDanPaiFa.vue +++ b/src/views/DialogTabs/component/GongDanPaiFa.vue @@ -44,7 +44,7 @@ import useUserStore from '@/store/modules/user'; const userStore = useUserStore(); -console.log('🚀 ~ userStore:----------', userStore.userInfo); +// console.log('🚀 ~ userStore:----------', userStore.userInfo); const props = defineProps({ // 数据id @@ -61,7 +61,7 @@ 'work_order_source', 'warn_level' ); -console.log('🚀 ~ module_type,order_type:', module_type, order_type, work_order_source); +// console.log('🚀 ~ module_type,order_type:', module_type, order_type, work_order_source); const AllData = reactive({ form: { // GDType: '预警工单', @@ -200,22 +200,22 @@ onMounted(() => { console.log(123123123, props.dataID); getWarningData(); - if (props.dataID == '001') { - form.value.FZYP = '压力监测异常波动,可能是设施故障'; - } else if (props.dataID == '002') { - form.value.FZYP = '燃气管道压力过大,会存在燃气爆管风险'; - } else if (props.dataID == '003') { - form.value.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险'; - } else if (props.dataID == '004') { - form.value.FXWZ = '东大街管网'; - form.value.FZYP = '高水位，水深250mm'; - } else if (props.dataID == '005') { - form.value.FXWZ = '枣园南路与枣园五路管网'; - form.value.FZYP = '满管，水深400mm'; - } else if (props.dataID == '006') { - form.value.FXWZ = '王家坪旧址门口'; - form.value.FZYP = '积水，水深120mm'; - } + // if (props.dataID == '001') { + // form.value.FZYP = '压力监测异常波动,可能是设施故障'; + // } else if (props.dataID == '002') { + // form.value.FZYP = '燃气管道压力过大,会存在燃气爆管风险'; + // } else if (props.dataID == '003') { + // form.value.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险'; + // } else if (props.dataID == '004') { + // form.value.FXWZ = '东大街管网'; + // form.value.FZYP = '高水位，水深250mm'; + // } else if (props.dataID == '005') { + // form.value.FXWZ = '枣园南路与枣园五路管网'; + // form.value.FZYP = '满管，水深400mm'; + // } else if (props.dataID == '006') { + // form.value.FXWZ = '王家坪旧址门口'; + // form.value.FZYP = '积水，水深120mm'; + // } }); diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue index 00a30ef..cd3aaeb 100644 --- a/src/views/oneMap/BIM/WangJiaPIng.vue +++ b/src/views/oneMap/BIM/WangJiaPIng.vue @@ -174,7 +174,7 @@ icon: '/Three/icon/jsdj_icon.png', data: [], show: false, - pointCode: '111', + pointCode: 'nS34TXN', dataTime: '', toP: { x: -2.6309215167693845, @@ -203,7 +203,7 @@ icon: '/Three/icon/jsdj_icon.png', data: [], show: false, - pointCode: '111', + pointCode: 'a60toBt', dataTime: '', toP: { x: -2.6309215167693845, @@ -232,7 +232,7 @@ icon: '/Three/icon/fsfx_icon.png', data: [], show: false, - pointCode: '112', + pointCode: 'W5gfQor', dataTime: '', toP: { x: -58.221584999469584, @@ -261,19 +261,19 @@ icon: '/Three/icon/lfj_mx.png', data: [], show: false, - pointCode: '113', + pointCode: 'tbd1HZw', dataTime: '', toP: { - x: -58.221584999469584, - y: 6.590211176632594, - z: 9.665579736149148, + x: -57.02391699702596, + y: 4.679545725497521, + z: 12.416539848914276, duration: 2, ease: 'power4.out', }, toC: { - x: 1, - y: 1, - z: -20, + x: 2.197668002974112, + y: -0.9106652745024885, + z: -17.24904015108576, duration: 2, ease: 'power4.out', }, @@ -607,8 +607,8 @@ LabelRenderer.value.render(Scene, Camera.value); const delta = clock.getDelta(); // 如需调试请打开这个获取Camera,Controls 的值 - // console.log('Camera.value', Camera.value); - // console.log('Controls.value', Controls.value); + console.log('Camera.value', Camera.value); + console.log('Controls.value', Controls.value); }; // 创建气泡窗 @@ -682,16 +682,16 @@ }); } else if (data.name.includes('加速度计')) { gsap.to(Camera.value.position, { - x: -52.91501071801578, - y: 7.683177659311091, - z: 13.794583117848436, + x: -11.465032004199559, + y: 5.053503359128684, + z: 15.647675383755246, duration: 3, ease: 'power4.out', }); gsap.to(Controls.value.target, { - x: -0.08589571801577686, - y: 0.40105465931109363, - z: -16.870063882151577, + x: 12.070445610968184, + y: -0.5540312430818636, + z: -12.12358097277393, duration: 3, ease: 'power4.out', }); @@ -712,16 +712,16 @@ }); } else if (data.name.includes('裂缝计')) { gsap.to(Camera.value.position, { - x: -58.221584999469584, - y: 6.590211176632594, - z: 9.665579736149148, + x: -57.02391699702596, + y: 4.679545725497521, + z: 12.416539848914276, duration: 3, ease: 'power4.out', }); gsap.to(Controls.value.target, { - x: 1, - y: 1, - z: -20, + x: 2.197668002974112, + y: -0.9106652745024885, + z: -17.24904015108576, duration: 3, ease: 'power4.out', }); diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue index 946a0cf..db090fc 100644 --- a/src/views/oneMap/index.vue +++ b/src/views/oneMap/index.vue @@ -250,7 +250,7 @@ if (element.location) { let warningFeature = turf.point(element.location.split(',').map(Number), element); warningFeature.properties.name = element.assessment; - warningFeature.properties.size = 1000; + warningFeature.properties.size = 200; warningFeatures.push(warningFeature); } }); @@ -268,6 +268,12 @@ warningPoint.on('click', e => { let popupData = e.feature.properties; console.log('popupData---', '告警12.19---------', popupData); + let data = { + title: popupData.wranLocation, + comIDs: ['gdpf'], + getSiteId: popupData.id, + }; + bus.emit('publicDialog', data); }); } }