diff --git a/riis-web/src/3dState.json b/riis-web/src/3dState.json new file mode 100644 index 0000000..e88c38e --- /dev/null +++ b/riis-web/src/3dState.json @@ -0,0 +1,44 @@ +[ + { + "name": "庄周", + "model": "scene.glb", + "modelLight": true, + "ambientColor": "0xffffff", + "directColor": "0xcccccc", + "DirectionalLight": true, + "SpotLight": true, + "gui": false, + "objectX": "object.position.x - center.x", + "objectY": 10, + "objectZ": "object.position.z - center.z", + "defaultCameraX": "defaultCamera.position.x += size / 2", + "defaultCameraY": "defaultCamera.position.y += size / 4", + "defaultCameraZ": "defaultCamera.position.z += size / 5.2", + "defaultCameraPositionX": 148.31480981421555, + "defaultCameraPositionY": 110.21040546785065, + "defaultCameraPositionZ": 59.16669210959738, + "browsingRoam": [ + { + "x": 69.5, + "y": 10.2, + "z": -6 + }, + { + "x": -80.5, + "y": 10.2, + "z": -6 + }, + { + "x": -80.5, + "y": 10.2, + "z": -66 + }, + { + "x": 69.5, + "y": 10.2, + "z": -66 + } + + ] + } +] \ No newline at end of file diff --git a/riis-web/src/api/equipment/index.ts b/riis-web/src/api/equipment/index.ts index d1e90bc..f07ad7a 100644 --- a/riis-web/src/api/equipment/index.ts +++ b/riis-web/src/api/equipment/index.ts @@ -21,7 +21,10 @@ export function addMain(params:any){ return request({ url: '/basedata/substation-maindevice/addMainDevice' , method: 'post', - params:params + data:params, + headers: { + 'Content-Type': 'multipart/form-data' + } }); } //修改主设备 @@ -29,7 +32,10 @@ export function editMain(params:any){ return request({ url: '/basedata/substation-maindevice/updateMainDevice' , method: 'post', - params:params + data:params, + headers: { + 'Content-Type': 'multipart/form-data' + } }); } //新增部件 diff --git a/riis-web/src/api/pointSolution/index.ts b/riis-web/src/api/pointSolution/index.ts index 8334f35..d02c45f 100644 --- a/riis-web/src/api/pointSolution/index.ts +++ b/riis-web/src/api/pointSolution/index.ts @@ -97,4 +97,13 @@ export function deleteAlgorithmArrange(params: any) { method: 'post', params: params, }); +} +//预览方案图片 +export function viewFile(params: any) { + return request({ + url: '/algorithm/algorithm-arrange/viewFile', + method: 'get', + params: params, + responseType: 'blob', + }); } \ No newline at end of file diff --git a/riis-web/src/api/question/index.ts b/riis-web/src/api/question/index.ts index df55263..90271fe 100644 --- a/riis-web/src/api/question/index.ts +++ b/riis-web/src/api/question/index.ts @@ -47,4 +47,12 @@ export function getAlgorithmLogsPage(params:any){ method: 'get', params: params }); +} +//获取主设备信息 +export function getMainDeviceInfo(params:any){ + return request({ + url: '/algorithm/algorithm-class-component/getMainDeviceInfo' , + method: 'get', + params: params + }); } \ No newline at end of file diff --git a/riis-web/src/assets/navigation/0904.png b/riis-web/src/assets/navigation/0904.png new file mode 100644 index 0000000..9e5fbbf Binary files /dev/null and b/riis-web/src/assets/navigation/0904.png differ diff --git a/riis-web/src/assets/point/Viewfile.png b/riis-web/src/assets/point/Viewfile.png new file mode 100644 index 0000000..9270b27 Binary files /dev/null and b/riis-web/src/assets/point/Viewfile.png differ diff --git a/riis-web/src/assets/point/camera.png b/riis-web/src/assets/point/camera.png new file mode 100644 index 0000000..b23f95c Binary files /dev/null and b/riis-web/src/assets/point/camera.png differ diff --git a/riis-web/src/assets/point/humidity.png b/riis-web/src/assets/point/humidity.png new file mode 100644 index 0000000..9270b27 Binary files /dev/null and b/riis-web/src/assets/point/humidity.png differ diff --git a/riis-web/src/assets/point/partial.png b/riis-web/src/assets/point/partial.png new file mode 100644 index 0000000..0128e28 Binary files /dev/null and b/riis-web/src/assets/point/partial.png differ diff --git a/riis-web/src/assets/point/voiceprint.png b/riis-web/src/assets/point/voiceprint.png new file mode 100644 index 0000000..1266076 Binary files /dev/null and b/riis-web/src/assets/point/voiceprint.png differ diff --git a/riis-web/src/components/IntelligentPoint/index.vue b/riis-web/src/components/IntelligentPoint/index.vue index 25d9045..5469297 100644 --- a/riis-web/src/components/IntelligentPoint/index.vue +++ b/riis-web/src/components/IntelligentPoint/index.vue @@ -56,10 +56,10 @@ import { } from "@/api/algorithm"; import { fa } from 'element-plus/es/locale'; import { ElMessage } from 'element-plus'; -import camera from '@/assets/point/1.svg' -import voiceprint from '@/assets/point/2.svg' -import partial from '@/assets/point/3.svg' -import humidity from '@/assets/point/4.svg' +import camera from '@/assets/point/camera.png' +import voiceprint from '@/assets/point/voiceprint.png' +import partial from '@/assets/point/partial.png' +import humidity from '@/assets/point/humidity.png' const userStore = useUserStore(); const props = defineProps({ width: { type: Number, default: 600 }, diff --git a/riis-web/src/layout/components/Navbar.vue b/riis-web/src/layout/components/Navbar.vue index c24cc29..733ee6f 100644 --- a/riis-web/src/layout/components/Navbar.vue +++ b/riis-web/src/layout/components/Navbar.vue @@ -50,8 +50,8 @@
- -
{{ item.name }}
+ +
{{ item.name }}
diff --git a/riis-web/src/views/basedata/equipment/index.vue b/riis-web/src/views/basedata/equipment/index.vue index 07bdd7d..4fc9d37 100644 --- a/riis-web/src/views/basedata/equipment/index.vue +++ b/riis-web/src/views/basedata/equipment/index.vue @@ -19,12 +19,15 @@ import { delComData, addFile, } from "@/api/equipment"; - -import { getTreefirst } from "@/api/device"; +import axios from 'axios'; +import { getTreefirst, GetCamera } from "@/api/device"; import { getmaintype } from "@/api/makeTask"; import { ElMessageBox, ElMessage } from "element-plus"; import { useAppStore } from '@/store/modules/app'; +import { useUserStore } from '@/store/modules/user'; import Eldialog from '@/components/seccmsdialog/eldialog.vue'; +import JessibucaPlayer from '@/components/jessibuca/index1.vue' +const userStore = useUserStore(); //左侧树形控件 interface Tree { [x: string]: any; @@ -289,6 +292,7 @@ function addClick() { } title.value = '新增主设备' dialogMain.value = true + patroldeviceJson.value = {} } //修改设备 || 部件 function handleEdit(row: any) { @@ -300,6 +304,18 @@ function handleEdit(row: any) { dialogMain.value = true title.value = '修改主设备' delete Maininfo.value.children + if (Maininfo.value.fileUrl) { + imageUrl.value = userStore.webApiBaseUrl + '/mainDevice/' + Maininfo.value.fileUrl + } else { + imageUrl.value = '' + } + if (Maininfo.value.patroldeviceJson) { + patroldeviceJson.value = JSON.parse(row.patroldeviceJson) + Maininfo.value.patroldevice_name = patroldeviceJson.value.patroldevice_name + Maininfo.value.patroldevice_pos = patroldeviceJson.value.patroldevice_pos + Maininfo.value.pos_name = patroldeviceJson.value.pos_name + } + options.value.avlue.forEach((element: any) => { if (row.deviceType == element.itemcode) { row.deviceType = element.dictname @@ -326,8 +342,25 @@ function visible() { function IntervalClick(formEl: any) { formEl.validate((valid: any) => { if (valid) { + const files = new FormData() + if (Maininfo.value.stationName) files.append('stationName', Maininfo.value.stationName) + if (Maininfo.value.stationCode) files.append('stationCode', Maininfo.value.stationCode) + if (Maininfo.value.areaName) files.append('areaName', Maininfo.value.areaName) + if (Maininfo.value.areaId) files.append('areaId', Maininfo.value.areaId) + if (Maininfo.value.bayName) files.append('bayName', Maininfo.value.bayName) + if (Maininfo.value.bayId) files.append('bayId', Maininfo.value.bayId) + if (Maininfo.value.deviceType) files.append('deviceType', Maininfo.value.deviceType) + if (Maininfo.value.mainDeviceName) files.append('mainDeviceName', Maininfo.value.mainDeviceName) + if (Maininfo.value.materialId) files.append('materialId', Maininfo.value.materialId) + if (patroldeviceJson.value) { + let patroldeviceJsonarr = JSON.parse(JSON.stringify(patroldeviceJson.value)) + files.append('patroldeviceJson', JSON.stringify(patroldeviceJsonarr)) + } + if (uploadFile.value) files.append('file', uploadFile.value) + console.log(files) if (Maininfo.value.mainDeviceId) { - editMain(Maininfo.value).then((item: any) => { + files.append('mainDeviceId', Maininfo.value.mainDeviceId) + editMain(files).then((item: any) => { if (item.code == 0) { getData() ElMessage({ @@ -340,7 +373,7 @@ function IntervalClick(formEl: any) { }); } else { - addMain(Maininfo.value).then((res: any) => { + addMain(files).then((res: any) => { if (res.code == 0) { dialogMain.value = false loading.value = true @@ -536,6 +569,226 @@ const tableRowClassName = ({ } return '' } +//上传图片 +const imageUrl: any = ref(''); +const uploadFile = ref(null); + +const handleChange = (file: any) => { + // 验证文件类型和大小等 + const isJPG = file.raw.type === 'image/jpeg'; + const isPNG = file.raw.type === 'image/png'; + const isLt2M = file.raw.size / 1024 / 1024 < 2; + + if (!isJPG && !isPNG) { + ElMessage.error('上传图片只能是 JPG/PNG 格式!'); + return false; + } + + + // 预览图片 + const reader = new FileReader(); + reader.onload = (e: any) => { + imageUrl.value = e.target.result; + }; + reader.readAsDataURL(file.raw); + + // 保存文件对象用于后续上传 + uploadFile.value = file.raw; +}; + +const beforeAvatarUpload = (file: any) => { + // 这里可以做一些上传前的验证 + return true; +}; +//摄像头相关配置 +//获取摄像头 +const defaultprops = { + label: "patroldeviceName" +} +const patroldeviceName = ref() +const allCamera = ref([]) +const dialogMonitor = ref(false); +const urls = ref("") +const beforehandPosition = ref(1) // 预置位参数 +const beforName = ref() // 预置位名称 +const deviceId = ref("") // 摄像头国标编号 +const channelId = ref("") // 通道国标编号 +const controSpeed = ref(100) // 摄像头转动速度默认值 30 +const videofmp4 = ref('') +const isGaoliang: any = ref("") +const devicecode = ref() +const channelcode = ref() +const patroldeviceJson: any = ref({}) +const treeloading1 = ref(false) +function MonitorClose() { // 关闭监控设备 + axios.get(userStore.webApiMonitorUrl + '/api/play/stop/' + deviceId.value + '/' + channelId.value, {}).then((res: any) => { }) + urls.value = "" + dialogMonitor.value = false +} +function MonitorClick() { + patroldeviceJson.value.pos_name = beforName.value + patroldeviceJson.value.patroldevice_pos = beforehandPosition.value + Maininfo.value.patroldevice_name = patroldeviceJson.value.patroldevice_name + Maininfo.value.patroldevice_pos = patroldeviceJson.value.patroldevice_pos + Maininfo.value.pos_name = patroldeviceJson.value.pos_name + dialogMonitor.value = false + beforehandPosition.value = 1 + beforName.value = '' +} +function monitorClick() { + urls.value = "" + getCamera() + dialogMonitor.value = true + beforName.value = patroldeviceJson.value.pos_name + beforehandPosition.value = patroldeviceJson.value.patroldevice_pos ? patroldeviceJson.value.patroldevice_pos : 1 +} +function getCamera() { + treeloading1.value = true + const params = { + patroldeviceName: patroldeviceName.value, + type: '10', + stationId: userStore.stationId, + areaId: '', + } + GetCamera(params).then(res => { + treeloading1.value = false + allCamera.value = res.data + isLighting.value = false + isInfrared.value = false + isWiper.value = false + let foundUser + if (patroldeviceJson.value) { + debugger + foundUser = res.data.find((user: any) => user.channelId === patroldeviceJson.value.patroldevice_channelcode); + } else { + foundUser = res.data[0] + } + onSubmit(foundUser) + devicecode.value = foundUser.deviceId + channelcode.value = foundUser.channelId + nextTick(() => { + treeRef.value?.setCurrentKey(foundUser.channelId); + }); + presetPosition(130, beforehandPosition.value) + patroldeviceJson.value = { + patroldevice_name: foundUser.patroldeviceName, + patroldevice_code: foundUser.patroldeviceCode, + patroldevice_channelcode: foundUser.channelId, + patroldevice_pos: beforehandPosition.value, + pos_name: beforName.value, + } + }) +} +function handleClick(data: Tree, node: any) { + devicecode.value = data.deviceId + channelcode.value = data.channelId + patroldeviceJson.value = { + patroldevice_name: data.patroldeviceName, + patroldevice_code: data.patroldeviceCode, + patroldevice_channelcode: data.channelId, + patroldevice_pos: beforehandPosition.value, + pos_name: beforName.value, + } + presetPosition(130, beforehandPosition.value) + onSubmit(data) +} +function onSubmit(row: any) { + deviceId.value = row.deviceId + channelId.value = row.channelId + axios.get(userStore.webApiMonitorUrl + '/api/play/start/' + row.deviceId + '/' + row.channelId, {}).then((res: any) => { + if (res.data.data != undefined) { + urls.value = res.data.data.ws_flv + videofmp4.value = res.data.data.fmp4 + } + }).catch(function (error: any) { + }) +} +const isLighting = ref(false) +function lightingClick(row: any) { // 灯光方法 + const cmdCode = ref(10) + const parameter1 = isLighting.value + axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + userStore.stationCode + "&devicecode=" + deviceId.value, {}).then((res: any) => { + if (res.data.data == "0") { + axios.post(userStore.webApiMonitorUrl + '/api/ptz/front_end_command/' + deviceId.value + '/' + channelId.value + '?cmdCode=' + cmdCode.value + '¶meter1=' + parameter1 + '¶meter2=128&combindCode2=0', {}).then((res: any) => { }) + } + }) +} +const isInfrared = ref(false) +function infraredClick(row: any) { // 红外方法 + const cmdCode = ref(13) + const parameter1 = isInfrared.value + axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + userStore.stationCode + "&devicecode=" + deviceId.value, {}).then((res: any) => { + if (res.data.data == "0") { + axios.post(userStore.webApiMonitorUrl + '/api/ptz/front_end_command/' + deviceId.value + '/' + channelId.value + '?cmdCode=' + cmdCode.value + '¶meter1=' + parameter1 + '¶meter2=128&combindCode2=0', {}).then((res: any) => { }) + } + }) + +} +const isWiper = ref(false) +function WiperClick(row: any) { // 雨刷方法 + const cmdCode = ref(1) + const combindCode2 = isWiper.value + axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + userStore.stationCode + "&devicecode=" + deviceId.value, {}).then((res: any) => { + if (res.data.data == "0") { + axios.post(userStore.webApiMonitorUrl + '/api/ptz/front_end_command/' + deviceId.value + '/' + channelId.value + '?cmdCode=' + cmdCode.value + '¶meter1=0¶meter2=0&combindCode2=' + combindCode2, {}).then((res: any) => { }) + } + }) +} +function ptzCamera(command: any) { // 监控视频控制方法 userStore.stationId + isGaoliang.value = command + axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + userStore.stationCode + "&devicecode=" + deviceId.value, {}).then((res: any) => { + if (res.data.data == "0") { + axios.post(userStore.webApiMonitorUrl + '/api/ptz/control/' + deviceId.value + '/' + channelId.value + '?command=' + command + + '&horizonSpeed=' + controSpeed.value + '&verticalSpeed=' + controSpeed.value + '&zoomSpeed=' + controSpeed.value, {}).then((res: any) => { }) + } + }) + +} +function presetPosition(cmdCode: any, presetPos: any) { // 预置位操作 ---设置、删除、调用 + + axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + userStore.stationCode + "&devicecode=" + deviceId.value, {}).then((res: any) => { + if (res.data.data == "0") { + axios.post(userStore.webApiMonitorUrl + '/api/ptz/front_end_command/' + deviceId.value + '/' + channelId.value + '?cmdCode=' + cmdCode + '¶meter1=0¶meter2=' + presetPos + '&combindCode2=0', {}).then((res: any) => { }) + } + }) +} +function condensationChang(command: any) { // 光聚方法 + // 近（42H ） 66 远（41H） 65 + const cmdCode = ref() + if (command == '加') { + cmdCode.value = 65 + isGaoliang.value = '65' + } else if (command == '减') { + isGaoliang.value = '66' + cmdCode.value = 66 + } + axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + userStore.stationCode + "&devicecode=" + deviceId.value, {}).then((res: any) => { + if (res.data.data == "0") { + axios.post(userStore.webApiMonitorUrl + '/api/ptz/front_end_command/' + deviceId.value + '/' + channelId.value + '?cmdCode=' + cmdCode.value + '¶meter1=80¶meter2=0&combindCode2=0', {}).then((res: any) => { }) + } + }) + +} +function apertureChang(command: any) { // 光圈方法 + // 缩小（48H ） 72 放大（44H） 70 + const cmdCode = ref(72) + if (command == '加') { + cmdCode.value = 70 + isGaoliang.value = '70' + } else if (command == '减') { + cmdCode.value = 72 + isGaoliang.value = '72' + } + axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + userStore.stationCode + "&devicecode=" + deviceId.value, {}).then((res: any) => { + if (res.data.data == "0") { + axios.post(userStore.webApiMonitorUrl + '/api/ptz/front_end_command/' + deviceId.value + '/' + channelId.value + '?cmdCode=' + cmdCode.value + '¶meter1=0¶meter2=80&combindCode2=0', {}).then((res: any) => { }) + } + }) + +} +function quxiao() { + isGaoliang.value = '' +}