+
+
+
+
+
+ 紧急
+ 新告警
+ C003
+ 用电量超标
当日用电量超出预设值
+ 1栋10层低压柜
+ 0
+
+
+
+ 确定
+
-
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
index d6cb122..9ec1b01 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
@@ -8,16 +8,81 @@
:cancel="handleClose"
placement="right"
@close="handleClose">
- 状态
+
+ Content of Tab Pane 1
+
+
+
+
+
+
+ 创建工单
+ 确定
+
+
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
index 8adc472..8d4092f 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
@@ -130,18 +130,10 @@ export const notificationtableConfig = (look: any, status: any) => {
],
},
},
- {
- field: 'provider',
- label: '告警标题',
- component: 'NsInput',
- componentProps: {
- placeholder: '请输入告警标题关键字',
- },
- },
{
field: 'provider',
label: '错误码',
- component: 'NsInputApi',
+ component: 'NsInput',
componentProps: {
placeholder: '请输入告警错误码',
},
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue
deleted file mode 100644
index c205a2d..0000000
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-
-
-
-
-
-
-
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
index be5bf5b..9298666 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
@@ -1,13 +1,13 @@
-
+
();
- const total = ref()
- const queryParams = ref({
- pageNum: 1,
- pageSize: 10,
- })
const orgId = ref('');
const result = JSON.parse(sessionStorage.getItem('ORGID')!);
orgId.value = result;
const fetch = (api, params = { orgId } ) => {
return http.post(api, params);
};
+ const data = ref([]);
+ const selectYear = ref(dayjs( new Date().getFullYear().toString()));
+ const total = ref()
+ const queryParams = ref({
+ pageNum: 1,
+ pageSize: 10,
+ year: selectYear.value.format('YYYY'),
+ orgId: orgId.value
+ })
// 年份选择改变触发
const changeYearData = () => {
- queryParams.value.year = selectYear.value.format('YYYY')
+ queryParams.value.year = selectYear.value
getTableList()
}
+ // 表头
+ const column: TableColumnsType [] = [
+ {
+ title: '排放类型',
+ dataIndex: 'cnValue',
+ customCell: (record, rowIndex) => {
+ if (rowIndex == undefined) {
+ return {
+ rowSpan: 0,
+ colSpan: 0,
+ };
+ }
+ const rowSpan = getRowSpan('cnValue', record, data.value);
+ if (rowIndex != 0 && data.value[rowIndex - 1].name == record.name) {
+ return {
+ rowSpan: 0,
+ colSpan: 0,
+ };
+ }
+ return {
+ rowSpan: rowSpan,
+ };
+ },
+ },
+ {
+ title: '能源种类',
+ dataIndex: 'energyType',
+ },
+ {
+ title: '计量单位',
+ dataIndex: 'unit',
+ },
+ {
+ title: '加权平均',
+ dataIndex: 'averageFactorValue',
+ },
+ {
+ title: '全年',
+ dataIndex: 'carbonYearly',
+ },
+ {
+ title: '1月',
+ dataIndex: 'jan',
+ },
+ {
+ title: '2月',
+ dataIndex: 'feb',
+ },
+ {
+ title: '3月',
+ dataIndex: 'mar',
+ },
+ {
+ title: '4月',
+ dataIndex: 'apr',
+ },
+ {
+ title: '5月',
+ dataIndex: 'may',
+ },
+ {
+ title: '6月',
+ dataIndex: 'jun',
+ },
+ {
+ title: '7月',
+ dataIndex: 'jul',
+ },
+ {
+ title: '8月',
+ dataIndex: 'aug',
+ },
+ {
+ title: '9月',
+ dataIndex: 'sep',
+ },
+ {
+ title: '10月',
+ dataIndex: 'oct',
+ },
+ {
+ title: '11月',
+ dataIndex: 'nov',
+ },
+ {
+ title: '12月',
+ dataIndex: 'dec',
+ },
+ ];
+ // 合并单元格
+ const getRowSpan = (dataIndex: string, record: any, data: any, dependents: string[] = []) => {
+ let rowSpan = 1;
+ for (let i = data.indexOf(record) + 1; i < data.length; i++) {
+ let shouldMerge = true;
+ for (const dependent of dependents) {
+ if (data[i][dependent] !== record[dependent]) {
+ shouldMerge = false;
+ break;
+ }
+ }
+ if (shouldMerge && data[i][dataIndex] === record[dataIndex]) {
+ rowSpan++;
+ } else {
+ break;
+ }
+ }
+ return rowSpan;
+ };
// 获取表格数据
const getTableList = () => {
- fetch(energyConsumption.pageList , queryParams.value).then((res) => {
+ fetch(carbonEmission.carbonEmissionStatistics , queryParams.value).then((res) => {
data.value = res.data.records
total.value = res.data.total
});
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
index 6c8fd15..6f69329 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
@@ -1,3 +1,4 @@
+// 能耗统计表表头
export const tableColumns = [
{
title: '序号',
@@ -78,6 +79,7 @@ export const tableColumns = [
width: 130
},
];
+// 碳排速算表表头
export const columns = [
{
title: '序号',
@@ -101,8 +103,8 @@ export const columns = [
},
{
title: '启用时间',
- className: 'startTime ',
- dataIndex: 'startTime ',
+ className: 'startTime',
+ dataIndex: 'startTime',
},
{
title: '结束时间',
@@ -120,6 +122,7 @@ export const columns = [
width: 130
},
];
+// 碳排速算新增页中表头
export const drawerColumns = [
{
title: '名称',
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 7026fdb..78ff753 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -16,7 +16,7 @@
-
+
+ 