Browse Source

feat:添加基本信息弹窗和农资农服的农事动态

wangsisi 1 tuần trước cách đây
mục cha
commit
278870d16b

BIN
src/assets/img/home/popup-mask.png


+ 1392 - 0
src/views/old_mini/agri_services/components/farmDynamics.vue

@@ -0,0 +1,1392 @@
+<template>
+    <div class="farm-dynamics">
+        <div class="record-filter">
+            <div
+                class="filter-item"
+                v-for="(item, index) in filterType"
+                :key="index"
+                @click="handlePlanClick(index)"
+                :class="{ active: activePlanIndex === index }"
+            >
+                {{ item }}
+            </div>
+        </div>
+        <div class="task-content">
+            <div class="plan-menu">
+                <el-anchor :container="containerRef" direction="vertical" type="default" @click="handleClick">
+                    <el-menu :default-active="defaultActive" class="el-menu-vertical-demo">
+                        <el-sub-menu v-for="(menu, index) in menuData" :key="index" :index="String(menu.id)">
+                            <template #title>
+                                <img class="menu-icon" :src="require(`@/assets/img/gallery/icon-${index}.png`)" />
+                                <span class="menu-text">{{ menu.title }}</span>
+                            </template>
+                            <el-menu-item v-for="item in menu.children" :key="item.id" :index="`${menu.id}-${item.id}`">
+                                <el-anchor-link :href="item.href" :title="item.title" />
+                            </el-menu-item>
+                        </el-sub-menu>
+                    </el-menu>
+                </el-anchor>
+            </div>
+            <div class="expert-content" ref="containerRef">
+                <div v-for="(section, index) in contentData" :key="index" class="content-section">
+                    <div class="section-id" :id="section.targetId"></div>
+                    <record-item :record-item-data="section" :onlyRecipeName="true" class="recipe-item">
+                        <template #title>
+                            <div class="box-title">
+                                <div class="title-l">
+                                    {{ section.title }}
+                                    <span class="parent-text">{{ section.parentTitle || "秋梢期" }}</span>
+                                </div>
+                                <div class="title-r">
+                                    <span class="r-dot"></span>
+                                    2区
+                                </div>
+                            </div>
+                        </template>
+                        <template #footer>
+                            <div class="apply-wrap" v-if="section.orderStatus === 3">
+                                <div class="apply-title">申请列表</div>
+                                <div class="apply-list">
+                                    <div class="apply-item" v-for="(item, index) in 2" :key="index">
+                                        <div class="apply-info">
+                                            <el-avatar
+                                                :size="17"
+                                                src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png"
+                                            />
+                                            <span class="apply-name">农资农服农资1</span>
+                                            <span class="apply-score">5.0分</span>
+                                        </div>
+                                        <div class="apply-text">服务设备:无人机、水肥一体机、水肥</div>
+                                        <div class="action-r apply-action">
+                                            <div class="action-item default-item">联系他们</div>
+                                            <div class="action-item primary-item">接受申请</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="action-group">
+                                <div class="action-l">查看详情</div>
+                                <div class="action-r" v-if="section.orderStatus === 0">
+                                    <div class="action-item second-item">拍照识别</div>
+                                    <div class="action-item primary-item">去确认</div>
+                                </div>
+                                <div class="action-r" v-if="section.orderStatus === 1">
+                                    <div class="action-item warning-item">发起需求</div>
+                                    <div class="action-item primary-item">确认完成</div>
+                                </div>
+                                <div class="action-r" v-if="section.orderStatus === 2">
+                                    <div class="action-item warning-item">发起需求</div>
+                                    <div class="action-item primary-item">去复核</div>
+                                </div>
+                                <div class="action-r" v-if="section.orderStatus === 3 || section.orderStatus === 4">
+                                    <div class="action-item cancel-item">取消发起</div>
+                                </div>
+                            </div>
+                        </template>
+                    </record-item>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script setup>
+import { ref } from "vue";
+import recordItem from "@/components/recordItem.vue";
+
+const filterType = ref(["申请列表", "未接单", "待触发"]);
+const activePlanIndex = ref(0);
+const handlePlanClick = (index) => {
+    activePlanIndex.value = index;
+};
+
+const containerRef = ref(null);
+const handleClick = (e) => {
+    e.preventDefault();
+};
+
+// 菜单
+const defaultActive = ref("1-1");
+const menuData = [
+    {
+        id: 1,
+        title: "秋梢期",
+        children: [
+            { id: 1, title: "巡园农事", href: "#part1" },
+            { id: 2, title: "梢期防虫", href: "#part2" },
+            { id: 3, title: "梢期营养", href: "#part3" },
+        ],
+    },
+    {
+        id: 2,
+        title: "开花期",
+        children: [
+            { id: 1, title: "巡园农事", href: "#part4" },
+            { id: 2, title: "摇花吹花", href: "#part5" },
+            { id: 3, title: "花期防治", href: "#part6" },
+        ],
+    },
+];
+
+const contentData = ref([
+    {
+        targetId: "part1",
+        title: "巡园农事",
+        parentTitle: "秋梢期",
+        reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,虫害风险控制优异,未发现虫害风险",
+        expert: 91356,
+        orderStatus: 3,
+        activeStatus: 0,
+        regionId: 2,
+        speciesId: "1",
+        speciesName: "荔枝",
+        farmWorkId: "699343457474318336",
+        farmWorkLibId: "699343457474318336",
+        farmWorkLibName: "梢期防虫",
+        farmWorkName: "梢期防虫",
+        expertIcon:
+            "https://birdseye-img.sysuimars.com/birdseye-look-vue/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250411150343.png",
+        expertName: "韦帮稳",
+        icon: 4,
+        beforeExecuteDate: "2025-08-01",
+        executeDate: "2025-08-15",
+        code: "BZ-BC-04-SQFC-20",
+        expertPrescription: "",
+        condition: "单树嫩叶率大于20.0%",
+        defaultFarmWork: 0,
+        farmWorkType: 3,
+        farmWorkTypeName: "病虫",
+        usageMode: "叶面施",
+        serviceMain: "广州泽秾丰农资有限公司",
+        updateDate6: null,
+        confirmPicture: [],
+        executeMain: "广州泽秾丰农资有限公司",
+        storeShortName: "泽秾丰",
+        serviceRegion: "广州市从化区荔枝博览园",
+        prescriptionList: [
+            {
+                name: "营养",
+                pesticideFertilizerList: [
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "尿素",
+                        defaultRatio: 0,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 15000.0,
+                        muUsage2: 15000.0,
+                        ratio: 0,
+                        ratio2: 0,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施、根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1001",
+                        pesticideFertilizerId: "1",
+                        pesticideFertilizerName: "尿素",
+                        brand: "山东联盟",
+                        typeName: "营养",
+                        price: 132,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "15-15-15复合肥",
+                        defaultRatio: 0,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 45000.0,
+                        muUsage2: 45000.0,
+                        ratio: 0,
+                        ratio2: 0,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1002",
+                        pesticideFertilizerId: "2",
+                        pesticideFertilizerName: "15-15-15复合肥",
+                        brand: "金正大",
+                        typeName: "营养",
+                        price: 220,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                ],
+            },
+        ],
+    },
+    {
+        targetId: "part2",
+        title: "梢期防虫",
+        parentTitle: "秋梢期",
+        consequenceText: "如果不做本次农事,会导致您的产量、质量下降30%,管理得分降低10分",
+        id: "274654",
+        reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,树体营养较充足,土壤肥力增加",
+        farmName: "荔枝博览园",
+        farmPoint: "POINT(113.61702297075017 23.584863449735067)",
+        orderId: "745923632567422976",
+        area: 2.719998598098755,
+        expert: 91356,
+        orderStatus: 4,
+        activeStatus: 0,
+        farmId: 766,
+        regionId: 2,
+        speciesId: "1",
+        speciesName: "荔枝",
+        agriculturalId: 24,
+        farmWorkId: "699343457444958208",
+        farmWorkLibId: "699343457444958208",
+        farmWorkLibName: "梢期营养",
+        farmWorkName: "梢期营养",
+        expertIcon:
+            "https://birdseye-img.sysuimars.com/birdseye-look-vue/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250411150343.png",
+        expertName: "韦帮稳",
+        expertUserIcon: "",
+        expertUserName: "韦帮稳",
+        icon: 4,
+        indexChart: [],
+        indexName: "",
+        beforeExecuteDate: "2025-05-26",
+        checkDate: null,
+        executeDate: "2025-08-01",
+        indexJson: "",
+        code: "BZ-YY-04-SQYY-20",
+        expertPrescription: "",
+        condition: "园区叶芽率大于20.0%",
+        solarName: "",
+        reCheck: null,
+        executeBlueZones: [
+            {
+                id: "ws0y1m6x7cjz",
+                level: null,
+            },
+            {
+                id: "ws0y1md9v3ht",
+                level: null,
+            },
+            {
+                id: "ws0y1mdspbk7",
+                level: null,
+            },
+            {
+                id: "ws0y1mdvvdsz",
+                level: null,
+            },
+            {
+                id: "ws0y1me545tg",
+                level: null,
+            },
+        ],
+        menu: 1,
+        isEdit: 0,
+        isMaster: null,
+        num: null,
+        purpose: "",
+        selfExec: null,
+        defaultFarmWork: 0,
+        farmWorkType: 2,
+        farmWorkTypeName: "营养",
+        type: 1,
+        execute: 4,
+        updateDate0: "2025-08-20",
+        updateDate1: null,
+        updateDate2: null,
+        updateDate3: null,
+        updateDate4: null,
+        updateDate5: null,
+        usageMode: "根部施",
+        serviceMain: "广州泽秾丰农资有限公司",
+        updateDate6: null,
+        confirmPicture: [],
+        executeMain: "广州泽秾丰农资有限公司",
+        storeShortName: "泽秾丰",
+        weatherWarningMsg: "",
+        executeEvidence: [],
+        userEvaluation: null,
+        reviewDate: null,
+        reviewDate2: null,
+        reviewImage: [],
+        reviewImage2: [],
+        serviceRegion: "广州市从化区荔枝博览园",
+        users: [
+            {
+                id: null,
+                orderId: null,
+                serviceType: null,
+                userType: null,
+                userId: 81881,
+                joinStatus: null,
+                icon: "https://birdseye-img.sysuimars.com/birdseye-look-mini/Group%201321316260.png",
+                userName: "飞鸟种植助手",
+                area: "",
+                point: "",
+                farmName: "",
+                selected: null,
+            },
+        ],
+        cost: null,
+        prescriptionList: [
+            {
+                name: "营养",
+                pesticideFertilizerList: [
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "尿素",
+                        defaultRatio: 0,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 15000.0,
+                        muUsage2: 15000.0,
+                        ratio: 0,
+                        ratio2: 0,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施、根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1001",
+                        pesticideFertilizerId: "1",
+                        pesticideFertilizerName: "尿素",
+                        brand: "山东联盟",
+                        typeName: "营养",
+                        price: 132,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "15-15-15复合肥",
+                        defaultRatio: 0,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 45000.0,
+                        muUsage2: 45000.0,
+                        ratio: 0,
+                        ratio2: 0,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1002",
+                        pesticideFertilizerId: "2",
+                        pesticideFertilizerName: "15-15-15复合肥",
+                        brand: "金正大",
+                        typeName: "营养",
+                        price: 220,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                ],
+            },
+        ],
+        conditionList: [
+            {
+                index: "1-2-001-02-02-02-01-0008",
+                name: "园区叶芽率",
+                type: 1,
+                value: "0.2",
+            },
+        ],
+    },
+    {
+        targetId: "part3",
+        title: "梢期营养",
+        consequenceText: "如果不做本次农事,会导致您的产量、质量下降5%,管理得分降低2分",
+        reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,树体营养较充足,转色速度非常稳定,转色率超过80%",
+        farmName: "荔枝博览园",
+        farmPoint: "POINT(113.61702297075017 23.584863449735067)",
+        orderId: "745923697054846976",
+        area: 2.719998598098755,
+        expert: 91356,
+        orderStatus: 2,
+        activeStatus: 0,
+        farmId: 766,
+        regionId: 2,
+        speciesId: "1",
+        speciesName: "荔枝",
+        agriculturalId: 24,
+        farmWorkId: "699343457482706947",
+        farmWorkLibId: "699343457482706947",
+        farmWorkLibName: "转色营养",
+        farmWorkName: "转色营养",
+        expertIcon:
+            "https://birdseye-img.sysuimars.com/birdseye-look-vue/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250411150343.png",
+        expertName: "韦帮稳",
+        expertUserIcon: "",
+        expertUserName: "韦帮稳",
+        icon: 0,
+        indexChart: [],
+        indexName: "",
+        beforeExecuteDate: "2025-05-26",
+        checkDate: null,
+        executeDate: "2025-05-26",
+        indexJson: "",
+        code: "BZ-YY-06-ZSYY-100",
+        expertPrescription: "",
+        condition: "园区转色率大于20.0%",
+        solarName: "",
+        reCheck: null,
+        executeBlueZones: [
+            {
+                id: "ws0y1m6x7cjz",
+                level: null,
+            },
+            {
+                id: "ws0y1md9v3ht",
+                level: null,
+            },
+            {
+                id: "ws0y1mdspbk7",
+                level: null,
+            },
+            {
+                id: "ws0y1mdvvdsz",
+                level: null,
+            },
+            {
+                id: "ws0y1me545tg",
+                level: null,
+            },
+        ],
+        menu: 1,
+        isEdit: 0,
+        isMaster: null,
+        num: null,
+        purpose: "",
+        selfExec: null,
+        defaultFarmWork: 0,
+        farmWorkType: 2,
+        farmWorkTypeName: "营养",
+        type: 1,
+        execute: 4,
+        updateDate0: "2025-08-20",
+        updateDate1: null,
+        updateDate2: null,
+        updateDate3: null,
+        updateDate4: null,
+        updateDate5: null,
+        usageMode: "根部施",
+        serviceMain: "广州泽秾丰农资有限公司",
+        updateDate6: null,
+        confirmPicture: [],
+        executeMain: "广州泽秾丰农资有限公司",
+        storeShortName: "泽秾丰",
+        weatherWarningMsg: "",
+        executeEvidence: [],
+        userEvaluation: null,
+        reviewDate: null,
+        reviewDate2: null,
+        reviewImage: [],
+        reviewImage2: [],
+        serviceRegion: "广州市从化区荔枝博览园",
+        users: [
+            {
+                id: null,
+                orderId: null,
+                serviceType: null,
+                userType: null,
+                userId: 81881,
+                joinStatus: null,
+                icon: "https://birdseye-img.sysuimars.com/birdseye-look-mini/Group%201321316260.png",
+                userName: "飞鸟种植助手",
+                area: "",
+                point: "",
+                farmName: "",
+                selected: null,
+            },
+        ],
+        cost: null,
+        prescriptionList: [
+            {
+                name: "营养",
+                pesticideFertilizerList: [
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "矿源黄腐酸钾",
+                        defaultRatio: 2000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 4.0,
+                        muUsage2: 4.0,
+                        ratio: 2000,
+                        ratio2: 200,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施、根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1166",
+                        pesticideFertilizerId: "166",
+                        pesticideFertilizerName: "矿源黄腐酸钾",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 15000,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "有机质水溶肥",
+                        defaultRatio: 5000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 10.0,
+                        muUsage2: 10.0,
+                        ratio: 5000,
+                        ratio2: 500,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1167",
+                        pesticideFertilizerId: "167",
+                        pesticideFertilizerName: "有机质水溶肥",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 10000,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "磷酸二氢钾",
+                        defaultRatio: 5000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 10.0,
+                        muUsage2: 10.0,
+                        ratio: 5000,
+                        ratio2: 500,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施、根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1168",
+                        pesticideFertilizerId: "168",
+                        pesticideFertilizerName: "磷酸二氢钾",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 12000,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "高钾复合肥",
+                        defaultRatio: 5000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 10.0,
+                        muUsage2: 10.0,
+                        ratio: 5000,
+                        ratio2: 500,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1169",
+                        pesticideFertilizerId: "169",
+                        pesticideFertilizerName: "高钾复合肥",
+                        brand: "未知",
+                        typeName: "营养",
+                        price: 245,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "红牛硫酸钾",
+                        defaultRatio: 5000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 10.0,
+                        muUsage2: 10.0,
+                        ratio: 5000,
+                        ratio2: 500,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1170",
+                        pesticideFertilizerId: "170",
+                        pesticideFertilizerName: "红牛硫酸钾",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 230,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                ],
+            },
+        ],
+        conditionList: [
+            {
+                index: "1-2-016-02-02-02-01-0008",
+                name: "园区转色率",
+                type: 1,
+                value: "0.2",
+            },
+        ],
+    },
+    {
+        targetId: "part4",
+        title: "巡园农事",
+        parentTitle: "开花期",
+        consequenceText: "如果不做本次农事,会导致您的产量、质量下降20%,管理得分降低8分",
+        id: "274672",
+        reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,病虫害基数得到大幅下降,未发现病虫害风险",
+        farmName: "荔枝博览园",
+        farmPoint: "POINT(113.61702297075017 23.584863449735067)",
+        orderId: "745923690209742848",
+        area: 2.719998598098755,
+        expert: 91356,
+        orderStatus: 3,
+        activeStatus: 0,
+        farmId: 766,
+        regionId: 2,
+        speciesId: "1",
+        speciesName: "荔枝",
+        agriculturalId: 24,
+        farmWorkId: "699343457478512646",
+        farmWorkLibId: "699343457478512646",
+        farmWorkLibName: "果期防治II",
+        farmWorkName: "果期防治II",
+        expertIcon:
+            "https://birdseye-img.sysuimars.com/birdseye-look-vue/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250411150343.png",
+        expertName: "韦帮稳",
+        expertUserIcon: "",
+        expertUserName: "韦帮稳",
+        icon: 1,
+        indexChart: [],
+        indexName: "",
+        beforeExecuteDate: "2025-05-06",
+        checkDate: null,
+        executeDate: "2025-05-12",
+        indexJson: "",
+        code: "BZ-BC-06-GQFZ2-100",
+        expertPrescription: "",
+        condition: "园区膨果率大于20.0%",
+        solarName: "",
+        reCheck: null,
+        executeBlueZones: [
+            {
+                id: "ws0y1m6x7cjz",
+                level: null,
+            },
+            {
+                id: "ws0y1md9v3ht",
+                level: null,
+            },
+            {
+                id: "ws0y1mdspbk7",
+                level: null,
+            },
+            {
+                id: "ws0y1mdvvdsz",
+                level: null,
+            },
+            {
+                id: "ws0y1me545tg",
+                level: null,
+            },
+        ],
+        menu: 1,
+        isEdit: 0,
+        isMaster: null,
+        num: null,
+        purpose: "",
+        selfExec: null,
+        defaultFarmWork: 0,
+        farmWorkType: 3,
+        farmWorkTypeName: "病虫",
+        type: 1,
+        execute: 4,
+        updateDate0: "2025-08-20",
+        updateDate1: null,
+        updateDate2: null,
+        updateDate3: null,
+        updateDate4: null,
+        updateDate5: null,
+        usageMode: "叶面施",
+        serviceMain: "广州泽秾丰农资有限公司",
+        updateDate6: null,
+        confirmPicture: [],
+        executeMain: "广州泽秾丰农资有限公司",
+        storeShortName: "泽秾丰",
+        weatherWarningMsg: "",
+        executeEvidence: [],
+        userEvaluation: null,
+        reviewDate: null,
+        reviewDate2: null,
+        reviewImage: [],
+        reviewImage2: [],
+        serviceRegion: "广州市从化区荔枝博览园",
+        users: [
+            {
+                id: null,
+                orderId: null,
+                serviceType: null,
+                userType: null,
+                userId: 81881,
+                joinStatus: null,
+                icon: "https://birdseye-img.sysuimars.com/birdseye-look-mini/Group%201321316260.png",
+                userName: "飞鸟种植助手",
+                area: "",
+                point: "",
+                farmName: "",
+                selected: null,
+            },
+        ],
+        cost: null,
+        prescriptionList: [
+            {
+                name: "病虫",
+                pesticideFertilizerList: [
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "威远.绿凯",
+                        defaultRatio: 150000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 150.0,
+                        muUsage2: 150.0,
+                        ratio: 150000,
+                        ratio2: 15000,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1147",
+                        pesticideFertilizerId: "147",
+                        pesticideFertilizerName: "威远.绿凯",
+                        brand: "利民控股绿凯",
+                        typeName: "病虫",
+                        price: 90,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "微量元素益元液",
+                        defaultRatio: 150000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 300.0,
+                        muUsage2: 300.0,
+                        ratio: 150000,
+                        ratio2: 15000,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1174",
+                        pesticideFertilizerId: "174",
+                        pesticideFertilizerName: "微量元素益元液",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 60,
+                        unit: "ml",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "中量元素益元液",
+                        defaultRatio: 150000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 300.0,
+                        muUsage2: 300.0,
+                        ratio: 150000,
+                        ratio2: 15000,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1175",
+                        pesticideFertilizerId: "175",
+                        pesticideFertilizerName: "中量元素益元液",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 30,
+                        unit: "ml",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "济南中科翠剑",
+                        defaultRatio: 150000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 150.0,
+                        muUsage2: 150.0,
+                        ratio: 150000,
+                        ratio2: 15000,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1149",
+                        pesticideFertilizerId: "149",
+                        pesticideFertilizerName: "吡唑醚菌酯",
+                        brand: "济南中科翠剑",
+                        typeName: "病虫",
+                        price: 60,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "佳果天成",
+                        defaultRatio: 150000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 300.0,
+                        muUsage2: 300.0,
+                        ratio: 150000,
+                        ratio2: 15000,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1171",
+                        pesticideFertilizerId: "171",
+                        pesticideFertilizerName: "佳果天成",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 120,
+                        unit: "ml",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "高效氟氯氰菊酯",
+                        defaultRatio: 150000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 150.0,
+                        muUsage2: 150.0,
+                        ratio: 150000,
+                        ratio2: 15000,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1155",
+                        pesticideFertilizerId: "155",
+                        pesticideFertilizerName: "高效氟氯氰菊酯",
+                        brand: "广东立威.立功",
+                        typeName: "病虫",
+                        price: 50,
+                        unit: "ml",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "联苯噻虫嗪",
+                        defaultRatio: 150000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 150.0,
+                        muUsage2: 150.0,
+                        ratio: 150000,
+                        ratio2: 15000,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1156",
+                        pesticideFertilizerId: "156",
+                        pesticideFertilizerName: "联苯噻虫嗪",
+                        brand: "青岛金正飞灵",
+                        typeName: "病虫",
+                        price: 60,
+                        unit: "ml",
+                        executeStyle: null,
+                    },
+                ],
+            },
+        ],
+        conditionList: [
+            {
+                index: "1-2-014-02-02-02-01-0008",
+                name: "园区膨果率",
+                type: 1,
+                value: "0.2",
+            },
+        ],
+    },
+    {
+        id: "part5",
+        title: "摇花吹花",
+        parentTitle: "开花期",
+        consequenceText: "如果不做本次农事,会导致您的产量、质量下降15%,管理得分降低5分",
+        id: "274671",
+        reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,树体营养较充足,膨果速度非常稳定,膨果率超过80%",
+        farmName: "荔枝博览园",
+        farmPoint: "POINT(113.61702297075017 23.584863449735067)",
+        orderId: "745923686854299648",
+        area: 2.719998598098755,
+        expert: 91356,
+        orderStatus: 1,
+        activeStatus: 0,
+        farmId: 766,
+        regionId: 2,
+        speciesId: "1",
+        speciesName: "荔枝",
+        agriculturalId: 24,
+        farmWorkId: "699343457482706944",
+        farmWorkLibId: "699343457482706944",
+        farmWorkLibName: "膨果营养",
+        farmWorkName: "膨果营养",
+        expertIcon:
+            "https://birdseye-img.sysuimars.com/birdseye-look-vue/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250411150343.png",
+        expertName: "韦帮稳",
+        expertUserIcon: "",
+        expertUserName: "韦帮稳",
+        icon: 2,
+        indexChart: [],
+        indexName: "",
+        beforeExecuteDate: "2025-05-01",
+        checkDate: null,
+        executeDate: "2025-05-06",
+        indexJson: "",
+        code: "BZ-YY-06-PGYY-100",
+        expertPrescription: "",
+        condition: "园区膨果率大于10.0%",
+        solarName: "",
+        reCheck: null,
+        executeBlueZones: [
+            {
+                id: "ws0y1m6x7cjz",
+                level: null,
+            },
+            {
+                id: "ws0y1md9v3ht",
+                level: null,
+            },
+            {
+                id: "ws0y1mdspbk7",
+                level: null,
+            },
+            {
+                id: "ws0y1mdvvdsz",
+                level: null,
+            },
+            {
+                id: "ws0y1me545tg",
+                level: null,
+            },
+        ],
+        menu: 1,
+        isEdit: 0,
+        isMaster: null,
+        num: null,
+        purpose: "",
+        selfExec: null,
+        defaultFarmWork: 0,
+        farmWorkType: 2,
+        farmWorkTypeName: "营养",
+        type: 1,
+        execute: 4,
+        updateDate0: "2025-08-20",
+        updateDate1: null,
+        updateDate2: null,
+        updateDate3: null,
+        updateDate4: null,
+        updateDate5: null,
+        usageMode: "根部施",
+        serviceMain: "广州泽秾丰农资有限公司",
+        updateDate6: null,
+        confirmPicture: [],
+        executeMain: "广州泽秾丰农资有限公司",
+        storeShortName: "泽秾丰",
+        weatherWarningMsg: "",
+        executeEvidence: [],
+        userEvaluation: null,
+        reviewDate: null,
+        reviewDate2: null,
+        reviewImage: [],
+        reviewImage2: [],
+        serviceRegion: "广州市从化区荔枝博览园",
+        users: [
+            {
+                id: null,
+                orderId: null,
+                serviceType: null,
+                userType: null,
+                userId: 81881,
+                joinStatus: null,
+                icon: "https://birdseye-img.sysuimars.com/birdseye-look-mini/Group%201321316260.png",
+                userName: "飞鸟种植助手",
+                area: "",
+                point: "",
+                farmName: "",
+                selected: null,
+            },
+        ],
+        cost: null,
+        prescriptionList: [
+            {
+                name: "营养",
+                pesticideFertilizerList: [
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "硝酸铵钙",
+                        defaultRatio: 0,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 15000.0,
+                        muUsage2: 15000.0,
+                        ratio: 0,
+                        ratio2: 0,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1162",
+                        pesticideFertilizerId: "162",
+                        pesticideFertilizerName: "硝酸铵钙",
+                        brand: "未知",
+                        typeName: "营养",
+                        price: 2000,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "氯化钾",
+                        defaultRatio: 0,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 15000.0,
+                        muUsage2: 15000.0,
+                        ratio: 0,
+                        ratio2: 0,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1163",
+                        pesticideFertilizerId: "163",
+                        pesticideFertilizerName: "氯化钾",
+                        brand: "未知",
+                        typeName: "营养",
+                        price: 4500,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "高氮水溶肥",
+                        defaultRatio: 5000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 10.0,
+                        muUsage2: 10.0,
+                        ratio: 5000,
+                        ratio2: 500,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1165",
+                        pesticideFertilizerId: "165",
+                        pesticideFertilizerName: "高氮水溶肥",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 8500,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "矿源黄腐酸钾",
+                        defaultRatio: 2000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 4.0,
+                        muUsage2: 4.0,
+                        ratio: 2000,
+                        ratio2: 200,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施、根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1166",
+                        pesticideFertilizerId: "166",
+                        pesticideFertilizerName: "矿源黄腐酸钾",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 15000,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                ],
+            },
+        ],
+        conditionList: [
+            {
+                index: "1-2-014-02-02-02-01-0008",
+                name: "园区膨果率",
+                type: 1,
+                value: "0.1",
+            },
+        ],
+    },
+]);
+</script>
+<style lang="scss" scoped>
+.farm-dynamics {
+    width: 100%;
+    height: 100vh;
+    background: #f5f7fb;
+    .record-filter {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        background: #fff;
+        padding: 5px 0;
+        .filter-item {
+            color: rgba(0, 0, 0, 0.5);
+            padding: 0 12px;
+            height: 28px;
+            line-height: 28px;
+            border-radius: 20px;
+            &.active {
+                background: rgba(33, 153, 248, 0.2);
+                color: #2199f8;
+            }
+        }
+        .filter-item + .filter-item {
+            margin-left: 10px;
+        }
+    }
+    .task-content {
+        display: flex;
+        padding-top: 10px;
+        height: calc(100% - 140px);
+        .plan-menu {
+            width: 90px;
+            height: 100%;
+            padding: 10px 0;
+            box-sizing: border-box;
+            background: #fff;
+            border-radius: 0 10px 10px 0;
+            .menu-icon {
+                width: 13px;
+            }
+            .menu-text {
+                padding: 0 4px;
+            }
+            ::v-deep {
+                .el-anchor {
+                    height: 100%;
+                    background: none;
+                }
+                .el-anchor__marker {
+                    display: none;
+                }
+                .el-menu {
+                    background: none;
+                    border: none;
+                    .el-sub-menu__title {
+                        background: none;
+                        padding: 0 2px;
+                        justify-content: center;
+                    }
+                    .el-sub-menu__title {
+                        height: 32px;
+                    }
+                    .el-sub-menu .el-sub-menu__icon-arrow {
+                        position: static;
+                        padding-top: 6px;
+                    }
+                    .el-sub-menu {
+                        margin-bottom: 16px;
+                        &.is-opened {
+                            .el-sub-menu__icon-arrow {
+                                padding-bottom: 6px;
+                                padding-top: 0;
+                            }
+                        }
+                        .el-menu-item {
+                            height: 32px;
+                            line-height: 32px;
+                            margin: 4px 8px;
+                            padding: 0 2px;
+                            justify-content: center;
+                            background: none;
+                        }
+                        .el-menu-item.is-active {
+                            background: none;
+                            color: #fff;
+                        }
+                        .el-anchor__item {
+                            width: 100%;
+                            text-align: center;
+                        }
+                        .el-anchor__link {
+                            color: #666666;
+                        }
+                        .el-anchor__link.is-active {
+                            background: linear-gradient(180deg, #70bffe, #2199f8);
+                            border-radius: 20px;
+                            color: #fff;
+                        }
+                    }
+                }
+                .el-anchor__list {
+                    padding-left: 0;
+                }
+            }
+        }
+        .expert-content {
+            width: calc(100% - 90px);
+            height: 100%;
+            overflow: auto;
+            padding-bottom: 10px;
+            box-sizing: border-box;
+            .content-section {
+                position: relative;
+                .section-id {
+                    position: absolute;
+                    top: 0;
+                    width: 100%;
+                    height: 1px;
+                }
+                .recipe-item {
+                    margin-right: 0;
+                }
+            }
+            .box-title {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                padding-bottom: 8px;
+                .title-l {
+                    font-size: 16px;
+                    font-weight: 600;
+                    color: #000;
+                    .parent-text {
+                        margin-left: 5px;
+                        font-size: 12px;
+                        font-weight: normal;
+                        padding: 4px 6px;
+                        border-radius: 14px;
+                        background: rgba(119, 119, 119, 0.1);
+                    }
+                }
+                .title-btn {
+                    width: 24px;
+                    height: 24px;
+                    border-radius: 50%;
+                    background: #2199f8;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                }
+                .title-r {
+                    display: flex;
+                    align-items: center;
+                    color: #ff8a2a;
+                    font-size: 12px;
+                    .r-dot {
+                        width: 6px;
+                        height: 6px;
+                        border-radius: 50%;
+                        background: #ff8a2a;
+                        margin-right: 5px;
+                    }
+                }
+            }
+
+            .apply-wrap {
+                .apply-title {
+                    color: #2199f8;
+                    font-weight: 500;
+                    margin: 8px 0;
+                }
+                .apply-list {
+                    .apply-item {
+                        border-radius: 8px;
+                        border: 1px solid rgba(0, 0, 0, 0.1);
+                        padding: 10px;
+                        .apply-info{
+                            display: flex;
+                            align-items: center;
+                            font-weight: 500;
+                            .apply-name{
+                                margin: 0 5px;
+                            }
+                            .apply-score{
+                                font-size: 12px;
+                                color: #FF953D;
+                            }
+                        }
+                        .apply-text {
+                            font-size: 12px;
+                            color: #666666;
+                            margin: 5px 0 10px 0;
+                        }
+                    }
+                    .apply-item + .apply-item {
+                        margin-top: 8px;
+                    }
+                }
+            }
+
+            .action-group {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                padding-top: 8px;
+                margin-top: 8px;
+                border-top: 1px solid #f5f5f5;
+                .action-l {
+                    font-size: 12px;
+                    color: rgba(0, 0, 0, 0.4);
+                }
+            }
+            .apply-wrap,
+            .action-group {
+                .action-r {
+                    display: flex;
+                    align-items: center;
+                    .action-item {
+                        padding: 0 11px;
+                        height: 30px;
+                        line-height: 30px;
+                        border-radius: 20px;
+                        font-size: 12px;
+                        &.second-item {
+                            border: 1px solid #2199f8;
+                            color: #2199f8;
+                        }
+                        &.primary-item {
+                            background: #2199f8;
+                            color: #fff;
+                        }
+                        &.warning-item {
+                            background: rgba(255, 131, 29, 0.1);
+                            color: #ff831d;
+                        }
+                        &.cancel-item {
+                            color: #676767;
+                            border: 1px solid rgba(103, 103, 103, 0.2);
+                        }
+                    }
+                    .action-item + .action-item {
+                        margin-left: 5px;
+                    }
+                }
+                .apply-action {
+                    justify-content: flex-end;
+                    .default-item {
+                        border: 1px solid rgba(0, 0, 0, 0.4);
+                        color: rgba(0, 0, 0, 0.4);
+                    }
+                }
+            }
+        }
+    }
+}
+</style>

+ 10 - 6
src/views/old_mini/agri_services/index.vue

@@ -1,9 +1,8 @@
 <template>
-    <div class="agri-services">
+    <div class="agri-services" :style="{ height: `calc(100vh - ${tabBarHeight}px - 50px)` }">
         <tabs v-model:active="active" class="tabs">
             <tab title="农事动态">
-                农事动态
-                <!-- <farm-manage /> -->
+                <farm-dynamics />
             </tab>
             <tab title="农资农服大厅">
                 <services-hall />
@@ -13,15 +12,20 @@
 </template>
 
 <script setup>
-import { ref } from "vue";
+import { ref, computed } from "vue";
+import { useStore } from "vuex";
 import { Tab, Tabs } from "vant";
 import servicesHall from "./components/servicesHall.vue";
-const active = ref(1);
+import farmDynamics from "./components/farmDynamics.vue";
+
+const store = useStore();
+const tabBarHeight = computed(() => store.state.home.tabBarHeight);
+const active = ref(0);
 </script>
 <style lang="scss" scoped>
 .agri-services {
     width: 100%;
-    height: 100%;
+    height: 100vh;
     .tabs {
         ::v-deep {
             .van-tabs__wrap {

+ 147 - 0
src/views/old_mini/home/components/farmInfoPopup.vue

@@ -0,0 +1,147 @@
+<template>
+    <Popup v-model:show="show" class="farm-info-popup" closeable>
+        <div class="popup-content-box">
+            <div class="popup-title">基本信息</div>
+            <div class="popup-content">
+                <div class="map-box">
+                    <div class="map" ref="mapContainer"></div>
+                    <div class="map-text" @click="handleEditMap">点击编辑地块</div>
+                </div>
+                <cell-group inset class="cell-group">
+                    <field v-model="farmInfo.name" readonly label="农场名称" />
+                    <field v-model="farmInfo.area" readonly label="农场面积" />
+                    <field v-model="farmInfo.plant" readonly label="种植作物" />
+                    <field class="address-field" v-model="farmInfo.address" readonly label="农场位置" />
+                </cell-group>
+            </div>
+            <div class="popup-footer">
+                <div class="footer-btn no-btn" @click="handleCancel">取消</div>
+                <div class="footer-btn yes-btn" @click="handleEdit">去编辑</div>
+            </div>
+        </div>
+    </Popup>
+</template>
+
+<script setup>
+import { Popup, Field, CellGroup } from "vant";
+import { ref, nextTick } from "vue";
+import { useRouter } from "vue-router";
+import IndexMap from "../map/index.js";
+import { useStore } from "vuex";
+
+const store = useStore();
+const router = useRouter();
+const show = ref(false);
+const mapContainer = ref(null);
+const indexMap = new IndexMap();
+const farmInfo = ref({
+    name: "从化荔博园",
+    area: "1000亩",
+    plant: "荔枝",
+    address: "广东省广州市从化区",
+});
+
+const handleShow = () => {
+    show.value = true;
+    nextTick(() => {
+        const point = store.state.home.miniUserLocationPoint
+        indexMap.initMap(point, mapContainer.value);
+    });
+};
+
+const handleEditMap = () => {
+    router.push("/edit_map");
+    // indexMap.clearLayer();
+};
+
+const handleEdit = () => {
+    router.push("/create_farm");
+};
+
+const handleCancel = () => {
+    show.value = false;
+};
+
+defineExpose({handleShow});
+</script>
+
+<style lang="scss" scoped>
+.farm-info-popup {
+    width: 100%;
+    border-radius: 8px;
+    .popup-content-box {
+        background: url("@/assets/img/home/popup-mask.png") no-repeat center left / 100% 100%;
+        padding: 20px;
+    }
+    ::v-deep {
+        .van-popup__close-icon {
+            color: #000;
+        }
+    }
+    .popup-title {
+        text-align: center;
+        font-size: 24px;
+        font-family: "PangMenZhengDao";
+    }
+    .popup-content {
+        margin: 12px 0;
+        .map-box {
+            width: 100%;
+            height: 150px;
+            position: relative;
+            .map {
+                width: 100%;
+                height: 100%;
+                clip-path: inset(0px round 5px);
+                pointer-events: none;
+            }
+            .map-text {
+                position: absolute;
+                right: 6px;
+                bottom: 8px;
+                font-size: 12px;
+                color: #ffffff;
+                padding: 8px 12px;
+                border-radius: 20px;
+                background: rgba(0, 0, 0, 0.5);
+                border: 1px solid rgba(255, 255, 255, 0.5);
+            }
+        }
+        .cell-group {
+            margin: 12px 0 0;
+            .address-field {
+                position: relative;
+                &::before {
+                    position: absolute;
+                    box-sizing: border-box;
+                    content: " ";
+                    pointer-events: none;
+                    right: 16px;
+                    bottom: 0;
+                    left: 16px;
+                    border-bottom: 1px solid #ebedf0;
+                    transform: scaleY(0.5);
+                }
+            }
+        }
+    }
+    .popup-footer {
+        display: flex;
+        gap: 13px;
+        .footer-btn {
+            text-align: center;
+            flex: 1;
+            padding: 8px 0;
+            border-radius: 25px;
+        }
+        .no-btn {
+            color: #666666;
+            border: 1px solid #999999;
+        }
+        .yes-btn {
+            background: #2199f8;
+            color: #fff;
+        }
+    }
+}
+</style>

+ 9 - 2
src/views/old_mini/home/index.vue

@@ -15,7 +15,7 @@
         <!-- 操作按钮 -->
         <div class="operation-button">
             <div class="button-group">
-                <div class="button-item">
+                <div class="button-item" @click="toFarmInfo">
                     <img class="button-icon" src="@/assets/img/tab_bar/home-active.png" alt="">
                     <span>基本信息</span>
                 </div>
@@ -38,6 +38,8 @@
         ></home-floating-panel>
         <!-- 问题提醒 -->
         <problem-reminder></problem-reminder>
+        <!-- 农场信息 -->
+        <farm-info-popup ref="farmInfoRef"></farm-info-popup>
     </div>
 </template>
 
@@ -50,11 +52,12 @@ import customHeader from "@/components/customHeader.vue";
 import weatherInfo from "@/components/weatherInfo.vue";
 import homeFloatingPanel from "./components/homeFloatingPanel.vue";
 import problemReminder from "./components/problemReminder.vue";
+import farmInfoPopup from "./components/farmInfoPopup.vue";
 const router = useRouter();
 const route = useRoute();
 const store = useStore();
 const tabBarHeight = computed(() => store.state.home.tabBarHeight);
-
+const farmInfoRef = ref(null);
 const indexMap = new IndexMap();
 const mapContainer = ref(null);
 
@@ -95,6 +98,10 @@ function toFarmPhoto() {
         path: "/farm_photo",
     });
 }
+
+function toFarmInfo() {
+    farmInfoRef.value.handleShow();
+}
 </script>
 
 <style lang="scss" scoped>