Browse Source

fix:修改接口层级

temp
zhaohy 4 months ago
parent
commit
c9e283c3c8
  1. 0
      hx-ai-intelligent/src/api/alarmManagement/alarmSettings/deviceAlarms.ts
  2. 0
      hx-ai-intelligent/src/api/alarmManagement/alarmSettings/energyAlarm.ts
  3. 0
      hx-ai-intelligent/src/api/alarmManagement/alarmSettings/notificationManagements.ts
  4. 38
      hx-ai-intelligent/src/router/alarmManagement.ts
  5. 3
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue
  6. 3
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
  7. 3
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
  8. 3
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
  9. 3
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
  10. 3
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
  11. 7
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
  12. 3
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
  13. 2
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
  14. 3
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
  15. 2
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts
  16. 2
      hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
  17. 10
      hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts

0
hx-ai-intelligent/src/api/alarmSettings/deviceAlarms.ts → hx-ai-intelligent/src/api/alarmManagement/alarmSettings/deviceAlarms.ts

0
hx-ai-intelligent/src/api/alarmSettings/energyAlarm.ts → hx-ai-intelligent/src/api/alarmManagement/alarmSettings/energyAlarm.ts

0
hx-ai-intelligent/src/api/alarmSettings/notificationManagements.ts → hx-ai-intelligent/src/api/alarmManagement/alarmSettings/notificationManagements.ts

38
hx-ai-intelligent/src/router/alarmManagement.ts

@ -43,25 +43,25 @@ const alarmManagement = {
}, },
], ],
}, },
// { {
// path: 'gatewayAlarm', path: 'gatewayAlarm',
// name: 'GatewayAlarm', name: 'GatewayAlarm',
// meta: { title: '网关告警', hideChildren: true, icon: 'gaojingguanli' }, meta: { title: '网关告警', hideChildren: true, icon: 'gaojingguanli' },
// component: Base, component: Base,
// redirect: { name: 'GatewayAlarmIndex' }, redirect: { name: 'GatewayAlarmIndex' },
// children: [ children: [
// { {
// path: 'index', path: 'index',
// name: 'GatewayAlarmIndex', name: 'GatewayAlarmIndex',
// component: () => import('/@/view/alarmManagement/gatewayAlarm/index.vue'), component: () => import('/@/view/alarmManagement/gatewayAlarm/index.vue'),
// meta: { meta: {
// title: '网关告警', title: '网关告警',
// keepAlive: false, keepAlive: false,
// // backApi: [], // backApi: [],
// }, },
// }, },
// ], ],
// }, },
{ {
path: 'alarmSettings', path: 'alarmSettings',
name: 'AlarmSettings', name: 'AlarmSettings',

3
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue

@ -24,7 +24,7 @@
import { http } from '/nerv-lib/util'; import { http } from '/nerv-lib/util';
import { NsMessage, NsModal } from '/nerv-lib/component'; import { NsMessage, NsModal } from '/nerv-lib/component';
import editConfigureEnergyAlarm from './editConfigureEnergyAlarm.vue'; import editConfigureEnergyAlarm from './editConfigureEnergyAlarm.vue';
import { energyAlarms } from '/@/api/alarmSettings/energyAlarm'; import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import { device } from '/@/api/deviceManage'; import { device } from '/@/api/deviceManage';
import { dict } from '/@/api'; import { dict } from '/@/api';
@ -362,3 +362,4 @@
background-color: grey !important; background-color: grey !important;
} }
</style> </style>
../../../../api/alarmManagement/alarmSettings/energyAlarm

3
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue

