+
+
控制模式
+
+
手动
+
+
自动
-
-
-
-
-
-
控制模式
-
-
手动
-
-
自动
-
+
+
亮度
+
+
+
{{
+ item?.stateBefore?.brightness != undefined ? item.stateBefore.brightness : '--'
+ }}
+
+
{{
+ item?.stateAfter?.brightness != undefined ? item.stateAfter.brightness : '--'
+ }}
-
-
亮度
-
-
-
{{
- item?.stateBefore?.brightness != undefined ? item.stateBefore.brightness : '--'
- }}
-
-
{{
- item?.stateAfter?.brightness != undefined ? item.stateAfter.brightness : '--'
- }}
-
+
+
+
控制场景
+
+
{{
+ item?.stateBefore?.scene?.label ? item.stateBefore.scene.label : '--'
+ }}
+
+
{{
+ item?.stateAfter?.scene?.label ? item.stateAfter.scene.label : '--'
+ }}
-
-
控制场景
-
-
{{
- item?.stateBefore?.scene?.label ? item.stateBefore.scene.label : '--'
- }}
-
-
{{
- item?.stateAfter?.scene?.label ? item.stateAfter.scene.label : '--'
- }}
-
+
+
+
色温
+
+
{{
+ item?.stateBefore?.color != undefined ? item.stateBefore.color : '--'
+ }}
+
+
+ {{ item?.stateAfter?.color != undefined ? item.stateAfter.color : '--' }}
+
-
-
色温
-
-
{{
- item?.stateBefore?.color != undefined ? item.stateBefore.color : '--'
- }}
-
-
- {{ item?.stateAfter?.color != undefined ? item.stateAfter.color : '--' }}
-
-
+
+
+
启用状态
+
+
{{
+ item?.stateBefore?.lockStatus != undefined
+ ? item.stateBefore.lockStatus
+ ? '禁用'
+ : '启用'
+ : '--'
+ }}
+
+
+ {{
+ item?.stateAfter?.lockStatus != undefined
+ ? item.stateAfter.lockStatus
+ ? '禁用'
+ : '启用'
+ : '--'
+ }}
+
-
-
-
+
+
+
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 f49bd40..a39353a 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -102,7 +102,7 @@
-
+
@@ -281,7 +281,7 @@
type: 'primary',
handle: () => {
visible.value = true;
- getNewTable();
+ // getNewTable();
},
},
],
@@ -384,7 +384,7 @@
// 点击新增按钮
const addNewData = () => {
visible.value = true;
- getNewTable();
+ // getNewTable();
};
// 获取新增页面的列表
const selectedRowKeys = ref([]);
@@ -404,6 +404,11 @@
newTableData.value = res.data.records;
});
};
+ const selectData = ref();
+ const keyChange = () => {
+ queryData.value.emissionSources = selectData.value;
+ getNewTable();
+ };
// 点击编辑按钮
const editData = (record) => {
selectedRowKeys.value = [record.factorId];
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
index 457306a..c85cfb3 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
@@ -291,6 +291,7 @@
@@ -848,7 +849,7 @@
const openVoucher = ref(false);
const downLoadVoucher = () => {
fetch(carbonInventoryCheck.voucherDownloadList, { bizType: 2 }).then((res) => {
- voucherData.value = res.data
+ voucherData.value = res.data;
});
openVoucher.value = true;
};
@@ -898,6 +899,7 @@
uid: item.id.toString(), // 使用文件的id作为唯一标识
name: item.fileName, // 文件名
status: 'done', // 设置默认状态为已完成
+ type: 'done',
url: item.filePath, // 文件的URL,这里假设用示例的URL格式
}));
});
@@ -909,6 +911,10 @@
total.value = res.data.total;
});
};
+ const searchKey = () => {
+ queryData.value.emissionSources = editFormState.value.emissionFactors;
+ getNewTable();
+ };
// 数据来源选择框改变
const canEdit = ref(false);
const automatic = ref(false);
@@ -957,7 +963,9 @@
message.error(`${info.file.name} 文件上传失败`);
}
};
+ const delIds = ref([]);
const handleFileRemove = (file) => {
+ delIds.value.push(file.uid);
const newFileList = [];
fileList.value.forEach((item) => {
if (item.uid !== file.uid) {
@@ -985,14 +993,20 @@
if (fileList.value.length !== 0) {
const formData = ref(new FormData());
fileList.value.forEach((file) => {
- formData.value.append('files', file.originFileObj);
+ if (file.type !== 'done') {
+ formData.value.append('files', file.originFileObj);
+ }
});
formData.value.append('bizType', 2);
formData.value.append('bizId', editFormState.value.id);
+ delIds.value.forEach((item) => {
+ formData.value.append('deleteList', item);
+ });
fetch(uploadPic.uploadfiles, formData.value)
.then((res) => {
message.success('操作成功!');
editData.value = false;
+ delIds.value = [];
getPFYTableList(getTableId.value);
})
.catch((error) => {
@@ -1000,6 +1014,7 @@
});
} else {
editData.value = false;
+ delIds.value = [];
getPFYTableList(getTableId.value);
}
});
@@ -1010,6 +1025,7 @@
};
const onCloseEditData = () => {
editData.value = false;
+ delIds.value = [];
editFormState.value = {
orgId: orgId.value,
};
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 efa4496..6d2d2d1 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
@@ -48,7 +48,12 @@