功能与样式修改

src/components/windNeedCharts/dash-pie-chart.vue

@@ -249,6 +249,7 @@ export default {
                     color: "#fff",
                     fontSize: 12,
                     fontWeight: "bold",
+                    fontFamily: "Bicubik",
                     position: "center",
                     show: true,
                   },
@@ -381,5 +382,6 @@ export default {
   height: 100%;
   display: block;
   margin: auto;
+  font-family: "Bicubik";
 }
 </style>

src/components/windNeedCharts/list-bar-chart2-home.vue

@@ -147,6 +147,7 @@ export default {
                 textStyle: {
                 //   color: partten.getColor(currColor),
                 color: "#00E5FF",
+                fontFamily: "Bicubik",
                   // this.$store.state.themeName === "dark" ? "#ffffff" : "#000",
                   fontSize: 12,
                 },

src/components/windNeedCharts/pieChart.vue

@@ -192,7 +192,7 @@ export default {
             roseType: "area",
             label: {
               normal: {
-                color: "#fff",
+                color: "#fff",fontFamily: "Bicubik",fontSize: "10px",
                 formatter: "{d}%",
               },
             },

src/views/cesium.vue

@@ -442,7 +442,7 @@ export default {
       this.initCesiumBaseMapImage();
       //   this.switchWindLayer();
       this.showAllStation(viewer, allStationJson.station);
-      //   this.initGeoJsonData();
+        this.initGeoJsonData(); 
     },
 
     // 初始化地形

src/views/cesiumComponents/windMap2D.vue

@@ -828,7 +828,7 @@ export default {
         const glZb = this.viewer.entities.add({
           position,
           label: {
-            text: `功率: ${glText} MW`,
+            text: `功率: ${glText} MW/n风速: ${fsText}/n转速: ${zsText}`,
             font: "14pt sans-serif",
             style: Cesium.LabelStyle.FILL_AND_OUTLINE,
             outlineWidth: 2,
@@ -854,67 +854,68 @@ export default {
 
         glZb.zb = "glText";
 
-        const fsZb = this.viewer.entities.add({
-          position,
-          label: {
-            text: `风速: ${fsText}`,
-            font: "14pt sans-serif",
-            style: Cesium.LabelStyle.FILL_AND_OUTLINE,
-            outlineWidth: 2,
-            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-            showBackground: false, // 显示背景
-            backgroundColor: new Cesium.Color.fromCssColorString(
-              "rgba(13, 38, 77, 0.5)"
-            ), // 背景颜色
-            backgroundPadding: new Cesium.Cartesian2(10, 10), // 背景内边距
-            verticalOrigin: Cesium.VerticalOrigin.CENTER, // 垂直对齐方式
-            horizontalOrigin: Cesium.HorizontalOrigin.LEFT, // 水平对齐方式
-            pixelOffset: new Cesium.Cartesian2(80, -20), // 原来是-20，现在改为30，向上移动
-            eyeOffset: new Cesium.Cartesian3(0, 0, 0), // 保持固定大小
-            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-            scaleByDistance: new Cesium.NearFarScalar(
-              6000, // 6000米内
-              1,
-              9000, // 9000米外
-              0.8
-            ),
-          },
-        });
+        // const fsZb = this.viewer.entities.add({
+        //   position,
+        //   label: {
+        //     text: `风速: ${fsText}`,
+        //     font: "14pt sans-serif",
+        //     style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+        //     outlineWidth: 2,
+        //     verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+        //     showBackground: false, // 显示背景
+        //     backgroundColor: new Cesium.Color.fromCssColorString(
+        //       "rgba(13, 38, 77, 0.5)"
+        //     ), // 背景颜色
+        //     backgroundPadding: new Cesium.Cartesian2(10, 10), // 背景内边距
+        //     verticalOrigin: Cesium.VerticalOrigin.CENTER, // 垂直对齐方式
+        //     horizontalOrigin: Cesium.HorizontalOrigin.LEFT, // 水平对齐方式
+        //     pixelOffset: new Cesium.Cartesian2(80, -20), // 原来是-20，现在改为30，向上移动
+        //     eyeOffset: new Cesium.Cartesian3(0, 0, 0), // 保持固定大小
+        //     heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+        //     scaleByDistance: new Cesium.NearFarScalar(
+        //       6000, // 6000米内
+        //       1,
+        //       9000, // 9000米外
+        //       0.8
+        //     ),
+        //   },
+        // });
 
-        fsZb.zb = "fsText";
+        // fsZb.zb = "fsText";
 
-        const zsZb = this.viewer.entities.add({
-          position,
-          label: {
-            text: `转速: ${zsText}`,
-            font: "14pt sans-serif",
-            style: Cesium.LabelStyle.FILL_AND_OUTLINE,
-            outlineWidth: 2,
-            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-            showBackground: false, // 显示背景
-            backgroundColor: new Cesium.Color.fromCssColorString(
-              "rgba(13, 38, 77, 0.5)"
-            ), // 背景颜色
-            backgroundPadding: new Cesium.Cartesian2(10, 10), // 背景内边距
-            verticalOrigin: Cesium.VerticalOrigin.CENTER, // 垂直对齐方式
-            horizontalOrigin: Cesium.HorizontalOrigin.LEFT, // 水平对齐方式
-            pixelOffset: new Cesium.Cartesian2(80, 0), // 原来是-20，现在改为30，向上移动
-            eyeOffset: new Cesium.Cartesian3(0, 0, 0), // 保持固定大小
-            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-            scaleByDistance: new Cesium.NearFarScalar(
-              6000, // 6000米内
-              1,
-              9000, // 9000米外
-              0.8
-            ),
-          },
-        });
+        // const zsZb = this.viewer.entities.add({
+        //   position,
+        //   label: {
+        //     text: `转速: ${zsText}`,
+        //     font: "14pt sans-serif",
+        //     style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+        //     outlineWidth: 2,
+        //     verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+        //     showBackground: false, // 显示背景
+        //     backgroundColor: new Cesium.Color.fromCssColorString(
+        //       "rgba(13, 38, 77, 0.5)"
+        //     ), // 背景颜色
+        //     backgroundPadding: new Cesium.Cartesian2(10, 10), // 背景内边距
+        //     verticalOrigin: Cesium.VerticalOrigin.CENTER, // 垂直对齐方式
+        //     horizontalOrigin: Cesium.HorizontalOrigin.LEFT, // 水平对齐方式
+        //     pixelOffset: new Cesium.Cartesian2(80, 0), // 原来是-20，现在改为30，向上移动
+        //     eyeOffset: new Cesium.Cartesian3(0, 0, 0), // 保持固定大小
+        //     heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+        //     scaleByDistance: new Cesium.NearFarScalar(
+        //       6000, // 6000米内
+        //       1,
+        //       9000, // 9000米外
+        //       0.8
+        //     ),
+        //   },
+        // });
 
-        zsZb.zb = "zsText";
+        // zsZb.zb = "zsText";
 
         this.zbLabelList.push({
           fjbh: model.fjbh,
-          zb: [wtName, glZb, fsZb, zsZb],
+        //   zb: [wtName, glZb, fsZb, zsZb],
+          zb: [wtName, glZb],
         });
       }
     },

src/views/cesiumComponents/windMap3D.vue

@@ -1030,6 +1030,7 @@ export default {
           position,
           label: {
             text: `功率: ${glText} MW`,
+            // text: `功率: ${glText} MW\n风速: ${fsText}\n转速: ${zsText}`,
             font: "14pt sans-serif",
             style: Cesium.LabelStyle.FILL_AND_OUTLINE,
             outlineWidth: 2,
@@ -1116,6 +1117,7 @@ export default {
         this.zbLabelList.push({
           fjbh: model.fjbh,
           zb: [wtName, glZb, fsZb, zsZb],
+        //   zb: [wtName, glZb],
         });
       }
 

src/views/cesiumComponents/windView2.vue

@@ -577,7 +577,7 @@
                         : 'background-color:#05BB4C'
                     "
                     ></span>
-                    <span style="color: #fff">{{ item[0].total }}</span>
+                    <span style="color: #fff;font-family: 'Bicubik';font-size: 10px">{{ item[0].total }}</span>
                 </div>
                 <list-bar-chart-2-home
                     :list="item"
@@ -1284,7 +1284,7 @@ export default {
   background-color: rgba(0, 0, 0, 0.4);
   border: 1px solid rgba(255, 255, 255, 0.2);
   color: #f0f0f0;
-  border-radius: 10px;
+  border-radius: 5px;
   cursor: pointer;
   font-size: 14px;
   transition: background-color 0.3s ease, border-color 0.3s ease;

src/views/weatherComponents/cesiumweatherView.vue

@@ -97,13 +97,13 @@
                         </div>
                     </div>
                 </div>
-                <el-tooltip
+                <!-- <el-tooltip
                     effect="dark"
                     content="天气详情点击查看"
                     placement="bottom-end"
                 >
                     <span style="cursor: pointer" @click="showDetail">☰</span>
-                </el-tooltip>
+                </el-tooltip> -->
             </div>
 
             <div class="market-demand">
@@ -381,6 +381,7 @@ export default {
         },
         changeShowWeather(val) {
             this.showWeather = val 
+            this.showDetail()
         },
         coverOnChange(it) {
             this.coverArr.forEach(it => {
@@ -1065,7 +1066,7 @@ display: block;border-right: 2px solid #fff; }
 .weather-temp .value { font-size: 28px; font-weight: 500; }
 .weather-temp .icon { font-size: 24px; }
 .weather-info .condition { font-size: 12px; color: #fff; }
-.market-demand { background-color: #00abbd; color: white; padding: 15px 10px; border-radius: 8px; font-size: 14px; }
+.market-demand { background-color: rgba(34, 60, 89, 0.7); color: white; padding: 15px 10px; border-radius: 8px; font-size: 14px; }
 .info-section { font-size: 13px; }
 .info-section h3 { font-size: 12px; font-weight: 600; text-transform: uppercase; color: #fff; margin-bottom: 15px; }
 .info-item { display: flex; justify-content: space-between; margin-bottom: 12px; }