From a4be773f4540cc8383a8f4f86435a40bbb12071e Mon Sep 17 00:00:00 2001 From: wangxk Date: Fri, 23 May 2025 13:36:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/environmentalMonitoring/index.ts | 8 - riis-web/src/api/substation/index.ts | 43 ++- riis-web/src/assets/3d/xq1.png | Bin 0 -> 370 bytes riis-web/src/components/jessibuca/index1.vue | 2 +- .../src/views/basedata/algorithm/index.vue | 8 +- riis-web/src/views/basedata/device/index.vue | 38 +- .../views/collectmonitor/datasurvey/index.vue | 30 +- .../environmentalMonitoring/index.vue | 33 +- .../voiceprintDetection/index.vue | 4 +- riis-web/src/views/dashboard/index.vue | 2 +- .../ledgermanagement/monitordevice/index.vue | 319 +++++++---------- .../ledgermanagement/voiceprint/index.vue | 1 + .../views/monitorsystem/alarminformation.vue | 41 ++- .../src/views/monitorsystem/giveanalarm.vue | 35 +- .../src/views/question/question/index.vue | 32 +- riis-web/src/views/task/alarmInfo/index.vue | 50 ++- .../src/views/task/patrolmonitor/index.vue | 2 +- .../src/views/task/patrolreport/index.vue | 2 +- .../threevisitation/3Dbrowsing/index.vue | 338 +++++++++++++++++- 19 files changed, 704 insertions(+), 284 deletions(-) create mode 100644 riis-web/src/assets/3d/xq1.png diff --git a/riis-web/src/api/environmentalMonitoring/index.ts b/riis-web/src/api/environmentalMonitoring/index.ts index b051139..cde4eeb 100644 --- a/riis-web/src/api/environmentalMonitoring/index.ts +++ b/riis-web/src/api/environmentalMonitoring/index.ts @@ -1,12 +1,4 @@ import request from '@/utils/request'; -// 查询环境设备 -export function getWeatherLogPage(params:any){ - return request({ - url: '/basedata/weather-log/getWeatherLogPage' , - method: 'get', - params:params - }); -} export function getdeviceworkdata(params:any){ return request({ url: '/auxcontrol/device-work-data/page' , diff --git a/riis-web/src/api/substation/index.ts b/riis-web/src/api/substation/index.ts index 444da58..29d2c39 100644 --- a/riis-web/src/api/substation/index.ts +++ b/riis-web/src/api/substation/index.ts @@ -224,4 +224,45 @@ export function editArea(params: any) { method: 'get', params: params }); - } \ No newline at end of file + } + //按类型查询模型对象 + export function getModelListByType(params: any) { + return request({ + url: '/basedata/substation-model/getModelListByType', + method: 'get', + params + }); + } + //按 任务查找模型 + export function getDevicelListByTask(params: any) { + return request({ + url: '/basedata/substation-model/getDevicelListByTask', + method: 'get', + params + }); + } + //添加模型信息 + export function addModelObject(params: any) { + return request({ + url: '/basedata/substation-model/addModelObject', + method: 'post', + data: params + }); + } + //删除模型对象 + export function deleteModelObject(params: any) { + return request({ + url: '/basedata/substation-model/deleteModelObject', + method: 'post', + params + }); + } + //修改模型信息 + export function updateModelObject(params: any) { + return request({ + url: '/basedata/substation-model/updateModelObject', + method: 'post', + data: params + }); + } + \ No newline at end of file diff --git a/riis-web/src/assets/3d/xq1.png b/riis-web/src/assets/3d/xq1.png new file mode 100644 index 0000000000000000000000000000000000000000..3083542053c93d212ff587c011e59a21b88675ed GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*bKn;gMnDKc2iWHy*c25__5DWjg6F2%XISRD>-zg)@+RB>0pmpio z^$(aGI&`PM)_K`7sl|n>Yj@uvmMVD%;kbk129p?M_ilPzUoCvLklkfpim~s; z6kW28^#SJuwPe;`YzJ+39lXS%T&lgKDm8NEk+T)|Hop&xCOyf4sG&#*K$uy}6G%`#v( OF?hQAxvX { dialog.value = false tableData.value = res.data.records @@ -404,7 +405,7 @@ const paramstable: any = ref({ componentId: '' }) function getdevicedata1() { - + devicedataloading.value = true if (sourceType.value == 1) { paramstable.value.bayId = bayId.value paramstable.value.componentId = componentId.value @@ -438,7 +439,7 @@ function getdevicedata1() { }); }) } - devicedataloading.value = true + @@ -824,7 +825,6 @@ onMounted(() => {
关联信号
-
diff --git a/riis-web/src/views/basedata/device/index.vue b/riis-web/src/views/basedata/device/index.vue index e481f5b..40598ca 100644 --- a/riis-web/src/views/basedata/device/index.vue +++ b/riis-web/src/views/basedata/device/index.vue @@ -61,17 +61,10 @@ const currentNodeKey = ref("") //获取企业树形信息 const value = ref() const optionSelect = ref() -function getSelect() { - getTreefirst().then((res: any) => { - optionSelect.value = res.data - value.value = res.data[0].stationId - getTree(res.data[0].stationId) - }) -} const areaId = ref() -function getTree(val: any) { +function getTree() { const params = { - stationId: val + stationId: userStore.stationId } getTreelist(params).then((res: any) => { if (res.data.length == 0) { @@ -873,7 +866,8 @@ const patroldeviceName = ref() const manufacturerList: any = ref([]) //获取用户列表信息 onMounted(() => { - getSelect(); + getTree() + // getSelect(); notification() getDeviceByType({ dictcode: 'DeviceClass' }).then((res: any) => { DeviceClass.value = res.data @@ -1024,9 +1018,9 @@ function onSubmit(row: any) { }).catch(function (error: any) { }) } -function ptzCamera(command: any) { // 监控视频控制方法 +function ptzCamera(command: any) { // 监控视频控制方法 userStore.stationId isGaoliang.value = command - axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + info.value.stationCode + "&devicecode=" + deviceId.value, {}).then((res: 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/control/' + deviceId.value + '/' + channelId.value + '?command=' + command + '&horizonSpeed=' + controSpeed.value + '&verticalSpeed=' + controSpeed.value + '&zoomSpeed=' + controSpeed.value, {}).then((res: any) => { }) @@ -1036,7 +1030,7 @@ function ptzCamera(command: any) { // 监控视频控制方法 } function presetPosition(cmdCode: any, presetPos: any) { // 预置位操作 ---设置、删除、调用 - axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + info.value.stationCode + "&devicecode=" + deviceId.value, {}).then((res: 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) => { }) } @@ -1046,7 +1040,7 @@ 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=' + info.value.stationCode + "&devicecode=" + deviceId.value, {}).then((res: 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.value + '¶meter1=' + parameter1 + '¶meter2=128&combindCode2=0', {}).then((res: any) => { }) } @@ -1056,7 +1050,7 @@ 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=' + info.value.stationCode + "&devicecode=" + deviceId.value, {}).then((res: 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.value + '¶meter1=' + parameter1 + '¶meter2=128&combindCode2=0', {}).then((res: any) => { }) } @@ -1067,7 +1061,7 @@ 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=' + info.value.stationCode + "&devicecode=" + deviceId.value, {}).then((res: 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.value + '¶meter1=0¶meter2=0&combindCode2=' + combindCode2, {}).then((res: any) => { }) } @@ -1086,7 +1080,7 @@ function condensationChang(command: any) { // 光聚方法 isGaoliang.value = '66' cmdCode.value = 66 } - axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + info.value.stationCode + "&devicecode=" + deviceId.value, {}).then((res: 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.value + '¶meter1=80¶meter2=0&combindCode2=0', {}).then((res: any) => { }) } @@ -1103,7 +1097,7 @@ function apertureChang(command: any) { // 光圈方法 cmdCode.value = 72 isGaoliang.value = '72' } - axios.get(userStore.webApiBaseUrl + '/basedata/substation-patroldevice/isWorkingOfPatrolDevice?stationcode=' + info.value.stationCode + "&devicecode=" + deviceId.value, {}).then((res: 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.value + '¶meter1=0¶meter2=80&combindCode2=0', {}).then((res: any) => { }) } @@ -1163,7 +1157,7 @@ function getCamera() { const params = { patroldeviceName: patroldeviceName.value, type: '10', - stationId: value.value, + stationId: userStore.stationId, areaId: '', } GetCamera(params).then(res => { @@ -1377,7 +1371,7 @@ const total1 = ref() const tableData1: any = ref() function getData1() { loading.value = true - paramstable1.value.stationId = value.value + paramstable1.value.stationId = userStore.stationId getdata(JSON.stringify(paramstable1.value)).then((res: any) => { loading.value = false tableData1.value = res.data.records @@ -1723,12 +1717,12 @@ function handleSelectionChange(val: any) {
分类导航
- - + --> --> - +
+
近一小时
+
近一天
+
@@ -331,6 +335,24 @@ function exportDevice() { diff --git a/riis-web/src/views/monitorsystem/giveanalarm.vue b/riis-web/src/views/monitorsystem/giveanalarm.vue index eacc792..a60a8e9 100644 --- a/riis-web/src/views/monitorsystem/giveanalarm.vue +++ b/riis-web/src/views/monitorsystem/giveanalarm.vue @@ -238,8 +238,9 @@ const handleChange = (value: any) => {
-
-
+
-
+
@@ -274,7 +265,7 @@ const handleChange = (value: any) => { controls>
{ :deep(.el-input-number .el-icon:hover) { color: #409eff !important; } - +.lookvideo { + position: absolute; + right: 40px; + top: 5px; + width: 26px; + height: 26px; + border-radius: 4px; + display: flex; + align-items: center; + justify-content: center; + cursor: pointer; + z-index: 99; + background: rgba(0, 0, 0, 0.5); + +} :deep(.el-input__inner) { color: #fff !important; } diff --git a/riis-web/src/views/question/question/index.vue b/riis-web/src/views/question/question/index.vue index 97e5b4c..4863bb8 100644 --- a/riis-web/src/views/question/question/index.vue +++ b/riis-web/src/views/question/question/index.vue @@ -57,9 +57,10 @@ function init() { } treeloading.value = true getAlgorithmClassTree(params).then((res: any) => { + treeloading.value = false if (res.data.length !== 0 && res.data !== null) { treeData.value = res.data - treeloading.value = false + if (res.data.length !== 0 && res.data !== null) { componentId.value = res.data[0].children[0].id algorithmId.value = res.data[0].children[0].parentId @@ -104,7 +105,7 @@ function gatdata() { const eacherslist: any = ref([1, 2, 3, 4]) function getecharts() { checloading.value = true - getAlgorithmDeviceCurve({ algorithmId: algorithmId.value, componentId: componentId.value }).then((res: any) => { + getAlgorithmDeviceCurve({ algorithmId: algorithmId.value, componentId: componentId.value,type:type.value }).then((res: any) => { checloading.value = false eacherslist.value = res.data setTimeout(() => { @@ -232,6 +233,11 @@ function getaction() { }) }) } +const type = ref(1) +function changeType(val: any) { + type.value = val + getecharts() +}