Merge remote-tracking branch 'origin/master'

riis-web/src/api/alarminterval/index.ts

@@ -2,7 +2,7 @@ import request from '@/utils/request';
 //获取所有角色
 export function getAlarm (queryParams:any){
     return request({
-      url: '/basedata/substation-device/getAlarmThresholdPage' ,
+      url: '/basedata/substation-device/getAlarmThresholdList' ,
       method: 'get',
       params:queryParams
     });
@@ -10,14 +10,14 @@ export function getAlarm (queryParams:any){
   //获取所有角色
 export function getSubstation (){
     return request({
-      url: '/basedata/substation/getSubstationTree' ,
+      url: '/basedata/substation/getSubstationBayTree' ,
       method: 'get',
     });
   }
   //批量修改警告阈值
 export function updateAlarm(params:any){
     return request({
-      url: 'basedata/substation-device/updateBatchDevice' ,
+      url: 'basedata/substation-device/updateAlarmThreshold' ,
       method: 'post',
       data:params
     });

riis-web/src/api/device/index.ts

@@ -9,7 +9,7 @@ export function getTreefirst() {
 //获取变电站信息
 export function getTreelist(params: any) {
   return request({
-    url: '/basedata/substation/getSubstationNaviTree',
+    url: '/basedata/substation/getSubstationTree',
     method: 'get',
     params: params
   });
@@ -17,9 +17,9 @@ export function getTreelist(params: any) {
 //获取table表格
 export function getdevicedata(params: any) {
   return request({
-    url: '/basedata/substation-device/getSubstationDevicePage',
+    url: '/basedata/substation-device/getSubstationDeviceList',
-    method: 'get',
+    method: 'post',
-    params: params
+    data: params
   });
 }
 //获取所属主设备select
@@ -49,7 +49,7 @@ export function getaccType(params: any) {
 //间隔下所属部件
 export function getBayType(params: any) {
   return request({
-    url: '/basedata/substation-maindevice/getComponentByCriteria',
+    url: '/basedata/substation-maindevice/getComponentByBay',
     method: 'get',
     params: params
   });
@@ -73,7 +73,7 @@ export function changeStatus(params: any) {
 //修改点位
 export function editPosition(params: any) {
   return request({
-    url: '/basedata/substation-device/updateSubstationDevice',
+    url: '/basedata/substation-device/updateSubstationDeviceById',
     method: 'post',
     data: params
   });
@@ -81,7 +81,7 @@ export function editPosition(params: any) {
 //删除
 export function delPosition(params: any) {
   return request({
-    url: '/basedata/substation-device/deleteSubstationDevice',
+    url: '/basedata/substation-device/deleteSubstationDeviceById',
     method: 'post',
     params: params
   });
@@ -132,7 +132,7 @@ export function getDeviceByType(params: any) {
 //根据条件获取部件(分页)
 export function getComponentByBayPage(params: any) {
   return request({
-    url: '/basedata/substation-maindevice/getComponentPage',
+    url: '/basedata/substation-maindevice/getComponentByBayPage',
     method: 'get',
     params: params
   });

riis-web/src/api/equipment/index.ts

@@ -3,7 +3,7 @@ import request from '@/utils/request';
 //获取左侧导航树
 export function getTreeData(params:any){
   return request({
-    url: '/basedata/substation/getSubstationNaviTree' ,
+    url: '/basedata/substation/getSubstationTree' ,
     method: 'get',
     params:params
   });

riis-web/src/api/home/index.ts

@@ -70,4 +70,12 @@ export function getAlarmLogById(params:any){
     params:params
   });
 }
+//告警准确率
+export function getConfirmationRate(params:any){
+  return request({
+    url: '/patroltask/task-alarm/getConfirmationRate' ,
+    method: 'get',
+    params:params
+  });
+}
 

riis-web/src/api/makeTask/index.ts

@@ -2,7 +2,7 @@ import request from '@/utils/request';
 //获取表格数据
 export function getdata(params: any) {
     return request({
-        url: '/patroltasks/task/getTaskPage',
+        url: '/patroltasks/task/getTaskList',
         method: 'get',
         params: params
     });
@@ -34,7 +34,7 @@ export function changeSwitch(params: any) {
 //删除巡视任务
 export function delTask(params: any) {
     return request({
-        url: '/patroltasks/task/deleteTask',
+        url: '/patroltasks/task/deleteTaskById',
         method: 'post',
         params: params
     });
@@ -70,7 +70,7 @@ export function getSubstationNaviTree(params: any) {
 //获取主设备类型
 export function getmaintype() {
     return request({
-        url: '/basedata/substation-maindevice/getDeviceTypeList',
+        url: '/basedata/substation-maindevice/getDeviceType',
         method: 'get',
     });
 }
@@ -102,7 +102,7 @@ export function checkTask(params:any) {
 //巡视任务上报
 export function PatrolTask(params:any) {
     return request({
-        url: '/patroltasks/task/reportTask',
+        url: '/patroltasks/task/reportTaskById',
         method: 'post',
         params:params
     });

riis-web/src/api/monitordevice/index.ts

@@ -3,7 +3,7 @@ import request from '@/utils/request';
 //获取table表格
 export function getdata(params:any){
   return request({
-    url: '/basedata/substation-patroldevice/getPatrolDevicePage' ,
+    url: '/basedata/substation-patroldevice/getPatrolDeviceList' ,
     method: 'get',
     params:params
   });
@@ -19,7 +19,7 @@ export function addPosition(params:any){
 //修改设备
 export function editPosition(params:any){
   return request({
-    url: '/basedata/substation-patroldevice/updatePatrolDevice' ,
+    url: '/basedata/substation-patroldevice/updatePatrolDeviceById' ,
     method: 'post',
     data:params
   });
@@ -43,7 +43,7 @@ export function setDailyMonitorStatus(params:any){
 //删除
 export function delPosition(params:any){
   return request({
-    url: '/basedata/substation-patroldevice/deletePatrolDevice' ,
+    url: '/basedata/substation-patroldevice/deletePatrolDeviceById' ,
     method: 'post',
     params:params
   });
@@ -142,7 +142,7 @@ export function setEffectiveArea(params:any){
 //获取变电站下的区域
 export function getArea(params: any) {
   return request({
-    url: '/basedata/substation/getAreaByStationCode',
+    url: '/basedata/substation/getSubstationAreaByCode',
     method: 'get',
     params: params,
   });

riis-web/src/api/patrolreport/index.ts

@@ -2,7 +2,7 @@ import request from '@/utils/request';
 //获取表格数据
 export function getdata(params: any) {
     return request({
-        url: '/patroltasks/task-todo/getTaskReportPage',
+        url: '/patroltasks/task-todo/getTaskReportList',
         method: 'get',
         params: params
     });
@@ -18,7 +18,7 @@ export function DelData(params:any) {
 //导出报告
 export function exportExcel(queryParams: any) {
     return request({
-      url: '/patroltasks/task-todo/exportTaskTodo',
+      url: '/patroltasks/task-todo/exportTaskTodoById',
       method: 'get',
       params: queryParams,
       responseType: 'arraybuffer'
@@ -36,7 +36,7 @@ export function getword(queryParams: any) {
 // 上报巡视报告
 export function uploadTaskTodoById(queryParams: any) {
   return request({
-    url: '/patroltasks/task-todo/uploadTaskTodo',
+    url: '/patroltasks/task-todo/uploadTaskTodoById',
     method: 'get',
     params: queryParams,
   });

riis-web/src/api/substation/index.ts

@@ -3,7 +3,7 @@ import request from '@/utils/request';
 //获取所有角色
 export function getdata(params:any){
   return request({
-    url: '/basedata/substation/getSubstationTree' ,
+    url: '/basedata/substation/getSubstationBayTree' ,
     method: 'get',
     params:params
   });

riis-web/src/api/videomonitor/index.ts

@@ -3,7 +3,7 @@ import request from '@/utils/request';
 //获取左侧导航树
 export function getCameraByArea(params:any){
   return request({
-    url: '/basedata/substation-patroldevice/getOnlyCamera' ,
+    url: '/basedata/substation-patroldevice/getCameraByArea' ,
     method: 'get',
     params:params
   });

riis-web/src/api/voiceprint/index.ts

@@ -3,9 +3,9 @@ import request from '@/utils/request';
 //获取table表格
 export function getdata(params:any){
   return request({
-    url: '/basedata/substation-patroldevice/getPatrolDevicePage' ,
+    url: '/basedata/substation-patroldevice/getPatrolDeviceList' ,
-    method: 'get',
+    method: 'post',
-    params:params
+    data:params
   });
 }
 
@@ -21,7 +21,7 @@ export function addPosition(params:any){
   //修改设备
   export function editPosition(params:any){
     return request({
-      url: '/basedata/substation-patroldevice/updatePatrolDevice' ,
+      url: '/basedata/substation-patroldevice/updatePatrolDeviceById' ,
       method: 'post',
       data:params
     });
@@ -29,7 +29,7 @@ export function addPosition(params:any){
 //根据机器人编码获取摄像头
 export function getCreamRoot(params:any){
     return request({
-      url: '/basedata/substation-patroldevice/getCameraByRobotCode' ,
+      url: '/basedata/substation-patroldevice/getCameraByRobot' ,
       method: 'get',
       params:params
     });
@@ -45,7 +45,7 @@ export function changeStatus(params:any){
 //删除
 export function delPosition(params:any){
   return request({
-    url: '/basedata/substation-patroldevice/deletePatrolDevice' ,
+    url: '/basedata/substation-patroldevice/deletePatrolDeviceById' ,
     method: 'post',
     params:params
   });