横屏修改 其他BUG修改

public/static/config/modeConfig.js

@@ -7,14 +7,23 @@ let baseURL = null;
 // websocket 服务器地址
 let websocketUrl = null;
 
+// 3D 地球瓦片路径
+let tilesUrl = null;
+// 3D 地球最大支持放大到多少级
+const tilesMaxLevel = 18;
+
 // 适配器地址
 const adapterUrl = "http://10.155.32.4:8011/";
 
 if (localTest) {
     baseURL = "http://192.168.10.13:8082/" // 联机调试 - 石林
-        // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
+    // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
+
+    tilesUrl = "http://localhost:8080/static/cesium/Assets/Textures/NaturalEarthII";
 } else {
     baseURL = "http://10.155.32.4:8082/" // 正式环境
+
+    tilesUrl = "http://10.155.32.4:8070/zhfx/new_tiles";
 }
 
 websocketUrl = (baseURL.replace(/http:\/\/|https:\/\//g, "")) + "gyee-websocket";
@@ -22,5 +31,7 @@ websocketUrl = (baseURL.replace(/http:\/\/|https:\/\//g, "")) + "gyee-websocket"
 window.__MODE__ = {
     baseURL,
     websocketUrl,
-    adapterUrl
+    adapterUrl,
+    tilesUrl,
+    tilesMaxLevel
 };

src/components/other/cesium/index.vue

@@ -71,9 +71,7 @@ export default {
   data() {
     return {
       viewer: null,
-      url: "http://localhost:8080/static/cesium/Assets/Textures/temp",
-      // url: "http://localhost:8080/static/cesium/Assets/Textures/NaturalEarthII",
-      // url: "http://localhost:8082/static/cesium/Assets/Textures/NaturalEarthII",
+      url: window.__MODE__.tilesUrl,
       publicPath: "./",
       initPosition: [106.0231304, 37.73323706, 0],
 
@@ -136,7 +134,7 @@ export default {
         imageryProvider: new Cesium.TileMapServiceImageryProvider({
           url: that.url,
           fileExtension: "jpg",
-          maximumLevel: 13,
+          maximumLevel: window.__MODE__.tilesMaxLevel,
         }),
       });
 
@@ -222,6 +220,19 @@ export default {
           } else {
             this.geoJSON();
             this.windtShow = true;
+            this.viewer.camera.flyTo({
+              // fromDegrees()将经纬度和高程转换为世界坐标
+              destination: Cesium.Cartesian3.fromDegrees(
+                106.052978,
+                33.122394,
+                400000
+              ),
+              orientation: {
+                heading: Cesium.Math.toRadians(0.0), // 方向
+                pitch: Cesium.Math.toRadians(-45.0), // 倾斜角度
+                roll: 0,
+              },
+            });
             wtTree.forEach((ele) => {
               this.addFengjiModel(
                 Cesium.Cartesian3.fromDegrees(ele.lng, ele.lat, 1650)
@@ -361,10 +372,10 @@ export default {
           h
         ),
         //duration:5, // 设置飞行持续时间，默认会根据距离来计算
-        complete: function () {
+        complete() {
           // 到达位置后执行的回调函数
         },
-        cancle: function () {
+        cancle() {
           // 如果取消飞行则会调用此函数
         },
         pitchAdjustHeight: -90, // 如果摄像机飞越高于该值，则调整俯仰俯仰的俯仰角度，并将地球保持在视口中。
@@ -413,7 +424,7 @@ export default {
           minimumPixelSize: 100,
           // 模型最大刻度
           maximumSize: 100,
-          //设置模型最大放大大小
+          // 设置模型最大放大大小
           maximumScale: 150,
           // 模型是否可见
           show: true,
@@ -426,7 +437,10 @@ export default {
           // 仅用于调试。显示模型绘制时的边界球。
           debugShowBoundingVolume: false,
           scale: 0.05,
-          runAnimations: true, //是否运行模型中的动画效果
+          // 是否运行模型中的动画效果
+          runAnimations: true, 
+          // 模型贴地
+          heightReference: Cesium.HeightReference.CLAMP_TO_GROUND
         },
         // 添加描述
         description: "风机模型",

src/components/other/clock/index.vue

@@ -39,7 +39,7 @@ export default {
     this.drawCoolClock();
     this.timer = setInterval(() => {
       this.drawCoolClock();
-    }, 30);
+    }, 150);
   },
 
   unmounted() {

src/views/sisView/index.vue

@@ -3,82 +3,82 @@
     <div class="viewItem">
       <clock :width="330" :height="300" />
       <div class="viewTitle">综<br /><br />合<br /><br />参<br /><br />数</div>
-      <div class="contentBox" style="height: 300px;">
+      <div class="contentBox" style="height: 300px">
         <div class="contentItem">
           <div class="itemName size5">装机容量</div>
-          <div class="itemNum">{{items.zjrl}}</div>
+          <div class="itemNum">{{ items.zjrl }}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName size6">安全天数</div>
-          <div class="itemNum">{{items.aqts}}</div>
+          <div class="itemNum">{{ items.aqts }}</div>
           <div class="itemUnit">天</div>
           <div class="itemName size5">总功率</div>
-          <div class="itemNum">{{items.zgl}}</div>
+          <div class="itemNum">{{ items.zgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName size5">日发电量</div>
-          <div class="itemNum">{{items.rfdl}}</div>
+          <div class="itemNum">{{ items.rfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName size6">年利用小时</div>
-          <div class="itemNum">{{items.nlyxs}}</div>
+          <div class="itemNum">{{ items.nlyxs }}</div>
           <div class="itemUnit">小时</div>
           <div class="itemName size5">年发电量</div>
-          <div class="itemNum">{{items.nfdl}}</div>
+          <div class="itemNum">{{ items.nfdl }}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
           <div class="itemName size5">上网电量</div>
-          <div class="itemNum">{{items.swdl}}</div>
+          <div class="itemNum">{{ items.swdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName size6">月利用小时</div>
-          <div class="itemNum">{{items.ylyxs}}</div>
+          <div class="itemNum">{{ items.ylyxs }}</div>
           <div class="itemUnit">小时</div>
           <div class="itemName size5">月发电量</div>
-          <div class="itemNum">{{items.yfdl}}</div>
+          <div class="itemNum">{{ items.yfdl }}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">复位及时率</div>
-          <div class="itemNum">{{items.fwjsl}}</div>
+          <div class="itemNum">{{ items.fwjsl }}</div>
           <div class="itemUnit">%</div>
           <div class="itemName size6">年计划电量</div>
-          <div class="itemNum">{{items.njhdl}}</div>
+          <div class="itemNum">{{ items.njhdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName size5">年完成率</div>
-          <div class="itemNum">{{items.nwcl}}</div>
+          <div class="itemNum">{{ items.nwcl }}</div>
           <div class="itemUnit">%</div>
         </div>
         <div class="contentItem">
           <div class="itemName">转换及时率</div>
-          <div class="itemNum">{{items.zhjsl}}</div>
+          <div class="itemNum">{{ items.zhjsl }}</div>
           <div class="itemUnit">%</div>
           <div class="itemName size6">月计划电量</div>
-          <div class="itemNum">{{items.yjhdl}}</div>
+          <div class="itemNum">{{ items.yjhdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName size5">月完成率</div>
-          <div class="itemNum">{{items.ywcl}}</div>
+          <div class="itemNum">{{ items.ywcl }}</div>
           <div class="itemUnit">%</div>
         </div>
         <div class="contentItem">
           <div class="itemName">消缺及时率</div>
-          <div class="itemNum">{{items.xqjsl}}</div>
+          <div class="itemNum">{{ items.xqjsl }}</div>
           <div class="itemUnit">%</div>
           <div class="itemName">综合厂用电率</div>
-          <div class="itemNum">{{items.zhcydl}}</div>
+          <div class="itemNum">{{ items.zhcydl }}</div>
           <div class="itemUnit">%</div>
           <div class="itemName size5">月M&nbsp;T&nbsp;B&nbsp;F</div>
-          <div class="itemNum">{{items.ymtbf}}</div>
+          <div class="itemNum">{{ items.ymtbf }}</div>
           <div class="itemUnit">小时</div>
         </div>
         <div class="contentItem">
           <div class="itemName">风能利用率</div>
-          <div class="itemNum">{{items.fnlyl}}</div>
+          <div class="itemNum">{{ items.fnlyl }}</div>
           <div class="itemUnit">%</div>
           <div class="itemName">设备可利用率</div>
-          <div class="itemNum">{{items.sbklyl}}</div>
+          <div class="itemNum">{{ items.sbklyl }}</div>
           <div class="itemUnit">%</div>
           <div class="itemName size5">月可靠性</div>
-          <div class="itemNum">{{items.ykkx}}</div>
+          <div class="itemNum">{{ items.ykkx }}</div>
           <div class="itemUnit">%</div>
         </div>
       </div>
@@ -88,108 +88,108 @@
       <div class="contentBox">
         <div class="contentItem">
           <div class="itemName">装机容量</div>
-          <div class="itemNum">{{items.fdzjrl}}</div>
+          <div class="itemNum">{{ items.fdzjrl }}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName">实时风速</div>
-          <div class="itemNum">{{items.fdssfs}}</div>
+          <div class="itemNum">{{ items.fdssfs }}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">月发电量</div>
-          <div class="itemNum">{{items.fdyfdl}}</div>
+          <div class="itemNum">{{ items.fdyfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">年发电量</div>
-          <div class="itemNum">{{items.fdnfdl}}</div>
+          <div class="itemNum">{{ items.fdnfdl }}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">日发电量</div>
-          <div class="itemNum">{{items.fdrfdl}}</div>
+          <div class="itemNum">{{ items.fdrfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">实时功率</div>
-          <div class="itemNum">{{items.fdssgl}}</div>
+          <div class="itemNum">{{ items.fdssgl }}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName">利用小时</div>
-          <div class="itemNum">{{items.fdylyxs}}</div>
+          <div class="itemNum">{{ items.fdylyxs }}</div>
           <div class="itemUnit">小时(月)</div>
           <div class="itemName">利用小时</div>
-          <div class="itemNum">{{items.fdnlyxs}}</div>
+          <div class="itemNum">{{ items.fdnlyxs }}</div>
           <div class="itemUnit">小时(年)</div>
         </div>
         <div class="contentItem">
           <div class="itemName">上网电量</div>
-          <div class="itemNum">{{items.fdswdl}}</div>
+          <div class="itemNum">{{ items.fdswdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">总欠发</div>
-          <div class="itemNum">{{items.fdzqf}}</div>
+          <div class="itemNum">{{ items.fdzqf }}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">牛发电量</div>
-          <div class="itemNum">{{items.nssfdl}}</div>
+          <div class="itemNum">{{ items.nssfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">牛欠发</div>
-          <div class="itemNum">{{items.nssqf}}</div>
+          <div class="itemNum">{{ items.nssqf }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">牛风速</div>
-          <div class="itemNum">{{items.nssfs}}</div>
+          <div class="itemNum">{{ items.nssfs }}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">牛功率</div>
-          <div class="itemNum">{{items.nssgl}}</div>
+          <div class="itemNum">{{ items.nssgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">麻发电量</div>
-          <div class="itemNum">{{items.mhsfdl}}</div>
+          <div class="itemNum">{{ items.mhsfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">麻欠发</div>
-          <div class="itemNum">{{items.mhsqf}}</div>
+          <div class="itemNum">{{ items.mhsqf }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">麻风速</div>
-          <div class="itemNum">{{items.mhsfs}}</div>
+          <div class="itemNum">{{ items.mhsfs }}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">麻功率</div>
-          <div class="itemNum">{{items.mhsgl}}</div>
+          <div class="itemNum">{{ items.mhsgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">青发电量</div>
-          <div class="itemNum">{{items.qsfdl}}</div>
+          <div class="itemNum">{{ items.qsfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">青欠发</div>
-          <div class="itemNum">{{items.qsqf}}</div>
+          <div class="itemNum">{{ items.qsqf }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">青风速</div>
-          <div class="itemNum">{{items.qsfs}}</div>
+          <div class="itemNum">{{ items.qsfs }}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">青功率</div>
-          <div class="itemNum">{{items.qsgl}}</div>
+          <div class="itemNum">{{ items.qsgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">石发电量</div>
-          <div class="itemNum">{{items.sbqfdl}}</div>
+          <div class="itemNum">{{ items.sbqfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">石欠发</div>
-          <div class="itemNum">{{items.sbqqf}}</div>
+          <div class="itemNum">{{ items.sbqqf }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">石风速</div>
-          <div class="itemNum">{{items.sbqfs}}</div>
+          <div class="itemNum">{{ items.sbqfs }}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">石功率</div>
-          <div class="itemNum">{{items.sbqgl}}</div>
+          <div class="itemNum">{{ items.sbqgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">香发电量</div>
-          <div class="itemNum">{{items.xsfdl}}</div>
+          <div class="itemNum">{{ items.xsfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">香欠发</div>
-          <div class="itemNum">{{items.xsqf}}</div>
+          <div class="itemNum">{{ items.xsqf }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">香风速</div>
-          <div class="itemNum">{{items.xsfs}}</div>
+          <div class="itemNum">{{ items.xsfs }}</div>
           <div class="itemUnit">m/s</div>
           <div class="itemName">香功率</div>
-          <div class="itemNum">{{items.xsgl}}</div>
+          <div class="itemNum">{{ items.xsgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
       </div>
@@ -199,90 +199,90 @@
       <div class="contentBox">
         <div class="contentItem">
           <div class="itemName">装机容量</div>
-          <div class="itemNum">{{items.gfzjrl}}</div>
+          <div class="itemNum">{{ items.gfzjrl }}</div>
           <div class="itemUnit">MW</div>
           <div class="itemName">日照强度</div>
-          <div class="itemNum">{{items.gfrzqd}}</div>
+          <div class="itemNum">{{ items.gfrzqd }}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">实时功率</div>
-          <div class="itemNum">{{items.gfssgl}}</div>
+          <div class="itemNum">{{ items.gfssgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">日发电量</div>
-          <div class="itemNum">{{items.gfrfdl}}</div>
+          <div class="itemNum">{{ items.gfrfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">月发电量</div>
-          <div class="itemNum">{{items.gfyfdl}}</div>
+          <div class="itemNum">{{ items.gfyfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">年发电量</div>
-          <div class="itemNum">{{items.gfnfdl}}</div>
+          <div class="itemNum">{{ items.gfnfdl }}</div>
           <div class="itemUnit">万kWh</div>
         </div>
         <div class="contentItem">
           <div class="itemName">上网电量</div>
-          <div class="itemNum">{{items.gfswdl}}</div>
+          <div class="itemNum">{{ items.gfswdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">利用小时</div>
-          <div class="itemNum">{{items.gfylyxs}}</div>
+          <div class="itemNum">{{ items.gfylyxs }}</div>
           <div class="itemUnit">小时(月)</div>
-           <div class="itemName">利用小时</div>
-          <div class="itemNum">{{items.gfnlyxs}}</div>
+          <div class="itemName">利用小时</div>
+          <div class="itemNum">{{ items.gfnlyxs }}</div>
           <div class="itemUnit">小时(年)</div>
         </div>
         <div class="contentItem">
           <div class="itemName">武发电量</div>
-          <div class="itemNum">{{items.dwkfdl}}</div>
+          <div class="itemNum">{{ items.dwkfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">武日强度</div>
-          <div class="itemNum">{{items.dwkrzqd}}</div>
+          <div class="itemNum">{{ items.dwkrzqd }}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">武功率</div>
-          <div class="itemNum">{{items.dwkgl}}</div>
+          <div class="itemNum">{{ items.dwkgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">平发电量</div>
-          <div class="itemNum">{{items.plfdl}}</div>
+          <div class="itemNum">{{ items.plfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">平日强度</div>
-          <div class="itemNum">{{items.plrzqd}}</div>
+          <div class="itemNum">{{ items.plrzqd }}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">平功率</div>
-          <div class="itemNum">{{items.plgl}}</div>
+          <div class="itemNum">{{ items.plgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">宣发电量</div>
-          <div class="itemNum">{{items.xhfdl}}</div>
+          <div class="itemNum">{{ items.xhfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">宣日强度</div>
-          <div class="itemNum">{{items.xhrzqd}}</div>
+          <div class="itemNum">{{ items.xhrzqd }}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">宣功率</div>
-          <div class="itemNum">{{items.xhgl}}</div>
+          <div class="itemNum">{{ items.xhgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">马发电量</div>
-          <div class="itemNum">{{items.mchfdl}}</div>
+          <div class="itemNum">{{ items.mchfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">马日强度</div>
-          <div class="itemNum">{{items.mchrzqd}}</div>
+          <div class="itemNum">{{ items.mchrzqd }}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">马功率</div>
-          <div class="itemNum">{{items.mchgl}}</div>
+          <div class="itemNum">{{ items.mchgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
         <div class="contentItem">
           <div class="itemName">海发电量</div>
-          <div class="itemNum">{{items.hzjfdl}}</div>
+          <div class="itemNum">{{ items.hzjfdl }}</div>
           <div class="itemUnit">万kWh</div>
           <div class="itemName">海日强度</div>
-          <div class="itemNum">{{items.hzjrzqd}}</div>
+          <div class="itemNum">{{ items.hzjrzqd }}</div>
           <div class="itemUnit">W/㎡</div>
           <div class="itemName">海功率</div>
-          <div class="itemNum">{{items.hzjgl}}</div>
+          <div class="itemNum">{{ items.hzjgl }}</div>
           <div class="itemUnit">MW</div>
         </div>
       </div>
@@ -305,8 +305,9 @@ export default {
   // 数据
   data() {
     return {
-		items:{}
-	};
+      items: {},
+      timmer: null,
+    };
   },
 
   // 函数
@@ -319,34 +320,43 @@ export default {
           .css("height", viewTitle.eq(i).parent(".viewItem").css("height"));
       }
     },
-	viewAjax() {
-	  var that = this;
-	  that.API.requestData({
-	    method: "GET",
-	    subUrl: "http://10.155.32.4:8034/bigscreen/list",
-	    success(res) {
-			var keys = Object.keys(res.data);
-			var items = res.data;
-			keys.forEach(ele=>{
-				if(items[ele].toFixed(2).split('.')[1] == '00'){
-					items[ele] = items[ele].toFixed(2).split('.')[0]
-				}else{
-					items[ele] = items[ele].toFixed(2)
-				}
-			})
-			that.items = items;
-	    },
-	  });
-	},
+
+    viewAjax() {
+      let that = this;
+      that.API.requestData({
+        method: "GET",
+        subUrl: "http://10.155.32.4:8034/bigscreen/list",
+        success(res) {
+          let keys = Object.keys(res.data);
+          let items = res.data;
+          keys.forEach((ele) => {
+            if (items[ele].toFixed(2).split(".")[1] == "00") {
+              items[ele] = items[ele].toFixed(2).split(".")[0];
+            } else {
+              items[ele] = items[ele].toFixed(2);
+            }
+          });
+          that.items = items;
+        },
+      });
+    },
   },
 
   created() {
-	  this.viewAjax();
-	  setInterval(() => {this.viewAjax()},1000);
+    this.viewAjax();
+    this.timmer = setInterval(() => {
+      this.viewAjax();
+    }, 6000);
   },
+
   mounted() {
     this.resetViewTitleHeight();
   },
+
+  unmounted() {
+    clearInterval(this.timmer);
+    this.timmer = null;
+  },
 };
 </script>
 
@@ -363,7 +373,7 @@ export default {
     display: flex;
     justify-content: start;
     align-items: center;
-    margin:15px 0 0 0;
+    margin: 15px 0 0 0;
 
     &:first-child {
       margin: 0;
@@ -398,15 +408,15 @@ export default {
         justify-content: start;
         align-items: center;
         padding: 2px 0;
-		
-		.size5{
-			width: 165px;
-		}
-		
-		.size6{
-			width: 195px;
-		}
-		
+
+        .size5 {
+          width: 165px;
+        }
+
+        .size6 {
+          width: 195px;
+        }
+
         .itemName {
           min-width: 136px;
           padding: 0 10px;
@@ -418,7 +428,7 @@ export default {
           font-family: Arial, Helvetica, sans-serif;
           color: red;
           width: 187px;
-		  margin-left: 15px;
+          margin-left: 15px;
         }
 
         .itemUnit {