xuziqiang/SaaS-lib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix:修改计划添加页面 根据ui修改页面

Browse Source
This commit is contained in:
zhaohy
2024-08-12 15:33:23 +08:00
parent dbdf3da68a
commit e7642fe14c
21 changed files with 408 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,6 +167,7 @@
customRender: (text: any) => {
return text.index + 1;
},
width: 80,
},
{
title: '规则id',
@@ -179,6 +180,7 @@
{
title: '对比类型',
dataIndex: 'comparisonType',
width: 180,
},
{
title: '告警点位',
@@ -196,11 +198,16 @@
{
title: '启用状态',
dataIndex: 'enableRules',
width: 120,
},
],
// rowSelection: null, 选择按钮
scroll: { x: 2500 },
columnActions: {
title: '操作',
width: 200,
fixed: 'right',
dataIndex: 'tableAction',
actions: [
{
label: '编辑',
@@ -318,24 +325,25 @@
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
rgba(0, 150, 229, 1) 100%
rgba(57, 215, 187, 1) 100%
) !important;
}
.grey-background.ant-switch {
background-color: grey !important;
background-color: rgba(238, 238, 238, 1) !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%
rgba(57, 215, 187, 1) 100%
) !important;
}
.ant-switch-checked {
background-color: rgba(57, 215, 187, 1) !important;
}
.grey-background.ant-switch .ant-switch-handle {
background-color: grey !important;
background-color: rgba(238, 238, 238, 1) !important;
}
</style>
../../../../api/alarmManagement/alarmSettings/energyAlarm

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

@@ -2,12 +2,28 @@
<ns-drawer
v-model:visible="visible"
width="520"
:title="infoObject?.id ? '编辑告警规则' : '新增告警规则'"
:title="' '"
:footer-style="{ textAlign: 'right' }"
:ok="btnClick"
:cancel="handleClose"
@close="handleClose"
placement="right">
<div
class="ns-title-extra-box"
style="
width: 100%;
height: 22px;
opacity: 1;
/** 文本1 */
font-size: 16px;
font-weight: 700;
letter-spacing: 0px;
line-height: 21px;
color: rgba(51, 51, 51, 1);
margin-bottom: 24px;
">
<span style="margin-left: 6px">{{ infoObject?.id ? '编辑' : '新增' }}</span>
</div>
<div style="padding: 18px; width: 100%; overflow: hidden">
<a-form ref="formRef" :model="infoObject" :rules="rules">
<a-form-item ref="site" label="站点" name="site">
@@ -104,9 +120,7 @@
<div
style="width: 70px; align-items: center; cursor: pointer"
@click="deleteAlarmList(index - 1)">
<img
style="width: 14px; margin: 0 12px"
src="https://files.axshare.com/gsc/4T0UQR/5a/e6/81/5ae6813d499c422383c7a15dd956523f/images/设备规则/u72.svg?pageId=cbce6e61-bc6a-4283-802d-993fce6151c0" />
<img style="width: 14px; margin: 0 12px" src="../../../../../src/icon/del.svg" />
</div>
</div>
<div
@@ -484,24 +498,26 @@
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
rgba(0, 150, 229, 1) 100%
rgba(57, 215, 187, 1) 100%
) !important;
}
.grey-background.ant-switch {
background-color: grey !important;
background-color: rgba(238, 238, 238, 1) !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%
rgba(57, 215, 187, 1) 100%
) !important;
}
.ant-switch-checked {
background-color: rgba(57, 215, 187, 1) !important;
}
.grey-background.ant-switch .ant-switch-handle {
background-color: grey !important;
background-color: rgba(238, 238, 238, 1) !important;
}
:deep(.ant-form-item-label) {
z-index: 20;
@@ -509,4 +525,3 @@
width: 23%;
}
</style>
../../../../api/alarmManagement/alarmSettings/energyAlarm

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

