yudao-team/oa-ui
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首页bug修复

Browse Source
This commit is contained in:
XaoLi717 2024-10-09 16:43:12 +08:00
parent a597eaefaa
commit 9901c5a47a
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/views/Home/Index.vue
View File

@ -87,7 +87,7 @@
<!-- </el-link>--> <!-- </el-link>-->
</div> </div>
</template> </template>
<el-skeleton :loading="loading" animated> <el-skeleton v-if="allData" :loading="loading" animated>
<el-row> <el-row>
<el-col <el-col
v-for="(item, index) in dataList" v-for="(item, index) in dataList"
@ -185,7 +185,7 @@
style="width: 20%" style="width: 20%"
> >
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.HOME_PJ_TYPE" :value="scope.row.pjType" /> <dict-tag :type="DICT_TYPE.HOME_PJ_TYPE || 'info'" :value="scope.row.pjType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -193,7 +193,7 @@
label="部门" label="部门"
style="width: 20%"> style="width: 20%">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.HOME_PJ_DEPT" :value="scope.row.pjDept" /> <dict-tag :type="DICT_TYPE.HOME_PJ_DEPT || 'info'" :value="scope.row.pjDept" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -281,7 +281,7 @@
style="width: 20%" style="width: 20%"
> >
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.HOME_PJ_TYPE" :value="scope.row.pjType" /> <dict-tag :type="DICT_TYPE.HOME_PJ_TYPE || 'info'" :value="scope.row.pjType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -289,7 +289,7 @@
label="部门" label="部门"
style="width: 20%"> style="width: 20%">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.HOME_PJ_DEPT" :value="scope.row.pjDept" /> <dict-tag :type="DICT_TYPE.HOME_PJ_DEPT || 'info'" :value="scope.row.pjDept" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -351,7 +351,7 @@ const list3 = ref<imgVO[]>([]) // 列表的数据
const total = ref(0) // 列表的总页数 const total = ref(0) // 列表的总页数
const avatar = userStore.getUser.avatar const avatar = userStore.getUser.avatar
const username = userStore.getUser.nickname const username = userStore.getUser.nickname
const allData = ref({}); const allData = ref(null);
const allData2 = ref({}); const allData2 = ref({});
const pieOptionsData = reactive<EChartsOption>(pieOptions) as EChartsOption const pieOptionsData = reactive<EChartsOption>(pieOptions) as EChartsOption
// 获取统计数 // 获取统计数
@ -439,18 +439,32 @@ const imgUrl = "//images.weserv.nl/?url="
// {id: 2, src: mn3, name: '03'}, // {id: 2, src: mn3, name: '03'},
// {id: 3, src: mn4, name: '04'}, // {id: 3, src: mn4, name: '04'},
// ] // ]
const dataList = computed(() => [ const dataList = computed(() => {
{ name: '碳排放', infoCo2e: allData.value.infoCo2e, dAn: '吨', time: '2024-07-05', color: '#e6eae3' }, return [
{ name: '用水量', infoCo2e: allData.value.infoWater, dAn: '吨', time: '2024-07-05', color: '#ecf5ff' }, { name: '碳排放', infoCo2e: allData.value.infoCo2e || 0, dAn: '吨', time: '2024-07-05', color: '#e6eae3' },
{ name: '环保投入', infoCo2e: allData.value.infoEcom, dAn: '万元', time: '2024-07-05', color: '#f0f9eb' }, { name: '用水量', infoCo2e: allData.value.infoWater || 0, dAn: '吨', time: '2024-07-05', color: '#ecf5ff' },
{ name: '技能培训', infoCo2e: allData.value.infoTraining, dAn: '人', time: '2024-07-05', color: '#fef0f0' }, { name: '环保投入', infoCo2e: allData.value.infoEcom || 0, dAn: '万元', time: '2024-07-05', color: '#f0f9eb' },
{ name: '污染物质', infoCo2e: allData.value.infoPollution, dAn: '吨', time: '2024-07-05', color: '#c0c4cc' }, { name: '技能培训', infoCo2e: allData.value.infoTraining || 0, dAn: '人', time: '2024-07-05', color: '#fef0f0' },
{ name: '研发费用', infoCo2e: allData.value.infoRd, dAn: '万元', time: '2024-07-05', color: '#fdf6ec' } { name: '污染物质', infoCo2e: allData.value.infoPollution || 0, dAn: '吨', time: '2024-07-05', color: '#c0c4cc' },
]); { name: '研发费用', infoCo2e: allData.value.infoRd || 0, dAn: '万元', time: '2024-07-05', color: '#fdf6ec' }
];
});
const dataList2 = computed(() => [ const dataList2 = computed(() => [
{E: allData2.value[0].infoEnvironment, S: allData2.value[0].infoSociety, G: allData2.value[0].infoGovern}, {
{E: allData2.value[1].infoEnvironment, S: allData2.value[1].infoSociety, G: allData2.value[1].infoGovern}, E: allData2.value[0]?.infoEnvironment || 70,
{E: allData2.value[2].infoEnvironment, S: allData2.value[2].infoSociety, G: allData2.value[2].infoGovern}, S: allData2.value[0]?.infoSociety || 70,
G: allData2.value[0]?.infoGovern || 70
},
{
E: allData2.value[1]?.infoEnvironment || 70,
S: allData2.value[1]?.infoSociety || 70,
G: allData2.value[1]?.infoGovern || 70
},
{
E: allData2.value[2]?.infoEnvironment || 70,
S: allData2.value[2]?.infoSociety || 70,
G: allData2.value[2]?.infoGovern || 70
},
]); ]);
/** 查询列表 */ /** 查询列表 */
const getList = async () => { const getList = async () => {