fix: 农事列表去除status

src/components/fnHeader.vue

@@ -1,29 +1,8 @@
 <template>
   <div class="header">
     <div class="title">
-      <!-- <img class="logo" src="@/assets/images/common/logo.png" alt="" /> -->
-      <span>百色农业大智慧中心</span>
-      <!-- <img class="logo-icon" src="@/assets/images/common/logo-icon.png" alt="" /> -->
+      <span>百色农业大数据中心</span>
     </div>
-    <!-- <div class="focus-farm" v-show="!hideSwitch">
-        <el-select
-            v-model="farmVal"
-            placeholder="我的关注农场"
-            style="width: 189px"
-            popper-class="focus-farm-select"
-            @change="toggleFarm"
-        >
-            <el-option label="荔博园" :value="1" />
-            <el-option label="井冈红糯基地" :value="2" />
-        </el-select>
-    </div> -->
-    <!-- <div class="date" v-show="showDate">
-      <el-icon size="25"><MoreFilled /></el-icon>
-      <div class="time">
-        <div>{{time}}</div>
-        <span>{{getCurrentFormattedTime('date')}} {{getCurrentDayOfWeek()}}</span>
-      </div>
-    </div> -->
   </div>
   <!-- 四个方向的阴影 -->
   <div class="page-shadow">

src/views/home/album/index.vue

@@ -22,18 +22,16 @@
                                         class="menu-icon"
                                         :src="
                                             require('@/assets/img/gallery/icon-' +
-                                                item.icon +
-                                                (item.statuss === 0 ? '-no' : '') +
-                                                '.png')
+                                                item.icon + '.png')
                                         "
                                     />
                                     <div
                                         :class="[
                                             'menu-name',
                                             {
-                                                noTime: item.status === 0,
-                                                onTime: item.status === 2,
-                                                now: item.status === 1,
+                                                feature: item.execute === 0 ||item.execute === 2,
+                                                onTime:  item.execute === 1,
+                                                now: item.execute === 3,
                                             },
                                         ]"
                                     >
@@ -48,13 +46,13 @@
                             class="done-card section"
                             v-for="(card, cardI) in farmWorkList"
                             :key="cardI"
-                            :class="{ flashing: card.status === 1 && isFlashing }"
+                            :class="{ flashing: card.execute === 3 && isFlashing && cardI === secondLastIndex }"
                         >
                             <div
                                 class="card-dom"
                                 :id="'section' + cardI"
                             ></div>
-                            <div v-if="card.status === 1 && indicatorChartData.content" class="log-wrap">
+                            <div v-if="card.execute === 3 && indicatorChartData.content && cardI === secondLastIndex" class="log-wrap">
                                 <div class="log-box">
                                     <div class="log-title PangMenZhengDao-FONT">
                                         <span>果园日志</span>
@@ -80,10 +78,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="card-wrap" :class="{ noCarousel: card.status !== 0, 'done': card.status === 0 }">
+                            <div class="card-wrap" :class="{ noCarousel: (card.execute !== 0 && card.execute !== 2), 'done': (card.execute === 4 || card.execute === 5) }">
                                 <div
                                     class="card-content"
-                                    :class="{ push: card.status === 1, hasBg: card.status === 2 && !card.hasBg }"
+                                    :class="{ push: card.execute === 3, hasBg: (card.execute === 0 || card.execute === 2) && !card.hasBg }"
                                 >
                                     <div
                                         class="card-top"
@@ -96,7 +94,7 @@
                                             <div v-if="card.type === 2" class="status-tag advice">推荐农事</div>
                                             <div v-if="card.type === 0" class="status-tag warning">预警农事</div>
                                             <!-- 右上角角标 -->
-                                            <div v-if="card.status === 2 && card.execute === 0" class="add-btn">
+                                            <div v-if="card.execute === 0" class="add-btn">
                                                 未触发
                                             </div>
                                             <div
@@ -106,10 +104,10 @@
                                                 未激活
                                             </div>
                                             <div v-if="card.execute === 3" class="add-btn">待执行</div>
-                                            <div v-if="card.status === 0 && card.execute === 4" class="add-btn recheck">
+                                            <div v-if="card.execute === 4" class="add-btn recheck">
                                                 已完成
                                             </div>