@@ -8,6 +8,22 @@
:cancel="handleClose"
placement="right"
@close="handleClose">
<div
class="ns-title-extra-box"
style="
width: 100%;
height: 22px;
opacity: 1;
/** 文本1 */
font-size: 16px;
font-weight: 700;
letter-spacing: 0px;
line-height: 21px;
color: rgba(51, 51, 51, 1);
margin-bottom: 24px;
">
<span style="margin-left: 6px">{{ infoObject?.id ? '编辑' : '新增' }}</span>
</div>
<a-form ref="formRef" :model="infoObject" :rules="rules">
<a-form-item name="alarmTitle" label="告警标题">
<ns-input allowClear v-model:value="infoObject.alarmTitle" placeholder="请输入告警标题" />
@@ -260,24 +276,26 @@
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
rgba(0, 150, 229, 1) 100%
rgba(57, 215, 187, 1) 100%
) !important;
}
.grey-background.ant-switch {
background-color: grey !important;
background-color: rgba(238, 238, 238, 1) !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%
rgba(57, 215, 187, 1) 100%
) !important;
}
.ant-switch-checked {
background-color: rgba(57, 215, 187, 1) !important;
}
.grey-background.ant-switch .ant-switch-handle {
background-color: grey !important;
background-color: rgba(238, 238, 238, 1) !important;
}
:deep(.ant-form-item-label) {
z-index: 20;
@@ -285,4 +303,3 @@
width: 23%;
}
</style>
../../../../api/alarmManagement/alarmSettings/energyAlarm

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

@@ -145,6 +145,7 @@
customRender: (text: any) => {
return text.index + 1;
},
width: 80,
},
{
title: '规则id',
@@ -157,6 +158,7 @@
{
title: '告警点位',
dataIndex: 'devicePointName',
width: 120,
},
{
title: '判断条件',
@@ -165,6 +167,7 @@
{
title: '取值类型',
dataIndex: 'valueType',
width: 140,
},
{
title: '异常描述',
@@ -173,11 +176,16 @@
{
title: '启用状态',
dataIndex: 'enableRules',
width: 120,
},
],
// rowSelection: null, 选择按钮
scroll: { x: 2500 },
columnActions: {
title: '操作',
width: 200,
fixed: 'right',
dataIndex: 'tableAction',
actions: [
{
label: '编辑',
@@ -304,24 +312,25 @@
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
rgba(0, 150, 229, 1) 100%
rgba(57, 215, 187, 1) 100%
) !important;
}
.grey-background.ant-switch {
background-color: grey !important;
background-color: rgba(238, 238, 238, 1) !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%
rgba(57, 215, 187, 1) 100%
) !important;
}
.ant-switch-checked {
background-color: rgba(57, 215, 187, 1) !important;
}
.grey-background.ant-switch .ant-switch-handle {
background-color: grey !important;
background-color: rgba(238, 238, 238, 1) !important;
}
</style>
../../../../api/alarmManagement/alarmSettings/deviceAlarms

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

@@ -2,13 +2,29 @@
<ns-drawer
v-model:visible="visible"
width="520"
:title="infoObject?.id ? '编辑告警规则' : '新增告警规则'"
:title="' '"
:footer-style="{ textAlign: 'right' }"
:ok="btnClick"
:cancel="handleClose"
placement="right"
@close="handleClose">
<div style="padding: 18px; width: 100%; overflow: hidden">
<div style="padding: 12px; width: 100%; overflow: hidden">
<div
class="ns-title-extra-box"
style="
width: 100%;
height: 22px;
opacity: 1;
/** 文本1 */
font-size: 16px;
font-weight: 700;
letter-spacing: 0px;
line-height: 21px;
color: rgba(51, 51, 51, 1);
margin-bottom: 24px;
">
<span style="margin-left: 6px">{{ infoObject?.id ? '编辑' : '新增' }}</span>
</div>
<a-form ref="formRef" :model="infoObject" :rules="rules">
<a-form-item ref="site" label="站点" name="site">
<a-tree-select
@@ -123,9 +139,7 @@
<div
style="width: 70px; align-items: center; cursor: pointer"
@click="deleteAlarmList(index - 1)">
<img
style="width: 14px; margin: 0 12px"
src="https://files.axshare.com/gsc/4T0UQR/5a/e6/81/5ae6813d499c422383c7a15dd956523f/images/设备规则/u72.svg?pageId=cbce6e61-bc6a-4283-802d-993fce6151c0" />
<img style="width: 14px; margin: 0 12px" src="../../../../../src/icon/del.svg" />
</div>
</div>
<div
@@ -508,29 +522,32 @@
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
rgba(0, 150, 229, 1) 100%
rgba(57, 215, 187, 1) 100%
) !important;
}
.grey-background.ant-switch {
background-color: grey !important;
background-color: rgba(238, 238, 238, 1) !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%
rgba(57, 215, 187, 1) 100%
) !important;
}
.ant-switch-checked {
background-color: rgba(57, 215, 187, 1) !important;
}
.grey-background.ant-switch .ant-switch-handle {
background-color: grey !important;
background-color: rgba(238, 238, 238, 1) !important;
}
:deep(.ant-form-item-label) {
z-index: 20;
text-align: right;
width: 23%;
display: flex;
position: relative;
}
</style>
../../../../api/alarmManagement/alarmSettings/deviceAlarms

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

