|
@@ -157,12 +157,14 @@
|
|
|
<div v-else>
|
|
|
<div class="card-desc condition-wrap">
|
|
|
<span class="desc-title">触发条件:</span>
|
|
|
- {{ card.condition }}
|
|
|
- </div>
|
|
|
- <div v-if="card.executeDate || card.solarName" class="card-desc">
|
|
|
- <span class="desc-title">推荐时间:</span>
|
|
|
- {{ card.executeDate || card.solarName }}
|
|
|
+ <template v-for="condition in card.conditionList" :key="condition.index">
|
|
|
+ {{condition.name}}大于{{condition.value * 100}}%
|
|
|
+ </template>
|
|
|
</div>
|
|
|
+<!-- <div v-if="card.executeDate || card.solarName" class="card-desc">-->
|
|
|
+<!-- <span class="desc-title">推荐时间:</span>-->
|
|
|
+<!-- {{ card.executeDate || card.solarName }}-->
|
|
|
+<!-- </div>-->
|
|
|
<div v-if="card.execute === 4" class="card-desc">
|
|
|
<span class="desc-title">{{
|
|
|
card.execute === 5 ? "复核时间:" : "执行时间:"
|
|
@@ -171,29 +173,30 @@
|
|
|
</div>
|
|
|
<div class="card-desc">
|
|
|
<span class="desc-title">农事编号:</span>
|
|
|
- {{ card.code }}
|
|
|
+ {{ card.code.slice(0,10) }}
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="card-desc last-desc">
|
|
|
<span class="desc-title">药物处方:</span>
|
|
|
<div class="rescription-wrap">
|
|
|
<div class="rescription">
|
|
|
- <span
|
|
|
- v-for="(
|
|
|
+ <template v-for="prescription in card.prescriptionList" :key="prescription.name">
|
|
|
+ <span
|
|
|
+ v-for="(
|
|
|
fertilizer, fertilizerI
|
|
|
- ) in card.pesticideFertilizerList"
|
|
|
- :key="fertilizerI"
|
|
|
- >
|
|
|
- {{ fertilizer.ratio ? fertilizer.ratio + "倍" : "" }}
|
|
|
- {{ fertilizer.name }}
|
|
|
+ ) in prescription.pesticideFertilizerList"
|
|
|
+ :key="fertilizerI"
|
|
|
+ >
|
|
|
+ {{ fertilizer.defaultName }}
|
|
|
<span
|
|
|
v-if="
|
|
|
- fertilizerI !== card.pesticideFertilizerList.length - 1
|
|
|
+ fertilizerI !== prescription.pesticideFertilizerList.length - 1
|
|
|
"
|
|
|
>
|
|
|
+
|
|
|
</span>
|
|
|
</span>
|
|
|
+ </template>
|
|
|
</div>
|
|
|
<div class="detail-text">查看详情></div>
|
|
|
</div>
|
|
@@ -257,11 +260,11 @@
|
|
|
</div>
|
|
|
<div v-if="card.execute !== 0 && card.execute !== 2" :class="['over-img']">
|
|
|
<!-- 图片列表 -->
|
|
|
- <album-carousel7d
|
|
|
- :key="farmName"
|
|
|
- :farmId="farmId"
|
|
|
- :farmWork="card"
|
|
|
- ></album-carousel7d>
|
|
|
+<!-- <album-carousel7d-->
|
|
|
+<!-- :key="farmName"-->
|
|
|
+<!-- :farmId="farmId"-->
|
|
|
+<!-- :farmWork="card"-->
|
|
|
+<!-- ></album-carousel7d>-->
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -351,7 +354,7 @@ onMounted(() => {
|
|
|
|
|
|
getFarmDetail(farmId.value);
|
|
|
getFarmWorkList(farmId.value);
|
|
|
- getFarmLog()
|
|
|
+ // getFarmLog()
|
|
|
window.addEventListener("scroll", debouncedHandleScroll);
|
|
|
});
|
|
|
|
|
@@ -439,7 +442,7 @@ const getSecondLastIndex = (data) => {
|
|
|
const filteredItems = data.filter((item) => item.execute === 3);
|
|
|
// 获取倒数第二项
|
|
|
if (filteredItems.length >= 1) {
|
|
|
- const secondLastItem = filteredItems[filteredItems.length - 1];
|
|
|
+ const secondLastItem = filteredItems[filteredItems.length-1];
|
|
|
// 获取该项在原数组中的索引
|
|
|
secondLastIndex.value = data.indexOf(secondLastItem);
|
|
|
|
|
@@ -513,7 +516,7 @@ function addNsRecord(){
|
|
|
.album-wrap {
|
|
|
width: 100%;
|
|
|
height: 100%;
|
|
|
-
|
|
|
+
|
|
|
.slot-right {
|
|
|
width: 70%;
|
|
|
cursor: pointer;
|