202505028版本替换

src/views/ConstructionApplication3D/parkCheck/parkResult.vue

@@ -7,7 +7,7 @@
     >
       <el-table-column prop="id" label="序号" width="60"></el-table-column>
       <el-table-column prop="landNo" label="地块" width=""> </el-table-column>
-      <el-table-column prop="" label="机动车位(包含特殊车位)">
+      <el-table-column prop="" label="机动车位">
         <el-table-column prop="jdcDesignCount" label="方案数量(个)" width="">
         </el-table-column>
         <el-table-column prop="jdcNormalCount" label="规范数量(个)" width="">

src/views/ConstructionApplication3D/projectManagement/CheckParkAnalyse.js

@@ -1,6 +1,6 @@
 import { mapQuery } from "@/utils/MapHelper/MapHelper.js";
 import { Message } from "element-ui";
-import { forEach } from "lodash";
+
 const CheckParkAnalyse = {
   /**
    * 计算计容面积及车位
@@ -39,6 +39,7 @@ const CheckParkAnalyse = {
       Minfo.dataurl + "/featureResults.json?returnContent=true",
       queryByGeometryParameters
     );
+    debugger;
     if (result && result.totalCount == 0) {
       Message({
         message: "未查询到停车位和报建分层数据数据,请重新尝试",
@@ -173,16 +174,16 @@ const CheckParkAnalyse = {
         } else if (landItems[i].CWType == "非机动车") {
           fjdcCount++;
         } else if (landItems[i].CWType == "临时车位") {
-          jdcCount++;
+          // jdcCount++;
           lscwCount++;
         } else if (landItems[i].CWType == "大客车位") {
-          jdcCount++;
+          // jdcCount++;
           dkcwCount++;
         } else if (landItems[i].CWType == "无障碍车位") {
-          jdcCount++;
+          // jdcCount++;
           wzacwCount++;
         } else if (landItems[i].CWType == "装卸车位") {
-          jdcCount++;
+          // jdcCount++;
           zxcwCount++;
         }
 
@@ -195,7 +196,7 @@ const CheckParkAnalyse = {
       for (var index = 0; index < floors.length; index++) {
         var floorItems = landItems.filter((t) => t.floor == floors[index]);
         var jdcItems = landItems.filter(
-          (t) => t.floor == floors[index] && t.CWType != "非机动车"
+          (t) => t.floor == floors[index] && t.CWType == "机动车"
         );
         var fjdcItems = landItems.filter(
           (t) => t.floor == floors[index] && t.CWType == "非机动车"
@@ -526,11 +527,11 @@ const CheckParkAnalyse = {
           landzxcwCount = specialParking.zxcwCount;
           landwzacwCount = specialParking.wzacwCount;
 
-          //加入到总机动车位
-          landjdcCount += specialParking.lscwCount;
-          landjdcCount += specialParking.dkcwCount;
-          landjdcCount += specialParking.zxcwCount;
-          landjdcCount += specialParking.wzacwCount;
+          // //加入到总机动车位
+          // landjdcCount += specialParking.lscwCount;
+          // landjdcCount += specialParking.dkcwCount;
+          // landjdcCount += specialParking.zxcwCount;
+          // landjdcCount += specialParking.wzacwCount;
         }
       }
 

src/views/ConstructionApplication3D/projectManagement/projectManagement.vue

@@ -1257,7 +1257,7 @@ export default {
       //左上角(left=弹窗宽/2;top=弹窗高/2+header高)
       //右上角 (left=w-弹窗宽+(弹窗宽/2);top=弹窗高/2+header高);
       let left = w - 430 + 430 / 2;
-      let top = 550 / 2 + 60;
+      let top = 660 / 2 + 60;
       this.$layer.iframe({
         id: "BJTC",
         content: {
@@ -1266,7 +1266,7 @@ export default {
           data: { info }, //props
         },
         offset: [left, top], //left top
-        area: ["430px", "600px"],
+        area: ["430px", "660px"],
         title: "日照分析",
         maxmin: false,
         shade: false, //是否显示遮罩