-                                            <div v-if="card.status === 0 && card.reCheck === 1" class="add-btn recheck">
+                                            <div v-if="card.execute === 5" class="add-btn recheck">
                                                 已复核
                                             </div>
                                             <div v-if="card.execute === 1" class="add-btn unactive">已失效</div>
@@ -121,7 +119,7 @@
                                                 优<img class="good" src="@/assets/img/weather_index/good.png" />
                                             </div>
                                         </div> -->
-                                        <div v-if="card.status === 0">
+                                        <div v-if="card.execute === 4 || card.execute === 5">
                                             <!-- 已完成 -->
                                             <div class="card-desc">
                                                 <span class="desc-title">服务主体：</span>
@@ -148,17 +146,13 @@
                                                 <span class="desc-title">农事编号：</span>
                                                 {{ card.code }}
                                             </div>
-                                            <div v-if="card.status === 2" class="card-desc">
+                                            <div v-if="card.executeDate || card.solarName" class="card-desc">
                                                 <span class="desc-title">推荐时间：</span>
-                                                {{ card.solarName }}
+                                                {{ card.executeDate || card.solarName }}
                                             </div>
-                                            <div v-if="card.status === 1" class="card-desc">
-                                                <span class="desc-title">推荐时间：</span>
-                                                {{ card.executeDate }}
-                                            </div>
-                                            <div v-if="card.status === 0" class="card-desc">
+                                            <div v-if="card.execute === 4" class="card-desc">
                                                 <span class="desc-title">{{
-                                                    card.reCheck ? "复核时间：" : "执行时间："
+                                                    card.execute === 5 ? "复核时间：" : "执行时间："
                                                 }}</span>
                                                 {{ card.executeDate }}
                                             </div>
@@ -187,26 +181,27 @@
                                                 <div class="detail-text">查看详情></div>
                                             </div>
                                         </div>
-                                        <div class="card-link" v-if="card.status === 2" @click.stop="handlePage(card)">
-                                            <img src="@/assets/img/gallery/expert-icon.png" />
+                                        <div class="card-link" v-if="card.execute === 0 || card.execute === 2|| (card.execute === 3 && card.orderStatus === null)" @click.stop="handlePage(card)">
+                                            <!-- <img src="@/assets/img/gallery/expert-icon.png" /> -->
+                                            <img class="expert-icon" :src="card.expertIcon" />
                                             <div class="expert-name">
                                                 {{ card.expertName
                                                 }}<el-icon size="12" class="icon"><ArrowRightBold /></el-icon>
                                             </div>
                                         </div>
                                         <div class="step-box" v-else>
-                                            <step-box :card="card" :isDone="card.status === 0 && (card.reCheck === 1 || card.execute === 4)" v-if="card.orderStatus || card.status === 0 || card.orderStatus === 0"></step-box>
+                                            <step-box :card="card" v-if="card.orderStatus || card.orderStatus === 0"></step-box>
                                         </div>
                                     </div>
                                     <chart
-                                        v-if="card.status !== 2 && card.indexChart.length && card.status !== 0"
+                                        v-if="card.execute === 3 && card.indexChart.length"
                                         :key="cardI"
                                         :indexName="card.indexName"
-                                        :type="card.status !== 1 ? 'normal' : 'feature'"
+                                        :type="(card.execute === 2 || card.execute === 0) ? 'feature' : 'normal'"
                                         :chartData="card.indexChart"
                                     ></chart>
 
-                                    <div v-if="card.status === 0 && card.userEvaluation">
+                                    <div v-if="(card.orderStatus === 4 || card.orderStatus === 5) && card.userEvaluation">
                                         <div class="evaluate">
                                             <div class="evaluate-title">用户评价</div>
                                             <div class="comment">
@@ -243,7 +238,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div v-if="card.status !== 2" :class="['over-img']">
+                            <div v-if="card.execute !== 0 && card.execute !== 2" :class="['over-img']">
                                 <!-- 图片列表 -->
                                 <album-carousel7d
                                     :key="farmName"
