Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/forestry-wx

src/pages/plant/port/models/task.vue

@@ -26,8 +26,8 @@
                 <view class="c-#666 w-s-no">基地：</view>
                 <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd d-flex a-c">
                     {{ data?.baseRef?.baseName }}
-                    <text v-if="+data?.landFlag">全部地块</text>
-                    <view v-else>
+                    <!-- <text v-if="+data?.landFlag">全部地块</text> -->
+                    <view class="tx-ov w-s-no ov-hd">
                         <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text v-if="index != 0">、</text> {{ item?.landName }}</text>
                     </view>
                 </view>
@@ -95,8 +95,8 @@
                 <view class="c-#666 w-s-no">基地：</view>
                 <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd d-flex a-c">
                     {{ data?.baseRef?.baseName }}
-                    <text v-if="+data?.landFlag">全部地块</text>
-                    <view v-else>
+                    <!-- <text v-if="+data?.landFlag">全部地块</text> -->
+                    <view class="tx-ov w-s-no ov-hd">
                         <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text v-if="index != 0">、</text> {{ item?.landName }}</text>
                     </view>
                 </view>
@@ -174,8 +174,8 @@
                 <view class="c-#666 w-s-no">基地：</view>
                 <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd d-flex a-c">
                     {{ data?.baseRef?.baseName }}
-                    <text v-if="+data?.landFlag">全部地块</text>
-                    <view v-else>
+                    <!-- <text v-if="+data?.landFlag">全部地块</text> -->
+                    <view class="tx-ov w-s-no ov-hd">
                         <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text v-if="index != 0">、</text> {{ item?.landName }}</text>
                     </view>
                 </view>
@@ -243,8 +243,8 @@
                 <view class="c-#666 w-s-no">基地：</view>
                 <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd d-flex a-c">
                     {{ data?.baseRef?.baseName }}
-                    <text v-if="+data?.landFlag">全部地块</text>
-                    <view v-else>
+                    <!-- <text v-if="+data?.landFlag">全部地块</text> -->
+                    <view class="tx-ov w-s-no ov-hd">
                         <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"> <text v-if="index != 0">、</text> {{ item?.landName }}</text>
                     </view>
                 </view>

src/plant/port/port-create/index.vue

@@ -453,10 +453,12 @@
                                 <Baseinfo :modeValue="deawerData" @close="handleBaseinfoClose" :baseType="form.taskType" />
                             </view>
                         </up-form-item>
-                        <up-form-item :borderBottom="false" label="具体位置" prop="baseId" id="baseIdpppp">
-                            <Go_button v-if="!laboratory" @click="openLaboratory" title="请选择具体位置" style="flex: 1" />
-                            <view class="w-100%" v-else>
-                                <laboratory :modeValue="laboratory" @close="handleLaboratoryClose" :baseType="form.taskType" />
+                        <up-form-item :borderBottom="false" label="具体位置" prop="landLayers" id="landLayerspppp">
+                            <Go_button @click="openLaboratory" title="请选择具体位置" style="flex: 1" />
+                            <view class="w-100%" v-for="(it, indexs) in form?.landLayers" :key="indexs">
+                                <view class="">{{ it?.layers }}</view>
+                                <view class="">{{ stringifyCheckedList(it?.checkedList, Number(it?.capacityAmount || 0)) }}</view>
+                                <view class="" @click="deleteLayer(indexs)">删除</view>
                             </view>
                         </up-form-item>
                     </view>
@@ -754,7 +756,7 @@
                         <view class="b-radius border-#A3E5EA c-#18BECA bg-#FAFFFF w-100% d-flex j-c a-c h-100 f-s-34">从种源库快速添加</view>
                     </view>
                     <up-swipe-action>
-                        <up-swipe-action-item  class="mb-20" v-for="(item, index) in animalIds" :key="index" :index="item" :name="item" :options="options1" @click="clickSwipe">
+                        <up-swipe-action-item class="mb-20" v-for="(item, index) in animalIds" :key="index" :index="item" :name="item" :options="options1" @click="clickSwipe">
                             <view class="b-radius border-#37A954 c-#333 f-s-28 pd4-34-30-34-30">{{ item }}</view>
                         </up-swipe-action-item>
                     </up-swipe-action>
@@ -828,7 +830,13 @@ const form = ref<PlantationTaskForm>({
     inoculationDosageUnit: null,
     cultureMediumFormula: null,
     landFlag: null,
+    landLayers: [],
 });
