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

src/components/Viewer/smViewer.vue

@@ -1,7 +1,7 @@
 <template>
-  <div id="cesiumContainer" class="cockpitNew" :class="isbig|| $props.isdefaultbig ? 'cesiumbig' : ''" ref="viewer">
-    <i class="cesiumbtn" v-if="!$props.isdefaultbig" :class="isbig ? 'el-icon-aim' : 'el-icon-rank'" :title="isbig ? '缩小' : '放大'"
-      @click="viewerChange"></i>
+  <div id="cesiumContainer" class="cockpitNew" :class="isbig || $props.isdefaultbig ? 'cesiumbig' : ''" ref="viewer">
+    <i class="cesiumbtn" v-if="!$props.isdefaultbig" :class="isbig ? 'el-icon-aim' : 'el-icon-rank'"
+      :title="isbig ? '缩小' : '放大'" @click="viewerChange"></i>
     <!-- 工具选择组件 -->
     <!-- <tool-bar></tool-bar>
     <compass></compass>
@@ -35,7 +35,7 @@ export default {
       //是否折叠
       type: Boolean,
     },
-    isdefaultbig:{
+    isdefaultbig: {
       //是否默认最大
       type: Boolean,
     }
@@ -204,6 +204,57 @@ export default {
         },
       })
       store.setisInitViewer(true); //初始化viewer标志
+
+
+      // 添加管线服务
+      //点击属性查询
+      // var promise = scene.open('http://192.168.60.3:8099/iserver/services/3D-ResultNetWork-GuanXian/rest/realspace');
+      // setTimeout(() => {
+      //   let buildingLayer = scene.layers.find("ResultNetWork@管线#1");
+      //   buildingLayer.indexedDBSetting.isAttributesSave = true;//保存属性
+
+      //   var handler = new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas);
+      //   handler.setInputAction(function (evt) {
+      //     var position = scene.pickPosition(evt.position);
+
+      //     if (buildingLayer.getSelection().length > 0) {
+      //       const selectedId = Number(buildingLayer.getSelection()[0]);
+      //       buildingLayer.getAttributesById([selectedId]).then(function (atts) {
+      //         if (atts) {
+      //           console.log(atts);
+
+      //           viewer.entities.removeAll();
+
+      //           var length = Object.keys(atts).length;
+      //           var des;
+      //           for (var i = 0; i < length; i++) {
+      //             var key = Object.keys(atts)[i];
+      //             var value = atts[key];
+
+      //             console.log(key);
+      //             console.log(value);
+
+      //             var index = i.toString();
+      //             if (i == 0) {
+      //               des = '<table class="cesium-infoBox-defaultTable"><tbody>' + '<tr><th>' + key + '</th><td>' + value + '</td></tr>';
+      //             } else if (i == length - 1) {
+      //               des += '<tr><th>' + key + '</th><td>' + value + '</td></tr>' + "</tbody></table>";
+      //             } else {
+      //               des += '<tr><th>' + key + '</th><td>' + value + '</td></tr>';
+      //             }
+      //           }
+
+
+
+      //         }
+      //       }
+      //       )
+      //     }
+      //   }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+
+      // }, 3300);
+    
+    
     },
     viewerChange() {
       this.isbig = !this.isbig

src/store/store.js

@@ -39,7 +39,7 @@ var store2 = {
         sceneLayerlist: [],
         flattenNames: [],//存储压平的名称数组
         cockpit_date: null,
-        viewer_flag : true,
+        viewer_flag: true,
         cockpit_hysy: {
             text: {
                 xzqhdm_number: 0,
@@ -78,6 +78,7 @@ var store2 = {
             kfbjmj: 0,
             // 覆盖城镇开发边界
             bfb: 0,
+            ghdkmj: 0,//已入库管控范围
         }
     },
     setisInitViewer(newValue) {
@@ -209,7 +210,7 @@ var store2 = {
         this.state.cockpit_date = newValue;
     }, setCockpitGkzb(newValue) {
         this.state.cockpit_gkzb = newValue;
-    },setViewerFlagb(newValue) {
+    }, setViewerFlagb(newValue) {
         this.state.viewer_flag = newValue;
     },
 }

src/views/cockpitNew1/gkzb.vue

@@ -74,10 +74,10 @@
           </div>
         </div>
         <div class="text">
-          <p>己入库控规范国
+          <p>己入库控规范围
 
           </p>
-          <span>66</span>平方干米
+          <span>{{ store.state.cockpit_gkzb.ghdkmj }}</span>平方干米
 
         </div>
       </div>
@@ -182,7 +182,7 @@ export default {
         yjjbntmj: obj_yjjbntmj_data.data[0].yjjbntmj,// 永久基本农田保护面积
         kfbjmj: obj_kfbjmj_data.data[0].kfbjmj,// 城市开发边界
         bfb: obj_kfbjmj_data.data[0].bfb * 100,// 覆盖城镇开发边界
-
+        ghdkmj: obj_kfbjmj_data.data[0].ghdkmj//已入库管控范围
       });
 
     }

src/views/cockpitNew1/hysy.vue

@@ -340,7 +340,6 @@ export default {
         },
         async label_data() {
             const that = this;
-            console.log(store.state.cockpit_date, "store.state.cockpit_date");
 
             let obj = {
                 beginTime: store.state.cockpit_date[0],

src/views/viewer.vue

@@ -164,6 +164,7 @@ export default {
                 yjjbntmj: obj_yjjbntmj_data.data[0].yjjbntmj,// 永久基本农田保护面积
                 kfbjmj: obj_kfbjmj_data.data[0].kfbjmj,// 城市开发边界
                 bfb: obj_kfbjmj_data.data[0].bfb * 100,// 覆盖城镇开发边界
+                ghdkmj: obj_kfbjmj_data.data[0].ghdkmj//已入库管控范围
 
             });
             console.log(store.state.cockpit_gkzb, "sadas");
@@ -236,6 +237,7 @@ export default {
                             that.hysyq(address);
                             // 驾驶舱土地收储
                             that.tdsc_xzqh(address);
+                            // 管控指标
                             that.gkzb_xzqh(address);
 
                         } else {