Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

package.json

@@ -10,7 +10,7 @@
         "build": "node build/build.js"
     },
     "dependencies": {
-        "@turf/turf": "^7.0.0",
+        "@turf/turf": "^6.5.0",
         "axios": "^0.19.2",
         "echarts": "^4.8.0",
         "element-ui": "^2.15.14",

src/components/3DAnalysis/Smashing/Smashing.vue

@@ -87,6 +87,7 @@ export default {
       // );
       //绘制多边形
       const that = this;
+      let tooltip = createTooltip(document.body);
 
       that.clear();
       // let handler = new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas);

src/router/index.js

@@ -62,7 +62,7 @@ export const constantRoutes = [{
     {
         path: '/siteselection',
         component: () =>
-            import('@/views/siteselection'),
+            import('@/views/siteselection/index.vue'),
         hidden: true
     },
     {

src/views/ConstructionApplication3D/backLineAnalysis/backLineAnalysisinfo.vue

@@ -3,7 +3,7 @@
     <el-row :gutter="10">
       <el-col :span="24">
         <div class="titleHeader">
-          <span>超建筑退线面积:80.45平方米。</span>
+          <span>超建筑退线面积:{{ cczmj }}平方米。</span>
           <br />
           <span v-if="TableData.length > 0">结论：超出建筑退线范围。</span>
           <span v-else>结论：未超出建筑退线范围。</span>
@@ -63,6 +63,7 @@ import {
 export default {
   data() {
     return {
+      cczmj: 0,
       TableData: [],
     };
   },
@@ -98,6 +99,7 @@ export default {
   methods: {
     async init() {
       //查询当前项目建筑轮廓范围
+      this.cczmj = 0;
       let jzlkList = [];
       if (this.info.Minfo.dataurl && this.info.Minfo.dataSourceName) {
         let queryByGeometryParameters = {
@@ -150,6 +152,7 @@ export default {
             debugger;
             jzlkData.ccmj = Area * FLOOR;
             if (jzlkData.ccmj > 0) {
+              this.cczmj += jzlkData.ccmj;
               this.TableData.push(jzlkData);
             }
           });

src/views/ConstructionApplication3D/projectManagement/projectManagement.vue

@@ -1,9 +1,10 @@
 <template>
   <div style="width: 100%; padding: 1rem 1rem 0rem 1rem; color: white">
     <el-row :gutter="10">
+      <!-- 这是我们集成过来的项目，在这个项目里调试，文件位置和你们给我的是一样的 -->
       <el-col :span="12">
         <el-input
-          size="mini"
+          size="mini" 
           placeholder="请输入内容"
           v-model="input3"
           class="input-with-select"
@@ -232,18 +233,7 @@
                                     @click.stop="normAnalysis(itemModel)"
                                     >指标分析
                                   </el-button>
-                                  <el-button
-                                    type="primary"
-                                    size="mini"
-                                    @click.stop="backLineAnalysis(itemModel)"
-                                    >建筑退线
-                                  </el-button>
-                                  <el-button
-                                    type="primary"
-                                    size="mini"
-                                    @click.stop="occupyAnalysis(itemModel)"
-                                    >占压分析
-                                  </el-button>
+                                  
                                 </el-col>
                               </el-row>
                             </el-col>

src/views/siteselection.vue → src/views/siteselection/index.vue

@@ -23,8 +23,9 @@
   }
   
   .innerContainer {
-    width: 350px;
-    height: calc(100% - 20px);
+    width: 430px;
+    // height: calc(100% - 20px);
+    height: 800px;
     position: absolute;
     background: #041024;
     z-index: 99;

static/Config/config.js

@@ -122,8 +122,8 @@ window.constructionmodel = [
     x: "109.55145569681383",
     y: "18.28012526287734",
     z: "2000.0",
-    url: "http://192.168.1.30:8091/iserver/services/3D-fangan/rest/realspace",
-    dataurl: "http://192.168.1.30:8091/iserver/services/data-fangan/rest/data",
+    url: "http://192.168.60.3:8099/iserver/services/3D-fangan/rest/realspace",
+    dataurl: "http://192.168.60.3:8099/iserver/services/data-fangan/rest/data",
     dataSourceName: "sanyatieluxiaoqu",
     datasetName: "Model",
     selectionStatus: false,
@@ -143,8 +143,8 @@ window.constructionmodel = [
     x: "109.55145569681383",
     y: "18.28012526287734",
     z: "2000.0",
-    url: "http://192.168.1.30:8091/iserver/services/3D-fangan2/rest/realspace",
-    dataurl: "http://192.168.1.30:8091/iserver/services/data-fangan2/rest/data",
+    url: "http://192.168.60.3:8099/iserver/services/3D-fangan2/rest/realspace",
+    dataurl: "http://192.168.60.3:8099/iserver/services/data-fangan2/rest/data",
     dataSourceName: "sanyatieluxiaoqu2",
     datasetName: "Model",
     selectionStatus: false,
@@ -164,8 +164,8 @@ window.constructionmodel = [
     x: "109.55145569681383",
     y: "18.28012526287734",
     z: "2000.0",
-    url: "http://192.168.1.30:8091/iserver/services/3D-fangan2/rest/realspace",
-    dataurl: "http://192.168.1.30:8091/iserver/services/data-fangan2/rest/data",
+    url: "http://192.168.60.3:8099/iserver/services/3D-fangan2/rest/realspace",
+    dataurl: "http://192.168.60.3:8099/iserver/services/data-fangan2/rest/data",
     dataSourceName: "sanyatieluxiaoqu2",
     datasetName: "Model",
     selectionStatus: true,
@@ -378,7 +378,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "地类图斑",
-          url: "http://192.168.1.30:8091/iserver/services/data-sanyamap1-2/rest/data",
+          url: "http://192.168.60.3:8099/iserver/services/data-sanyamap1/rest/data",
           dataSourceName: "sanya",
           datasetName: "地类图斑",
         },
@@ -520,7 +520,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "规划地块",
-          url: "http://192.168.1.30:8091/iserver/services/data-sanyamap1-2/rest/data",
+          url: "http://192.168.60.3:8099/iserver/services/data-sanyamap1/rest/data",
           dataSourceName: "sanya",
           datasetName: "规划地块",
         },
@@ -622,7 +622,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "建筑退线",
-          url: "http://192.168.1.30:8091/iserver/services/data-sanyamap1-2/rest/data",
+          url: "http://192.168.60.3:8099/iserver/services/data-sanyamap1/rest/data",
           dataSourceName: "sanya",
           datasetName: "建筑退线",
         },
@@ -724,7 +724,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "道路中线",
-          url: "http://192.168.1.30:8091/iserver/services/data-sanyamap1-2/rest/data",
+          url: "http://192.168.60.3:8099/iserver/services/data-sanyamap1/rest/data",
           dataSourceName: "sanya",
           datasetName: "道路中线",
         },
@@ -744,7 +744,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "禁止开口线",
-          url: "http://192.168.1.30:8091/iserver/services/data-sanyamap1-2/rest/data",
+          url: "http://192.168.60.3:8099/iserver/services/data-sanyamap1/rest/data",
           dataSourceName: "sanya",
           datasetName: "禁止开口线",
         },