@ -135,7 +135,7 @@
import type { SelectProps } from 'ant-design-vue'; import type { SelectProps } from 'ant-design-vue';
import type { ShowSearchType } from 'ant-design-vue/es/cascader'; import type { ShowSearchType } from 'ant-design-vue/es/cascader';
import { device, group } from '/@/api/deviceManage'; import { device, group } from '/@/api/deviceManage';
import { energyAlarms } from '/@/api/alarmSettings/energyAlarm'; import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm';
import { http } from '/nerv-lib/util'; import { http } from '/nerv-lib/util';
import { dict } from '/@/api'; import { dict } from '/@/api';
import { async } from '@antv/x6/lib/registry/marker/async'; import { async } from '@antv/x6/lib/registry/marker/async';
@ -508,3 +508,4 @@
width: 23%; width: 23%;
} }
</style> </style>
../../../../api/alarmManagement/alarmSettings/energyAlarm

3
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue

@ -74,7 +74,7 @@
import { ref } from 'vue'; import { ref } from 'vue';
import { NsMessage } from '/nerv-lib/component'; import { NsMessage } from '/nerv-lib/component';
import { http } from '/nerv-lib/util'; import { http } from '/nerv-lib/util';
import { energyAlarms } from '/@/api/alarmSettings/energyAlarm'; import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm';
const visible = ref(false); const visible = ref(false);
// //
@ -307,3 +307,4 @@
width: 23%; width: 23%;
} }
</style> </style>
../../../../api/alarmManagement/alarmSettings/energyAlarm

3
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue

@ -24,7 +24,7 @@
import { http } from '/nerv-lib/util'; import { http } from '/nerv-lib/util';
import { NsMessage, NsModal } from '/nerv-lib/component'; import { NsMessage, NsModal } from '/nerv-lib/component';
import editConfigureDeviceAlarm from '../equipmentAlarm/editConfigureDeviceAlarm.vue'; import editConfigureDeviceAlarm from '../equipmentAlarm/editConfigureDeviceAlarm.vue';
import { deviceAlarms } from '/@/api/alarmSettings/deviceAlarms'; import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import { device } from '/@/api/deviceManage'; import { device } from '/@/api/deviceManage';
@ -323,3 +323,4 @@
background-color: grey !important; background-color: grey !important;
} }
</style> </style>
../../../../api/alarmManagement/alarmSettings/deviceAlarms

3
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue

@ -150,7 +150,7 @@
import type { SelectProps } from 'ant-design-vue'; import type { SelectProps } from 'ant-design-vue';
import type { ShowSearchType } from 'ant-design-vue/es/cascader'; import type { ShowSearchType } from 'ant-design-vue/es/cascader';
import { device } from '/@/api/deviceManage'; import { device } from '/@/api/deviceManage';
import { deviceAlarms } from '/@/api/alarmSettings/deviceAlarms'; import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms';
import { http } from '/nerv-lib/util'; import { http } from '/nerv-lib/util';
@ -519,3 +519,4 @@
width: 23%; width: 23%;
} }
</style> </style>
../../../../api/alarmManagement/alarmSettings/deviceAlarms

3
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue

@ -80,7 +80,7 @@
import { ref } from 'vue'; import { ref } from 'vue';
import { NsMessage } from '/nerv-lib/component'; import { NsMessage } from '/nerv-lib/component';
import { http } from '/nerv-lib/util'; import { http } from '/nerv-lib/util';
import { deviceAlarms } from '/@/api/alarmSettings/deviceAlarms'; import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms';
const visible = ref(false); const visible = ref(false);
// //
@ -307,3 +307,4 @@
width: 23%; width: 23%;
} }
</style> </style>
../../../../api/alarmManagement/alarmSettings/deviceAlarms

7
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue

@ -151,10 +151,10 @@
import notificationManagement from './notificationManagement/index.vue'; import notificationManagement from './notificationManagement/index.vue';
import configureEnergyAlarms from './energyAlarm/configureEnergyAlarms.vue'; import configureEnergyAlarms from './energyAlarm/configureEnergyAlarms.vue';
import configureDeviceAlarms from './equipmentAlarm/configureDeviceAlarms.vue'; import configureDeviceAlarms from './equipmentAlarm/configureDeviceAlarms.vue';
import { deviceAlarms } from '/@/api/alarmSettings/deviceAlarms'; import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms';
import { energyAlarms } from '/@/api/alarmSettings/energyAlarm'; import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import { notificationManagementApi } from '/@/api/alarmSettings/notificationManagements'; import { notificationManagementApi } from '/@/api/alarmManagement/alarmSettings/notificationManagements';
export default { export default {
name: 'AlarmSettingsIndex', name: 'AlarmSettingsIndex',
@ -339,3 +339,4 @@
background-color: grey !important; background-color: grey !important;
} }
</style> </style>
../../../api/alarmManagement/alarmSettings/deviceAlarms../../../api/alarmManagement/alarmSettings/energyAlarm../../../api/alarmManagement/alarmSettings/notificationManagements

