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

src/store/store.js

@@ -57,6 +57,10 @@ var store2 = {
                 bar: [],
             }
         },
+        regional_information: {
+            id: 4602,
+            name: '',
+        },
         cockpit_gkzb: {
             // 生态保护红线面积
             mj: 0,
@@ -94,6 +98,9 @@ var store2 = {
     setS3MList(newValue) {//压平
         this.state.S3MList = newValue;
     },
+    setRegionalInformation(newValue) {//行政区划信息存储
+        this.state.regional_information = newValue;
+    },
     setModelLayerList(newValue) {
         this.state.modellayerlist = newValue;
     },
@@ -198,8 +205,4 @@ var store2 = {
 
 //   console.log(this.sharedState.message)
 //   store.setMessageAction("dajiahao")
-
-
-
-
 export default store2

src/views/cockpitNew1/bjxm.vue

@@ -1,11 +1,3 @@
-<!--
- * @Author: liukeke
- * @Date: 2024-06-08 12:51:03
- * @LastEditTime: 2024-06-08 16:59:26
- * @LastEditors: liukeke
- * @FilePath: \real3d-portalsite\src\views\cockpitNew1\bjxm.vue
- * @Description: 
--->
 <template>
   <div class="bjxm">
     <div class="title">
@@ -57,12 +49,12 @@ export default {
       var dataList = [
         {
           value: 31,
-          name: "城市报建"
+          name: "城市报建",
         },
         {
           value: 43,
-          name: "私宅报建"
-        }
+          name: "私宅报建",
+        },
       ];
       var color2 = [
         {
@@ -75,15 +67,15 @@ export default {
             colorStops: [
               {
                 offset: 0,
-                color: "#FC8053"
+                color: "#FC8053",
               },
               {
                 offset: 1,
-                color: "#F2CAA4"
-              }
+                color: "#F2CAA4",
+              },
             ],
-            global: false
-          }
+            global: false,
+          },
         },
         {
           color: {
@@ -95,15 +87,15 @@ export default {
             colorStops: [
               {
                 offset: 0,
-                color: "#5583e7"
+                color: "#5583e7",
               },
               {
                 offset: 1,
-                color: "#36dddb"
-              }
+                color: "#36dddb",
+              },
             ],
-            global: false
-          }
+            global: false,
+          },
         },
         {
           color: {
@@ -115,16 +107,16 @@ export default {
             colorStops: [
               {
                 offset: 0,
-                color: "#f888b1"
+                color: "#f888b1",
               },
               {
                 offset: 1,
-                color: "#fbe6ee"
-              }
+                color: "#fbe6ee",
+              },
             ],
-            global: false
-          }
-        }
+            global: false,
+          },
+        },
       ];
       var dataAll = 0;
       dataList.forEach((item, index) => {
@@ -136,14 +128,14 @@ export default {
         backgroundColor: "rgba(0,0,0,0)",
         title: {
           text: "报建数量",
-          x:'20%',
+          x: "20%",
           textStyle: {
             //  rich: {
-            fontSize:14,
+            fontSize: 14,
             color: "#fff",
             fontWeight: "bold",
             // align: "35%"
-     
+
             //        a: {
             //           color: "#fff",
             //           fontSize: 42,
@@ -158,7 +150,7 @@ export default {
             //  },
           },
           x: "20%",
-          y: "45%"
+          y: "45%",
         },
         legend: {
           orient: "vertical",
@@ -173,8 +165,8 @@ export default {
           textStyle: {
             //图例文字的样式
             color: "#fff",
-            fontSize: 16
-          }
+            fontSize: 16,
+          },
         },
         graphic: [
           {
@@ -206,8 +198,8 @@ export default {
               //     // textAlign: "center"
               //   }
               // }
-            ]
-          }
+            ],
+          },
         ],
         series: [
           {
@@ -220,42 +212,42 @@ export default {
               normal: {
                 show: false,
                 position: "inner", // 数值显示在内部
-                formatter: params => {
+                formatter: (params) => {
                   console.log(params);
                   return `${params.name}` + ":" + +params.value + "个";
-                }
+                },
               },
               textStyle: {
                 //图例文字的样式
                 color: "#fff",
-                fontSize: 16
-              }
+                fontSize: 16,
+              },
             },
             emphasis: {
               label: {
                 show: true,
                 fontSize: "16",
-                fontWeight: "bold"
-              }
+                fontWeight: "bold",
+              },
             },
             labelLine: {
               show: false,
-              length: 48
+              length: 48,
             },
-            data: dataList
-          }
+            data: dataList,
+          },
         ],
         grid: {
           left: "20%",
           // right: "40%",
           // bottom: "10%",
           top: "16%",
-          containLabel: true
-        }
+          containLabel: true,
+        },
       };
 
       myChart.setOption(option);
-    }
+    },
   },
   beforeCreate() {}, //生命周期 - 创建之前
   created() {}, //生命周期 - 创建完成（可以访问当前this实例）
@@ -268,21 +260,21 @@ export default {
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroy() {}, //生命周期 - 销毁完成
   activated() {}, //若组件实例是 <KeepAlive> 缓存树的一部分，当组件被插入到 DOM 中时调用。
-  deactivated() {} //若组件实例是 <KeepAlive> 缓存树的一部分，当组件从 DOM 中被移除时调用。
+  deactivated() {}, //若组件实例是 <KeepAlive> 缓存树的一部分，当组件从 DOM 中被移除时调用。
 };
 </script>
 <style lang="scss" scoped>
 .bjxm {
   border-width: 0px;
-  position: relative;
+  position: absolute;
   width: 407px;
   height: 310px;
+  top: 68%;
+  left: 1080px;
   background: inherit;
   border: none;
   border-radius: 0px;
   -webkit-box-shadow: none;
-  left: 1080px;
-  top: 270px;
   box-shadow: none;
 }
 

src/views/viewer.vue

@@ -197,7 +197,10 @@ export default {
                             const name = pickObj.id.properties.name.getValue();
                             const address = pickObj.id.properties.adcode.getValue();
                             const center = pickObj.id.properties.centroid.getValue();
-
+                            store.state.regional_information={
+                                id:address,
+                                name:name,
+                            }
                             // 选中状态
                             pickObj.id.polygon._material.color = Cesium.Color.fromCssColorString(that.xzqh_color_click);
                             pickObj.id.polygon.extrudedHeight = 850;