+const deleteLayer = (index) => {
+    if (form.value?.landLayers && Array.isArray(form.value.landLayers)) {
+        form.value.landLayers.splice(index, 1); // 删除当前索引的项
+    }
+};
 const changeStartTime = () => {
     if (!form.value?.queryType6?.plannedEndDate) {
         form.value.queryType6.plannedEndDate = form.value.queryType6.plannedStartDate;
@@ -878,7 +886,60 @@ const handleAnimalIdCancel = () => {
     editIndex.value = -1;
     showAnimalIdDialog.value = false;
 };
+const stringifyCheckedList = (list: any[], capacityAmount: number) => {
+    if (!list || list.length === 0) {
+        return '';
+    }
+    type ParsedItem = {
+        layer: number;
+        capacity: number;
+        value: string;
+    };
+    const parsed = list
+        .map((value) => {
+            const [layerText, capacityText] = String(value).split('-');
+            const layer = Number(layerText);
+            const capacity = Number(capacityText);
+            if (!layer || !capacity) {
+                return null;
+            }
+            return {
+                layer,
+                capacity,
+                value: `${layer}-${capacity}`,
+            };
+        })
+        .filter((item): item is ParsedItem => item !== null)
+        .sort((left, right) => {
+            if (left.layer !== right.layer) {
+                return left.layer - right.layer;
+            }
+            return left.capacity - right.capacity;
+        });
+
+    if (!parsed.length) {
+        return '';
+    }
 
+    const segments: string[] = [];
+    let startIndex = 0;
+
+    for (let index = 1; index <= parsed.length; index++) {
+        const previous = parsed[index - 1]!;
+        const current = parsed[index];
+        const isSameLayerContinuous = !!current && current.layer === previous.layer && current.capacity === previous.capacity + 1;
+        const isCrossLayerContinuous = !!current && current.layer === previous.layer + 1 && previous.capacity === capacityAmount && current.capacity === 1;
+        const isContinuous = isSameLayerContinuous || isCrossLayerContinuous;
+        if (isContinuous) {
+            continue;
+        }
+        const start = parsed[startIndex]!;
+        segments.push(start.value === previous.value ? start.value : `${start.value}至${previous.value}`);
+        startIndex = index;
+    }
+
+    return `${segments.join('，')}共${parsed.length}个位置`;
+};
 // 扫一扫添加个体标识
 const handleScanAdd = () => {
     uni.scanCode({
@@ -1198,83 +1259,91 @@ const randomCode = async () => {
 };
 //完成提交表单
 const save = () => {
-    uni.$u.debounce(async () => {
-        try {
-            console.log('开始提交');
-            await upFormRef.value?.validate();
-            console.log('校验完成');
-            if (+(form.value.delegateFlag ?? 0)) {
-                form.value.delegateInfo.cusName = form.value?.delegate.cusName;
-                form.value.delegateInfo.cusCode = form.value?.delegate.cusCode;
-            } else {
-                form.value.delegateInfo = null as any;
-                form.value.delegate = null as any;
-            }
+    uni.$u.debounce(
+        async () => {
+            try {
+                console.log('开始提交');
+                await upFormRef.value?.validate();
+                console.log('校验完成');
+                if (+(form.value.delegateFlag ?? 0)) {
+                    form.value.delegateInfo.cusName = form.value?.delegate.cusName;
+                    form.value.delegateInfo.cusCode = form.value?.delegate.cusCode;
+                } else {
+                    form.value.delegateInfo = null as any;
+                    form.value.delegate = null as any;
+                }
 
-            const params = {
-                ...form.value,
-                ...form.value.queryType6,
-                ...form.value.inoculation,
-                animalIds: animalIds.value,
-            };
-            console.log('提交参数:', params);
-            let res = null;
-            if (isEdit.value) {
-                res = await useClientRequest.post('/plt-api/app/plantationTask/updateTask', params);
-            } else {
-                res = await useClientRequest.post('/plt-api/app/plantationTask/saveTask', params);
-            }
+                const params = {
+                    ...form.value,
+                    ...form.value.queryType6,
+                    ...form.value.inoculation,
+                    animalIds: animalIds.value,
+                };
+                console.log('提交参数:', params);
+                let res = null;
+                if (isEdit.value) {
+                    res = await useClientRequest.post('/plt-api/app/plantationTask/updateTask', params);
+                } else {
+                    res = await useClientRequest.post('/plt-api/app/plantationTask/saveTask', params);
+                }
 
-            if (res.code == 200) {
-                uni.showToast({
-                    title: '提交成功',
-                    icon: 'success',
-                    duration: 2000,
-                });
-                uni.$emit('refreshportList');
-                setTimeout(() => {
-                    uni.navigateBack();
-                }, 1000);
-            }
-        } catch (error: any) {
-            // 滚动到第一个错误字段
-            console.log(error);
+                if (res.code == 200) {
+                    uni.showToast({
+                        title: '提交成功',
+                        icon: 'success',
+                        duration: 2000,
+                    });
+                    uni.$emit('refreshportList');
+                    setTimeout(() => {
+                        uni.navigateBack();
+                    }, 1000);
+                }
+            } catch (error: any) {
+                // 滚动到第一个错误字段
+                console.log(error);
 
-            const firstErrorField = error && error[0].field + 'pppp';
-            paging.value?.scrollIntoViewById(firstErrorField, 30, true);
-            return;
-        }
-    }, 500, true);
+                const firstErrorField = error && error[0].field + 'pppp';
+                paging.value?.scrollIntoViewById(firstErrorField, 30, true);
+                return;
+            }
+        },
+        500,
+        true,
+    );
 };
 // 暂存
 const saveDraft = () => {
-    uni.$u.debounce(async () => {
-        try {
-            const params = {
-                ...form.value,
-                ...form.value.queryType6,
-                animalIds: animalIds.value,
-            };
-            if (form.value?.delegate?.cusCode) {
-                form.value.delegateInfo.cusName = form.value?.delegate?.cusName;
-                form.value.delegateInfo.cusCode = form.value?.delegate?.cusCode;
-            }
-            console.log('暂存参数:', params);
-            const res = await useClientRequest.post('/plt-api/app/plantationTask/draftTask', params);
-            if (res.code == 200) {
-                uni.showToast({
-                    title: '提交成功',
-                    icon: 'success',
-                    duration: 2000,
-                });
-                setTimeout(() => {
-                    uni.navigateBack();
-                }, 1000);
+    uni.$u.debounce(
+        async () => {
+            try {
+                const params = {
+                    ...form.value,
+                    ...form.value.queryType6,
+                    animalIds: animalIds.value,
+                };
+                if (form.value?.delegate?.cusCode) {
+                    form.value.delegateInfo.cusName = form.value?.delegate?.cusName;
+                    form.value.delegateInfo.cusCode = form.value?.delegate?.cusCode;
+                }
+                console.log('暂存参数:', params);
+                const res = await useClientRequest.post('/plt-api/app/plantationTask/draftTask', params);
+                if (res.code == 200) {
+                    uni.showToast({
+                        title: '提交成功',
+                        icon: 'success',
+                        duration: 2000,
+                    });
+                    setTimeout(() => {
+                        uni.navigateBack();
+                    }, 1000);
+                }
+            } catch (error: any) {
+                console.log(error, 'error');
             }
-        } catch (error: any) {
-            console.log(error, 'error');
-        }
-    }, 500, true);
+        },
+        500,
+        true,
+    );
 };
 const clickSwipe = async (name: any, index: number) => {
     if (name?.index == 0) {
@@ -1339,13 +1408,28 @@ function handleLaboratoryClose() {
 }
 // 处理实验室的打开
 function openLaboratory() {
-    uni.$on('cultivationLocationSelected', function (data) {
-        console.log(data);
+    uni.navigateTo({
+        url: `/tools/select-cultivation-location/index`,
+        success: (res) => {
+            if (form.value?.landLayers) {
+                res.eventChannel.emit('selectCultivationLocation', {
+                    baseid: form.value.baseId,
+                    list: form.value?.landLayers,
+                });
+            } else {
+                let list = [];
+                form.value.landIds?.forEach((i) => {
+                    list.push({
+                        id: i.id,
+                    });
+                });
+                res.eventChannel.emit('selectCultivationLocation', {
+                    baseid: form.value.baseId,
+                    list: list,
+                });
+            }
+        },
     });
-    uni.$u.route({
-        type: 'navigateTo',
-        url: '/tools/select-cultivation-location/index',
-    })
 }
 // 处理抽屉确认事件
 function handleLaboratoryConfirm(data: any) {

src/plant/port/port-create/models/baseinfo.vue

@@ -22,10 +22,10 @@
             <text v-if="+modeValue?.data?.[0]?.landType == 1" class="c-#666 f-s-28">地块信息:</text>
             <text v-if="+modeValue?.data?.[0]?.landType == 2" class="c-#666 f-s-28">圈舍信息:</text>
             <text v-if="+modeValue?.data?.[0]?.landType == 3" class="c-#666 f-s-28">培养架信息:</text>
-            <text v-if="!modeValue?.aloneChecked" class="c-#333 f-s-28 f-w-5">{{ modeValue?.data?.length }}个</text>
-            <text v-if="modeValue?.aloneChecked" class="c-#333 f-s-28 f-w-5">该基地所有{{ +modeValue?.data?.[0]?.landType == 1 ? '地块' : +modeValue?.data?.[0]?.landType == 2 ? '圈舍' : '培养架' }}</text>
+            <text class="c-#333 f-s-28 f-w-5">{{ modeValue?.data?.length }}个</text>
+            <!-- <text v-if="modeValue?.aloneChecked" class="c-#333 f-s-28 f-w-5">该基地所有{{ +modeValue?.data?.[0]?.landType == 1 ? '地块' : +modeValue?.data?.[0]?.landType == 2 ? '圈舍' : '培养架' }}</text> -->
         </view>
-        <view v-if="!modeValue?.aloneChecked" class="pt-8 pb-8" v-for="(item, index) in modeValue?.data" :key="index">
+        <view class="pt-8 pb-8" v-for="(item, index) in modeValue?.data" :key="index">
             <text class="c-#666 f-s-28 mr-20">{{ item?.landName }}:</text>
             <text v-if="+modeValue?.data?.[0]?.landType == 3" class="c-#333 f-s-28 f-w-5">{{ item?.capacityAmount }}{{ item?.capacityUnit }}</text>
             <text v-else class="c-#333 f-s-28 f-w-5">{{ item?.area }}{{ item?.areaUnit }}</text>

src/plant/port/port-create/models/types.ts

@@ -118,6 +118,7 @@ export interface PlantationTaskForm {
     inoculationDosageUnit: any;
     cultureMediumFormula?: string | null; // 仅种苗繁育
     landFlag: any;
+    landLayers: any;
 }
 
 /**

src/plant/port/port-detail/index.vue

@@ -287,7 +287,7 @@
                         <text class="c-#666 f-s-30">繁育日期：</text>
                         <text class="c-#333 f-s-30 f-w-5">{{ `${form.plannedStartDate} 至 ${form.plannedEndDate}` }}</text>
                     </view>
-                    <view v-if="+deawerData?.data[0]?.landType == 1" class="pt-16 pb-16 info-border-bottom">
+                    <view v-if="+deawerData?.data?.[0]?.landType == 1" class="pt-16 pb-16 info-border-bottom">
                         <text class="c-#666 f-s-30">种植面积：</text>
                         <text class="c-#333 f-s-30 f-w-5">{{ form.plantingAmount ? `${form.plantingAmount}${form.plantingUnit || ''}` : '--' }}</text>
                     </view>

src/plant/port/port-harvest-create/models/baseinfo.vue

@@ -22,10 +22,10 @@
             <text v-if="+modeValue?.data?.[0]?.landType == 1" class="c-#666 f-s-28">地块信息:</text>
             <text v-if="+modeValue?.data?.[0]?.landType == 2" class="c-#666 f-s-28">圈舍信息:</text>
             <text v-if="+modeValue?.data?.[0]?.landType == 3" class="c-#666 f-s-28">培养架信息:</text>
-            <text v-if="!modeValue?.aloneChecked" class="c-#333 f-s-28 f-w-5">{{ modeValue?.data?.length }}个</text>
-            <text v-if="modeValue?.aloneChecked" class="c-#333 f-s-28 f-w-5">该基地所有{{ +modeValue?.data?.[0]?.landType == 1 ? '地块' : +modeValue?.data?.[0]?.landType == 2 ? '圈舍' : '培养架' }}</text>
+            <text class="c-#333 f-s-28 f-w-5">{{ modeValue?.data?.length }}个</text>
+            <!-- <text v-if="modeValue?.aloneChecked" class="c-#333 f-s-28 f-w-5">该基地所有{{ +modeValue?.data?.[0]?.landType == 1 ? '地块' : +modeValue?.data?.[0]?.landType == 2 ? '圈舍' : '培养架' }}</text> -->
         </view>
-        <view v-if="!modeValue?.aloneChecked" class="pt-8 pb-8" v-for="(item, index) in modeValue?.data" :key="index">
+        <view class="pt-8 pb-8" v-for="(item, index) in modeValue?.data" :key="index">
             <text class="c-#666 f-s-28 mr-20">{{ item?.landName }}:</text>
             <text v-if="+modeValue?.data?.[0]?.landType == 3" class="c-#333 f-s-28 f-w-5">{{ item?.capacityAmount }}{{ item?.capacityUnit }}</text>
             <text v-else class="c-#333 f-s-28 f-w-5">{{ item?.area }}{{ item?.areaUnit }}</text>

src/plant/port/port-harvest/models/task_card.vue

@@ -2,9 +2,7 @@
     <!-- 种植 -->
     <view class="" v-if="data?.taskType === '1'" @click="$emit('click')">
         <view class="b-radius bg-#fff pd-10 p-rtv">
-            <image class="w-80 h-34"
-                src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Planting.png"
-                mode="widthFix" style="position: absolute; top: 0; left: 0" />
+            <image class="w-80 h-34" src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Planting.png" mode="widthFix" style="position: absolute; top: 0; left: 0" />
             <view class="d-flex j-ed f-s-22 c-#666">{{ data?.plannedStartDate }}至{{ data?.plannedEndDate }}</view>
             <view class="d-flex a-ed pd-16 pt-8 pb-8">
                 <view class="c-#333 f-s-34 f-w-5 mr-6">{{ data?.variety }}</view>
@@ -18,23 +16,20 @@
                 <view class="c-#666 w-s-no">基地：</view>
                 <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd d-flex a-c">
                     {{ data?.baseRef?.baseInfo?.address }}基地
-                    <text v-if="data?.landIds.length == 0">全部地块</text>
-                    <view v-else>
-                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text
-                                v-if="index != 0">、</text> {{ item?.landName }}</text>
+                    <!-- <text v-if="+data?.landFlag">全部地块</text> -->
+                    <view class="tx-ov w-s-no ov-hd">
+                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text v-if="index != 0">、</text> {{ item?.landName }}</text>
                     </view>
                 </view>
             </view>
             <view class="d-flex f-s-28 pd-16 pt-8 pb-8">
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">种植面积：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingAmount }}{{ data?.plantingUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingAmount }}{{ data?.plantingUnit }} </view>
                 </view>
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">种植量：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }} </view>
                 </view>
             </view>
         </view>
@@ -42,9 +37,7 @@
     <!-- 养殖 -->
     <view class="" v-if="data?.taskType === '2'" @click="$emit('click')">
         <view class="b-radius bg-#fff pd-10 p-rtv">
-            <image class="w-80 h-34"
-                src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Breeding.png"
-                mode="widthFix" style="position: absolute; top: 0; left: 0" />
+            <image class="w-80 h-34" src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Breeding.png" mode="widthFix" style="position: absolute; top: 0; left: 0" />
             <view class="d-flex j-ed f-s-22 c-#666">{{ data?.plannedStartDate }}至{{ data?.plannedEndDate }}</view>
             <view class="d-flex a-ed pd-16 pt-8 pb-8">
                 <view class="c-#333 f-s-34 f-w-5 mr-6">{{ data?.variety }}</view>
@@ -58,23 +51,20 @@
                 <view class="c-#666 w-s-no">基地：</view>
                 <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd d-flex a-c">
                     {{ data?.baseRef?.baseInfo?.address }}基地
-                    <text v-if="data?.landIds.length == 0">全部地块</text>
-                    <view v-else>
-                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text
-                                v-if="index != 0">、</text> {{ item?.landName }}</text>
+                    <!-- <text v-if="+data?.landFlag">全部地块</text> -->
+                    <view class="tx-ov w-s-no ov-hd">
+                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text v-if="index != 0">、</text> {{ item?.landName }}</text>
                     </view>
                 </view>
             </view>
             <view class="d-flex f-s-28 pd-16 pt-8 pb-8">
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">养殖区域：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.breedScale }}{{ data?.breedScaleUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.breedScale }}{{ data?.breedScaleUnit }} </view>
                 </view>
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">养殖量：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }} </view>
                 </view>
             </view>
         </view>
@@ -82,9 +72,7 @@
     <!-- 种苗繁育 -->
     <view class="" v-if="data?.taskType === '11'" @click="$emit('click')">
         <view class="b-radius bg-#fff pd-10 p-rtv">
-            <image class="w-112 h-34"
-                src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Seedling_breeding.png"
-                mode="widthFix" style="position: absolute; top: 0; left: 0" />
+            <image class="w-112 h-34" src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Seedling_breeding.png" mode="widthFix" style="position: absolute; top: 0; left: 0" />
             <view class="d-flex j-ed f-s-22 c-#666">{{ data?.plannedStartDate }}至{{ data?.plannedEndDate }}</view>
             <view class="d-flex a-ed pd-16 pt-8 pb-8">
                 <view class="c-#333 f-s-34 f-w-5 mr-6">{{ data?.variety }}</view>
@@ -98,28 +86,24 @@
                 <view class="c-#666 w-s-no">基地：</view>
                 <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd d-flex a-c">
                     {{ data?.baseRef?.baseInfo?.address }}基地
-                    <text v-if="data?.landIds.length == 0">全部地块</text>
-                    <view v-else>
-                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text
-                                v-if="index != 0">、</text> {{ item?.landName }}</text>
+                    <!-- <text v-if="+data?.landFlag">全部地块</text> -->
+                    <view class="tx-ov w-s-no ov-hd">
+                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text v-if="index != 0">、</text> {{ item?.landName }}</text>
                     </view>
                 </view>
             </view>
             <view class="d-flex f-s-28 pd-16 pt-8 pb-8">
                 <view v-if="data?.baseType == '3'" class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">接种数量：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.inoculationAmount }}{{ data?.inoculationUnit
-                        }}</view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.inoculationAmount }}{{ data?.inoculationUnit }}</view>
                 </view>
                 <view v-else class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">种植面积：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingAmount }}{{ data?.plantingUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingAmount }}{{ data?.plantingUnit }} </view>
                 </view>
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">繁育量：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }} </view>
                 </view>
             </view>
         </view>
@@ -127,9 +111,7 @@
     <!-- 种畜繁育 -->
     <view class="" v-if="data?.taskType === '21'" @click="$emit('click')">
         <view class="b-radius bg-#fff pd-10 p-rtv">
-            <image class="w-112 h-34"
-                src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Breeding_Livestock.png"
-                mode="widthFix" style="position: absolute; top: 0; left: 0" />
+            <image class="w-112 h-34" src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Breeding_Livestock.png" mode="widthFix" style="position: absolute; top: 0; left: 0" />
             <view class="d-flex j-ed f-s-22 c-#666">{{ data?.plannedStartDate }}至{{ data?.plannedEndDate }}</view>
             <view class="d-flex a-ed pd-16 pt-8 pb-8">
                 <view class="c-#333 f-s-34 f-w-5 mr-6">{{ data?.variety }}</view>
@@ -142,13 +124,11 @@
             <view class="d-flex f-s-28 pd-16 pt-8 pb-8">
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">养殖区域：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.breedScale }}{{ data?.breedScaleUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.breedScale }}{{ data?.breedScaleUnit }} </view>
                 </view>
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">养殖量：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }} </view>
                 </view>
             </view>
         </view>

src/plant/port/port-listinfo/models/task_card.vue

@@ -2,9 +2,7 @@
     <!-- 种植 -->
     <view class="" v-if="data?.taskType === '1'" @click="$emit('click')">
         <view class="b-radius bg-#fff pd-10 p-rtv">
-            <image class="w-80 h-34"
-                src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Planting.png"
-                mode="widthFix" style="position: absolute; top: 0; left: 0" />
+            <image class="w-80 h-34" src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Planting.png" mode="widthFix" style="position: absolute; top: 0; left: 0" />
             <view class="d-flex j-ed f-s-22 c-#666">{{ data?.plannedStartDate }}至{{ data?.plannedEndDate }}</view>
             <view class="d-flex a-ed pd-16 pt-8 pb-8">
                 <view class="c-#333 f-s-34 f-w-5 mr-6">{{ data?.variety }}</view>
@@ -18,23 +16,20 @@
                 <view class="c-#666 w-s-no">基地：</view>
                 <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd d-flex a-c">
                     {{ data?.baseRef?.baseInfo?.address }}基地
-                    <text v-if="data?.landIds.length == 0">全部地块</text>
-                    <view v-else>
-                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text
-                                v-if="index != 0">、</text> {{ item?.landName }}</text>
+                    <!-- <text v-if="+data?.landFlag">全部地块</text> -->
+                    <view>
+                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text v-if="index != 0">、</text> {{ item?.landName }}</text>
                     </view>
                 </view>
             </view>
             <view class="d-flex f-s-28 pd-16 pt-8 pb-8">
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">种植面积：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingAmount }}{{ data?.plantingUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingAmount }}{{ data?.plantingUnit }} </view>
                 </view>
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">种植量：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }} </view>
                 </view>
             </view>
         </view>
@@ -42,9 +37,7 @@
     <!-- 养殖 -->
     <view class="" v-if="data?.taskType === '2'" @click="$emit('click')">
         <view class="b-radius bg-#fff pd-10 p-rtv">
-            <image class="w-80 h-34"
-                src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Breeding.png"
-                mode="widthFix" style="position: absolute; top: 0; left: 0" />
+            <image class="w-80 h-34" src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Breeding.png" mode="widthFix" style="position: absolute; top: 0; left: 0" />
             <view class="d-flex j-ed f-s-22 c-#666">{{ data?.plannedStartDate }}至{{ data?.plannedEndDate }}</view>
             <view class="d-flex a-ed pd-16 pt-8 pb-8">
                 <view class="c-#333 f-s-34 f-w-5 mr-6">{{ data?.variety }}</view>
@@ -58,23 +51,20 @@
                 <view class="c-#666 w-s-no">基地：</view>
                 <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd d-flex a-c">
                     {{ data?.baseRef?.baseInfo?.address }}基地
-                    <text v-if="data?.landIds.length == 0">全部地块</text>
-                    <view v-else>
-                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text
-                                v-if="index != 0">、</text> {{ item?.landName }}</text>
+                    <!-- <text v-if="+data?.landFlag">全部地块</text> -->
+                    <view>
+                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text v-if="index != 0">、</text> {{ item?.landName }}</text>
                     </view>
                 </view>
             </view>
             <view class="d-flex f-s-28 pd-16 pt-8 pb-8">
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">养殖区域：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.breedScale }}{{ data?.breedScaleUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.breedScale }}{{ data?.breedScaleUnit }} </view>
                 </view>
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">养殖量：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }} </view>
                 </view>
             </view>
         </view>
@@ -82,9 +72,7 @@
     <!-- 种苗繁育 -->
     <view class="" v-if="data?.taskType === '11'" @click="$emit('click')">
         <view class="b-radius bg-#fff pd-10 p-rtv">
-            <image class="w-112 h-34"
-                src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Seedling_breeding.png"
-                mode="widthFix" style="position: absolute; top: 0; left: 0" />
+            <image class="w-112 h-34" src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Seedling_breeding.png" mode="widthFix" style="position: absolute; top: 0; left: 0" />
             <view class="d-flex j-ed f-s-22 c-#666">{{ data?.plannedStartDate }}至{{ data?.plannedEndDate }}</view>
             <view class="d-flex a-ed pd-16 pt-8 pb-8">
                 <view class="c-#333 f-s-34 f-w-5 mr-6">{{ data?.variety }}</view>
@@ -98,28 +86,24 @@
                 <view class="c-#666 w-s-no">基地：</view>
                 <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd d-flex a-c">
                     {{ data?.baseRef?.baseInfo?.address }}基地
-                    <text v-if="data?.landIds.length == 0">全部地块</text>
-                    <view v-else>
-                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text
-                                v-if="index != 0">、</text> {{ item?.landName }}</text>
+                    <!-- <text v-if="+data?.landFlag">全部地块</text> -->
+                    <view>
+                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text v-if="index != 0">、</text> {{ item?.landName }}</text>
                     </view>
                 </view>
             </view>
             <view class="d-flex f-s-28 pd-16 pt-8 pb-8">
                 <view v-if="data?.baseType == '3'" class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">接种数量：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.inoculationAmount }}{{ data?.inoculationUnit
-                        }}</view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.inoculationAmount }}{{ data?.inoculationUnit }}</view>
                 </view>
                 <view v-else class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">种植面积：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingAmount }}{{ data?.plantingUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingAmount }}{{ data?.plantingUnit }} </view>
                 </view>
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">繁育量：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }} </view>
                 </view>
             </view>
         </view>
@@ -127,9 +111,7 @@
     <!-- 种畜繁育 -->
     <view class="" v-if="data?.taskType === '21'" @click="$emit('click')">
         <view class="b-radius bg-#fff pd-10 p-rtv">
-            <image class="w-112 h-34"
-                src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Breeding_Livestock.png"
-                mode="widthFix" style="position: absolute; top: 0; left: 0" />
+            <image class="w-112 h-34" src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Breeding_Livestock.png" mode="widthFix" style="position: absolute; top: 0; left: 0" />
             <view class="d-flex j-ed f-s-22 c-#666">{{ data?.plannedStartDate }}至{{ data?.plannedEndDate }}</view>
             <view class="d-flex a-ed pd-16 pt-8 pb-8">
                 <view class="c-#333 f-s-34 f-w-5 mr-6">{{ data?.variety }}</view>
@@ -142,13 +124,11 @@
             <view class="d-flex f-s-28 pd-16 pt-8 pb-8">
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">养殖区域：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.breedScale }}{{ data?.breedScaleUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.breedScale }}{{ data?.breedScaleUnit }} </view>
                 </view>
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">养殖量：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }} </view>
                 </view>
             </view>
         </view>

src/plant/port/port-supervise/models/task_card.vue

@@ -2,9 +2,7 @@
     <!-- 种植 -->
     <view class="" v-if="data?.taskType === '1'" @click="$emit('click')">
         <view class="b-radius bg-#fff pd-10 p-rtv">
-            <image class="w-80 h-34"
-                src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Planting.png"
-                mode="widthFix" style="position: absolute; top: 0; left: 0" />
+            <image class="w-80 h-34" src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Planting.png" mode="widthFix" style="position: absolute; top: 0; left: 0" />
             <view class="d-flex j-ed f-s-22 c-#666">{{ data?.plannedStartDate }}至{{ data?.plannedEndDate }}</view>
             <view class="d-flex a-ed pd-16 pt-8 pb-8">
                 <view class="c-#333 f-s-34 f-w-5 mr-6">{{ data?.variety }}</view>
@@ -18,23 +16,20 @@
                 <view class="c-#666 w-s-no">基地：</view>
                 <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd d-flex a-c">
                     {{ data?.baseRef?.baseInfo?.address }}基地
-                    <text v-if="data?.landIds.length == 0">全部地块</text>
-                    <view v-else>
-                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text
-                                v-if="index != 0">、</text> {{ item?.landName }}</text>
+                    <!-- <text v-if="+data?.landFlag">全部地块</text> -->
+                    <view class="tx-ov w-s-no ov-hd">
+                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text v-if="index != 0">、</text> {{ item?.landName }}</text>
                     </view>
                 </view>
             </view>
             <view class="d-flex f-s-28 pd-16 pt-8 pb-8">
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">种植面积：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingAmount }}{{ data?.plantingUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingAmount }}{{ data?.plantingUnit }} </view>
                 </view>
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">种植量：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }} </view>
                 </view>
             </view>
         </view>
@@ -42,9 +37,7 @@
     <!-- 养殖 -->
     <view class="" v-if="data?.taskType === '2'" @click="$emit('click')">
         <view class="b-radius bg-#fff pd-10 p-rtv">
-            <image class="w-80 h-34"
-                src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Breeding.png"
-                mode="widthFix" style="position: absolute; top: 0; left: 0" />
+            <image class="w-80 h-34" src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Breeding.png" mode="widthFix" style="position: absolute; top: 0; left: 0" />
             <view class="d-flex j-ed f-s-22 c-#666">{{ data?.plannedStartDate }}至{{ data?.plannedEndDate }}</view>
             <view class="d-flex a-ed pd-16 pt-8 pb-8">
                 <view class="c-#333 f-s-34 f-w-5 mr-6">{{ data?.variety }}</view>
@@ -58,23 +51,20 @@
                 <view class="c-#666 w-s-no">基地：</view>
                 <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd d-flex a-c">
                     {{ data?.baseRef?.baseInfo?.address }}基地
-                    <text v-if="data?.landIds.length == 0">全部地块</text>
-                    <view v-else>
-                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text
-                                v-if="index != 0">、</text> {{ item?.landName }}</text>
+                    <!-- <text v-if="+data?.landFlag">全部地块</text> -->
+                    <view class="tx-ov w-s-no ov-hd">
+                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text v-if="index != 0">、</text> {{ item?.landName }}</text>
                     </view>
                 </view>
             </view>
             <view class="d-flex f-s-28 pd-16 pt-8 pb-8">
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">养殖区域：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.breedScale }}{{ data?.breedScaleUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.breedScale }}{{ data?.breedScaleUnit }} </view>
                 </view>
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">养殖量：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }} </view>
                 </view>
             </view>
         </view>
@@ -82,9 +72,7 @@
     <!-- 种苗繁育 -->
     <view class="" v-if="data?.taskType === '11'" @click="$emit('click')">
         <view class="b-radius bg-#fff pd-10 p-rtv">
-            <image class="w-112 h-34"
-                src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Seedling_breeding.png"
-                mode="widthFix" style="position: absolute; top: 0; left: 0" />
+            <image class="w-112 h-34" src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Seedling_breeding.png" mode="widthFix" style="position: absolute; top: 0; left: 0" />
             <view class="d-flex j-ed f-s-22 c-#666">{{ data?.plannedStartDate }}至{{ data?.plannedEndDate }}</view>
             <view class="d-flex a-ed pd-16 pt-8 pb-8">
                 <view class="c-#333 f-s-34 f-w-5 mr-6">{{ data?.variety }}</view>
@@ -98,28 +86,24 @@
                 <view class="c-#666 w-s-no">基地：</view>
                 <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd d-flex a-c">
                     {{ data?.baseRef?.baseInfo?.address }}基地
-                    <text v-if="data?.landIds.length == 0">全部地块</text>
-                    <view v-else>
-                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text
-                                v-if="index != 0">、</text> {{ item?.landName }}</text>
+                    <!-- <text v-if="data?.landFlag">全部地块</text> -->
+                    <view class="tx-ov w-s-no ov-hd">
+                        <text v-for="(item, index) in data?.baseRef?.baseInfo?.landList" :key="index"><text v-if="index != 0">、</text> {{ item?.landName }}</text>
                     </view>
                 </view>
             </view>
             <view class="d-flex f-s-28 pd-16 pt-8 pb-8">
                 <view v-if="data?.baseType == '3'" class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">接种数量：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.inoculationAmount }}{{ data?.inoculationUnit
-                        }}</view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.inoculationAmount }}{{ data?.inoculationUnit }}</view>
                 </view>
                 <view v-else class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">种植面积：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingAmount }}{{ data?.plantingUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingAmount }}{{ data?.plantingUnit }} </view>
                 </view>
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">繁育量：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }} </view>
                 </view>
             </view>
         </view>
@@ -127,9 +111,7 @@
     <!-- 种畜繁育 -->
     <view class="" v-if="data?.taskType === '21'" @click="$emit('click')">
         <view class="b-radius bg-#fff pd-10 p-rtv">
-            <image class="w-112 h-34"
-                src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Breeding_Livestock.png"
-                mode="widthFix" style="position: absolute; top: 0; left: 0" />
+            <image class="w-112 h-34" src="https://yujin-szyy.oss-cn-chengdu.aliyuncs.com/szyy/images-plt/plant/port/Task_Breeding_Livestock.png" mode="widthFix" style="position: absolute; top: 0; left: 0" />
             <view class="d-flex j-ed f-s-22 c-#666">{{ data?.plannedStartDate }}至{{ data?.plannedEndDate }}</view>
             <view class="d-flex a-ed pd-16 pt-8 pb-8">
                 <view class="c-#333 f-s-34 f-w-5 mr-6">{{ data?.variety }}</view>
@@ -142,13 +124,11 @@
             <view class="d-flex f-s-28 pd-16 pt-8 pb-8">
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">养殖区域：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.breedScale }}{{ data?.breedScaleUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.breedScale }}{{ data?.breedScaleUnit }} </view>
                 </view>
                 <view class="d-flex a-c w-50%">
                     <view class="c-#666 w-s-no">养殖量：</view>
-                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }}
-                    </view>
+                    <view class="c-#333 f-w-5 tx-ov w-s-no ov-hd">{{ data?.plantingMgAmount }}{{ data?.plantingMgUnit }} </view>
                 </view>
             </view>
         </view>

src/plant/port/supervise/models/baseinfo.vue

@@ -22,10 +22,10 @@
             <text v-if="+modeValue?.data?.[0]?.landType == 1" class="c-#666 f-s-28">地块信息:</text>
             <text v-if="+modeValue?.data?.[0]?.landType == 2" class="c-#666 f-s-28">圈舍信息:</text>
             <text v-if="+modeValue?.data?.[0]?.landType == 3" class="c-#666 f-s-28">培养架信息:</text>
-            <text v-if="!modeValue?.aloneChecked" class="c-#333 f-s-28 f-w-5">{{ modeValue?.data?.length }}个</text>
-            <text v-if="modeValue?.aloneChecked" class="c-#333 f-s-28 f-w-5">该基地所有{{ +modeValue?.data?.[0]?.landType == 1 ? '地块' : +modeValue?.data?.[0]?.landType == 2 ? '圈舍' : '培养架' }}</text>
+            <text class="c-#333 f-s-28 f-w-5">{{ modeValue?.data?.length }}个</text>
+            <!-- <text v-if="modeValue?.aloneChecked" class="c-#333 f-s-28 f-w-5">该基地所有{{ +modeValue?.data?.[0]?.landType == 1 ? '地块' : +modeValue?.data?.[0]?.landType == 2 ? '圈舍' : '培养架' }}</text> -->
         </view>
-        <view v-if="!modeValue?.aloneChecked" class="pt-8 pb-8" v-for="(item, index) in modeValue?.data" :key="index">
+        <view class="pt-8 pb-8" v-for="(item, index) in modeValue?.data" :key="index">
             <text class="c-#666 f-s-28 mr-20">{{ item?.landName }}:</text>
             <text v-if="+modeValue?.data?.[0]?.landType == 3" class="c-#333 f-s-28 f-w-5">{{ item?.capacityAmount }}{{ item?.capacityUnit }}</text>
             <text v-else class="c-#333 f-s-28 f-w-5">{{ item?.area }}{{ item?.areaUnit }}</text>