diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue index fcd8794..0d4f849 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue @@ -41,7 +41,6 @@ name: 'RoleTypeAdd', type: 'primary', handle: () => { - console.log('新增xxxxxxx'); editConfigureDeviceAlarms.value.toggle(); }, }, diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue index 5f835b6..546a033 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue @@ -2,10 +2,34 @@
- + + + - + + + { - // console.log(mainRef.value); - // mainRef.value?.nsTableRef.reload(); - // // console.log(newList.value.formFinish, '数据'); - // }; + const clickSwitch = (data: any) => { + console.log(data, '数据'); + mainRef.value?.nsTableRef.reload(); + }; // 编辑或添加成功 刷新列表 const editObject = () => { console.log('添加成功 刷新列表'); @@ -70,6 +93,7 @@ notificationConfig, equipmentAlarmConfig, editObject, + clickSwitch, editEquipmentAlarm, configureDeviceAlarms, equipmentAlarm, @@ -90,4 +114,27 @@ .full-height { height: 100%; /* 设置高度为父容器高度 */ } + .blue-background.ant-switch-checked { + background-color: linear-gradient( + 180deg, + rgba(1, 206, 255, 1) 0%, + rgba(0, 150, 229, 1) 100% + ) !important; + } + + .grey-background.ant-switch { + background-color: grey !important; + } + + .blue-background.ant-switch-checked .ant-switch-handle { + background-color: linear-gradient( + 180deg, + rgba(1, 206, 255, 1) 0%, + rgba(0, 150, 229, 1) 100% + ) !important; + } + + .grey-background.ant-switch .ant-switch-handle { + background-color: grey !important; + } diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/configureDeviceAlarms.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/configureDeviceAlarms.ts deleted file mode 100644 index 3ed560d..0000000 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/configureDeviceAlarms.ts +++ /dev/null @@ -1,204 +0,0 @@ -import { dateUtil } from '/nerv-lib/util/date-util'; -import data from '../notificationManagementMock.json'; -import { http } from '/nerv-lib/util'; -import { Modal } from 'ant-design-vue'; -import { ref } from 'vue'; -const tableKeyMap = [ - { - title: '序号', - dataIndex: 'address', - customRender: (text: any) => { - return text.index + 1; - }, - }, - { - title: '规则id', - dataIndex: 'id', - }, - { - title: '设备信息', - dataIndex: 'deviceCode', - }, - { - title: '告警点位', - dataIndex: 'deviceName', - }, - { - title: '判断条件', - dataIndex: 'position', - }, - { - title: '取值类型', - dataIndex: 'position', - textEllipsis: true, - }, - { - title: '异常描述', - dataIndex: 'position', - }, - { - title: '启用通知', - dataIndex: 'isUse', - }, -]; -const mockData = ref(data.listData); -const doWnload = (url) => { - const a = document.createElement('a'); - document.body.appendChild(a); - a.href = encodeURI(url); - //设置下载的文件名 - // a.download = fileName.value; - //触发a标签的点击事件，进行下载 - a.click(); -}; - -export const configureDeviceAlarms = (editEquipmentAlarm, elFormula, title) => { - return { - title: '告警规则', - // api: '/carbon_emission/device/getDeviceList', - value: mockData.value, - headerActions: [ - { - label: '新增', - name: 'RoleTypeAdd', - type: 'primary', - handle: () => { - editEquipmentAlarm.value.toggle(); - }, - }, - { - label: '导入', - name: 'groupImport', - type: 'primary', - extra: { - // api: props.postImportApi, // 导入接口名 - title: '设备信息', // 弹窗title - templateName: 'whiteListUser', // 所使用的文件名称 - indexName: '设备id', // 匹配类型字段 - message: [ - { label: '1、若必填项未填写，则不能进行导入操作' }, - { label: `2、当重复时，则更新数据。` }, - { label: '3、数据将从模版的第五行进行导入。' }, - { label: '4、文件导入勿超过5MB。' }, - ], - }, - }, - { - label: '导出', - name: 'groupExports', - type: 'primary', - handle: () => { - doWnload('/hx-ai-intelligent/asset/file/whiteListUser.xlsx'); - }, - }, - { - label: '批量删除', - type: 'primary', - name: 'userBatchDel', - dynamicDisabled: (data: any) => { - return data.list.length === 0; - }, - confirm: true, - isReload: true, - isClearCheck: true, - // api: origanizemanage.batchDel, - dynamicParams: { userIds: 'userId[]' }, - }, - ], - columns: tableKeyMap, - params: { - page: 0, - pageSize: 10, - }, - // rowSelection: null, 选择按钮 - columnActions: { - title: '操作', - actions: [ - { - label: '编辑', - name: 'FeedBackDetail', - dynamicParams: ['uuid', 'appealType'], - handle: (data: any) => { - editEquipmentAlarm.value.toggle(data); - }, - }, - { - label: '删除', - name: 'FeedBackDetail', - dynamicParams: ['uuid', 'appealType'], - confirm: true, - handle: () => { - // mockData.value.splice(0, 1); - }, - }, - ], - }, - formConfig: { - title: title, - schemas: [ - { - field: 'provider', - label: '告警优先级', - component: 'NsSelect', - componentProps: { - placeholder: '请选择告警优先级', - options: [ - { - label: '全部', - value: '', - }, - { - label: '启用', - value: '1', - }, - { - label: '关闭', - value: '0', - }, - ], - }, - }, - { - field: 'provider', - label: '告警标题', - component: 'NsInput', - componentProps: { - placeholder: '请输入告警标题关键字', - }, - }, - { - field: 'provider', - label: '告警标题', - component: 'NsInput', - componentProps: { - placeholder: '请输入告警标题关键字', - }, - }, - { - field: 'payWay', - label: '启用状态', - component: 'NsSelect', - componentProps: { - placeholder: '请选择启用状态', - options: [ - { - label: '全部', - value: '', - }, - { - label: '启用', - value: '1', - }, - { - label: '关闭', - value: '0', - }, - ], - }, - }, - ], - }, - // pagination: { pageSizeOptions: false }, - rowKey: 'id', - }; -}; diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts index 51abef7..e04db8a 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts @@ -98,10 +98,6 @@ export const equipmentAlarmTableConfig = ( }, ], columns: tableKeyMap, - params: { - page: 0, - pageSize: 10, - }, // rowSelection: null, 选择按钮 columnActions: { title: '操作', diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts index 6e2d34a..e1f6337 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts @@ -48,10 +48,6 @@ export const notificationtableConfig = (el, elGroup, elFormula) => { value: mockData.value, headerActions: [{}], columns: tableKeyMap, - params: { - page: 0, - pageSize: 10, - }, // rowSelection: null, 选择按钮 columnActions: { title: '操作', diff --git a/lib/component/table/table.vue b/lib/component/table/table.vue index c12e0d6..cc8030c 100644 --- a/lib/component/table/table.vue +++ b/lib/component/table/table.vue @@ -747,27 +747,4 @@ word-break: break-word; width: 100%; } - .blue-background.ant-switch-checked { - background-color: linear-gradient( - 180deg, - rgba(1, 206, 255, 1) 0%, - rgba(0, 150, 229, 1) 100% - ) !important; - } - - .grey-background.ant-switch { - background-color: grey !important; - } - - .blue-background.ant-switch-checked .ant-switch-handle { - background-color: linear-gradient( - 180deg, - rgba(1, 206, 255, 1) 0%, - rgba(0, 150, 229, 1) 100% - ) !important; - } - - .grey-background.ant-switch .ant-switch-handle { - background-color: grey !important; - }