@@ -333,7 +328,7 @@ const toExpert = (expertName) =>{
 
 onMounted(() => {
     sampleId.value = 766;
-    farmId.value = 88388;
+    farmId.value = route.query.farmId;
 
     // window.addEventListener("scroll", debouncedHandleScroll);
 
@@ -424,7 +419,7 @@ const initScrollToSection = (index) => {
 const secondLastIndex = ref(-1); // 初始化索引值
 const getSecondLastIndex = (data) => {
     // 过滤出 status 为 2 的项
-    const filteredItems = data.filter((item) => item.status === 1);
+    const filteredItems = data.filter((item) => item.execute === 3);
     // 获取倒数第二项
     if (filteredItems.length >= 1) {
         const secondLastItem = filteredItems[filteredItems.length - 1];
@@ -441,6 +436,7 @@ const getSecondLastIndex = (data) => {
         });
     } else {
         secondLastIndex.value = -1; // 如果没有足够的项，设置为 -1
+        farmWorkList.value = data
     }
 };
 
@@ -464,7 +460,7 @@ const showDetail = (card) => {
     if (card.orderStatus || card.orderStatus === 0) {
         router.push({ path: "/work_detail", query: { data: JSON.stringify(card), recordId: null } });
     }
-    if (card.status === 0 && (card.reCheck === 1 || card.execute === 4)) {
+    if (card.orderStatus === 5 || card.execute === 4) {
         // 农事成效
         router.push({ path: "/ns_recrod_effect", query: { data: JSON.stringify(card) } });
     }
@@ -773,11 +769,14 @@ function addNsRecord(){
                     .noTime {
                         // color: #cccccc;
                     }
+                    .feature {
+                        color: rgba(9, 243, 200, 0.6);
+                    }
                     .now {
-                        color: rgba(33, 153, 248, 1);
+                        color: #CECECE;
                     }
                     .onTime {
-                        color: rgba(9, 243, 200, 0.6);
+                        color: #CECECE;
                     }
                 }
                 ::v-deep {
@@ -804,9 +803,9 @@ function addNsRecord(){
                         text-align: center;
                     }
                     .card-wrap {
-                        border: 1px solid #dddddd;
+                        // border: 1px solid #dddddd;
+                        // padding: 8px 8px;
                         border-radius: 8px;
-                        padding: 8px 8px;
                         position: relative;
                         z-index: 1;
                         // margin-top: -20px;
@@ -900,8 +899,9 @@ function addNsRecord(){
                                         border-color: #09F3C8;
                                     }
                                     &.advice {
-                                        color: rgba(252, 167, 3, 0.9);
-                                        background: rgba(255, 220, 104, 0.38);
+                                        color: #09F3C8;
+                                        background: rgba(9, 243, 200, 0.06);
+                                        border-color: #09F3C8;
                                     }
                                     &.warning {
                                         color: #ff4221;
@@ -1014,6 +1014,9 @@ function addNsRecord(){
                                 .icon {
                                     padding-right: 2px;
                                 }
+                                .expert-icon {
+                                    width: 50px;
+                                }
                             }
                         }
                         .card-chart {

src/views/home/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="base-container no-events">
         <fnHeader showDate></fnHeader>
-        <div class="back btn yes-evetns" @click="goBack">
+        <div class="back btn yes-events" @click="goBack">
           <img class="icon" src="@/assets/images/common/back-icon.png" alt="" />
           <span>返回</span>
         </div>
@@ -41,45 +41,13 @@
             </div> -->
             <div class="right yes-events">
                 <div class="list">
-                    <chart-box name="农情动态" arrow="arrow-left" :class="{ 'list-wrap': rightIndex === 0 }">
-                        <template v-if="rightIndex === 0">
-                          <!-- <div class="sub-title">
-                            <img src="@/assets/images/common/title-icon.png" />
-                            <span>农情动态</span>
-                          </div> -->
-                            <album></album>
-                            <!-- <img class="tabs" src="@/assets/images/home/ns-tabs.png" alt="">
-              <div class="img-box">
-                <img @click="handleAct(item)" v-for="item in 2" :key="item" :src="require(`@/assets/images/home/0${act<=2&&act==item?item+'-act':item}.png`)" alt="">
-              </div> -->
-                        </template>
-                        <template v-if="rightIndex === 1">
-                            <div class="img-box1">
-                                <img src="@/assets/images/home/fh01.png" alt="" />
-                                <img src="@/assets/images/home/fh02.png" alt="" />
-                            </div>
-                        </template>
-                        <template v-if="rightIndex === 2">
-                            <div class="btn-wrap">
-                                <div :class="{ active: btnIndex === 0 }" @click="handleBtn(0)">
-                                    {{ btnIndex === 0 && btnName != "" ? "采样分区：" + btnName : "选择采样分区" }}
-                                </div>
-                                <div :class="{ active: btnIndex === 1 }" @click="handleBtn(1)">
-                                    {{ btnIndex === 1 && btnName != "" ? "单树编号：" + btnName : "选择树" }}
-                                </div>
-                            </div>
-                            <div class="img-box2" v-show="showPoint">
-                                <img v-if="showType === 'point'" src="@/assets/images/home/line-chart.png" alt="" />
-                                <img v-else src="@/assets/images/home/line-chart2.png" alt="" />
-                                <img src="@/assets/images/home/fh01.png" alt="" />
-                            </div>
-                            <div class="img-box2" v-show="!showPoint">
-                                <img v-if="showType === 'point'" src="@/assets/images/home/line-chart1.png" alt="" />
-                                <img v-else src="@/assets/images/home/line-chart3.png" alt="" />
-                                <img src="@/assets/images/home/fh02.png" alt="" />
-                            </div>
-                        </template>
-                    </chart-box>
+                    <div class="sub-title">
+                        <img class="title-icon" src="@/assets/images/common/title-icon.png" />
+                        <span>农情动态</span>
+                    </div>
+                    <div class="right-content">
+                        <album></album>
+                    </div>
                 </div>
                 <!-- <tool-list direction="right" :list="rightToolList" @handleActive="handleActiveRight"></tool-list> -->
             </div>
@@ -444,6 +412,15 @@ const goBack = () => {
           margin-right: 8px;
           .sub-title {
             display: flex;
+            height: 44px;
+            align-items: center;
+            padding-left: 12px;
+            .title-icon {
+                padding-right: 8px;
+            }
+          }
+          .right-content {
+            height: calc(100% - 44px);
           }
             .list {
                 width: 100%;

src/views/warningHome/components/album.vue

@@ -176,7 +176,7 @@
                                         </div>
                                     </div>
                                     <chart
-                                        v-if="card.status !== 2 && card.indexChart.length"
+                                        v-if="card.execute === 3 && card.indexChart.length"
                                         :key="cardI"
                                         :indexName="card.indexName"
                                         :type="card.status !== 1 ? 'normal' : 'feature'"
@@ -381,7 +381,7 @@ const initScrollToSection = (index) => {
 const secondLastIndex = ref(-1); // 初始化索引值
 const getSecondLastIndex = (data) => {
     // 过滤出 status 为 2 的项
-    const filteredItems = data.filter((item) => item.status === 1);
+    const filteredItems = data.filter((item) => item.execute === 3);
     // 获取倒数第二项
     if (filteredItems.length >= 1) {
         const secondLastItem = filteredItems[filteredItems.length - 1];
@@ -398,6 +398,7 @@ const getSecondLastIndex = (data) => {
         });
     } else {
         secondLastIndex.value = -1; // 如果没有足够的项，设置为 -1
+        farmWorkList.value = data
     }
 };
 

src/views/workDetail/components/prescriptionBox.vue

@@ -14,7 +14,7 @@
             <div class="card-item-title"><span class="dotted"></span>专家处方</div>
             <div class="prescription-box">
                 <div class="step-box">
-                    <step-box :card="infoItem" :isDone="infoItem.status === 0 && (infoItem.reCheck === 1 || infoItem.execute === 4)" v-if="infoItem.orderStatus || infoItem.status === 0 || infoItem.orderStatus === 0"></step-box>
+                    <step-box :card="infoItem" v-if="infoItem.orderStatus || infoItem.orderStatus === 0"></step-box>
                 </div>
                 <!-- <div class="blur-bg">
                         <div class="lock-btn">解锁智能处方</div>