计划库
@@ -132,7 +138,15 @@
// 计划启用/禁用事件
const togglePlan = (state: number) => {
dataSource.value.forEach((item: any) => {
- item.executeStatus.value = state;
+ // 执行中 无法修改为待执行
+ if (state == 1) {
+ if (item.executeStatus.value != 2) {
+ item.executeStatus.value = state;
+ }
+ // 任何状态都可以修改为 暂停
+ } else {
+ item.executeStatus.value = state;
+ }
});
};
@@ -155,20 +169,33 @@
const deletePlan = (row: any) => {
row.executeStatus.value = 0;
};
- // 重启表格中的计划（将当前任意状态，修改为待执行 = 1）
+ // 重启表格中的计划（将当前非 执行中 状态，修改为待执行 = 1）
const startPlan = (row: any) => {
if (row.executeStatus.value == 1) {
return message.info('该数据已是待执行状态，无需再次修改');
}
+ if (row.executeStatus.value == 2) {
+ return message.info('执行中的状态已被启用，无需修改');
+ }
row.executeStatus.value = 1;
};
// 将对表格的修改统一发送
const sendTable = () => {
- http.post(airConditionControl.submitTableData, dataSource.value).then(() => {
- message.success('操作成功');
- getTable();
- getLeftPlan();
- });
+ http
+ .post(
+ airConditionControl.submitTableData +
+ `?projectId=${state.projectId}${state.siteId ? `&siteId=${state.siteId}` : ''}`,
+ dataSource.value,
+ )
+ .then((res) => {
+ if (res.retcode == 0) {
+ message.success('操作成功');
+ getTable();
+ getLeftPlan();
+ } else {
+ message.info(res.msg);
+ }
+ });
};
// tab页弹窗部分 ====================================================
@@ -225,7 +252,7 @@
getLeftPlan();
});
};
-
+ // 穿梭框交互
const filterOption = (inputValue: string, option: any) => {
return option.description.indexOf(inputValue) > -1;
};
diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs3.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs3.vue
index 6c20c3d..032cf16 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs3.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs3.vue
@@ -11,7 +11,7 @@
-
-
-
-
-
-
- {{ cnValue.substring(0, cnValue.indexOf(searchValue)) }}
- {{ searchValue }}
- {{ cnValue.substring(cnValue.indexOf(searchValue) + searchValue.length) }}
-
- {{ cnValue }}
-
-
+
-
- {{ props.year }}年济阳站碳盘查报告
-
- 适用标准：ISO 14064-1
- 类别配置
-
-
-
-
-
-
-
-
+
-
+
-
- {{ props.year }}年济阳站碳盘查报告
+
+ 
+
+ 适用标准：ISO 14064-1
+
+
+ 返回
+
+
+
+ 适用标准：ISO 14064-1
+
+
-
- 返回
-
-
-
-
-
-
-
-
-
-
-
- {{ text || '-' }}
-
-
-
-
-
-
-
+
+
+
+
+ {{ text || '-' }}
+
+
+
+
+
+
+
+
-
-
-
- {{ data.emissionSource }}
-
-
-
+
-
-
+
类别设置
+
+
+
+
+ {
fetch(carbonInventoryCheck.carbonFlowDirection, queryFlowDirection.value).then((res) => {
console.log(res);
linksData.value = res.data[0];
+ if (linksData.value[0].value !== 0) {
+ showChart.value = true;
+ } else {
+ showChart.value = false;
+ }
datalist.value = res.data[1];
drawEcharts();
});
@@ -1467,14 +1520,18 @@
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
index 557b081..b179f13 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
@@ -20,6 +20,7 @@
:footer-style="{ textAlign: 'right' }"
destroyOnClose
@close="onClose">
+
{
if (formState.value.reportPeriod === '2') {
const year = current.year();
@@ -140,6 +142,7 @@
name: 'userAdd',
type: 'primary',
handle: () => {
+ text.value = '新增报告'
visible.value = true;
},
},
@@ -183,6 +186,7 @@
label: '编辑',
name: 'userEdit',
handle: (record: any) => {
+ text.value = '编辑报告'
visible.value = true;
fetch(carbonInventoryCheck.findById, { id: record.id }).then((res) => {
formState.value = res.data;
@@ -274,4 +278,30 @@
};
-
+
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue
index c34aae4..fb37166 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue
@@ -2,25 +2,37 @@
+
+ {
monthStyles.value = 'background: #2778ff';
- yearStyles.value = 'background: #f2f2f2';
+ yearStyles.value = 'background: #transparent';
+ monthText.value = 'color: #ffffff';
+ yearText.value = 'color: #2778ff';
columns.value[2].title = '月份';
columns.value[2].dataIndex = 'yearMonth';
selectedTime.value = false;
@@ -138,8 +156,10 @@
getMonthPillarData();
};
const changeToYear = () => {
- monthStyles.value = 'background: #f2f2f2';
+ monthStyles.value = 'background: #transparent';
yearStyles.value = 'background: #2778ff';
+ monthText.value = 'color: #2778ff';
+ yearText.value = 'color: #ffffff';
columns.value[2].title = '年份';
columns.value[2].dataIndex = 'year';
selectedTime.value = true;
@@ -574,7 +594,9 @@
user-select: text;
position: relative;
padding-left: 9px;
- width: 50%;
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
}
.title::before {
content: '';
@@ -587,34 +609,35 @@
border-radius: 1px;
background-color: #2778ff;
}
- .operation {
- display: flex;
- margin-right: 10px;
- font-weight: 400;
- height: 70%;
- cursor: pointer;
- width: 10%;
- }
- .month {
- width: 70px;
- display: flex;
- align-items: center;
- justify-content: center;
- // background: #f2f2f2;
- }
- .year {
- width: 70px;
- display: flex;
- align-items: center;
- justify-content: center;
- // background: #2778ff;
- }
+ }
+ .operation {
+ display: flex;
+ margin-right: 10px;
+ font-weight: 400;
+ height: 90%;
+ cursor: pointer;
+ width: 10%;
+ border-radius: 4px;
+ border: 1px solid rgba(39, 120, 255, 1);
+ }
+ .month {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .year {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.contant {
width: 100%;
- height: calc(100% - 5vh);
+ height: calc(94% - 5vh);
+ overflow-y: auto;
.chartsPart {
- width: 100%;
+ width: 99%;
height: 40%;
display: flex;
justify-content: space-between;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/index.vue
index f07b209..5e6b40b 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/index.vue
@@ -9,13 +9,13 @@
-
+
-
+
-
+
@@ -51,47 +51,47 @@
}
});
} else if (key === '2') {
- tabId.value = 1;
- energyType.value = 'ELECTRICITY_USAGE'
+ tabId.value = 4;
+ energyType.value = 'ELECTRICITY_USAGE';
nextTick(() => {
if (electricRef.value) {
- electricRef.value.electricTotal = true
+ electricRef.value.electricTotal = true;
electricRef.value.changeToYear(); // 调用子组件的方法
}
});
} else if (key === '3') {
- tabId.value = 2;
- energyType.value = 'WATER_USAGE'
+ tabId.value = 5;
+ energyType.value = 'WATER_USAGE';
nextTick(() => {
if (useWaterRef.value) {
- useWaterRef.value.electricTotal = true
+ useWaterRef.value.electricTotal = true;
useWaterRef.value.changeToYear(); // 调用子组件的方法
}
});
} else if (key === '4') {
- tabId.value = 3;
- energyType.value = 'gongshuiliang'
+ tabId.value = 6;
+ energyType.value = 'gongshuiliang';
nextTick(() => {
if (provideWaterRef.value) {
- provideWaterRef.value.electricTotal = true
+ provideWaterRef.value.electricTotal = true;
provideWaterRef.value.changeToYear(); // 调用子组件的方法
}
});
} else if (key === '5') {
- tabId.value = 5;
- energyType.value = 'CARBON_EMISSIONS'
+ tabId.value = 7;
+ energyType.value = 'CARBON_EMISSIONS';
nextTick(() => {
if (carbonEmissionsRef.value) {
- carbonEmissionsRef.value.electricTotal = true
+ carbonEmissionsRef.value.electricTotal = true;
carbonEmissionsRef.value.changeToYear(); // 调用子组件的方法
}
});
} else if (key === '6') {
- tabId.value = 4;
- energyType.value = 'HEAT_SUPPLY'
+ tabId.value = 8;
+ energyType.value = 'HEAT_SUPPLY';
nextTick(() => {
if (provideHotRef.value) {
- provideHotRef.value.electricTotal = true
+ provideHotRef.value.electricTotal = true;
provideHotRef.value.changeToYear(); // 调用子组件的方法
}
});
diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue
index cc0b7c5..b3c3c02 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue
@@ -1,7 +1,12 @@
+
+
新增
+
+
凭证列表
+
+
编辑
+
+
因子列表
+
+
凭证上传
+ {{text}}
- 查询
-
+
+
-
月
- 年
+
+ 本月
+
+
+ 本年
+
@@ -62,8 +74,10 @@
const selectYear = ref(dayjs(new Date().getFullYear().toString()));
const selectMonth = ref(dayjs().startOf('year').month(0));
// 年/月切换
- const monthStyles = ref('background: #f2f2f2');
+ const monthStyles = ref('background: transparent');
const yearStyles = ref('background: #2778ff');
+ const monthText = ref('color: #2778ff');
+ const yearText = ref('color: #ffffff');
const selectedTime = ref(true);
const changeMonth = () => {
queryParams.value.yearMonth = selectMonth.value;
@@ -71,7 +85,9 @@
};
const changeToMonth = () => {
monthStyles.value = 'background: #2778ff';
- yearStyles.value = 'background: #f2f2f2';
+ yearStyles.value = 'background: transparent';
+ monthText.value = 'color: #ffffff';
+ yearText.value = 'color: #2778ff';
queryParams.value.yearAndMonth = 'month';
queryParams.value.yearMonth = selectMonth.value.format('YYYY-DD');
columns.value[2].title = '月份';
@@ -84,8 +100,10 @@
getTableData();
};
const changeToYear = () => {
- monthStyles.value = 'background: #f2f2f2';
+ monthStyles.value = 'background:transparent';
yearStyles.value = 'background: #2778ff';
+ monthText.value = 'color: #2778ff';
+ yearText.value = 'color: #ffffff';
queryParams.value.yearAndMonth = 'year';
delete queryParams.value.yearMonth;
// queryParams.value.year = selectYear.value;
@@ -218,6 +236,7 @@
const columns = ref([
{
title: '序号',
+ width: 100,
customRender: (text: any) => {
return text.index + 1;
},
@@ -301,32 +320,32 @@
border-radius: 1px;
background-color: #2778ff;
}
- .operation {
- display: flex;
- margin-right: 10px;
- font-weight: 400;
- height: 70%;
- cursor: pointer;
- width: 10%;
- }
- .month {
- width: 70px;
- display: flex;
- align-items: center;
- justify-content: center;
- // background: #f2f2f2;
- }
- .year {
- width: 70px;
- display: flex;
- align-items: center;
- justify-content: center;
- // background: #2778ff;
- }
+ }
+ .operation {
+ display: flex;
+ margin-right: 10px;
+ font-weight: 400;
+ height: 90%;
+ cursor: pointer;
+ width: 10%;
+ border-radius: 4px;
+ border: 1px solid rgba(39, 120, 255, 1);
+ }
+ .month {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .year {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.contant {
width: 100%;
- height: calc(100% - 5vh);
+ height: calc(94% - 5vh);
.chartsPart {
width: 100%;
height: 35%;
@@ -336,6 +355,7 @@
width: 19%;
height: 100%;
background: rgba(39, 120, 255, 0.05);
+ border-radius: 8px;
}
}
.tablePart {
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
index 34b1b3f..90f3cd1 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
@@ -88,7 +88,6 @@
selectedRowKeys: selectedRowKeys,
onChange: onSelectionChange,
}"
- :scroll="{ x: 1300, y: 400 }"
:pagination="false">
@@ -209,6 +208,7 @@
import type { UnwrapRef } from 'vue';
import { ref, defineEmits, reactive, toRaw } from 'vue';
import { http } from '/nerv-lib/util/http';
+ import { message } from 'ant-design-vue';
import {
CaretUpOutlined,
CaretDownOutlined,
@@ -402,7 +402,7 @@
// 在这里可以执行需要在页面切换时执行的逻辑
if (key === '1') {
} else if (key === '2') {
- if (selectedRowKeysSet.value) {
+ if (selectedRowKeysSet.value.length !== 0) {
fetch(carbonPlanning.monthBenchmarkSetting, {
type: props.type,
referenceYear: selectedRowKeysSet.value[0],
@@ -413,6 +413,7 @@
monthData.value = res.data;
});
} else {
+ message.warning('请先选择年基准值！');
activeKey.value = '1';
}
}
@@ -420,6 +421,16 @@
//开关
const changeSwitch = (data: any) => {
data.isAutoObtained = data.isAutoObtained === 0 ? 1 : 0;
+ if (data.isAutoObtained === 0) {
+ fetch(carbonPlanning.autoObtained, {
+ type: props.type,
+ itemizeId: props.parentId,
+ orgId: orgId.value,
+ yearMonth: data.yearMonth,
+ }).then((res) => {
+ data.referenceValue = res.data.referenceValue;
+ });
+ }
monthData.value = [...monthData.value];
console.log(monthData.value);
};
@@ -473,11 +484,18 @@
itemizeId: props.parentId,
}).then((res) => {
visible.value = false;
+ activeKey.value = '1';
selectedRowKeysSet.value = [];
getTableData();
});
};
const onClose = () => {
+ activeKey.value = '1';
+ selectedRowKeysSet.value = [];
+ if (selectYear.value) {
+ selectYear.value = '';
+ queryData.value.referenceYear = selectYear.value;
+ }
visible.value = false;
};
// echarts图
@@ -766,9 +784,12 @@
}
.model {
width: 16%;
- height: 90%;
+ height: 100%;
background: #f7f9ff;
padding: 12px;
+ border-radius: 12px;
+ background: linear-gradient(180deg, rgba(255, 255, 255, 1) 0%, rgba(222, 255, 246, 1) 100%);
+ border: 1px solid rgba(18, 174, 132, 1);
.quantity {
font-size: 12px;
font-weight: 400;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
index 6201c4e..b53a483 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
@@ -4,25 +4,37 @@
+
统计数据
新增节点
-
+
+
-
月
- 年
+
+ 本月
+
+
+ 本年
+
@@ -38,8 +50,7 @@
:pagination="false"
row-key="itemizeId"
:onRow="onRow"
- :customRow="customRow"
- :scroll="{ x: 1300, y: 250 }">
+ :customRow="customRow">
@@ -61,6 +72,9 @@
+
新增节点
+
-
+
@@ -47,6 +52,7 @@
title="此操作将移除该数据"
ok-text="确定"
cancel-text="取消"
+ placement="topRight"
@confirm="deletePlan(row)">
删除
@@ -55,7 +61,7 @@
-
+ {{ row.startTime }}
{{ row.operationContent }}
{{ row.createUser }}
- {{ row.ctrlResult ? '成功' : '失败' }}
+ {{ row.ctrlResult ? '失败' : '成功' }}
@@ -163,6 +163,8 @@
};
// 刷新功能（右下角）
const reset = () => {
+ trIndex.value = -1;
+ logModalVisible.value = false;
pagination.value = {
pageSize: 10,
pageNum: 1,
@@ -172,13 +174,8 @@
};
// 点击日志行事件
const handleRowClick = (id: any, index: any) => {
- // 忽略无效点击
- if (index === trIndex.value) {
- return;
- } else {
- trIndex.value = index;
- getLogDetail(id);
- }
+ trIndex.value = index;
+ getLogDetail(id);
};
// 日志详情业务 ==================================================
@@ -200,7 +197,7 @@
const cxList = ref([]);