fix: 切换图片属性，增加果园

src/components/fnHeader.vue

@@ -14,9 +14,6 @@
                 @change="toggleFarm"
             >
                 <el-option v-for="item in options" :key="item.organId" :label="item.name" :value="item.organId" />
-                <el-option label="从化凤二基地" value="90264" />
-                <el-option label="从化井岗基地" value="90263" />
-                <el-option label="创业果园" value="26196" />
             </el-select>
         </div>
         <div class="date" v-show="showDate">
@@ -110,6 +107,10 @@ const getGardenList = () => {
     };
     VE_API.home.userGarden(params).then((res) => {
         options.value = res.data;
+        options.value.push({name: "从化凤二基地",organId:90264, wkt: "POINT(113.67884027228604 23.511176408307904)"},
+        {name: "从化井岗基地",organId:90263, wkt: "POINT(113.5081595 23.5320866)"},
+        {name: "创业果园",organId:26196, wkt: "POINT(110.4909544 21.4152538)"},
+    );
     });
 };
 

src/components/navigation.vue

@@ -148,13 +148,16 @@ const toPage = () => {
 .navigation {
     position: fixed;
     top: 34px;
-    left: calc(50% - 470px);
+    // left: calc(50% - 470px);
+    left: 50%;
+    transform: translateX(-50%);
     width: calc(100% - 430px * 2);
     display: flex;
     justify-content: center;
     align-items: center;
     .select{
-        width: 120px;
+        // width: 120px;
+        width: 226px;
         height: 50px;
         margin-right: 21px;
         ::v-deep{

src/views/home/album/index.vue

@@ -171,7 +171,7 @@
                                                 <div class="detail-text">查看详情></div>
                                             </div>
                                         </div>
-                                        <div class="card-link" v-if="card.execute === 0 || card.execute === 2|| (card.execute === 3 && card.orderStatus === null)" @click.stop="handlePage(card)">
+                                        <div class="card-link" v-if="card.execute === 0 || card.execute === 2|| (card.execute === 3 && card.orderStatus === null) || card.orderStatus <0" @click.stop="handlePage(card)">
                                             <!-- <img src="@/assets/img/weather_index/expert-icon.png" /> -->
                                             <img class="expert-icon" :src="card.expertIcon" />
                                             <div class="expert-name">
@@ -320,14 +320,6 @@ const toExpert = (expertName) =>{
 eventBus.off('garden:organId', getListData)
 eventBus.on('garden:organId', getListData)
 
-const areaIdVal = ref(2)
-eventBus.off('area:id')
-eventBus.on('area:id', ({areaId,farmId}) => {
-    console.log('areaId', areaId);
-    areaIdVal.value = areaId
-    getFarmLog()
-})
-
 onMounted(() => {
     // farmId.value = 88388;
 
@@ -339,20 +331,25 @@ onMounted(() => {
 
     window.addEventListener("scroll", debouncedHandleScroll);
 });
-eventBus.off("area:id", areaId);
-eventBus.on("area:id", areaId);
+eventBus.off("area:id", toggleAreaId);
+eventBus.on("area:id", toggleAreaId);
 const regionId = ref(null)
-function areaId({ areaId, farmId }) {
+function toggleAreaId({ areaId, farmId }) {
+    console.log('aaaaareid', areaId);
     regionId.value = areaId
+    
+    farmWorkList.value = []
     getFarmWorkList(farmId)
+    
+    getFarmLog()
     // farmId.value = farmId
 }
 
 function getListData(farmIdVal) {
     farmId.value = farmIdVal
     getFarmDetail(farmId.value);
-    getFarmWorkList(farmId.value);
-    getFarmLog()
+    // getFarmWorkList(farmId.value);
+    // getFarmLog()
 }
 
 const farmId = ref(null);
@@ -366,7 +363,7 @@ onUnmounted(() => {
 // 果园日志
 const indicatorChartData = ref({})
 const getFarmLog = () => {
-    VE_API.farm.fetchFarmLog({id: areaIdVal.value, farmId: farmId.value}).then(({data,code}) => {
+    VE_API.farm.fetchFarmLog({id: regionId.value, farmId: farmId.value}).then(({data,code}) => {
         if(code === 0){
             indicatorChartData.value = data
             eventBus.emit('chart:updateOption', indicatorChartData.value)
@@ -1024,7 +1021,7 @@ function addNsRecord(){
                                     align-items: center;
                                 }
                                 img {
-                                    width: 64px;
+                                    width: 36px;
                                 }
                                 .icon {
                                     padding-right: 2px;

src/views/home/album_compoents/albumCarousel.vue

@@ -64,7 +64,7 @@
                             class="box-item"
                             v-for="(value, key) in images[currentIndex].detail2"
                             :key="key"
-                            @click="toggleAcitve(key)"
+                            @click="toggleQualityAcitve(key)"
                             :class="{ active: activeOuput === key }"
                         >
                             <div class="item-name">{{ key }}</div>
@@ -106,14 +106,6 @@ eventBus.on("click:point", function ({ farmId, sampleId, geoHash }) {
     getSampleFiles(geoHash);
     VE_API.miniimage.list(params).then((res) => {
         if (res.code === 0) {
-            res.data.map((item) => {
-                item.detail1 = { 总枝条数: "11000", 开花率: "56", 雄花比例: "38", 花穗率: "78" };
-                item.detail2 = {
-                    地形条件: "81",
-                    透光率: "66",
-                    通风率: "78",
-                };
-            });
             images.value = res.data;
             dialogVisible.value = true;
             console.log("images", images.value);
@@ -174,28 +166,29 @@ const photoBaseData = ref([
     },
 ]);
 
-const photoList = ref([
-    { key: "营养", statement: "营养老熟 延迟，12月10日 末次老熟" },
-    { key: "病虫", statement: "2月3日爆发啃食类虫害。" },
-    { key: "异常", statement: "1月3日，花带叶30%。3月4日，花量过大。" },
-]);
+const photoList = ref([]);
 
 const activeOuput = ref(1);
-const outputBox = ref([
-    { id: 1, name: "花穗率", value: "78%" },
-    { id: 2, name: "总枝条数", value: "11000" },
-    { id: 3, name: "开花率", value: "56%" },
-    { id: 4, name: "雄花比例", value: "38%" },
-]);
 
-const qualityBox = ref([
-    { id: 5, name: "通风率", value: "78%" },
-    { id: 6, name: "透光率", value: "66%" },
-    { id: 7, name: "地形条件", value: "81%" },
-]);
+// 产量详情
+function toggleAcitve(name) {
+    activeOuput.value = name;
+    if (name.indexOf("开花") > -1) {
+        eventBus.emit("change:watermark", "开花目标框")
+    } else if (name.indexOf("花穗") > -1) {
+        eventBus.emit("change:watermark", "花穗目标框")
+    } else if (name.indexOf("雄花") > -1) {
+        eventBus.emit("change:watermark", "雄花目标框")
+    } else if (name.indexOf("枝条数") > -1) {
+        eventBus.emit("change:watermark", "枝条目标框")
+    } else {
+        eventBus.emit("change:watermark", "")
+    }
+}
+
+// 质量详情
+function toggleQualityAcitve() {
 
-function toggleAcitve(id) {
-    activeOuput.value = id;
 }
 </script>