From 1dac158e752018b3cd8d2a51acfad30c18c96197 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Thu, 12 Sep 2024 16:13:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E4=B8=8D=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enforceHome.vue | 43 +++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue
index ae8fe4d..cc09c7c 100644
--- a/src/views/enforceHome.vue
+++ b/src/views/enforceHome.vue
@@ -1,12 +1,11 @@
 <template>
-<!--    <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>-->
-<!--    <div class="home app_content" v-if="!isLoading">-->
-    <div class="home app_content">
+   <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
+   <div class="home app_content" v-if="!isLoading">
+    <!-- <div class="home app_content"> -->
         <!-- 导航栏 -->
         <!-- <div class="header_body">
                     <header-nav :leftArrow="false" titelText="执法监督码"></header-nav>
                 </div> -->
-
         <!-- 中间 -->
         <div class="warp_body">
             <div class="logobox"></div>
@@ -182,24 +181,34 @@
                 if(carouselList.length==0){
                     data.notNull=false
                 }
-                for (let i = 0; i < success.data.length; i++) {
-                    // carouselList.push(success.data[i]);
-                    noticeObj.noticeList.push(success.data[i].planName);
-                    var obj = {
-                        content: success.data[i].planName,
-                        id:success.data[i].id
+                for (let index = 0; index < success.data.length; index++) {
+                    const element = success.data[index];
+                    console.log(element);
+                    // element.planName = element.planYear + element.planName;
+                    if(element.timeType == 'quarter'){
+                      let val = "";
+                      if(element.quarter == "1") val = "一季度";
+                      if(element.quarter == "2") val = "二季度";
+                      if(element.quarter == "3") val = "三季度";
+                      if(element.quarter == "4") val = "四季度";
+                      element.planName = element.planYear + "年" + val +  element.planName;
+                    }else if (element.timeType == 'mouth') {
+                      const val = element.mouth + "月";
+                      element.planName = element.planYear + "年" + val +  element.planName;
                     }
-                    data.noticeList.push(obj)
-                //}
-                // noticeStr += success.rows[0].planName != null ? success.rows[0].planName + "" : "";
-            }
+                    element.planName = element.bureauDeptName + element.planName;
+                    noticeObj.noticeList.push(element.planName);
+                          var obj = {
+                              content: element.planName,
+                              id:element.id
+                          }
+                          data.noticeList.push(obj)
+              }
             freshMap.key = 1
             console.log(carouselList);
             console.log(data.noticeList);
             // timerObj.timer = setInterval(flushMessage, 4000);
             setNotificationMove();
-
-            
         }, error => {
 
         })
@@ -248,7 +257,7 @@
             queryList();
             // 如果不是执法用户 则跳转
             if (!success.data.lawOfficer) {
-                router.push(
+                router.replace(
                     {
                         path: "/noAccess"
                     });