刘秀芳 1 неделя назад
Родитель
Сommit
77a63402fc

+ 4 - 0
src/api/modules/farm.js

@@ -93,4 +93,8 @@ module.exports = {
         url: config.base_dev_url + "lz_sample/speciesItemList?key="+config.mini_key,
         type: "get",
     },
+    getFarmFiles: {
+        url: config.base_url + "farm/getFarmFiles",
+        type: "get",
+    },
 }

+ 3 - 1
src/components/navigation.vue

@@ -56,9 +56,10 @@ const options = ref([]);
 eventBus.off('garden:organId', gardenOrganId)
 eventBus.on('garden:organId',gardenOrganId)
 
-const organId = ref(null)
+const organId = ref()
 function gardenOrganId(farmId){
     organId.value = farmId
+    console.log('organId.value', organId.value, farmId);
     VE_API.region.list({farmId}).then(res =>{
         options.value = res.data
         options.value.unshift({
@@ -72,6 +73,7 @@ function gardenOrganId(farmId){
 }
 
 const changeSelect = (e) =>{
+    console.log('changeSelect', e);
     eventBus.emit('area:id',{areaId:areaId.value,farmId:organId.value})
     sessionStorage.setItem('regionId',e)
     eventBus.emit('handleTab',)

+ 1 - 2
src/views/home/album/index.vue

@@ -338,12 +338,11 @@ eventBus.off("area:id", toggleAreaId);
 eventBus.on("area:id", toggleAreaId);
 const regionId = ref(null)
 function toggleAreaId({ areaId, farmId }) {
-    console.log('aaaaareid', areaId);
+    console.log('aaaaareid', areaId, farmId);
     regionId.value = areaId
     
     farmWorkList.value = []
     getFarmWorkList(farmId)
-    console.log('farmId', farmId);
     // getFarmLog()
     // farmId.value = farmId
 }

+ 52 - 16
src/views/home/components/homeFile.vue

@@ -42,7 +42,7 @@
 
             <div class="box-r">
                 <div class="overview-file">
-                    <div class="box-title">产量详情</div>
+                    <div class="box-title">产量信息</div>
                     <div class="box-wrap">
                         <div
                             class="box-item"
@@ -81,48 +81,53 @@
 import eventBus from "@/api/eventBus";
 import { onMounted, ref, } from "vue";
 const outputBox = ref([
-    { id: 1, name: "产量估计", value: "1100", unit: "斤/亩" },
-    { id: 2, name: "高质果率", value: "66", unit: "%" },
+    { id: 1, name: "产量估计", value: "--", unit: "斤/亩" },
+    { id: 2, name: "高质果率", value: "--", unit: "%" },
+    { id: 3, name: "雄花比例", value: "--", unit: "%" },
 ]);
 
 const qualityBox = ref([
-    { id: 5, name: "通风率", value: "78", unit: "%" },
-    { id: 6, name: "透光率", value: "56", unit: "%" },
-    { id: 7, name: "病虫等级", value: "80", unit: "%" },
+    { id: 5, name: "通风率", value: "--", unit: "%" },
+    { id: 6, name: "透光率", value: "--", unit: "%" },
+    { id: 7, name: "病虫等级", value: "--", unit: "" },
 ]);
 
 const photoBaseData = ref([
     {
         label: "品种",
-        value: "桂味",
+        value: "--",
     },
     {
         label: "冠幅平均表面积",
-        value: "8.7平方米",
+        value: "--",
     },
     {
         label: "平均总枝条",
-        value: "2000",
+        value: "--",
     },
     {
         label: "平均树龄",
-        value: "10年",
+        value: "--",
     },
 ]);
 
 const photoList = ref([
-    {key: "物候", statement: "营养老熟 延迟,12月10日 末次老熟"},
-    {key: "病虫", statement: "病虫 2025年02月19日,发现毛毡病异常1级"},
-    {key: "异常", statement: "2025年03月17日,发现花量大异常3级"},
-    {key: "农事", statement: "无营养异常"},
+    {key: "物候", statement: "--"},
+    {key: "病虫", statement: "--"},
+    {key: "异常", statement: "--"},
+    {key: "农事", statement: "--"},
 ]);
 
 const activeOuput = ref(1);
 
 // 品种
+const farmId = ref(null)
 onMounted(() => {
-    
-    getSpeciesItemList(766, 2)
+eventBus.off("area:id", toggleAreaId);
+eventBus.on("area:id", toggleAreaId);
+farmId.value = sessionStorage.getItem("farmId")
+
+
 })
 const selectOptions = ref([])
 const getSpeciesItemList = (farmId,regionId) =>{
@@ -141,6 +146,37 @@ function toggleAcitve(name) {
     activeOuput.value = name;
     eventBus.emit("change:mapPoint", name)
 }
+
+const regionId = ref(null)
+function toggleAreaId({ areaId, farmId }) {
+    console.log('22222aaaaareid',  areaId, farmId);
+    regionId.value = areaId
+    getSpeciesItemList(farmId, areaId)
+    getFileData(farmId, areaId)
+}
+
+function getFileData(farmId,regionId) {
+    VE_API.farm.getFarmFiles({farmId,regionId: regionId ? regionId: undefined}).then(({data}) =>{
+        const res = data.find(item => item.type_id == photoBaseData.value[0].speciesItemId)
+        photoBaseData.value[1].value = res.meta_info.avg_crown + "平方米"
+        photoBaseData.value[2].value = res.meta_info.avg_branch_num
+        photoBaseData.value[3].value = res.meta_info.avg_age + "年"
+        photoList.value[0].key = res.meta_info.phenology_info.key
+        photoList.value[0].statement = res.meta_info.phenology_info.statement
+        photoList.value[1].key = res.meta_info.dp_alert_info.key
+        photoList.value[1].statement = res.meta_info.dp_alert_info.statement
+        photoList.value[2].key = res.meta_info.grow_alert_info.key
+        photoList.value[2].statement = res.meta_info.grow_alert_info.statement
+        photoList.value[3].key = res.meta_info.prescription_info.key
+        photoList.value[3].statement = res.meta_info.prescription_info.statement
+        outputBox.value[0].value = res.production_info.production
+        outputBox.value[1].value = res.production_info.quality.toFixed(0)
+        outputBox.value[2].value = res.production_info.xionghua_ratio.toFixed(0)
+        qualityBox.value[0].value = res.ecology_info.ventilation
+        qualityBox.value[1].value = res.ecology_info.transmittance
+        qualityBox.value[2].value = res.ecology_info.dp_situation
+    })
+}
 </script>
 
 <style lang="scss" scoped>