修改测试问题
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -308,80 +308,82 @@
|
||||
<div class="ns-form-title-edit">
|
||||
<div class="title">编辑</div>
|
||||
</div>
|
||||
<a-form
|
||||
ref="editFormRef"
|
||||
:model="editFormState"
|
||||
:label-col="labelCol"
|
||||
:wrapper-col="wrapperCol">
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item ref="name" label="数据来源" name="dataSources">
|
||||
<a-select
|
||||
ref="select"
|
||||
v-model:value="editFormState.dataSources"
|
||||
@change="changeSelect">
|
||||
<a-select-option value="1">自行推估</a-select-option>
|
||||
<a-select-option value="2">定期量测</a-select-option>
|
||||
<a-select-option value="3">自动测量</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item ref="name" label="消耗量" name="consumption">
|
||||
<ns-input-number
|
||||
v-model:value="editFormState.consumption"
|
||||
:maxlength="20"
|
||||
@keydown="handleKeyDown"
|
||||
:disabled="canEdit" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row v-if="automatic">
|
||||
<a-col :span="24">
|
||||
<a-form-item label="能耗类型">
|
||||
<a-select
|
||||
v-model:value="editFormState.energyConsumptionType"
|
||||
@change="changeEnergyType"
|
||||
placeholder="请选择能耗类型">
|
||||
<a-select-option
|
||||
v-for="(item, index) in energyTypeOptions"
|
||||
:key="index"
|
||||
:value="item.dicKey">
|
||||
{{ item.cnValue }}
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item ref="name" label="采集节点" name="collectionNode">
|
||||
<a-tree-select
|
||||
v-model:value="editFormState.collectionNode"
|
||||
:tree-line="true"
|
||||
@select="selectNode"
|
||||
:tree-data="collectingNodes">
|
||||
</a-tree-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item ref="name" label="因子值" name="emissionFactors">
|
||||
<ns-input
|
||||
v-model:value="editFormState.emissionFactors"
|
||||
:maxlength="20"
|
||||
@keydown="handleKeyDown" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item ref="name" label="关键字" name="key">
|
||||
<a-input-search
|
||||
v-model:value="editFormState.key"
|
||||
@search="searchKey"
|
||||
placeholder="请输入关键字" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
<a-spin :spinning="spinning">
|
||||
<a-form
|
||||
ref="editFormRef"
|
||||
:model="editFormState"
|
||||
:label-col="labelCol"
|
||||
:wrapper-col="wrapperCol">
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item ref="name" label="数据来源" name="dataSources">
|
||||
<a-select
|
||||
ref="select"
|
||||
v-model:value="editFormState.dataSources"
|
||||
@change="changeSelect">
|
||||
<a-select-option value="1">自行推估</a-select-option>
|
||||
<a-select-option value="2">定期量测</a-select-option>
|
||||
<a-select-option value="3">自动测量</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item ref="name" label="消耗量" name="consumption">
|
||||
<ns-input-number
|
||||
v-model:value="editFormState.consumption"
|
||||
:maxlength="20"
|
||||
@keydown="handleKeyDown"
|
||||
:disabled="canEdit" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row v-if="automatic">
|
||||
<a-col :span="24">
|
||||
<a-form-item label="能耗类型">
|
||||
<a-select
|
||||
v-model:value="editFormState.energyConsumptionType"
|
||||
@change="changeEnergyType"
|
||||
placeholder="请选择能耗类型">
|
||||
<a-select-option
|
||||
v-for="(item, index) in energyTypeOptions"
|
||||
:key="index"
|
||||
:value="item.dicKey">
|
||||
{{ item.cnValue }}
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item ref="name" label="采集节点" name="collectionNode">
|
||||
<a-tree-select
|
||||
v-model:value="editFormState.collectionNode"
|
||||
:tree-line="true"
|
||||
@select="selectNode"
|
||||
:tree-data="collectingNodes">
|
||||
</a-tree-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item ref="name" label="因子值" name="emissionFactors">
|
||||
<ns-input
|
||||
v-model:value="editFormState.emissionFactors"
|
||||
:maxlength="20"
|
||||
@keydown="handleKeyDown" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item ref="name" label="关键字" name="key">
|
||||
<a-input-search
|
||||
v-model:value="editFormState.key"
|
||||
@search="searchKey"
|
||||
placeholder="请输入关键字" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
</a-spin>
|
||||
<div class="ns-form-title-edit" style="display: flex">
|
||||
<div class="titleEdit">因子列表</div>
|
||||
</div>
|
||||
@@ -1121,19 +1123,21 @@
|
||||
// 获取自动采集节点的数据
|
||||
fetch(group.queryDeviceGroupTree, { energyType: value, orgId: orgId.value }).then((res) => {
|
||||
collectingNodes.value = res.data;
|
||||
collectingNodes.value = collectingNodes.value.map((item) => ({
|
||||
value: item.id,
|
||||
label: item.pointName,
|
||||
children: item.children
|
||||
? item.children.map((child) => ({
|
||||
value: child.id,
|
||||
label: child.pointName,
|
||||
}))
|
||||
: [],
|
||||
}));
|
||||
collectingNodes.value = collectingNodes.value = transformData(collectingNodes.value);
|
||||
});
|
||||
};
|
||||
// 将数据转换为树形结构
|
||||
const transformData = (data: any[]) => {
|
||||
return data.map((item) => ({
|
||||
title: item.pointName,
|
||||
value: item.id,
|
||||
key: item.id,
|
||||
children: item.children ? transformData(item.children) : [],
|
||||
}));
|
||||
};
|
||||
const spinning = ref(false);
|
||||
const selectNode = (value) => {
|
||||
spinning.value = true;
|
||||
const getConsumeData = ref({
|
||||
acquisitionDate: acquisitionDate.value,
|
||||
collectionNode: value,
|
||||
@@ -1142,6 +1146,7 @@
|
||||
});
|
||||
fetch(carbonInventoryCheck.nodeCancellationConsumption, getConsumeData.value).then((res) => {
|
||||
editFormState.value.consumption = res.data;
|
||||
spinning.value = false;
|
||||
});
|
||||
};
|
||||
// 上传附件
|
||||
@@ -1696,6 +1701,13 @@
|
||||
background: #c9e4ff;
|
||||
}
|
||||
}
|
||||
:deep(.ant-empty) {
|
||||
height: 80%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
.right {
|
||||
flex: 1;
|
||||
@@ -1811,4 +1823,11 @@
|
||||
display: flex;
|
||||
justify-content: right;
|
||||
}
|
||||
:deep(.ant-empty) {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
}
|
||||
</style>
|
||||
|
@@ -39,7 +39,11 @@
|
||||
placeholder="请输入报告名称" />
|
||||
</a-form-item>
|
||||
<a-form-item ref="name" label="报告年度" name="reportYear">
|
||||
<a-date-picker v-model:value="formState.reportYear" picker="year" valueFormat="YYYY" />
|
||||
<a-date-picker
|
||||
v-model:value="formState.reportYear"
|
||||
@openChange="openChange"
|
||||
picker="year"
|
||||
valueFormat="YYYY" />
|
||||
</a-form-item>
|
||||
<a-form-item ref="name" label="适用标准" name="genericStandard">
|
||||
<a-input
|
||||
@@ -60,6 +64,7 @@
|
||||
<a-form-item ref="name" label="报告范围" name="reportScope">
|
||||
<a-range-picker
|
||||
v-model:value="formState.reportScope"
|
||||
:defaultPickerValue="defaultPickerValue"
|
||||
picker="month"
|
||||
:disabledDate="disabledDate"
|
||||
valueFormat="YYYY-MM" />
|
||||
@@ -79,6 +84,7 @@
|
||||
import { carbonInventoryCheck } from '/@/api/carbonEmissionFactorLibrary';
|
||||
import fillIn from './fillInPage/index.vue';
|
||||
import { message } from 'ant-design-vue';
|
||||
import dayjs, { Dayjs } from 'dayjs';
|
||||
defineOptions({ name: 'CarbonInventoryCheck' });
|
||||
const orgId = ref('');
|
||||
const result = JSON.parse(sessionStorage.getItem('ORGID')!);
|
||||
@@ -105,6 +111,17 @@
|
||||
const selectChange = (value) => {
|
||||
formState.value.reportScope = '';
|
||||
};
|
||||
const defaultPickerValue = ref([
|
||||
dayjs('2020'), // 默认开始日期
|
||||
dayjs('2020'), // 默认结束日期
|
||||
]);
|
||||
const openChange = (status) => {
|
||||
if (status === false) {
|
||||
if (formState.value.reportYear) {
|
||||
defaultPickerValue.value = [dayjs('2022'), dayjs('2022')];
|
||||
}
|
||||
}
|
||||
};
|
||||
// 定义form表单的必填
|
||||
const rules: Record<string, Rule[]> = {
|
||||
reportName: [{ required: true, message: '请输入报告名称', trigger: 'change' }],
|
||||
|
Reference in New Issue
Block a user