Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

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

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

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

@@ -24,7 +24,7 @@
   import { http } from '/nerv-lib/util';
   import { NsMessage, NsModal } from '/nerv-lib/component';
   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 { device } from '/@/api/deviceManage';
   import { dict } from '/@/api';
@@ -362,3 +362,4 @@
     background-color: grey !important;
   }
 </style>
+../../../../api/alarmManagement/alarmSettings/energyAlarm

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

@@ -135,7 +135,7 @@
   import type { SelectProps } from 'ant-design-vue';
   import type { ShowSearchType } from 'ant-design-vue/es/cascader';
   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 { dict } from '/@/api';
   import { async } from '@antv/x6/lib/registry/marker/async';
@@ -508,3 +508,4 @@
     width: 23%;
   }
 </style>
+../../../../api/alarmManagement/alarmSettings/energyAlarm

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

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

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

@@ -24,7 +24,7 @@
   import { http } from '/nerv-lib/util';
   import { NsMessage, NsModal } from '/nerv-lib/component';
   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 { device } from '/@/api/deviceManage';
 
@@ -323,3 +323,4 @@
     background-color: grey !important;
   }
 </style>
+../../../../api/alarmManagement/alarmSettings/deviceAlarms

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

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

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

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

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

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

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

@@ -72,7 +72,7 @@
   import { NsMessage } from '/nerv-lib/component';
   import { http } from '/nerv-lib/util';
   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';
 
   //table 数据
@@ -301,3 +301,4 @@
     width: 20%;
   }
 </style>
+../../../../api/alarmManagement/alarmSettings/notificationManagements

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

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

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

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

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

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

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

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

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',
-          label: '生产日期',
+          label: '数据日期',
           component: 'NsRangePicker',
           fieldMap: ['manufactureBeginDate', 'manufactureEndDate'],
           componentProps: {