From 9901c5a47a3f0ce401a619b840b9db8ae0f6d05c Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Wed, 9 Oct 2024 16:43:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/Index.vue | 48 ++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 17 deletions(-)

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