@@ -2,12 +2,28 @@
<ns-drawer
v-model:visible="visible"
width="520"
:title="infoObject?.id ? '编辑告警' : '新增告警'"
:title="' '"
:footer-style="{ textAlign: 'right' }"
:ok="btnClick"
:cancel="handleClose"
placement="right"
@close="handleClose">
<div
class="ns-title-extra-box"
style="
width: 100%;
height: 22px;
opacity: 1;
/** 文本1 */
font-size: 16px;
font-weight: 700;
letter-spacing: 0px;
line-height: 21px;
color: rgba(51, 51, 51, 1);
margin-bottom: 24px;
">
<span style="margin-left: 6px">{{ infoObject?.id ? '编辑' : '新增' }}</span>
</div>
<a-form ref="formRef" :model="infoObject" :rules="rules">
<a-form-item name="alarmTitle" label="告警标题">
<ns-input allowClear v-model:value="infoObject.alarmTitle" placeholder="请输入告警标题" />
@@ -320,24 +336,27 @@
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
rgba(0, 150, 229, 1) 100%
rgba(57, 215, 187, 1) 100%
) !important;
}
.grey-background.ant-switch {
background-color: grey !important;
background-color: rgba(238, 238, 238, 1) !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%
rgba(57, 215, 187, 1) 100%
) !important;
}
.grey-background.ant-switch .ant-switch-handle {
background-color: grey !important;
background-color: alarmSettings !important;
}
.ant-switch-checked {
background-color: rgba(57, 215, 187, 1) !important;
}
:deep(.ant-form-item-label) {
z-index: 20;

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

@@ -326,23 +326,25 @@
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
rgba(0, 150, 229, 1) 100%
rgba(57, 215, 187, 1) 100%
) !important;
}
.grey-background.ant-switch {
background-color: grey !important;
background-color: rgba(238, 238, 238, 1) !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%
rgba(57, 215, 187, 1) 100%
) !important;
}
.ant-switch-checked {
background-color: rgba(57, 215, 187, 1) !important;
}
.grey-background.ant-switch .ant-switch-handle {
background-color: grey !important;
background-color: rgba(238, 238, 238, 1) !important;
}
</style>

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

@@ -2,13 +2,29 @@
<ns-drawer
v-model:visible="visible"
width="600"
:title="'设置通知联系人'"
:title="' '"
:ok="btnClick"
:cancel="handleClose"
placement="right"
:footer-style="{ textAlign: 'right' }"
@close="handleClose">
<div style="width: 100%; overflow: hidden; overflow-y: hidden; height: 100%">
<div
class="ns-title-extra-box"
style="
width: 100%;
height: 22px;
opacity: 1;
/** 文本1 */
font-size: 16px;
font-weight: 700;
letter-spacing: 0px;
line-height: 21px;
color: rgba(51, 51, 51, 1);
margin-bottom: 24px;
">
<span style="margin-left: 6px">设置通知联系人</span>
</div>
<a-form ref="formRef" :model="infoObject" :rules="rules" style="width: 80%">
<a-form-item ref="notificationMethod" label="通知方式" name="notificationMethod">
<a-select
@@ -34,16 +50,28 @@
</a-form-item>
</a-form>
<div style="width: 100%; height: 765px; overflow-y: auto">
<div style="margin-bottom: 8px">
<div style="width: 100%; display: flex; position: relative" class="ns-title-extra-box">
<span style="margin-left: 12px; color: #333333">联系人名单</span>
<div style="margin-bottom: 8px; width: 100%; display: flex">
<div
style="
width: auto;
height: 30px;
opacity: 1;
/** 文本1 */
font-size: 16px;
font-weight: 700;
letter-spacing: 0px;
line-height: 30px;
color: rgba(51, 51, 51, 1);
">
联系人名单
</div>
<div style="margin-bottom: 16px; margin-left: 12px">
<a-button
style="color: rgba(67, 136, 251, 1); border: 1px solid rgba(67, 136, 251, 1)"
@click="chengUser"
>选择联系人
</a-button>
</div>
<img
style="width: 100%; margin-top: -10px"
src="https://files.axshare.com/gsc/4T0UQR/7e/5d/a2/7e5da2a277344db8af30521cefeb70cc/images/告警设置/u150.svg?pageId=1f58c1ba-b461-4fe8-a2b3-295f1e7b0aa0" />
</div>
<div style="margin-bottom: 16px">
<a-button type="primary" @click="chengUser">选择联系人 </a-button>
</div>
<a-table
:dataSource="dataSource"
@@ -136,8 +164,7 @@
showQuickJumper: true,
showLessItems: true,
// showSizeChanger: true, //分页改变大小
showTotal: (total: number, range: any) =>
total && range ? `显示第${range[0]}到${range[1]}条记录,共 ${total} 条记录` : '',
showTotal: (total: number, range: any) => (total && range ? '' : ''),
onChange: handleChangePage,
});
//点击联系人
@@ -287,28 +314,38 @@
background-color: linear-gradient(
180deg,
rgba(1, 206, 255, 1) 0%,
rgba(0, 150, 229, 1) 100%
rgba(57, 215, 187, 1) 100%
) !important;
}
.grey-background.ant-switch {
background-color: grey !important;
background-color: rgba(238, 238, 238, 1) !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%
rgba(57, 215, 187, 1) 100%
) !important;
}
.ant-switch-checked {
background-color: rgba(57, 215, 187, 1) !important;
}
.grey-background.ant-switch .ant-switch-handle {
background-color: grey !important;
background-color: rgba(238, 238, 238, 1) !important;
}
:deep(.ant-form-item-label) {
z-index: 20;
text-align: left;
width: 20%;
}
:deep(.ant-pagination-prev) {
border: 1px solid rgba(207, 212, 219, 1) !important;
margin-right: 6px !important;
}
:deep(.ant-pagination-next) {
border: 1px solid rgba(207, 212, 219, 1) !important;
margin-left: 6px !important;
}
</style>

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