3
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue

@ -72,7 +72,7 @@
import { NsMessage } from '/nerv-lib/component'; import { NsMessage } from '/nerv-lib/component';
import { http } from '/nerv-lib/util'; import { http } from '/nerv-lib/util';
import linkPeople from './linkPeople/index.vue'; import linkPeople from './linkPeople/index.vue';
import { notificationManagementApi } from '/@/api/alarmSettings/notificationManagements'; import { notificationManagementApi } from '/@/api/alarmManagement/alarmSettings/notificationManagements';
import { async } from '@antv/x6/lib/registry/marker/async'; import { async } from '@antv/x6/lib/registry/marker/async';
//table //table
@ -301,3 +301,4 @@
width: 20%; width: 20%;
} }
</style> </style>
../../../../api/alarmManagement/alarmSettings/notificationManagements

2
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts

@ -1,6 +1,6 @@
import { http } from '/nerv-lib/util'; import { http } from '/nerv-lib/util';
import { NsMessage } from '/nerv-lib/component'; import { NsMessage } from '/nerv-lib/component';
import { energyAlarms } from '/@/api/alarmSettings/energyAlarm'; import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm';
const tableKeyMap = [ const tableKeyMap = [
{ {

3
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts

@ -1,7 +1,6 @@
import { http } from '/nerv-lib/util'; import { http } from '/nerv-lib/util';
import { NsMessage } from '/nerv-lib/component'; import { NsMessage } from '/nerv-lib/component';
import { deviceAlarms } from '/@/api/alarmSettings/deviceAlarms'; import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms';
const tableKeyMap = [ const tableKeyMap = [
{ {
title: '序号', title: '序号',

2
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts

@ -1,6 +1,6 @@
import { dateUtil } from '/nerv-lib/util/date-util'; import { dateUtil } from '/nerv-lib/util/date-util';
import { http } from '/nerv-lib/util'; import { http } from '/nerv-lib/util';
import { notificationManagementApi } from '/@/api/alarmSettings/notificationManagements'; import { notificationManagementApi } from '/@/api/alarmManagement/alarmSettings/notificationManagements';
import { ref } from 'vue'; import { ref } from 'vue';
const tableKeyMap = [ const tableKeyMap = [

2
hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts

@ -140,7 +140,7 @@ export const notificationtableConfig = (look: any, status: any) => {
}, },
{ {
field: 'createTime', field: 'createTime',
label: '生产日期', label: '数据日期',
component: 'NsRangePicker', component: 'NsRangePicker',
fieldMap: ['manufactureBeginDate', 'manufactureEndDate'], fieldMap: ['manufactureBeginDate', 'manufactureEndDate'],
componentProps: { componentProps: {

10
hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts

@ -133,16 +133,8 @@ export const notificationtableConfig = (look: any, status: any) => {
}, },
}, },
{ {
field: 'provider',
label: '错误码',
component: 'NsInput',
componentProps: {
placeholder: '请输入告警错误码',
},
},
{
field: 'createTime', field: 'createTime',
label: '生产日期', label: '数据日期',
component: 'NsRangePicker', component: 'NsRangePicker',
fieldMap: ['manufactureBeginDate', 'manufactureEndDate'], fieldMap: ['manufactureBeginDate', 'manufactureEndDate'],
componentProps: { componentProps: {

Loading…
Cancel
Save