diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
index 7783915..aaad9c2 100644
--- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
+++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
@@ -11,6 +11,9 @@ export enum carbonEmissionFactorLibrary {
// 单位管理
dictionaryUnitManagement = '/carbon-smart/api/carbon/emission/factor/dictionaryUnitManagement',
findOutermost = '/carbon-smart/api/carbon/emission/factor/findOutermost',
+ createDictionary = '/carbon-smart/api/carbon/emission/factor/createDictionary',
+ updateDictionary = '/carbon-smart/api/carbon/emission/factor/updateDictionary',
+ delDictionary = '/carbon-smart/api/carbon/emission/factor/delDictionary',
}
// 碳排管理-碳排统计接口
export enum energyConsumption {
@@ -20,4 +23,12 @@ export enum energyConsumption {
creat = '/carbon-smart/api/carbon/stats/creat',
update = '/carbon-smart/api/carbon/stats/update',
del = '/carbon-smart/api/carbon/stats/del',
+}
+// 碳排管理-碳排速算接口
+export enum quickCalculation {
+ carbonQuickTree = '/carbon-smart/api/carbon/energy/correlation/carbonQuickTree',
+ queryCarbonEmissionPage = '/carbon-smart/api/carbon/energy/correlation/queryCarbonEmissionPage',
+ creat = '/carbon-smart/api/carbon/energy/correlation/creat',
+ update = '/carbon-smart/api/carbon/energy/correlation/update',
+ del = '/carbon-smart/api/carbon/energy/correlation/del',
}
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/router/alarmManagement.ts b/hx-ai-intelligent/src/router/alarmManagement.ts
index 6b8a490..dd930f3 100644
--- a/hx-ai-intelligent/src/router/alarmManagement.ts
+++ b/hx-ai-intelligent/src/router/alarmManagement.ts
@@ -26,6 +26,26 @@ const alarmManagement = {
],
},
{
+ path: 'equipmentAlarm ',
+ name: 'EquipmentAlarm',
+ meta: { title: '设备告警', hideChildren: true, icon: 'gaojingguanli' },
+ component: Base,
+ redirect: { name: 'equipmentAlarmIndex' },
+ children: [
+ {
+ path: 'index',
+ name: 'equipmentAlarmIndex',
+ // component: () => import('/nerv-lib/saas/view/menuManage/index.vue'),
+ component: () => import('/@/view/alarmManagement/equipmentAlarm/index.vue'),
+ meta: {
+ title: '设备告警',
+ keepAlive: true,
+ // backApi: [],
+ },
+ },
+ ],
+ },
+ {
path: 'alarmSettings',
name: 'AlarmSettings',
meta: { title: '告警设置', hideChildren: true, icon: 'gaojingguanli' },
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
index 2043200..eb35977 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
@@ -229,7 +229,7 @@
.post(device.queryDevicePage, {
pageNum: 1,
pageSize: 999,
- energyType: selectedOptions[0].cnValue,
+ energyType: selectedOptions[0].dicKey,
orgId: orgId.value,
})
.then((res) => {
@@ -241,7 +241,7 @@
.post(group.queryDeviceGroupTree, {
pageNum: 1,
pageSize: 999,
- energyType: selectedOptions[0].cnValue,
+ energyType: selectedOptions[0].dicKey,
orgId: orgId.value,
})
.then((res) => {
@@ -502,7 +502,7 @@
.grey-background.ant-switch .ant-switch-handle {
background-color: grey !important;
}
- /deep/ .ant-form-item-label {
+ :deep(.ant-form-item-label) {
z-index: 20;
text-align: right;
width: 23%;
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
index 39920f9..2ccca11 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
@@ -146,7 +146,7 @@
+
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/index.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/index.vue
new file mode 100644
index 0000000..59d78bf
--- /dev/null
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/index.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue
new file mode 100644
index 0000000..62e9a31
--- /dev/null
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue
@@ -0,0 +1,283 @@
+
+
+
+
+
+
+
+ 告警编号:20230310001
+
+
+ 15点08分
+
+
+
+
+
+
+
+
+
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/notificationManagementMock.json b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/notificationManagementMock.json
new file mode 100644
index 0000000..6f442ed
--- /dev/null
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/notificationManagementMock.json
@@ -0,0 +1,108 @@
+{
+ "listData":[
+ {
+ "id": "d4",
+ "isDel": "0",
+ "officesId": "84",
+ "deviceCode": "37430200143",
+ "deviceName": "地听测试电表",
+ "category": "1",
+ "type": "1001",
+ "energyCount": "1",
+ "serialNumber": "69",
+ "pidCode": null,
+ "brand": "",
+ "types": "",
+ "manufacturer": "elit non in",
+ "contacts": "ad reprehenderit",
+ "phonenumber": "34",
+ "position": "in esse commodo1",
+ "activeState": "1",
+ "measurementDirection": "1",
+ "deviceMagnification": 62,
+ "deviceAccuracy": "89",
+ "frequency": "anim consequat irure",
+ "standardFrequency": "ut elit",
+ "deviceHead": "pariatur ex velit",
+ "constructor": "84566",
+ "voltageType": "cillum aliquip reprehenderit",
+ "pt": 61,
+ "ct": 64,
+ "communicationProtocol": "cupidatat nisi ea ad",
+ "ip": "",
+ "port": "",
+ "com": "",
+ "slaveAddress": "",
+ "dlt": "",
+ "conversionIdentifier": "48",
+ "multiplicationAdjustment": "1",
+ "accessMethod": "1",
+ "replacementFrequency": "0",
+ "dataDetail": "sit",
+ "insertTime": null,
+ "children": null,
+ "devicePointList": null,
+ "insertUser": null,
+ "priority": "1",
+ "alarmTitle": "电压异常告警",
+ "errorCode": "A001",
+ "monitorTime":"1",
+ "repetitions":"1",
+ "monitorTimeUnit": "分",
+ "enableRules": "1",
+ "isUse":true
+ } , {
+ "id": "d5",
+ "isDel": "0",
+ "officesId": "84",
+ "deviceCode": "37430200143",
+ "deviceName": "地听测试电表",
+ "category": "1",
+ "type": "1001",
+ "energyCount": "1",
+ "serialNumber": "69",
+ "pidCode": null,
+ "brand": "",
+ "types": "",
+ "manufacturer": "elit non in",
+ "contacts": "ad reprehenderit",
+ "phonenumber": "34",
+ "position": "in esse commodo2",
+ "activeState": "1",
+ "measurementDirection": "1",
+ "deviceMagnification": 62,
+ "deviceAccuracy": "89",
+ "frequency": "anim consequat irure",
+ "standardFrequency": "ut elit",
+ "deviceHead": "pariatur ex velit",
+ "constructor": "84566",
+ "voltageType": "cillum aliquip reprehenderit",
+ "pt": 61,
+ "ct": 64,
+ "communicationProtocol": "cupidatat nisi ea ad",
+ "ip": "",
+ "port": "",
+ "com": "",
+ "slaveAddress": "",
+ "dlt": "",
+ "conversionIdentifier": "48",
+ "multiplicationAdjustment": "1",
+ "accessMethod": "1",
+ "replacementFrequency": "0",
+ "dataDetail": "sit",
+ "insertTime": null,
+ "children": null,
+ "devicePointList": null,
+ "insertUser": null,
+ "priority": "1",
+ "alarmTitle": "电压异常告警",
+ "errorCode": "A001",
+ "monitorTime":"1",
+ "repetitions":"1",
+ "monitorTimeUnit": "分",
+ "enableRules": "0",
+ "isUse":true
+ }
+ ]
+
+}
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
new file mode 100644
index 0000000..d6cb122
--- /dev/null
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
@@ -0,0 +1,39 @@
+
+
+ 状态
+
+
+
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
new file mode 100644
index 0000000..8adc472
--- /dev/null
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
@@ -0,0 +1,164 @@
+import { dateUtil } from '/nerv-lib/util/date-util';
+import data from '../notificationManagementMock.json';
+import { http } from '/nerv-lib/util';
+import { ref } from 'vue';
+const tableKeyMap = [
+ {
+ title: '序号',
+ dataIndex: 'address',
+ customRender: (text: any) => {
+ return text.index + 1;
+ },
+ },
+ {
+ title: '告警编号',
+ dataIndex: 'id',
+ },
+ {
+ title: '告警描述',
+ dataIndex: 'deviceCode',
+ },
+ {
+ title: '优先级',
+ dataIndex: 'deviceName',
+ },
+ {
+ title: '状态',
+ dataIndex: 'position',
+ },
+ {
+ title: '错误码',
+ dataIndex: 'position',
+ textEllipsis: true,
+ },
+ {
+ title: '设备信息',
+ dataIndex: 'position',
+ },
+ {
+ title: '更新时间',
+ dataIndex: 'enableRules',
+ },
+ {
+ title: '重复次数',
+ dataIndex: 'enableRules',
+ },
+];
+const mockData = ref(data.listData);
+export const notificationtableConfig = (look: any, status: any) => {
+ return {
+ title: '告警记录',
+ // api: '/carbon_emission/device/getDeviceList',
+ value: mockData.value,
+ headerActions: [{}],
+ columns: tableKeyMap,
+ // rowSelection: null, 选择按钮
+ columnActions: {
+ title: '操作',
+ actions: [
+ {
+ label: '详情',
+ name: 'FeedBackDetail',
+ dynamicParams: ['uuid', 'appealType'],
+ handle: (data: any) => {
+ console.log(look.value);
+ look.value.toggle(data);
+ },
+ },
+ {
+ label: '状态',
+ name: 'FeedBackDetail',
+ dynamicParams: ['uuid', 'appealType'],
+ handle: (data: any) => {
+ status.value.toggle(data);
+ },
+ },
+ ],
+ },
+
+ formConfig: {
+ schemas: [
+ {
+ field: 'name',
+ label: '告警类型',
+ component: 'NsSelect',
+ componentProps: {
+ placeholder: '请选择告警优先级',
+ options: [
+ {
+ label: '紧急',
+ value: '1',
+ },
+ {
+ label: '重要',
+ value: '2',
+ },
+ {
+ label: '一般',
+ value: '3',
+ },
+ ],
+ },
+ },
+ {
+ field: 'provider',
+ label: '状态',
+ component: 'NsSelect',
+ componentProps: {
+ placeholder: '请选择状态',
+ options: [
+ {
+ label: '待处理',
+ value: '1',
+ },
+ {
+ label: '处理中',
+ value: '2',
+ },
+ {
+ label: '已完成',
+ value: '3',
+ },
+ {
+ label: '超时',
+ value: '4',
+ },
+ {
+ label: '关闭',
+ value: '5',
+ },
+ ],
+ },
+ },
+ {
+ field: 'provider',
+ label: '告警标题',
+ component: 'NsInput',
+ componentProps: {
+ placeholder: '请输入告警标题关键字',
+ },
+ },
+ {
+ field: 'provider',
+ label: '错误码',
+ component: 'NsInputApi',
+ componentProps: {
+ placeholder: '请输入告警错误码',
+ },
+ },
+ {
+ field: 'createTime',
+ label: '生产日期',
+ component: 'NsRangePicker',
+ fieldMap: ['manufactureBeginDate', 'manufactureEndDate'],
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD',
+ placeholder: ['设备生产开始日期', '设备生产结束日期'],
+ },
+ },
+ ],
+ },
+ // pagination: { pageSizeOptions: false },
+ rowKey: 'id',
+ };
+};
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index 94b132f..cf05dbf 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -46,18 +46,18 @@
{{ data.emissionName }}
-
-
-
-
编辑
-
新增子节点
-
上移
-
下移
-
删除
-
+
+
+
+
+ 编辑
+ 新增子节点
+ 上移
+ 下移
+ 删除
+
-
-
+
@@ -107,61 +107,89 @@
title="单位管理"
@close="closeUnitManag">
+ class="draggable-tree"
+ block-node>
{{ data.cnValue }}
-
-
-
-
编辑
-
新增子节点
-
上移
-
下移
-
删除
-
-
-
-
+
取消
- 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.cnValue }}
+
+
+
+
+
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
index 09b276d..6c8fd15 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
@@ -87,36 +87,56 @@ export const columns = [
},
{
title: '因子值',
- dataIndex: 'energyType',
+ dataIndex: 'emissionFactors',
},
{
title: '计量单位',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'carbonEmissionSuffix',
+ dataIndex: 'carbonEmissionSuffix',
},
{
title: '更新时间',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'updateTime',
+ dataIndex: 'updateTime',
},
{
title: '启用时间',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'startTime ',
+ dataIndex: 'startTime ',
},
{
title: '结束时间',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'endTime',
+ dataIndex: 'endTime',
},
{
title: '数据来源',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'dataSources',
+ dataIndex: 'dataSources',
},
{
title: '操作',
key: 'action',
width: 130
},
+];
+export const drawerColumns = [
+ {
+ title: '名称',
+ dataIndex: 'emissionSources',
+ },
+ {
+ title: '因子值',
+ dataIndex: 'emissionFactors',
+ },
+ {
+ title: '排放环节',
+ className: 'emissionProcess',
+ dataIndex: 'emissionProcess',
+ },
+ {
+ title: '数据来源',
+ className: 'dataSources',
+ dataIndex: 'dataSources',
+ },
];
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
index 0e88f8d..7026fdb 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -181,6 +181,7 @@
const queryParams = ref({
pageNum: 1,
pageSize: 10,
+ orgId: orgId.value,
})
const isRequired = ref(false);
const visible = ref(false);
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index copy.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index copy.vue
deleted file mode 100644
index 81d30db..0000000
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index copy.vue
+++ /dev/null
@@ -1,401 +0,0 @@
-
-
-
-
-
-
-
- 排放分类
-
-
-
-
-
- {{ emissionName.substring(0, emissionName.indexOf(selectTreeDataValue)) }}
- {{ selectTreeDataValue }}
- {{ emissionName.substring(emissionName.indexOf(selectTreeDataValue) + selectTreeDataValue.length) }}
-
- {{ emissionName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 确定
-
-
-
-
-
-
-
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
index f9df2af..4c6d60c 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -17,19 +17,22 @@
-
-
- {{ title.substring(0, title.indexOf(searchValue)) }}
+
+
+ {{ data.energyType.substring(0, data.energyType.indexOf(searchValue)) }}
{{ searchValue }}
- {{ title.substring(title.indexOf(searchValue) + searchValue.length) }}
+ {{ data.energyType.substring(data.energyType.indexOf(searchValue) + searchValue.length) }}
- {{ title }}
+ {{ data.energyType }}
@@ -66,7 +69,7 @@
@change="onChange" />
-
-
-
-
-
-
-
-
-
-
-
-
- 是
- 否
-
-
-
-
-
- {{ item.cnValue }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
取消
确定
@@ -118,11 +120,12 @@
diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
index f6e8062..b599c83 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
@@ -40,18 +40,22 @@
-
+
查询
@@ -89,15 +93,15 @@
// 能耗类型list
const options1 = ref
([]);
- // 采集频率list
+ // 日期类型list
const options2 = ref([]);
const mode = ref('1');
// 能耗类型
const selectedValue = ref();
- // 采集频率
- const frequencyValue = ref();
+ // 日期类型
+ const dateTypeValue = ref();
// 时间
- const dateRange = ref<[Dayjs, Dayjs] | undefined>();
+ const dateValue = ref<[Dayjs, Dayjs] | undefined>();
// 页面初始化参数
const getOptionsList = async () => {
@@ -115,20 +119,12 @@
}
options2.value = [
{
- value: '1',
- label: '5分钟',
- },
- {
- value: '2',
- label: '10分钟',
+ value: 'month',
+ label: '月',
},
{
- value: '3',
- label: '30分钟',
- },
- {
- value: '4',
- label: '1小时',
+ value: 'year',
+ label: '年',
},
];
};
@@ -691,9 +687,9 @@
}
};
- const onChange = (val: RangeValue) => {
- dateRange.value = val;
- };
+ // const onChange = (val: RangeValue) => {
+ // dateRange.value = val;
+ // };
const onCalendarChange = (val: RangeValue) => {
dates.value = val;
@@ -716,8 +712,8 @@
options2,
mode,
selectedValue,
- frequencyValue,
- dateRange,
+ dateTypeValue,
+ dateValue,
getOptionsList,
getSelect,
getSelect11,
@@ -725,7 +721,7 @@
disabledDate,
onCalendarChange,
onOpenChange,
- onChange,
+ // onChange,
hackValue,
treeLoading,
changeEnergyType,
diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
index 1536c37..1831fc5 100644
--- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
@@ -1,3 +1,4 @@
+
@@ -59,7 +60,8 @@
align-items: center;
">
-
+
+
@@ -124,16 +160,30 @@