Browse Source

feat:修改查看区域显示页面逻辑

wangsisi 16 hours ago
parent
commit
8b1d67a997

+ 3 - 2
src/views/old_mini/interactionList/drawRegion.vue

@@ -86,14 +86,15 @@ onActivated(() => {
                 regions = parsed.geometryArr.map((item) => ({
                 regions = parsed.geometryArr.map((item) => ({
                     geometry: item,
                     geometry: item,
                     status: "unresolved",
                     status: "unresolved",
+                    reproductiveName: route.query.reproductiveName,
                     updatedTime: route.query.updatedTime,
                     updatedTime: route.query.updatedTime,
                 }));
                 }));
             } else if (typeof rangeWkt === "string" && rangeWkt.trim().length > 10) {
             } else if (typeof rangeWkt === "string" && rangeWkt.trim().length > 10) {
-                regions = [{ geometry: rangeWkt.trim(), status: "unresolved", updatedTime: route.query.updatedTime }];
+                regions = [{ geometry: rangeWkt.trim(), status: "unresolved", reproductiveName: route.query.reproductiveName, updatedTime: route.query.updatedTime }];
             }
             }
         } catch (_) {
         } catch (_) {
             if (typeof rangeWkt === "string" && rangeWkt.trim().length > 10) {
             if (typeof rangeWkt === "string" && rangeWkt.trim().length > 10) {
-                regions = [{ geometry: rangeWkt.trim(), status: "unresolved", updatedTime: route.query.updatedTime }];
+                regions = [{ geometry: rangeWkt.trim(), status: "unresolved", reproductiveName: route.query.reproductiveName, updatedTime: route.query.updatedTime }];
             }
             }
         }
         }
         if (regions.length) {
         if (regions.length) {

+ 3 - 3
src/views/old_mini/interactionList/index.vue

@@ -205,9 +205,9 @@
             <el-input class="input-item" v-model="currentItem.replyText" placeholder="请输入您咨询的问题" clearable />
             <el-input class="input-item" v-model="currentItem.replyText" placeholder="请输入您咨询的问题" clearable />
         </div>
         </div>
         <template v-if="currentItem.interactionTypeId != 1">
         <template v-if="currentItem.interactionTypeId != 1">
-            <div class="region-tips">勾画发生区域,精准匹配专属农事方案</div>
+            <div class="region-tips">勾画异常发生区域,精准匹配专属农事方案</div>
             <div class="region-map" ref="mapContainer" @click="handleDrawRegion(currentItem)">
             <div class="region-map" ref="mapContainer" @click="handleDrawRegion(currentItem)">
-                <div class="region-map-text">点击勾画发生区域</div>
+                <div class="region-map-text">点击勾画异常发生区域</div>
             </div>
             </div>
         </template>
         </template>
         <div class="confirm-btn" :class="{ 'confirm-btn-loading': confirmUploadLoading }" @click="handleConfirmUpload">
         <div class="confirm-btn" :class="{ 'confirm-btn-loading': confirmUploadLoading }" @click="handleConfirmUpload">
@@ -698,7 +698,7 @@ const handleDrawRegion = (item) => {
     }
     }
 
 
     if (item.rangeWkt && item.rangeWkt.length > 10) {
     if (item.rangeWkt && item.rangeWkt.length > 10) {
-        router.push(`/draw_region?polygonData=${polygonData}&rangeWkt=${item.rangeWkt}&updatedTime=${item.updatedTime.slice(0, 10)}&mapCenter=${localStorage.getItem('selectedFarmPoint') || 'POINT (113.6142086995688 23.585836479509055)'}`);
+        router.push(`/draw_region?polygonData=${polygonData}&rangeWkt=${item.rangeWkt}&updatedTime=${item.updatedTime.slice(0, 10)}&reproductiveName=${item.reproductiveName}&mapCenter=${localStorage.getItem('selectedFarmPoint') || 'POINT (113.6142086995688 23.585836479509055)'}`);
     } else {
     } else {
         if (polygonData) {
         if (polygonData) {
             router.push(`/draw_region?polygonData=${polygonData}&mapCenter=${localStorage.getItem('selectedFarmPoint') || 'POINT (113.6142086995688 23.585836479509055)'}`);
             router.push(`/draw_region?polygonData=${polygonData}&mapCenter=${localStorage.getItem('selectedFarmPoint') || 'POINT (113.6142086995688 23.585836479509055)'}`);

+ 3 - 1
src/views/old_mini/interactionList/map/drawRegionMap.js

@@ -59,13 +59,14 @@ class DrawRegionMap {
                 }
                 }
 
 
                 const status = f.get("status"); // 'resolved' | 'unresolved'
                 const status = f.get("status"); // 'resolved' | 'unresolved'
+                const reproductiveName = f.get("reproductiveName") || "";
                 const isResolved = status === "resolved";
                 const isResolved = status === "resolved";
                 // 已解决:深灰填充,浅白描边;未解决:浅蓝填充,亮蓝描边
                 // 已解决:深灰填充,浅白描边;未解决:浅蓝填充,亮蓝描边
                 const fillColor = isResolved ? "rgba(0, 0, 0, 0.6)" : "rgba(0, 0, 0, 0.5)";
                 const fillColor = isResolved ? "rgba(0, 0, 0, 0.6)" : "rgba(0, 0, 0, 0.5)";
                 const strokeColor = isResolved ? "#7C7C7C" : "#2199F8";
                 const strokeColor = isResolved ? "#7C7C7C" : "#2199F8";
 
 
                 const text = new Text({
                 const text = new Text({
-                    text: status === "resolved" ? "已解决" : "未解决",
+                    text: reproductiveName ? `${reproductiveName} ${status === "resolved" ? "已解决" : "未解决"}` : status === "resolved" ? "已解决" : "未解决",
                     font: "12px sans-serif",
                     font: "12px sans-serif",
                     fill: new Fill({ color: "#ffffff" }),
                     fill: new Fill({ color: "#ffffff" }),
                     backgroundFill: new Fill({ 
                     backgroundFill: new Fill({ 
@@ -328,6 +329,7 @@ class DrawRegionMap {
                     featureProjection: mapProjection,
                     featureProjection: mapProjection,
                 });
                 });
                 const feature = new Feature({ geometry });
                 const feature = new Feature({ geometry });
+                feature.set("reproductiveName", region.reproductiveName);
                 feature.set("status", region.status || "unresolved");
                 feature.set("status", region.status || "unresolved");
                 feature.set("updatedTime", region.updatedTime);
                 feature.set("updatedTime", region.updatedTime);
                 feature.set("label", region.label || "");
                 feature.set("label", region.label || "");