Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
This commit is contained in:
@@ -50,11 +50,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div style="display: flex; margin-top: 20px; height: calc(85% - 20px)">
|
<div style="display: flex; margin-top: 20px; height: calc(85% - 20px)">
|
||||||
<div class="detailTable">
|
<div class="detailTable">
|
||||||
<ns-view-list-table
|
<ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" :scroll="{ x: 1280 }">
|
||||||
v-bind="tableConfig"
|
|
||||||
:model="data"
|
|
||||||
ref="mainRef"
|
|
||||||
:scroll="{ x: 1280 }">
|
|
||||||
<template #bodyCell="{ column, text, record }">
|
<template #bodyCell="{ column, text, record }">
|
||||||
<template v-if="column.dataIndex === 'accountType'">
|
<template v-if="column.dataIndex === 'accountType'">
|
||||||
<span v-if="record.accountType">{{ record.accountType.label }}</span>
|
<span v-if="record.accountType">{{ record.accountType.label }}</span>
|
||||||
@@ -206,12 +202,23 @@
|
|||||||
year: year.value,
|
year: year.value,
|
||||||
});
|
});
|
||||||
const transactionTypeValue = ref();
|
const transactionTypeValue = ref();
|
||||||
|
|
||||||
|
const selectValue = ref([]);
|
||||||
const changeSelect = (value, selectedOptions) => {
|
const changeSelect = (value, selectedOptions) => {
|
||||||
debugger;
|
|
||||||
// transactionTypeValue.value = selectedOptions.flatMap((group) =>
|
// transactionTypeValue.value = selectedOptions.flatMap((group) =>
|
||||||
// group.flatMap((node) => [node.value, ...(node.children?.map((child) => child.value) || [])]),
|
// group.flatMap((node) => [node.value, ...(node.children?.map((child) => child.value) || [])]),
|
||||||
// );
|
// );
|
||||||
transactionTypeValue.value = value.flat();
|
const aaa = JSON.parse(JSON.stringify(value));
|
||||||
|
aaa.forEach((item) => {
|
||||||
|
if (item.length > 1) {
|
||||||
|
item.shift();
|
||||||
|
selectValue.value.push(item);
|
||||||
|
} else {
|
||||||
|
selectValue.value.push(item);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
transactionTypeValue.value = Array.from(new Set(selectValue.value.flat()));
|
||||||
|
selectValue.value = [];
|
||||||
};
|
};
|
||||||
const searchTableList = () => {
|
const searchTableList = () => {
|
||||||
year.value = queryParams.value.year;
|
year.value = queryParams.value.year;
|
||||||
|
@@ -171,13 +171,13 @@
|
|||||||
<span>{{ data.cnValue }}</span>
|
<span>{{ data.cnValue }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="actionMore">
|
<div class="actionMore">
|
||||||
<EditOutlined v-if="!data.parentId" @click="editGroup(data)" />
|
<PlusCircleOutlined v-if="!data.parentId" @click="addUnit(data)" />
|
||||||
<EditOutlined v-else @click="editUnit(data)" />
|
|
||||||
<MinusCircleOutlined style="margin-left: 6px" @click="delUnit(data)" />
|
<MinusCircleOutlined style="margin-left: 6px" @click="delUnit(data)" />
|
||||||
<PlusCircleOutlined
|
<EditOutlined
|
||||||
v-if="!data.parentId"
|
|
||||||
style="margin-left: 6px"
|
style="margin-left: 6px"
|
||||||
@click="addUnit(data)" />
|
v-if="!data.parentId"
|
||||||
|
@click="editGroup(data)" />
|
||||||
|
<EditOutlined style="margin-left: 6px" v-else @click="editUnit(data)" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -480,9 +480,9 @@
|
|||||||
// 删除树节点
|
// 删除树节点
|
||||||
const deleteTreeNode = (data) => {
|
const deleteTreeNode = (data) => {
|
||||||
Modal.confirm({
|
Modal.confirm({
|
||||||
title: '警告',
|
// title: '警告',
|
||||||
icon: createVNode(ExclamationCircleOutlined),
|
icon: createVNode(ExclamationCircleOutlined),
|
||||||
content: '确定要删除么?',
|
content: '您将删除此节点。其数据将保留并移至“未分类”区域,仍可访问。确定删除吗?',
|
||||||
okText: '确认',
|
okText: '确认',
|
||||||
okType: 'primary',
|
okType: 'primary',
|
||||||
cancelText: '取消',
|
cancelText: '取消',
|
||||||
@@ -710,11 +710,11 @@
|
|||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 999,
|
pageSize: 999,
|
||||||
ids: mainRef.value.nsTableRef.tableState.selectedRowKeys,
|
ids: mainRef.value.nsTableRef.tableState.selectedRowKeys,
|
||||||
bibliography:mainRef.value.nsTableRef.formParamsRef.bibliography,
|
bibliography: mainRef.value.nsTableRef.formParamsRef.bibliography,
|
||||||
emissionGas:mainRef.value.nsTableRef.formParamsRef.emissionGas,
|
emissionGas: mainRef.value.nsTableRef.formParamsRef.emissionGas,
|
||||||
carbonDatabase:mainRef.value.nsTableRef.formParamsRef.carbonDatabase,
|
carbonDatabase: mainRef.value.nsTableRef.formParamsRef.carbonDatabase,
|
||||||
emissionProcess:mainRef.value.nsTableRef.formParamsRef.emissionProcess,
|
emissionProcess: mainRef.value.nsTableRef.formParamsRef.emissionProcess,
|
||||||
emissionSources:mainRef.value.nsTableRef.formParamsRef.emissionSources,
|
emissionSources: mainRef.value.nsTableRef.formParamsRef.emissionSources,
|
||||||
};
|
};
|
||||||
const config = {
|
const config = {
|
||||||
responseType: 'blob',
|
responseType: 'blob',
|
||||||
|
@@ -7,10 +7,14 @@
|
|||||||
:pagination="false"
|
:pagination="false"
|
||||||
:scroll="{ x: 1700, y: 480 }">
|
:scroll="{ x: 1700, y: 480 }">
|
||||||
<template #title>
|
<template #title>
|
||||||
<a-date-picker v-model:value="selectYear" picker="year" valueFormat="YYYY" />
|
<a-date-picker
|
||||||
|
v-model:value="selectYear"
|
||||||
|
@change="changeYearData"
|
||||||
|
picker="year"
|
||||||
|
valueFormat="YYYY" />
|
||||||
<span style="margin-left: 30px">
|
<span style="margin-left: 30px">
|
||||||
<a-button type="primary" @click="changeYearData">查询</a-button>
|
<a-button type="primary" ghost @click="reset">重置</a-button>
|
||||||
<a-button type="primary" ghost style="margin-left: 6px" @click="reset">重置</a-button>
|
<a-button type="primary" style="margin-left: 6px" @click="clickSelect">搜索</a-button>
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
<template #bodyCell="{ column, text }">
|
<template #bodyCell="{ column, text }">
|
||||||
@@ -58,6 +62,8 @@
|
|||||||
// 年份选择改变触发
|
// 年份选择改变触发
|
||||||
const changeYearData = () => {
|
const changeYearData = () => {
|
||||||
queryParams.value.year = selectYear.value;
|
queryParams.value.year = selectYear.value;
|
||||||
|
};
|
||||||
|
const clickSelect = () => {
|
||||||
getTableList();
|
getTableList();
|
||||||
};
|
};
|
||||||
const reset = () => {
|
const reset = () => {
|
||||||
|
@@ -373,17 +373,26 @@
|
|||||||
dataIndex: 'energyType',
|
dataIndex: 'energyType',
|
||||||
width: 100,
|
width: 100,
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
|
customRender: (text: any) => {
|
||||||
|
return text.text !== undefined ? text : '-';
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '计量单位',
|
title: '计量单位',
|
||||||
className: 'unitName',
|
className: 'unitName',
|
||||||
dataIndex: 'unitName',
|
dataIndex: 'unitName',
|
||||||
width: 100,
|
width: 100,
|
||||||
|
customRender: (text: any) => {
|
||||||
|
return text.text !== undefined ? text : '-';
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '全年',
|
title: '全年',
|
||||||
dataIndex: 'yearly',
|
dataIndex: 'yearly',
|
||||||
width: 100,
|
width: 100,
|
||||||
|
customRender: (text: any) => {
|
||||||
|
return text.text !== undefined ? text : '-';
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '1月',
|
title: '1月',
|
||||||
@@ -394,11 +403,11 @@
|
|||||||
let color;
|
let color;
|
||||||
switch (value.record.janFlag) {
|
switch (value.record.janFlag) {
|
||||||
case 1:
|
case 1:
|
||||||
text = value.record.jan ? value.record.jan : '';
|
text = value.record.jan ? value.record.jan : '-';
|
||||||
color = 'rgba(243, 97, 99, 1)';
|
color = 'rgba(243, 97, 99, 1)';
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
text = value.record.jan ? value.record.jan : '';
|
text = value.record.jan ? value.record.jan : '-';
|
||||||
color = 'rgba(57, 215, 187, 1)';
|
color = 'rgba(57, 215, 187, 1)';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -415,11 +424,11 @@
|
|||||||
let color;
|
let color;
|
||||||
switch (value.record.febFlag) {
|
switch (value.record.febFlag) {
|
||||||
case 1:
|
case 1:
|
||||||
text = value.record.feb ? value.record.feb : '';
|
text = value.record.feb ? value.record.feb : '-';
|
||||||
color = 'rgba(243, 97, 99, 1)';
|
color = 'rgba(243, 97, 99, 1)';
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
text = value.record.feb ? value.record.feb : '';
|
text = value.record.feb ? value.record.feb : '-';
|
||||||
color = 'rgba(57, 215, 187, 1)';
|
color = 'rgba(57, 215, 187, 1)';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -436,11 +445,11 @@
|
|||||||
let color;
|
let color;
|
||||||
switch (value.record.marFlag) {
|
switch (value.record.marFlag) {
|
||||||
case 1:
|
case 1:
|
||||||
text = value.record.mar ? value.record.mar : '';
|
text = value.record.mar ? value.record.mar : '-';
|
||||||
color = 'rgba(243, 97, 99, 1)';
|
color = 'rgba(243, 97, 99, 1)';
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
text = value.record.mar ? value.record.mar : '';
|
text = value.record.mar ? value.record.mar : '-';
|
||||||
color = 'rgba(57, 215, 187, 1)';
|
color = 'rgba(57, 215, 187, 1)';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -457,11 +466,11 @@
|
|||||||
let color;
|
let color;
|
||||||
switch (value.record.aprFlag) {
|
switch (value.record.aprFlag) {
|
||||||
case 1:
|
case 1:
|
||||||
text = value.record.apr ? value.record.apr : '';
|
text = value.record.apr ? value.record.apr : '-';
|
||||||
color = 'rgba(243, 97, 99, 1)';
|
color = 'rgba(243, 97, 99, 1)';
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
text = value.record.apr ? value.record.apr : '';
|
text = value.record.apr ? value.record.apr : '-';
|
||||||
color = 'rgba(57, 215, 187, 1)';
|
color = 'rgba(57, 215, 187, 1)';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -478,11 +487,11 @@
|
|||||||
let color;
|
let color;
|
||||||
switch (value.record.mayFlag) {
|
switch (value.record.mayFlag) {
|
||||||
case 1:
|
case 1:
|
||||||
text = value.record.may ? value.record.may : '';
|
text = value.record.may ? value.record.may : '-';
|
||||||
color = 'rgba(243, 97, 99, 1)';
|
color = 'rgba(243, 97, 99, 1)';
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
text = value.record.may ? value.record.may : '';
|
text = value.record.may ? value.record.may : '-';
|
||||||
color = 'rgba(57, 215, 187, 1)';
|
color = 'rgba(57, 215, 187, 1)';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -499,11 +508,11 @@
|
|||||||
let color;
|
let color;
|
||||||
switch (value.record.junFlag) {
|
switch (value.record.junFlag) {
|
||||||
case 1:
|
case 1:
|
||||||
text = value.record.jun ? value.record.jun : '';
|
text = value.record.jun ? value.record.jun : '-';
|
||||||
color = 'rgba(243, 97, 99, 1)';
|
color = 'rgba(243, 97, 99, 1)';
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
text = value.record.jun ? value.record.jun : '';
|
text = value.record.jun ? value.record.jun : '-';
|
||||||
color = 'rgba(57, 215, 187, 1)';
|
color = 'rgba(57, 215, 187, 1)';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -520,11 +529,11 @@
|
|||||||
let color;
|
let color;
|
||||||
switch (value.record.julFlag) {
|
switch (value.record.julFlag) {
|
||||||
case 1:
|
case 1:
|
||||||
text = value.record.jul ? value.record.jul : '';
|
text = value.record.jul ? value.record.jul : '-';
|
||||||
color = 'rgba(243, 97, 99, 1)';
|
color = 'rgba(243, 97, 99, 1)';
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
text = value.record.jul ? value.record.jul : '';
|
text = value.record.jul ? value.record.jul : '-';
|
||||||
color = 'rgba(57, 215, 187, 1)';
|
color = 'rgba(57, 215, 187, 1)';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -541,11 +550,11 @@
|
|||||||
let color;
|
let color;
|
||||||
switch (value.record.augFlag) {
|
switch (value.record.augFlag) {
|
||||||
case 1:
|
case 1:
|
||||||
text = value.record.aug ? value.record.aug : '';
|
text = value.record.aug ? value.record.aug : '-';
|
||||||
color = 'rgba(243, 97, 99, 1)';
|
color = 'rgba(243, 97, 99, 1)';
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
text = value.record.aug ? value.record.aug : '';
|
text = value.record.aug ? value.record.aug : '-';
|
||||||
color = 'rgba(57, 215, 187, 1)';
|
color = 'rgba(57, 215, 187, 1)';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -562,11 +571,11 @@
|
|||||||
let color;
|
let color;
|
||||||
switch (value.record.sepFlag) {
|
switch (value.record.sepFlag) {
|
||||||
case 1:
|
case 1:
|
||||||
text = value.record.sep ? value.record.sep : '';
|
text = value.record.sep ? value.record.sep : '-';
|
||||||
color = 'rgba(243, 97, 99, 1)';
|
color = 'rgba(243, 97, 99, 1)';
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
text = value.record.sep ? value.record.sep : '';
|
text = value.record.sep ? value.record.sep : '-';
|
||||||
color = 'rgba(57, 215, 187, 1)';
|
color = 'rgba(57, 215, 187, 1)';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -583,11 +592,11 @@
|
|||||||
let color;
|
let color;
|
||||||
switch (value.record.octFlag) {
|
switch (value.record.octFlag) {
|
||||||
case 1:
|
case 1:
|
||||||
text = value.record.oct ? value.record.oct : '';
|
text = value.record.oct ? value.record.oct : '-';
|
||||||
color = 'rgba(243, 97, 99, 1)';
|
color = 'rgba(243, 97, 99, 1)';
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
text = value.record.oct ? value.record.oct : '';
|
text = value.record.oct ? value.record.oct : '-';
|
||||||
color = 'rgba(57, 215, 187, 1)';
|
color = 'rgba(57, 215, 187, 1)';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -604,11 +613,11 @@
|
|||||||
let color;
|
let color;
|
||||||
switch (value.record.novFlag) {
|
switch (value.record.novFlag) {
|
||||||
case 1:
|
case 1:
|
||||||
text = value.record.nov ? value.record.nov : '';
|
text = value.record.nov ? value.record.nov : '-';
|
||||||
color = 'rgba(243, 97, 99, 1)';
|
color = 'rgba(243, 97, 99, 1)';
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
text = value.record.nov ? value.record.nov : '';
|
text = value.record.nov ? value.record.nov : '-';
|
||||||
color = 'rgba(57, 215, 187, 1)';
|
color = 'rgba(57, 215, 187, 1)';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -625,11 +634,11 @@
|
|||||||
let color;
|
let color;
|
||||||
switch (value.record.decFlag) {
|
switch (value.record.decFlag) {
|
||||||
case 1:
|
case 1:
|
||||||
text = value.record.dece ? value.record.dece : '';
|
text = value.record.dece ? value.record.dece : '-';
|
||||||
color = 'rgba(243, 97, 99, 1)';
|
color = 'rgba(243, 97, 99, 1)';
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
text = value.record.dece ? value.record.dece : '';
|
text = value.record.dece ? value.record.dece : '-';
|
||||||
color = 'rgba(57, 215, 187, 1)';
|
color = 'rgba(57, 215, 187, 1)';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@@ -23,6 +23,7 @@
|
|||||||
:tree-data="gData"
|
:tree-data="gData"
|
||||||
:show-line="{ showLeafIcon: false }"
|
:show-line="{ showLeafIcon: false }"
|
||||||
show-line
|
show-line
|
||||||
|
block-node
|
||||||
@expand="onExpand"
|
@expand="onExpand"
|
||||||
@select="onSelect"
|
@select="onSelect"
|
||||||
style="padding: 0 16px !important">
|
style="padding: 0 16px !important">
|
||||||
@@ -231,8 +232,8 @@
|
|||||||
};
|
};
|
||||||
const truncatedName = (name) => {
|
const truncatedName = (name) => {
|
||||||
if (name) {
|
if (name) {
|
||||||
if (name.length > 8) {
|
if (name.length > 15) {
|
||||||
return name.substring(0, 8) + '...';
|
return name.substring(0, 15) + '...';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return name;
|
return name;
|
||||||
@@ -529,7 +530,7 @@
|
|||||||
console.log(setFactorRef.value.nsTableRef.rowSelection);
|
console.log(setFactorRef.value.nsTableRef.rowSelection);
|
||||||
setFactorRef.value.nsTableRef.params.emissionList = [0];
|
setFactorRef.value.nsTableRef.params.emissionList = [0];
|
||||||
setFactorRef.value.nsTableRef.treeElRef.selectedKeys = [];
|
setFactorRef.value.nsTableRef.treeElRef.selectedKeys = [];
|
||||||
// setFactorRef.value.nsTableRef.rowSelection.selectedRowKeys = [];
|
setFactorRef.value.nsTableRef.rowSelection.selectedRowKeys = undefined;
|
||||||
setFactorRef.value.nsTableRef.reload();
|
setFactorRef.value.nsTableRef.reload();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<!-- 首页 -->
|
<!-- 首页 -->
|
||||||
<div v-if="isMainPage">
|
<div v-if="isMainPage" style="height: 100%">
|
||||||
<ns-view-list-table v-bind="tableConfig" :scroll="{ x: 750 }" :model="data" ref="mainRef" />
|
<ns-view-list-table v-bind="tableConfig" :scroll="{ x: 750 }" :model="data" ref="mainRef" />
|
||||||
</div>
|
</div>
|
||||||
<!-- 填报页 -->
|
<!-- 填报页 -->
|
||||||
@@ -153,6 +153,14 @@
|
|||||||
formState.value.orgId = orgId.value;
|
formState.value.orgId = orgId.value;
|
||||||
formState.value.startTime = formState.value.reportScope[0];
|
formState.value.startTime = formState.value.reportScope[0];
|
||||||
formState.value.endTime = formState.value.reportScope[1];
|
formState.value.endTime = formState.value.reportScope[1];
|
||||||
|
if (text.value === '新增报告') {
|
||||||
|
spinning.value = true;
|
||||||
|
fetch(carbonInventoryCheck.createOrUpdate, formState.value).then((res) => {
|
||||||
|
visible.value = false;
|
||||||
|
mainRef.value?.nsTableRef.reload();
|
||||||
|
spinning.value = false;
|
||||||
|
});
|
||||||
|
} else {
|
||||||
if (
|
if (
|
||||||
oldStartTime.value === formState.value.startTime &&
|
oldStartTime.value === formState.value.startTime &&
|
||||||
oldEndTime.value === formState.value.endTime
|
oldEndTime.value === formState.value.endTime
|
||||||
@@ -165,7 +173,7 @@
|
|||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
Modal.confirm({
|
Modal.confirm({
|
||||||
title: '修改日期后会导致数据丢失是否保留数据?',
|
title: '修改日期会导致已有数据丢失,是否继续修改?',
|
||||||
icon: createVNode(ExclamationCircleOutlined),
|
icon: createVNode(ExclamationCircleOutlined),
|
||||||
onOk() {
|
onOk() {
|
||||||
spinning.value = true;
|
spinning.value = true;
|
||||||
@@ -185,6 +193,7 @@
|
|||||||
class: 'test',
|
class: 'test',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
console.log('error', error);
|
console.log('error', error);
|
||||||
|
@@ -52,6 +52,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<a-spin :spinning="spinning">
|
||||||
<div class="contant">
|
<div class="contant">
|
||||||
<div class="chartsPart">
|
<div class="chartsPart">
|
||||||
<template v-for="(item, index) in data" :key="index">
|
<template v-for="(item, index) in data" :key="index">
|
||||||
@@ -70,6 +71,7 @@
|
|||||||
</a-table>
|
</a-table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</a-spin>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -88,6 +90,7 @@
|
|||||||
const fetch = (api, params = { orgId }) => {
|
const fetch = (api, params = { orgId }) => {
|
||||||
return http.post(api, params);
|
return http.post(api, params);
|
||||||
};
|
};
|
||||||
|
const spinning = ref(false);
|
||||||
const selectYear = ref<Dayjs>(dayjs(new Date().getFullYear().toString()));
|
const selectYear = ref<Dayjs>(dayjs(new Date().getFullYear().toString()));
|
||||||
const selectMonth = ref<Dayjs>(dayjs().startOf('year').month(0));
|
const selectMonth = ref<Dayjs>(dayjs().startOf('year').month(0));
|
||||||
// 年/月切换
|
// 年/月切换
|
||||||
@@ -250,10 +253,12 @@
|
|||||||
yearAndMonth: 'year',
|
yearAndMonth: 'year',
|
||||||
});
|
});
|
||||||
const getTableData = () => {
|
const getTableData = () => {
|
||||||
|
spinning.value = true;
|
||||||
fetch(carbonPlanning.whole, queryParams.value).then((res) => {
|
fetch(carbonPlanning.whole, queryParams.value).then((res) => {
|
||||||
data.value = res.data;
|
data.value = res.data;
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
drawEcharts();
|
drawEcharts();
|
||||||
|
spinning.value = false;
|
||||||
}, 500);
|
}, 500);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@@ -8,6 +8,7 @@
|
|||||||
<a-button type="primary" @click="changeParentData">返回</a-button>
|
<a-button type="primary" @click="changeParentData">返回</a-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<a-spin :spinning="spinning">
|
||||||
<div class="contant">
|
<div class="contant">
|
||||||
<a-card class="chartsPart" v-if="showPart">
|
<a-card class="chartsPart" v-if="showPart">
|
||||||
<div class="chart" ref="chartRef"></div>
|
<div class="chart" ref="chartRef"></div>
|
||||||
@@ -124,6 +125,7 @@
|
|||||||
</a-table>
|
</a-table>
|
||||||
</a-card>
|
</a-card>
|
||||||
</div>
|
</div>
|
||||||
|
</a-spin>
|
||||||
<!-- 批量设置 -->
|
<!-- 批量设置 -->
|
||||||
<a-modal :visible="open" title="批量设置" @ok="handleOk" @cancel="onCancel">
|
<a-modal :visible="open" title="批量设置" @ok="handleOk" @cancel="onCancel">
|
||||||
<a-form ref="formRef" :model="formState" :label-col="labelCol" :wrapper-col="wrapperCol">
|
<a-form ref="formRef" :model="formState" :label-col="labelCol" :wrapper-col="wrapperCol">
|
||||||
@@ -317,6 +319,7 @@
|
|||||||
const fetch = (api, params = { orgId }) => {
|
const fetch = (api, params = { orgId }) => {
|
||||||
return http.post(api, params);
|
return http.post(api, params);
|
||||||
};
|
};
|
||||||
|
const spinning = ref(false);
|
||||||
// 点击返回
|
// 点击返回
|
||||||
const emit = defineEmits(['change-data']);
|
const emit = defineEmits(['change-data']);
|
||||||
const changeParentData = () => {
|
const changeParentData = () => {
|
||||||
@@ -345,6 +348,7 @@
|
|||||||
const totalLastYearActualUsage = ref();
|
const totalLastYearActualUsage = ref();
|
||||||
const totalReferenceValue = ref();
|
const totalReferenceValue = ref();
|
||||||
const getTableData = () => {
|
const getTableData = () => {
|
||||||
|
spinning.value = true;
|
||||||
fetch(carbonPlanning.detailedStatisticalDataTable, queryParams.value).then(async (res) => {
|
fetch(carbonPlanning.detailedStatisticalDataTable, queryParams.value).then(async (res) => {
|
||||||
let resUnit = await getEnumEnergy({ params: { code: props.resourceType } });
|
let resUnit = await getEnumEnergy({ params: { code: props.resourceType } });
|
||||||
unit.value = resUnit.data.unit;
|
unit.value = resUnit.data.unit;
|
||||||
@@ -358,6 +362,7 @@
|
|||||||
lastActualUsageList.value = data.value.map((item) => item.lastYearActualUsage);
|
lastActualUsageList.value = data.value.map((item) => item.lastYearActualUsage);
|
||||||
formState.value.lastYearList = lastActualUsageList.value;
|
formState.value.lastYearList = lastActualUsageList.value;
|
||||||
}
|
}
|
||||||
|
getChartData();
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
getTableData();
|
getTableData();
|
||||||
@@ -646,9 +651,9 @@
|
|||||||
lastYearActualUsage.value = res.data.lastYearActualUsage;
|
lastYearActualUsage.value = res.data.lastYearActualUsage;
|
||||||
count.value = res.data.count;
|
count.value = res.data.count;
|
||||||
chart();
|
chart();
|
||||||
|
spinning.value = false;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
getChartData();
|
|
||||||
const chart = () => {
|
const chart = () => {
|
||||||
chartInstance = echarts.init(chartRef.value);
|
chartInstance = echarts.init(chartRef.value);
|
||||||
const option = {
|
const option = {
|
||||||
@@ -996,7 +1001,7 @@
|
|||||||
:deep(.ant-card-bordered) {
|
:deep(.ant-card-bordered) {
|
||||||
border: unset;
|
border: unset;
|
||||||
}
|
}
|
||||||
:deep(.ant-input-number-handler-wrap){
|
:deep(.ant-input-number-handler-wrap) {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
@@ -38,6 +38,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<a-spin :spinning="spinning">
|
||||||
<div class="contant">
|
<div class="contant">
|
||||||
<div class="chartsPart">
|
<div class="chartsPart">
|
||||||
<div class="ballChart" ref="ballChartRef"></div>
|
<div class="ballChart" ref="ballChartRef"></div>
|
||||||
@@ -62,6 +63,7 @@
|
|||||||
</a-table>
|
</a-table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</a-spin>
|
||||||
</div>
|
</div>
|
||||||
<div class="totalContant" v-else>
|
<div class="totalContant" v-else>
|
||||||
<categoryDeatil
|
<categoryDeatil
|
||||||
@@ -136,6 +138,7 @@
|
|||||||
const fetch = (api, params = { orgId }) => {
|
const fetch = (api, params = { orgId }) => {
|
||||||
return http.post(api, params);
|
return http.post(api, params);
|
||||||
};
|
};
|
||||||
|
const spinning = ref(false);
|
||||||
const selectYearValue = ref<Dayjs>(dayjs(new Date().getFullYear().toString()));
|
const selectYearValue = ref<Dayjs>(dayjs(new Date().getFullYear().toString()));
|
||||||
const selectMonthValue = ref<Dayjs>(dayjs().startOf('year').month(0));
|
const selectMonthValue = ref<Dayjs>(dayjs().startOf('year').month(0));
|
||||||
const electricTotal = ref(true);
|
const electricTotal = ref(true);
|
||||||
@@ -371,6 +374,7 @@
|
|||||||
fetch(carbonPlanning.yearAndMonthAchievement, getBallQuery.value).then((res) => {
|
fetch(carbonPlanning.yearAndMonthAchievement, getBallQuery.value).then((res) => {
|
||||||
ballValue.value = res.data;
|
ballValue.value = res.data;
|
||||||
drawSQ();
|
drawSQ();
|
||||||
|
spinning.value = false;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
let ballChartInstance: echarts.ECharts | null = null;
|
let ballChartInstance: echarts.ECharts | null = null;
|
||||||
@@ -489,6 +493,7 @@
|
|||||||
// 获取单位
|
// 获取单位
|
||||||
const unit = ref();
|
const unit = ref();
|
||||||
const getYearData = () => {
|
const getYearData = () => {
|
||||||
|
spinning.value = true;
|
||||||
treeCheckedKeys.value = [];
|
treeCheckedKeys.value = [];
|
||||||
fetch(carbonPlanning.searchListByYear, yearQueryParams.value).then(async (res) => {
|
fetch(carbonPlanning.searchListByYear, yearQueryParams.value).then(async (res) => {
|
||||||
let resUnit = await getEnumEnergy({ params: { code: props.energyType } });
|
let resUnit = await getEnumEnergy({ params: { code: props.energyType } });
|
||||||
@@ -516,6 +521,7 @@
|
|||||||
getMonthData();
|
getMonthData();
|
||||||
};
|
};
|
||||||
const getMonthData = () => {
|
const getMonthData = () => {
|
||||||
|
spinning.value = true;
|
||||||
fetch(carbonPlanning.searchListByMonth, monthQueryParams.value).then(async (res) => {
|
fetch(carbonPlanning.searchListByMonth, monthQueryParams.value).then(async (res) => {
|
||||||
let resUnit = await getEnumEnergy({ params: { code: props.energyType } });
|
let resUnit = await getEnumEnergy({ params: { code: props.energyType } });
|
||||||
unit.value = resUnit.data.unit;
|
unit.value = resUnit.data.unit;
|
||||||
|
Reference in New Issue
Block a user