Merge branch 'dev-bxy' into 'dev'

fix: 修改代码逻辑，删除无用代码

See merge request product-group-fe/sfy-safety-group/sfy-safety!96

src/views/disaster/overview/components/DisasterCheckingLists.vue

@@ -78,10 +78,10 @@
   import { useRouter } from 'vue-router';
   import { ElIcon } from 'element-plus';
   import { DArrowRight } from '@element-plus/icons-vue';
-  import task from '@/assets/images/disaster-overview/task.png';
-  import signTask from '@/assets/images/disaster-overview/sign-task.png';
-  import successTask from '@/assets/images/disaster-overview/success-task.png';
-  import warningTask from '@/assets/images/disaster-overview/warning-task.png';
+  import taskIcon from '@/assets/images/disaster-overview/task.png';
+  import signTaskIcon from '@/assets/images/disaster-overview/sign-task.png';
+  import successTaskIcon from '@/assets/images/disaster-overview/success-task.png';
+  import warningTaskIcon from '@/assets/images/disaster-overview/warning-task.png';
   import brokenObject from '@/assets/images/disaster-overview/broken-object.png';
   import {
     QueryCheckingListsParams,
@@ -93,7 +93,7 @@
   // import DisasterCheckList from './disaster-checking-lists/DisasterCheckList.vue';
   // import DisasterDoneList from './disaster-checking-lists/DisasterDoneList.vue';
 
-  // const activeTab = ref('预防检查');<el-icon><Link /></el-icon>
+  // const activeTab = ref('预防检查');
 
   const router = useRouter();
 
@@ -105,27 +105,27 @@
   const preventCheckTitles = computed(() => {
     return [
       {
-        icon: task,
+        icon: taskIcon,
         label: '总任务',
         count: preventInspectData.value?.totalTask,
       },
       {
-        icon: warningTask,
+        icon: warningTaskIcon,
         label: '隐患任务',
         count: preventInspectData.value?.dangerTask,
       },
       {
-        icon: task,
+        icon: taskIcon,
         label: '待签字任务',
         count: preventInspectData.value?.submittedTask,
       },
       {
-        icon: successTask,
+        icon: successTaskIcon,
         label: '通过任务',
         count: preventInspectData.value?.passTask,
       },
       {
-        icon: signTask,
+        icon: signTaskIcon,
         label: '已签字任务',
         count: preventInspectData.value?.signedTask,
       },
@@ -136,7 +136,7 @@
   const disasterHandleTitles = computed(() => {
     return [
       {
-        icon: signTask,
+        icon: signTaskIcon,
         label: '应上报部门',
         count: disasterHandleData.value?.dueReportDeptCount,
       },
@@ -146,17 +146,17 @@
         count: disasterHandleData.value?.lossRecordCount,
       },
       {
-        icon: signTask,
+        icon: signTaskIcon,
         label: '已上报部门',
         count: disasterHandleData.value?.completeReportDeptCount,
       },
       {
-        icon: successTask,
+        icon: successTaskIcon,
         label: '处置完成',
         count: disasterHandleData.value?.completeHandleCount,
       },
       {
-        icon: signTask,
+        icon: signTaskIcon,
         label: '存在损失部门',
         count: disasterHandleData.value?.existLossDeptCount,
       },
@@ -173,19 +173,18 @@
         path: '/disaster-prevention/disaster-control/disposal-management',
       });
     }
-    return;
   };
 
-  const getData = async () => {
-    await getPreventInspect(queryCheckingListsParams.value).then((res) => {
+  const getData = () => {
+    getPreventInspect(queryCheckingListsParams.value).then((res) => {
       preventInspectData.value = res;
     });
-    await getDisasterHandleOverview(queryCheckingListsParams.value).then((res) => {
+    getDisasterHandleOverview(queryCheckingListsParams.value).then((res) => {
       disasterHandleData.value = res;
     });
   };
 
-  onMounted(async () => {
+  onMounted(() => {
     getData();
   });
 </script>

src/views/disaster/overview/components/WeatherCard.vue

@@ -58,25 +58,27 @@
 
   // 获取今日灾害预警信息
   const getTodayWarningInfo = async () => {
-    const res = await getDisasterWarningRecords(DisasterTimeSpan.ONE_WEEK);
-    if (res[0].warnRecord.length === 0) {
+    const weekDisasterInfo = await getDisasterWarningRecords(DisasterTimeSpan.ONE_WEEK);
+    const weekDisasterInfoList = weekDisasterInfo[0].warnRecord;
+    const normalMeasure = disasterMeasureDic.value.find((item) => item.itemCode === 'normal_measure');
+
+    if (weekDisasterInfoList.length === 0) {
       weatherInfo.value.warning = '';
-      measureInfo.value = disasterMeasureDic.value.find((item) => item.itemCode === 'normal_measure')?.itemValue;
+      measureInfo.value = normalMeasure?.itemValue;
     } else {
       const today = dayjs().format('YYYY-MM-DD');
-      const todayWarning = res[0].warnRecord.find((item) => item.warnTime.includes(today));
+      const todayWarning = weekDisasterInfoList.find((item) => item.warnTime.includes(today));
       if (todayWarning) {
         weatherInfo.value.warning =
           weatherDisasterDic.value.find((item) => item.itemCode === todayWarning.disasterType)?.itemValue || '';
-        const res = getWeatherWarningType(todayWarning.disasterType);
-        if (res) {
-          measureInfo.value = disasterMeasureDic.value.find((item) => item.itemCode.includes(res))
-            ? disasterMeasureDic.value.find((item) => item.itemCode.includes(res))?.itemValue
-            : disasterMeasureDic.value.find((item) => item.itemCode === 'normal_measure')?.itemValue;
+        const weatherWarningType = getWeatherWarningType(todayWarning.disasterType);
+        if (weatherWarningType) {
+          const targetMeasure = disasterMeasureDic.value.find((item) => item.itemCode.includes(weatherWarningType));
+          measureInfo.value = targetMeasure ? targetMeasure?.itemValue : normalMeasure?.itemValue;
         }
       } else {
         weatherInfo.value.warning = '';
-        measureInfo.value = disasterMeasureDic.value.find((item) => item.itemCode === 'normal_measure')?.itemValue;
+        measureInfo.value = normalMeasure?.itemValue;
       }
     }
   };