소스 검색

fix:修改bug

wangsisi 3 일 전
부모
커밋
565b40c166

+ 20 - 6
src/components/pageComponents/FarmWorkPlanTimeline.vue

@@ -33,7 +33,7 @@
                                     ? 'padding-bottom: 25px;'
                                     : 'padding-bottom: 10px'
                             "
-                            :class="getArrangeStatusClass(fw)"
+                            :class="[getArrangeStatusClass(fw), { 'first-card': aIdx === 0 && rIdx !== 0 }, { 'last-card': aIdx === r.farmWorkArrangeList.length - 1 && rIdx !== r.farmWorkArrangeList.length - 1 }]"
                             @click="handleRowClick(fw)"
                         >
                             <div class="card-header">
@@ -70,12 +70,12 @@
                     </template>
                     <template v-else>
                         <template v-if="r.phenologyName === getNextPhenologyName(idx, rIdx)">
-                            <div class="phenology-name">
+                            <div class="phenology-name text-blue">
                                 {{ r.name }}
                             </div>
                         </template>
                         <template v-else>
-                            <div class="phenology-name">{{ r.name }}</div>
+                            <div class="phenology-name text-blue">{{ r.name }}</div>
                             <div class="phenology-name mr">
                                 {{ r.phenologyName }}
                             </div>
@@ -738,6 +738,7 @@ watch(
                 color: #fff;
                 padding: 4px 0;
                 font-size: 12px;
+                box-sizing: border-box;
                 &.mr{
                     margin-right: 3px;
                 }
@@ -745,12 +746,19 @@ watch(
                     width: 43px;
                     line-height: 43px;
                 }
+                &.text-blue{
+                    background: rgba(33, 153, 248, 0.15);
+                    color: #2199f8;
+                    border: 1px solid #2199f8;
+                    line-height: 18px;
+                    box-sizing: border-box;
+                }
             }
             .arranges {
                 display: flex;
                 max-width: calc(100vw - 92px);
                 min-width: calc(100vw - 92px);
-                gap: 10px;
+                gap: 5px;
                 letter-spacing: 0px;
                 .arrange-card {
                     width: 93%;
@@ -761,6 +769,12 @@ watch(
                     position: relative;
                     padding: 8px;
                     writing-mode: horizontal-tb;
+                    &.first-card{
+                        margin-top: 10px;
+                    }
+                    &.last-card{
+                        margin-bottom: 10px;
+                    }
                     .card-header {
                         display: flex;
                         justify-content: space-between;
@@ -857,10 +871,10 @@ watch(
         }
     }
     .reproductive-item + .reproductive-item {
-        padding-top: 11px;
+        padding-top: 3px;
     }
     .phenology-bar + .phenology-bar {
-        padding-top: 11px;
+        padding-top: 3px;
     }
     .timeline-term {
         position: absolute;

+ 4 - 4
src/views/old_mini/modify_work/completedWork.vue

@@ -220,13 +220,13 @@
             </div>
 
             <!-- 农资,步骤:农资已执行,请求确认 -->
-            <div class="fixed-btn-wrap center" v-if="curRole == 2 && !detailData?.expectedExecuteDate">
+            <div class="fixed-btn-wrap" :class="{'center': !getButtonText()}" v-if="curRole == 2 && !detailData?.expectedExecuteDate">
                 <div class="fixed-btn orange primary-text" @click="handleRemindExecuteTime" v-if="getButtonText()">提醒确认执行时间</div>
-                <div class="fixed-btn orange" v-else @click="selectExecuteTime">确认执行时间</div>
+                <div class="fixed-btn orange" @click="selectExecuteTime">确认执行时间</div>
             </div>
-            <div class="fixed-btn-wrap center" v-if="curRole == 2 && detailData?.expectedExecuteDate">
+            <div class="fixed-btn-wrap" :class="{'center': !getButtonText()}" v-if="curRole == 2 && detailData?.expectedExecuteDate">
                 <div class="fixed-btn primary primary-text width-120" @click="handleExecute" v-if="getButtonText()">提醒执行</div>
-                <div class="fixed-btn primary" v-else @click="showOfferPopup(detailData)">上传照片</div>
+                <div class="fixed-btn primary" @click="showOfferPopup(detailData)">上传照片</div>
             </div>
 
             <!-- 农资,步骤:农事已确认 -->

+ 2 - 0
src/views/old_mini/monitor/subPages/plan.vue

@@ -254,6 +254,8 @@ const getListMySchemes = (type = "auto") => {
         if (sessionStorage.getItem("active")) {
             active.value = sessionStorage.getItem("active");
             sessionStorage.removeItem("active");
+            currentTab.value = data[currentTabIndex.value];
+
         } else {
             if (type === "right") {
                 active.value = data[data.length - 1].id;