@@ -14,10 +14,12 @@ const tableKeyMap = [
customRender: (text: any) => {
return text.index + 1;
},
width: 80,
},
{
title: '优先级',
dataIndex: 'priority',
width: 120,
},
{
title: '告警标题',
@@ -26,26 +28,32 @@ const tableKeyMap = [
{
title: '错误码',
dataIndex: 'errorCode',
width: 120,
},
{
title: '告警频率',
dataIndex: 'alarmFrequency',
width: 120,
},
{
title: '重复次数',
dataIndex: 'repetitions',
width: 120,
},
{
title: '频率间隔',
dataIndex: 'interval',
width: 120,
},
{
title: '监测时长',
dataIndex: 'monitorFrequency',
width: 120,
},
{
title: '是否启用',
dataIndex: 'enableRules',
width: 140,
},
];
const doWnload = (url: any) => {
@@ -103,9 +111,13 @@ export const energyAlarmConfigs = (
},
],
columns: tableKeyMap,
scroll: { x: 1800 },
// rowSelection: null, 选择按钮
columnActions: {
title: '操作',
width: 250,
fixed: 'right',
dataIndex: 'tableAction',
actions: [
{
label: '编辑',

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

@@ -14,6 +14,7 @@ const tableKeyMap = [
customRender: (text: any) => {
return text.index + 1;
},
width: 80,
},
{
title: '优先级',
@@ -105,8 +106,12 @@ export const equipmentAlarmTableConfig = (
],
columns: tableKeyMap,
// rowSelection: null, 选择按钮
scroll: { x: 1800 },
columnActions: {
title: '操作',
width: 250,
fixed: 'right',
dataIndex: 'tableAction',
actions: [
{
label: '编辑',

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

@@ -12,14 +12,17 @@ const tableKeyMap = [
customRender: (text: any) => {
return text.index + 1;
},
width: 80,
},
{
title: '优先级',
dataIndex: 'prioritys',
width: 120,
},
{
title: '告警类型',
dataIndex: 'alarmTypeName',
width: 140,
},
{
title: '告警标题',
@@ -28,20 +31,24 @@ const tableKeyMap = [
{
title: '错误码',
dataIndex: 'errorCode',
width: 120,
},
{
title: '通知名单',
dataIndex: 'notificationList',
width: 150,
width: 220,
textEllipsis: true,
textWidth: 150,
},
{
title: '通知方式',
dataIndex: 'notificationMethod',
width: 160,
},
{
title: '启用通知',
dataIndex: 'enableNotifications',
width: 140,
},
];
export const notificationtableConfig = (notificationManagements: any) => {
@@ -50,8 +57,12 @@ export const notificationtableConfig = (notificationManagements: any) => {
api: notificationManagementApi.getTableList,
headerActions: [],
columns: tableKeyMap,
scroll: { x: 1800 },
columnActions: {
title: '操作',
width: 140,
fixed: 'right',
dataIndex: 'tableAction',
actions: [
{
label: '联系方式',