Quellcode durchsuchen

集成中图代码添加规划选址改动

wanger vor 11 Monaten
Ursprung
Commit
eb9494d4bd

+ 11 - 11
src/components/Combinations/NightscapeAnalysis/index.js

@@ -87,7 +87,7 @@ const Nightscape = {
           window.alert(error);
         });
 
-      //一山湖灯光
+      //地标灯光
       Cesium.loadJson(window.NightLightUrl.yshdg).then((response) => {
         let features = response.features;
         features.forEach((element) => {
@@ -97,16 +97,16 @@ const Nightscape = {
             p[1],
             p[2] + 20
           );
-          var SpotLightPos32 = new Cesium.Cartesian3.fromDegrees(
-            p[0],
-            p[1],
-            p[2]
-          );
+          // var SpotLightPos32 = new Cesium.Cartesian3.fromDegrees(
+          //   p[0],
+          //   p[1],
+          //   p[2]
+          // );
           var SpotLightOptions3 = {
-            cutoffDistance: 120,
-            color: Cesium.Color.ORANGE,
-            decay: 1,
-            intensity: 2,
+            cutoffDistance: 100,
+            color: new Cesium.Color(18 / 255, 80 / 255, 193 / 255, 1),
+            decay: 2,
+            intensity: 1,
           };
 
           let SpotLight33 = new Cesium.PointLight(
@@ -160,7 +160,7 @@ const Nightscape = {
             p[2] + 40
           );
           var SpotLightOptions3 = {
-            cutoffDistance: 110,
+            cutoffDistance: 130,
             color: new Cesium.Color(209 / 255, 209 / 255, 147 / 255, 0.5),
             decay: 1,
             intensity: 1,

+ 115 - 68
src/views/ConstructionApplication3D/MXDBinfo/MXDBinfo.vue

@@ -142,8 +142,8 @@ export default {
         KG_Data.JZXGX = LandPlanning.data.find((c) => c.label == "JZXGX")
           ? LandPlanning.data.find((c) => c.label == "JZXGX").value
           : "";
-        KG_Data.JRJZMJD = KG_Data.YDMJ * KG_Data.RJLD;
-        KG_Data.JRJZMJX = KG_Data.YDMJ * KG_Data.RJLX;
+        KG_Data.JRJZMJD = "";
+        KG_Data.JRJZMJX = "";
         let FA_Data = {};
         if (Minfo.dataurl && Minfo.dataSourceName) {
           //获取项目范围数据数据
@@ -151,7 +151,7 @@ export default {
             getFeatureMode: "SQL",
             datasetNames: [Minfo.dataSourceName + ":" + "项目范围"],
             queryParameter: {
-              attributeFilter: "1=1",
+              attributeFilter: "DKBM = '" + KG_Data.DKBM + "'",
             },
             hasGeometry: "true",
           };
@@ -180,74 +180,74 @@ export default {
             });
           }
           FA_Data.YDMJ = xmzmj;
-          //获取单栋楼体数据 (模型中Model数据)
-          let queryByGeometryParameters1 = {
-            getFeatureMode: "SQL",
-            datasetNames: [Minfo.dataSourceName + ":" + Minfo.datasetName],
-            queryParameter: {
-              attributeFilter: "1=1",
-            },
-            hasGeometry: "true",
-          };
-          let e1 = await mapQuery(
-            Minfo.dataurl + "/featureResults.json?returnContent=true",
-            queryByGeometryParameters1
-          );
-          //楼体信息
-          let ltDatas = [];
-          if (e1 && e1.totalCount > 0) {
-            e1.features.forEach((feature) => {
-              let Data = {
-                data: [],
-                geometry: feature.geometry,
-              };
-              feature.fieldNames.forEach((fieldName, i) => {
-                let Field = e1.datasetInfos
-                  ? e1.datasetInfos[0].fieldInfos.find(
-                      (c) =>
-                        c.name &&
-                        c.name.toUpperCase() == fieldName.toUpperCase() &&
-                        c.name.toUpperCase().indexOf("SM") == -1
-                    )
-                  : null;
-                if (Field) {
-                  Data.data.push({
-                    label: fieldName,
-                    labelCN: Field ? Field.caption : fieldName,
-                    value: feature.fieldValues[i],
-                  });
-                }
-              });
-              ltDatas.push(Data);
-            });
-          }
-          //建筑总面积
-          let jzzmj = 0;
-          let maxJZGD = 0;
-          ltDatas.forEach((ltData) => {
-            jzzmj += Number(
-              ltData.data.find((c) => c.label == "BUILDAREA")
-                ? ltData.data.find((c) => c.label == "BUILDAREA").value
-                : 0
-            );
-            let jzgd = ltData.data.find((c) => c.label == "HEIGHT")
-              ? ltData.data.find((c) => c.label == "HEIGHT").value
-              : 0;
-            if (Number(jzgd) > maxJZGD) {
-              maxJZGD = Number(jzgd);
-            }
-          });
-          FA_Data.JZMJ = Number(jzzmj);
-          FA_Data.JZGD = Number(maxJZGD);
+          // //获取单栋楼体数据 (模型中Model数据)
+          // let queryByGeometryParameters1 = {
+          //   getFeatureMode: "SQL",
+          //   datasetNames: [Minfo.dataSourceName + ":" + Minfo.datasetName],
+          //   queryParameter: {
+          //     attributeFilter: "1=1",
+          //   },
+          //   hasGeometry: "true",
+          // };
+          // let e1 = await mapQuery(
+          //   Minfo.dataurl + "/featureResults.json?returnContent=true",
+          //   queryByGeometryParameters1
+          // );
+          // //楼体信息
+          // let ltDatas = [];
+          // if (e1 && e1.totalCount > 0) {
+          //   e1.features.forEach((feature) => {
+          //     let Data = {
+          //       data: [],
+          //       geometry: feature.geometry,
+          //     };
+          //     feature.fieldNames.forEach((fieldName, i) => {
+          //       let Field = e1.datasetInfos
+          //         ? e1.datasetInfos[0].fieldInfos.find(
+          //             (c) =>
+          //               c.name &&
+          //               c.name.toUpperCase() == fieldName.toUpperCase() &&
+          //               c.name.toUpperCase().indexOf("SM") == -1
+          //           )
+          //         : null;
+          //       if (Field) {
+          //         Data.data.push({
+          //           label: fieldName,
+          //           labelCN: Field ? Field.caption : fieldName,
+          //           value: feature.fieldValues[i],
+          //         });
+          //       }
+          //     });
+          //     ltDatas.push(Data);
+          //   });
+          // }
+          // //建筑总面积
+          // let jzzmj = 0;
+          // let maxJZGD = 0;
+          // ltDatas.forEach((ltData) => {
+          //   jzzmj += Number(
+          //     ltData.data.find((c) => c.label == "BUILDAREA")
+          //       ? ltData.data.find((c) => c.label == "BUILDAREA").value
+          //       : 0
+          //   );
+          //   let jzgd = ltData.data.find((c) => c.label == "HEIGHT")
+          //     ? ltData.data.find((c) => c.label == "HEIGHT").value
+          //     : 0;
+          //   if (Number(jzgd) > maxJZGD) {
+          //     maxJZGD = Number(jzgd);
+          //   }
+          // });
+          // FA_Data.JZMJ = Number(jzzmj);
+          // FA_Data.JZGD = Number(maxJZGD);
 
           //基底面积查建筑轮廓数据
           FA_Data.JDMJ = 0;
 
           let queryByGeometryParameters2 = {
             getFeatureMode: "SQL",
-            datasetNames: [Minfo.dataSourceName + ":" + "建筑轮廓"],
+            datasetNames: [Minfo.dataSourceName + ":" + Minfo.datasetName],
             queryParameter: {
-              attributeFilter: "1=1",
+              attributeFilter: "LANDNO = '" + KG_Data.DKBM + "'",
             },
             hasGeometry: "true",
           };
@@ -258,9 +258,53 @@ export default {
 
           //建筑基底总面积
           let jzjdzmj = 0;
+          //建筑总面积
+          let jzzmj = 0;
+          //地上建筑总面积
+          let dsjzzmj = 0;
+          //地下建筑总面积
+          let dxjzzmj = 0;
+          //最大建筑高度
+          let maxJZGD = 0;
           debugger;
           if (e2 && e2.totalCount > 0) {
             e2.features.forEach((feature) => {
+              let BUILDAREAIndex = feature.fieldNames.findIndex(
+                (c) => c == "BUILDAREA"
+              );
+              if (BUILDAREAIndex) {
+                let jzmj = feature.fieldValues[BUILDAREAIndex] || 0;
+                if (Number(jzmj)) {
+                  jzzmj += Number(jzmj);
+                }
+              }
+              let TBUILDAREAIndex = feature.fieldNames.findIndex(
+                (c) => c == "TBUILDAREA"
+              );
+              if (TBUILDAREAIndex) {
+                let dsjzmj = feature.fieldValues[TBUILDAREAIndex] || 0;
+                if (Number(dsjzmj)) {
+                  dsjzzmj += Number(dsjzmj);
+                }
+              }
+              let DBUILDAREAIndex = feature.fieldNames.findIndex(
+                (c) => c == "DBUILDAREA"
+              );
+              if (DBUILDAREAIndex) {
+                let dxjzmj = feature.fieldValues[DBUILDAREAIndex] || 0;
+                if (Number(dxjzmj)) {
+                  dxjzzmj += Number(dxjzmj);
+                }
+              }
+              let HEIGHTIndex = feature.fieldNames.findIndex(
+                (c) => c == "HEIGHT"
+              );
+              if (HEIGHTIndex) {
+                let jzgd = feature.fieldValues[HEIGHTIndex] || 0;
+                if (Number(jzgd) > maxJZGD) {
+                  maxJZGD = Number(jzgd);
+                }
+              }
               let DataPs = feature.geometry.points.map((item) => [
                 item.x,
                 item.y,
@@ -275,13 +319,16 @@ export default {
               }
             });
           }
+          FA_Data.JZMJ = Number(jzzmj);
+          FA_Data.JZGD = Number(maxJZGD).toFixed(2);
           FA_Data.JDMJ = jzjdzmj;
+          //计容建筑面积 为地上建筑总面积
+          FA_Data.JRJZMJ = dsjzzmj;
           // 容积率
-          FA_Data.RJL = (FA_Data.JZMJ / FA_Data.YDMJ).toFixed(5);
-          //计容建筑面积
-          FA_Data.JRJZMJ = FA_Data.YDMJ * FA_Data.RJL;
+          FA_Data.RJL = (FA_Data.JRJZMJ / FA_Data.YDMJ).toFixed(2);
+
           //建筑密度
-          FA_Data.JZMD = Number((FA_Data.JDMJ / FA_Data.YDMJ).toFixed(5)) * 100;
+          FA_Data.JZMD = (Number(FA_Data.JDMJ / FA_Data.YDMJ) * 100).toFixed(2);
         }
         tableDataList.push({ Minfo, KG_Data, FA_Data });
       }

+ 34 - 17
src/views/siteselection/components/fzxz.vue

@@ -443,23 +443,39 @@ export default {
       console.log(value);
     },
     submitData() {
-      // this.$refs.ruleForm.validate((valid) => {
-      //   if (valid) {
-          // this.activeTabs = 'lsju'
-          // this.$emit('updateParent','activeTabs','lsju')
-          this.$emit("updateParent", "loading", true);
-          setTimeout(() => {
-            let bsm = "8979e8f6a9364828a9d6b2e459c8fd76";
-            this.$emit("updateParent", "nowObj", this.ruleForm);
-            this.$emit("updateParent", "rzBsm", bsm);
-            this.$emit("updateParent", "loading", false);
-            this.reset();
-          }, 500);
-      //   } else {
-      //     console.log("error submit!!");
-      //     return false;
-      //   }
-      // });
+      // this.$emit("updateParent", "loading", true);
+      //     setTimeout(() => {
+      //       let bsm = "8979e8f6a9364828a9d6b2e459c8fd76";
+      //       this.$emit("updateParent", "nowObj", this.ruleForm);
+      //       this.$emit("updateParent", "rzBsm", bsm);
+      //       this.$emit("updateParent", "loading", false);
+      //       this.reset();
+      //     }, 500);
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          const loading = this.$loading({
+          lock: true,
+          text: '分析中',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        setTimeout(() => {
+          loading.close();
+          this.activeTabs = 'lsju'
+          this.$emit('updateParent','activeTabs','lsju')
+          this.$message({
+          message: '分析成功!',
+          type: 'success'
+        });
+          this.reset();
+        }, 2000);
+ 
+
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
     },
     reset() {
       (this.ruleForm = {
@@ -471,6 +487,7 @@ export default {
         ydmje: "", //用地面积结束
         sjy: "国土空间总体规划", //数据源
       }),
+      this.tableData = []
         this.$refs.ruleForm.resetFields();
         this.$refs.range.reset();
     },

+ 0 - 1
src/views/siteselection/components/yxyzPop.vue

@@ -86,7 +86,6 @@
                   placeholder="距离"
                   class="input-style font-14"
                   type="number"
-                  :disabled="!scope.row.type"
                 ></el-input>
                 <!-- :disabled="scope.row.condition == 'F'" -->
               </template>

+ 20 - 18
static/Config/config.js

@@ -139,32 +139,33 @@ window.projectinformation = [
   {
     id: "ertyuiop",
     meetingProgress: 0,
-    applicant: "三亚保岭投资发展有限公司",
-    projectname: "保利·栖山雨茗安居房项目",
-    projectaddress: "温泉二路南侧、 规划路北侧",
-    plotnumber: "bl-04-04、bl-04-08",
-    landarea: "58042.62平方米(约87.06亩)",
-    landusenature: "二类城镇住宅用地(070102)",
-    projectpositioning: "安居房",
-    landsituation: "2023年11月拿地, 12月22日取得不动产权证书",
+    applicant: "三亚投资发展有限公司",
+    projectname: "东岸卓越城项目",
+    projectaddress: "抱坡路",
+    plotnumber: "BP08-03,BP08-11",
+    landarea: "45540平方米",
+    landusenature: "商服用地",
+    projectpositioning: "商业",
+    landsituation: "",
     totalprojectinvestment: "约19亿元",
     fundingsource: "企业投资",
   },
   {
     id: "222ertyuiop",
-    projectname: "222保利·栖山雨茗安居房项目",
+    projectname: "三亚投资发展有限公司",
     meetingProgress: 1,
-    applicant: "三亚保岭投资发展有限公司",
-    projectaddress: "温泉二路南侧、 规划路北侧",
-    plotnumber: "bl-04-04、bl-04-08",
-    landarea: "58042.62平方米(约87.06亩)",
-    landusenature: "二类城镇住宅用地(070102)",
-    projectpositioning: "安居房",
-    landsituation: "2023年11月拿地, 12月22日取得不动产权证书",
+    applicant: "东岸卓越城项目",
+    projectaddress: "抱坡路",
+    plotnumber: "BP08-03,BP08-11",
+    landarea: "45540平方米",
+    landusenature: "商服用地",
+    projectpositioning: "商业",
+    landsituation: "",
     totalprojectinvestment: "约19亿元",
     fundingsource: "企业投资",
   },
 ];
+
 //报建模型
 window.constructionmodel = [
   {
@@ -172,8 +173,8 @@ window.constructionmodel = [
     projectinformationid: "ertyuiop",
     modelname: "报建模型1",
     creationtime: "2024-04-24 17:22:13",
-    url: "http://192.168.60.2:8090/iserver/services/3D-fangan/rest/realspace",
-    dataurl: "http://192.168.60.2:8090/iserver/services/data-fangan/rest/data",
+    url: "http://192.168.60.2:8090/iserver/services/3D-fangan2/rest/realspace",
+    dataurl: "http://192.168.60.2:8090/iserver/services/data-fangan2/rest/data",
     dataSourceName: "DongAnZhuoYueCheng",
     datasetName: "建筑轮廓",
     selectionStatus: false,
@@ -225,6 +226,7 @@ window.constructionmodel = [
   },
 ];
 
+
 //图层服务查询分组树
 window.layerTree = [
   {

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 1
static/data/地标.json


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.