diff --git a/riis-web/src/api/videomonitor/index.ts b/riis-web/src/api/videomonitor/index.ts index 70148ef..d87a092 100644 --- a/riis-web/src/api/videomonitor/index.ts +++ b/riis-web/src/api/videomonitor/index.ts @@ -8,7 +8,14 @@ export function getCameraByArea(params:any){ params:params }); } - +//获取左侧导航树-主设备 +export function getSubstationMainTree(params:any){ + return request({ + url: '/basedata/substation-maindevice/getSubstationMainTree' , + method: 'get', + params:params + }); +} export function getSubstationDeviceById(params:any){ return request({ url: '/basedata/substation-patroldevice/getSubstationDeviceById' , @@ -16,5 +23,59 @@ export function getSubstationDeviceById(params:any){ params:params }); } - - +//紧急调用 +export function setWorkingOfPatrolDevice(params:any){ + return request({ + url: '/basedata/substation-patroldevice/setWorkingOfPatrolDevice' , + method: 'post', + params:params + }); +} +// +export function isUrgentRetrieval(params:any){ + return request({ + url: '/basedata/substation-patroldevice/isUrgentRetrieval' , + method: 'get', + params:params + }); +} +//区域下声纹 +export function getVoicePrintByArea(params:any){ + return request({ + url: '/basedata/substation-patroldevice/getVoicePrintByArea' , + method: 'get', + params:params + }); +} +//分页查看声纹检测数据{} +export function getVoicePatrolPage(params:any){ + return request({ + url: '/basedata/voice-patrol-log/getVoicePatrolPage' , + method: 'get', + params:params + }); +} +//升温录制 +export function executeVoicePatrolTask(params:any){ + return request({ + url: '/basedata/voice-patrol-log/executeVoicePatrolTask' , + method: 'post', + params:params + }); +} +// 预置位模板录入 +export function importTemplateImage(params:any){ + return request({ + url: '/basedata/substation-patroldevice/importTemplateImage' , + method: 'get', + params:params + }); +} +//预置位偏移检测 +export function presetOffsetDetection(params:any){ + return request({ + url: '/basedata/substation-patroldevice/presetOffsetDetection' , + method: 'get', + params:params + }); +} \ No newline at end of file diff --git a/riis-web/src/assets/newimg/gjsz.png b/riis-web/src/assets/newimg/gjsz.png new file mode 100644 index 0000000..50b506a Binary files /dev/null and b/riis-web/src/assets/newimg/gjsz.png differ diff --git a/riis-web/src/assets/newimg/lj.png b/riis-web/src/assets/newimg/lj.png new file mode 100644 index 0000000..72a8356 Binary files /dev/null and b/riis-web/src/assets/newimg/lj.png differ diff --git a/riis-web/src/assets/newimg/ty.png b/riis-web/src/assets/newimg/ty.png new file mode 100644 index 0000000..f4a6be1 Binary files /dev/null and b/riis-web/src/assets/newimg/ty.png differ diff --git a/riis-web/src/components/wavEcharts/index.vue b/riis-web/src/components/wavEcharts/index.vue new file mode 100644 index 0000000..b2bff23 --- /dev/null +++ b/riis-web/src/components/wavEcharts/index.vue @@ -0,0 +1,491 @@ + + + + + \ No newline at end of file diff --git a/riis-web/src/views/collectmonitor/voiceprintDetection/index.vue b/riis-web/src/views/collectmonitor/voiceprintDetection/index.vue new file mode 100644 index 0000000..5b18c0a --- /dev/null +++ b/riis-web/src/views/collectmonitor/voiceprintDetection/index.vue @@ -0,0 +1,677 @@ + + + + + diff --git a/riis-web/src/views/ledgermanagement/auxiliarymanage/index.vue b/riis-web/src/views/ledgermanagement/auxiliarymanage/index.vue index d99690c..0268d94 100644 --- a/riis-web/src/views/ledgermanagement/auxiliarymanage/index.vue +++ b/riis-web/src/views/ledgermanagement/auxiliarymanage/index.vue @@ -375,9 +375,9 @@ const tableRowClassName = ({ diff --git a/riis-web/src/views/ledgermanagement/equipmentsignal/alarmset.vue b/riis-web/src/views/ledgermanagement/equipmentsignal/alarmset.vue index 5442043..5c9a3a7 100644 --- a/riis-web/src/views/ledgermanagement/equipmentsignal/alarmset.vue +++ b/riis-web/src/views/ledgermanagement/equipmentsignal/alarmset.vue @@ -488,9 +488,9 @@ const tableRowClassName = ({ @@ -514,7 +514,7 @@ const tableRowClassName = ({
- + {{ levelitem.dictname }} diff --git a/riis-web/src/views/ledgermanagement/equipmentsignal/index.vue b/riis-web/src/views/ledgermanagement/equipmentsignal/index.vue index db51cad..5038395 100644 --- a/riis-web/src/views/ledgermanagement/equipmentsignal/index.vue +++ b/riis-web/src/views/ledgermanagement/equipmentsignal/index.vue @@ -382,11 +382,11 @@ const tableRowClassName = ({ diff --git a/riis-web/src/views/ledgermanagement/systemmanage/index.vue b/riis-web/src/views/ledgermanagement/systemmanage/index.vue index 494c19c..e2ab585 100644 --- a/riis-web/src/views/ledgermanagement/systemmanage/index.vue +++ b/riis-web/src/views/ledgermanagement/systemmanage/index.vue @@ -360,15 +360,15 @@ const tableRowClassName = ({ diff --git a/riis-web/src/views/ledgermanagement/voiceprint/index.vue b/riis-web/src/views/ledgermanagement/voiceprint/index.vue index 98f97f5..af5f721 100644 --- a/riis-web/src/views/ledgermanagement/voiceprint/index.vue +++ b/riis-web/src/views/ledgermanagement/voiceprint/index.vue @@ -22,6 +22,9 @@ import JessibucaPlayer from '@/components/jessibuca/index1.vue' import { downloadFile } from '@/utils/index'; import { exportPatrolDeviceList } from "@/api/robot"; import Eldialog from '@/components/seccmsdialog/eldialog.vue'; +import { + getArea, +} from "@/api/monitordevice"; //左侧树形控件 interface Tree { [x: string]: any; @@ -52,6 +55,7 @@ function getSelect() { stationId.value = res.data[0].stationId stationName.value = res.data[0].stationName stationCode.value = res.data[0].stationCode + GetArea() treeloading.value = false loading.value = true nextTick(() => { @@ -70,6 +74,7 @@ function handleNodeClick(data: Tree, node: any) { stationId.value = data.stationId stationName.value = data.stationName stationCode.value = data.stationCode + GetArea() loading.value = true getData() disabled.value = false @@ -261,11 +266,14 @@ const info: any = ref({ materialId: '', internationalId: '', stationName: '', - stationCode: '' + stationCode: '', }); //rules - 新增 const rules = ref({ + areaId: [ + { required: true, message: '请输入设备编码', trigger: 'blur' }, + ], patroldeviceCode: [ { required: true, message: '请输入设备编码', trigger: 'blur' }, { validator: stringlength1, trigger: 'blur' } @@ -375,7 +383,13 @@ function confirmClick(formEl: any) { info.value.stationId = stationId.value info.value.stationName = stationName.value info.value.stationCode = stationCode.value - + if (info.value.areaId != '') { + areaList.value.forEach((element: any) => { + if (element.areaId == info.value.areaId) { + info.value.areaName = element.areaName + } + }); + } if (info.value.patroldeviceId) { editPosition(info.value).then((res: any) => { if (res.code == 0) { @@ -542,6 +556,15 @@ function currency(list: any, itemcode: any) { }) return dictname } +const areaList: any = ref([]) +function GetArea() { + const parmas = { + stationCode: stationCode.value + } + getArea(parmas).then((res: any) => { + areaList.value = res.data + }) +}