|
|
@@ -55,7 +55,7 @@
|
|
|
<div class="box-title warning">待执行农事</div>
|
|
|
<div class="box-text w-100">
|
|
|
<div class="row">
|
|
|
- <div v-for="(card, cardI) in pendingFarmWork" :key="cardI" class="status-card" :class="card.type"
|
|
|
+ <div v-for="(card, cardI) in pendingFarmWork" :key="cardI" class="status-card pending-card" :style="{ background: card.purposeColor }" :class="card.type"
|
|
|
>
|
|
|
<!-- <badge class="status-badge" dot
|
|
|
:offset="[80, -10]">
|
|
|
@@ -63,7 +63,7 @@
|
|
|
<div class="status-title">
|
|
|
{{ card.name }}
|
|
|
</div>
|
|
|
- <div class="status-sub">
|
|
|
+ <div class="status-sub pending-sub">
|
|
|
{{ card.status }}
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -106,7 +106,7 @@
|
|
|
<div class="report-header">
|
|
|
<!-- <img class="header-book" src="@/assets/img/home/book.png" alt="" /> -->
|
|
|
<div class="time-tag">{{ new Date().toISOString().split('T')[0] }}</div>
|
|
|
- <div class="report-title">作物长势报告</div>
|
|
|
+ <div class="report-title" @click="handleAddFarm">作物长势报告</div>
|
|
|
<div class="report-info pb-4">
|
|
|
<div class="info-item">
|
|
|
<img class="info-icon" src="@/assets/img/home/farm.png" alt="" />
|
|
|
@@ -199,9 +199,10 @@ const changeGarden = ({ id, name }) => {
|
|
|
...(paramsPage.value || {}),
|
|
|
subjectId: id,
|
|
|
};
|
|
|
+ // 初始化品种/大物候期转换
|
|
|
startInteractPopupRef.value.getPhenologyInitOrConfirmStatus();
|
|
|
getRegions();
|
|
|
- if(regionsData.value.length) {
|
|
|
+ if(regionsData.value.length && !route.query.hideInteraction) {
|
|
|
agriExecutePopupRef.value.showPopup(regionsData.value[currentIndex.value].farmId);
|
|
|
}
|
|
|
};
|
|
|
@@ -243,6 +244,10 @@ const handleLockClick = () => {
|
|
|
// });
|
|
|
}
|
|
|
|
|
|
+const handleAddFarm = () => {
|
|
|
+ router.push(`/create_farm?type=farmer&expertMiniUserId=81881&isReload=true`);
|
|
|
+}
|
|
|
+
|
|
|
const todayPatrolFocus = ref([]);
|
|
|
const pendingFarmWork = ref([]);
|
|
|
const getTodayPatrolFocus = () => {
|
|
|
@@ -709,16 +714,23 @@ linear-gradient(0deg, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2));
|
|
|
grid-template-columns: repeat(3, 1fr);
|
|
|
gap: 6px;
|
|
|
|
|
|
+
|
|
|
+
|
|
|
.status-card {
|
|
|
border-radius: 2px;
|
|
|
padding: 7px 0;
|
|
|
background: #ffffff;
|
|
|
border: 0.5px solid #e5e6eb;
|
|
|
+ color: #000;
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
align-items: center;
|
|
|
justify-content: center;
|
|
|
|
|
|
+ &.pending-card {
|
|
|
+ color: #fff;
|
|
|
+ }
|
|
|
+
|
|
|
.status-badge {
|
|
|
// position: absolute;
|
|
|
// top: 0;
|
|
|
@@ -732,6 +744,10 @@ linear-gradient(0deg, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2));
|
|
|
.status-sub {
|
|
|
font-size: 10px;
|
|
|
color: rgba(32, 32, 32, 0.4);
|
|
|
+
|
|
|
+ &.pending-sub {
|
|
|
+ color: #fff;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
&.risk-strong {
|