大屏展示假数据

nerpemde-ui/src/router/index.js

@@ -159,6 +159,29 @@ export const constantRoutes = [
   // },
   dataQuery,dataManagement,windResources,statistical,
   {
+    path: '/pdf',
+    component: Layout,
+    // redirect: '/dataManagement/electricFieldInfo',
+    name: 'pdf',
+    meta: {
+      title: '分析报告',
+      icon: 'pdf'
+    },
+    children: [
+      {
+        path: 'windPdf',
+        component: () => import('@/views/resourceAssessment/index'),
+        name: 'windPdf',
+        meta: {title: '风数据分析报告', "icon": "star", noCache: true},
+      }, {
+        path: 'opticalPdf',
+        component: () => import('@/views/opticalResources/index'),
+        name: 'opticalPdf',
+        meta: {title: '光数据分析报告', "icon": "star", noCache: true},
+      }
+    ]
+  },
+  {
     path: '/user',
     component: Layout,
     hidden: true,

nerpemde-ui/src/utils/tpMockData/mockrealData.js

@@ -2,55 +2,173 @@ export default {
 // 测风塔下拉框
   windOption:[
     {
-    "date": "2021-07-18-2023-03-20",
-    "heights": "120A,120,100,80,70,50,30,10",
-    "wdHeights": "120,80,10",
-    "label": "8069",
-    "value": "8069",
-    "status": "1"
-  },{
-    "date": "2020.12.30-2022.10.22",
-    "heights": "120A,120,100,80,70,50,30,10",
-    "wdHeights": "120,80,10",
-    "label": "0091",
-    "value": "0091",
-    "status": "1"
-  },{
-    "date": "2021.6.18 - 2022.12.27",
-    "heights": "120A,120,100,80,70,50,30,10",
-    "wdHeights": "120,80,10",
-    "label": "006171",
-    "value": "006171",
-    "status": "1"
-  },{
-    "date": "2020.12.30 - 2022.8.17",
-    "heights": "140A,140,120,100,80,50,30,10",
-    "wdHeights": "140,100,10",
-    "label": "5031",
-    "value": "5031",
-    "status": "1"
-  },{
-    "date": "2021.8.04 - 2023.3.20",
-    "heights": "140A,140,120,100,80,50,30,10",
-    "wdHeights": "140,100,10",
-    "label": "8891",
-    "value": "8891",
-    "status": "1"
-  },{
-    "date": "2022.5.19 - 2023.1.29",
-    "heights": "140A,140,120,100,80,50,30,10",
-    "wdHeights": "140,100,10",
-    "label": "1881",
-    "value": "1881",
-    "status": "1"
-  },{
-    "date": "2022.5.06 - 2022.12.27",
-    "heights": "140A,140,120,100,80,50,30,10",
-    "wdHeights": "140,100,10",
-    "label": "4376",
-    "value": "4376",
-    "status": "1"
-  }
+      "date": "2022-06-24-2023-07-26",
+      "heights": "140A,140,120,80,50,30",
+      "wdHeights": "140,100,30",
+      "label": "5301",
+      "value": "5301",
+      "status": "1"
+    },
+    {
+      "date": "2023-05-21-2023-07-25",
+      "heights": "150,140,140A,120,100,80,50,30,10",
+      "wdHeights": "140,100,10",
+      "label": "006180",
+      "value": "006180",
+      "status": "1"
+    },
+    {
+      "date": "2022-06-24-2023-07-25",
+      "heights": "140A,140,120,80,50,30",
+      "wdHeights": "140,100,30",
+      "label": "5302",
+      "value": "5302",
+      "status": "1"
+    },
+    {
+      "date": "2022-03-19-2023-07-25",
+      "heights": "140A,140,120,100,80,50,10",
+      "wdHeights": "140,100,10",
+      "label": "006177",
+      "value": "006177",
+      "status": "1"
+    },
+    {
+      "date": "2021-06-18-2023-07-10",
+      "heights": "120A,120,100,80,70,50,30,10",
+      "wdHeights": "120,80,10",
+      "label": "006172",
+      "value": "006172",
+      "status": "1"
+    },
+    {
+      "date": "2021-07-18-2023-06-24",
+      "heights": "140A,140,120,100,80,50,30,10",
+      "wdHeights": "140,100,10",
+      "label": "006173",
+      "value": "006173",
+      "status": "1"
+    },
+    {
+      "date": "2021-08-04-2023-06-24",
+      "heights": "140A,140,120,100,80,50,30,10",
+      "wdHeights": "140,100,10",
+      "label": "006174",
+      "value": "006174",
+      "status": "1"
+    },
+    {
+      "date": "2023-06-16-2023-06-18",
+      "heights": "180,160,140,120,100,80,50,10",
+      "wdHeights": "180,140,10",
+      "label": "6181",
+      "value": "006181",
+      "status": "1"
+    },
+    {
+      "date": "2022-03-23-2023-06-06",
+      "heights": "150A,150,140A,140,120,100,80,50,10",
+      "wdHeights": "150,100,10",
+      "label": "7317",
+      "value": "7317",
+      "status": "1"
+    },
+    {
+      "date": "2022-05-06-2023-06-05",
+      "heights": "140A,140,120,100,80,50,10",
+      "wdHeights": "140,100,10",
+      "label": "006176",
+      "value": "006176",
+      "status": "1"
+    },
+    {
+      "date": "2022-04-19-2023-03-21",
+      "heights": "150A,150,140,120,100,80,50,10",
+      "wdHeights": "150,100,10",
+      "label": "8069",
+      "value": "8069",
+      "status": "1"
+    },
+    {
+      "date": "2022-06-24-2023-03-21",
+      "heights": "140A,140,120,80,50,30",
+      "wdHeights": "140,100,30",
+      "label": "5303",
+      "value": "5303",
+      "status": "1"
+    },
+    {
+      "date": "2022-05-06-2023-03-20",
+      "heights": "140A,140,120,100,80,50,10",
+      "wdHeights": "140,100,10",
+      "label": "006178",
+      "value": "006178",
+      "status": "1"
+    },
+    {
+      "date": "2022-05-19-2023-03-20",
+      "heights": "140A,140,120,100,80,50,10",
+      "wdHeights": "140,100,10",
+      "label": "006175",
+      "value": "006175",
+      "status": "1"
+    },
+    {
+      "date": "2020-12-30-2022-10-22",
+      "heights": "120A,120,100,80,70,50,30,10",
+      "wdHeights": "120,80,10",
+      "label": "006171",
+      "value": "006171",
+      "status": "1"
+    },
+    {
+      "date": "2020-12-30-2022-08-17",
+      "heights": "120A,120,100,80,70,50,30,10",
+      "wdHeights": "120,80,10",
+      "label": "006170",
+      "value": "006170",
+      "status": "1"
+    },
+    {
+      "date": "",
+      "heights": "120A,120,110,100,90,50,10",
+      "wdHeights": "120,100,10",
+      "label": "7295",
+      "value": "7295",
+      "status": "1"
+    },
+    {
+      "date": "",
+      "heights": "150,140,120,100,80,50,30,10",
+      "wdHeights": "150,100,10",
+      "label": "6182",
+      "value": "006182",
+      "status": "1"
+    },
+    {
+      "date": "",
+      "heights": "120A,120,110,100,90,50,10",
+      "wdHeights": "100,120,10",
+      "label": "2466",
+      "value": "2466",
+      "status": "1"
+    },
+    {
+      "date": "",
+      "heights": "150,140,140A,120,100,80,50,30,10",
+      "wdHeights": "140,100,10",
+      "label": "006179",
+      "value": "006179",
+      "status": "1"
+    },
+    {
+      "date": "",
+      "heights": "120A,120,110,100,90,50,10",
+      "wdHeights": "120,100,10",
+      "label": "3779",
+      "value": "3779",
+      "status": "1"
+    }
   ],
 // 风速风向曲线
   wsWdData:{

nerpemde-ui/src/views/dataQuery/windTowerStatusInfo/index.vue

@@ -93,6 +93,7 @@
         <el-table-column label="纬度" align="center" prop="latitude"/>
         <el-table-column label="状态" align="center" prop="status" :formatter="formatStatus"/>
         <el-table-column label="首页展示层" align="center" prop="displayHeight" :formatter="formatHeight"/>
+        <el-table-column label="设备类型" align="center" prop="type" :formatter="formatType"/>
         <el-table-column label="海拔" align="center" prop="altitude"/>
         <el-table-column label="地形复杂程度" align="center" prop="terrainComplexity"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -689,6 +690,9 @@ export default {
       let option = this.heightOption.find(w=>w.value === row.displayHeight)
       return option !==undefined?option.label:row.displayHeight
     },
+    formatType(row){
+      return row.type === '1'?'测风塔':'声雷达'
+    },
     formatProjectId(row){
       let option = this.projectInfo.find(w=>w.id === row.projectId)
       return option !==undefined?option.projectName:row.projectName

nerpemde-ui/src/views/largeScreenPage/components/bigeHeatMap.vue

@@ -136,6 +136,10 @@ export default {
                 let tile = new Image;
                 tile.style.backgroundColor = 'inherit';
                 tile.src = `${ip2}/${heatmapid}/tiles/${z}/${x}/${y}.png?access_token=${token}`
+                // 给热力图图层加上错误处理事件
+                tile.onerror=function(){
+                  tile.remove()
+                }
                 setTimeout(function () {
                   done(error, tile);
                   return null

nerpemde-ui/src/views/largeScreenPage/components/bigeHeatSunMap.vue

@@ -118,6 +118,10 @@ export default {
                 let tile = new Image;
                 tile.style.backgroundColor = 'inherit';
                 tile.src = `http://localhost:9000/bigemap.heatMapSun/tiles/${z}/${x}/${y}.png?access_token=${token}`
+                // 给热力图图层加上错误处理事件
+                tile.onerror=function(){
+                  tile.remove()
+                }
                 setTimeout(function () {
                   done(error, tile);
                   return null

nerpemde-ui/src/views/resourceAssessment/pdfHomePage.vue

@@ -48,8 +48,8 @@
   .homePage {
     width: 100%;
     height: 2246px;
-    background: url("../../../public/img/pdfBg.png") no-repeat;
-    background-size: 100% 100%;
+    /*background: url("../../../public/img/pdfBg.png") no-repeat;*/
+    /*background-size: 100% 100%;*/
   }
   .divBox{
     height: 2246px;

nerpemde-ui/src/views/statistical/statisticsAveWs/index.vue

@@ -70,8 +70,8 @@
           this.tableData = [
             {
               "id": "3028d89367cb11f6296f3f15e39b852c",
-              "equipmentId": "8069",
-              "startTimeAndEndTime": "1626537600000,1679327400000",
+              "equipmentId": "006170",
+              "startTimeAndEndTime": "1609257600000,1660751400000",
               "wsAve140": null,
               "wsAve120": 8.29,
               "wsAve100": 8.06,
@@ -82,8 +82,8 @@
               "wsAve10": 5.85
             },
             {
-              "id": "e56fa50bfb6a80c125443695203e50c8",
-              "equipmentId": "0091",
+              "id": "f628c7a9f2d82e2c4a36cd173f8647ab",
+              "equipmentId": "006171",
               "startTimeAndEndTime": "1609257600000,1666453800000",
               "wsAve140": null,
               "wsAve120": 8.13,
@@ -96,7 +96,7 @@
             },
             {
               "id": "7583ada34be19d6d3943cb3a3fa30f15",
-              "equipmentId": "006171",
+              "equipmentId": "006172",
               "startTimeAndEndTime": "1624017600000,1672156200000",
               "wsAve140": null,
               "wsAve120": 7.15,
@@ -108,34 +108,34 @@
               "wsAve10": 1.31
             },
             {
-              "id": "ce6e2da189e147d4706c0bd428566ac2",
-              "equipmentId": "5031",
-              "startTimeAndEndTime": "1609257600000,1660751400000",
-              "wsAve140": 6.59,
-              "wsAve120": 6.36,
-              "wsAve100": 5.91,
-              "wsAve80": 5.56,
+              "id": "aaf58ce125a60566f96caeaa434c4476",
+              "equipmentId": "006173",
+              "startTimeAndEndTime": "1626537600000,1687621800000",
+              "wsAve140": 6.6,
+              "wsAve120": 6.38,
+              "wsAve100": 5.94,
+              "wsAve80": 5.6,
               "wsAve70": null,
-              "wsAve50": 4.54,
-              "wsAve30": 3.7,
-              "wsAve10": 2.54
+              "wsAve50": 4.59,
+              "wsAve30": 3.72,
+              "wsAve10": 2.52
             },
             {
-              "id": "9dffcc607a2964dfffedb09aaca3461d",
-              "equipmentId": "8891",
-              "startTimeAndEndTime": "1628049600000,1679327400000",
-              "wsAve140": 6.86,
-              "wsAve120": 6.64,
-              "wsAve100": 6.12,
-              "wsAve80": 6.29,
+              "id": "048231960bc9056810208c3facec1421",
+              "equipmentId": "006174",
+              "startTimeAndEndTime": "1628049600000,1687621800000",
+              "wsAve140": 7.4,
+              "wsAve120": 6.58,
+              "wsAve100": 6.64,
+              "wsAve80": 6.73,
               "wsAve70": null,
-              "wsAve50": 5.01,
-              "wsAve30": 3.92,
-              "wsAve10": 1.91
+              "wsAve50": 5.39,
+              "wsAve30": 4.21,
+              "wsAve10": 2.08
             },
             {
               "id": "9f55a80892e731f349d48b71734885d8",
-              "equipmentId": "1881",
+              "equipmentId": "006175",
               "startTimeAndEndTime": "1652937000000,1675007400000",
               "wsAve140": 6.13,
               "wsAve120": 5.88,
@@ -147,17 +147,134 @@
               "wsAve10": 2.43
             },
             {
-              "id": "6e82615187cf4f4f58bd1166ccde305f",
-              "equipmentId": "4376",
-              "startTimeAndEndTime": "1651766400000,1672156200000",
-              "wsAve140": 6.2,
-              "wsAve120": 6,
-              "wsAve100": 5.73,
-              "wsAve80": 5.37,
+              "id": "fb37598526169491d11a6427ea241f3b",
+              "equipmentId": "006176",
+              "startTimeAndEndTime": "1651766400000,1685980200000",
+              "wsAve140": 6.62,
+              "wsAve120": 6.35,
+              "wsAve100": 6.04,
+              "wsAve80": 5.63,
+              "wsAve70": null,
+              "wsAve50": 4.83,
+              "wsAve30": null,
+              "wsAve10": 2.5
+            },
+            {
+              "id": "78669065aaf9da1e68c7a809ac2eabf9",
+              "equipmentId": "006177",
+              "startTimeAndEndTime": "1647659400000,1679327400000",
+              "wsAve140": 5.52,
+              "wsAve120": 6.78,
+              "wsAve100": 6.5,
+              "wsAve80": 6.13,
+              "wsAve70": null,
+              "wsAve50": 5.36,
+              "wsAve30": null,
+              "wsAve10": 3.48
+            },
+            {
+              "id": "aa7ff67d38505d3197f2002d1db2f7ec",
+              "equipmentId": "006178",
+              "startTimeAndEndTime": "1651802400000,1679327400000",
+              "wsAve140": 6.13,
+              "wsAve120": 5.93,
+              "wsAve100": 5.74,
+              "wsAve80": 5.42,
+              "wsAve70": null,
+              "wsAve50": 4.81,
+              "wsAve30": null,
+              "wsAve10": 3.23
+            },
+            {
+              "id": "a73f768ef3d895d969a4a550bb0a3844",
+              "equipmentId": "006180",
+              "startTimeAndEndTime": "1684598400000,1685289000000",
+              "wsAve140": 5.92,
+              "wsAve120": 5.73,
+              "wsAve100": 5.4,
+              "wsAve80": 5.14,
+              "wsAve70": null,
+              "wsAve50": 4.68,
+              "wsAve30": 4.07,
+              "wsAve10": 2.64
+            },
+            {
+              "id": "dfeb2a218f785aff8f244b72aadf9e47",
+              "equipmentId": "214954",
+              "startTimeAndEndTime": "1684800600000,1685923200000",
+              "wsAve140": 0,
+              "wsAve120": 0,
+              "wsAve100": 0,
+              "wsAve80": 0,
+              "wsAve70": null,
+              "wsAve50": 0,
+              "wsAve30": null,
+              "wsAve10": 0
+            },
+            {
+              "id": "e9a61cbcd9383124fce58bd6a2a4ed8f",
+              "equipmentId": "5301",
+              "startTimeAndEndTime": "1656000000000,1679358000000",
+              "wsAve140": 6.07,
+              "wsAve120": 5.84,
+              "wsAve100": null,
+              "wsAve80": 5.05,
+              "wsAve70": null,
+              "wsAve50": 4.18,
+              "wsAve30": 3.1,
+              "wsAve10": null
+            },
+            {
+              "id": "1e967d52b6ec8d5b9bb873d8c519f233",
+              "equipmentId": "5302",
+              "startTimeAndEndTime": "1656000000000,1687308000000",
+              "wsAve140": 5.91,
+              "wsAve120": 5.51,
+              "wsAve100": null,
+              "wsAve80": 5,
+              "wsAve70": null,
+              "wsAve50": 4.16,
+              "wsAve30": 3.14,
+              "wsAve10": null
+            },
+            {
+              "id": "744aca4c09527cd288d213bc62bd339a",
+              "equipmentId": "5303",
+              "startTimeAndEndTime": "1656000000000,1679364600000",
+              "wsAve140": 5.94,
+              "wsAve120": 5.77,
+              "wsAve100": null,
+              "wsAve80": 5.56,
+              "wsAve70": null,
+              "wsAve50": 4.75,
+              "wsAve30": 4.29,
+              "wsAve10": null
+            },
+            {
+              "id": "c6df45a54d59e0dac3471d9960345db4",
+              "equipmentId": "7317",
+              "startTimeAndEndTime": "1647964800000,1686013800000",
+              "wsAve140": 6.21,
+              "wsAve120": 5.97,
+              "wsAve100": 5.26,
+              "wsAve80": 4.95,
+              "wsAve70": null,
+              "wsAve50": 4.26,
+              "wsAve30": null,
+              "wsAve10": 2.07
+            },
+            {
+              "id": "5e5fdd0c7231e2b4dd7db395712e6856",
+              "equipmentId": "8069",
+              "startTimeAndEndTime": "1650297600000,1679371200000",
+              "wsAve140": 6.86,
+              "wsAve120": 6.63,
+              "wsAve100": 6.37,
+              "wsAve80": 6.12,
               "wsAve70": null,
-              "wsAve50": 4.64,
+              "wsAve50": 5.41,
               "wsAve30": null,
-              "wsAve10": 2.48
+              "wsAve10": 3.7
             }
           ]
           this.page.total = this.tableData.length

nerpemde-ui/src/views/windData/windRender.vue

@@ -11,7 +11,7 @@
 
     <div id="position">
       <div id="zoom">
-        当前级别 : 7
+        当前级别 : 6
       </div>
       <div id="move">
         当前中心点: 纬度:0.00000,经度:0.00000
@@ -40,10 +40,10 @@ export default {
         // BM.Config.HTTP_URL = 'http://www.bigemap.com:9000';
         BM.Config.HTTP_URL = 'http://localhost:9000';
         // var map = BM.map('map', 'bigemap.zhongkexingtu', {
-        var map = BM.map('map', 'bigemap.a4u80hw4', {
+        var map = BM.map('map', 'bigemap.re-huafu', {
           center: [30, 104],
-          minZoom: 7,
-          maxZoom: 10,
+          minZoom: 6,
+          maxZoom: 12,
           zoomControl: true,
           attributionControl: false
         }), velocityLayer;
@@ -74,7 +74,7 @@ export default {
         this.bMap = map;
         let mask = window.BMturf.polygon([[[-180, -90], [180, -90], [180, 90], [-180, 90], [-180, -90]]]);
         let geo2;
-        fetch('/js/geojson/210000.json').then(res => res.json()).then(data => {
+        fetch('/js/geojson/230000/230000.geojson').then(res => res.json()).then(data => {
           geo2 = window.BM.geoJSON(data, {
             style: function () {
               return {
@@ -109,12 +109,8 @@ export default {
           window.geo2 = geo2;
           // console.log(geo2.getBounds())
           //限制拖动
-          // this.bMap.setMaxBounds([[43.489559, 128.791111], [38.719833, 110.846231]]);
-          // this.bMap.fitBounds([[43.489559, 128.791111], [38.719833, 110.846231]]);
-          this.bMap.setMaxBounds([[43.489559, 128.791111], [38.719833, 118.846231]]);
-          this.bMap.fitBounds([[43.489559, 128.791111], [38.719833, 118.846231]]);
-          // this.bMap.setMaxBounds(geo2.getBounds());
-          // this.bMap.fitBounds(geo2.getBounds());
+          this.bMap.setMaxBounds([[43.42301,122.574976],[53.561657,135.086264]]);
+          this.bMap.fitBounds([[43.42301,122.574976],[53.561657,135.086264]]);
 
           const layers = geo2.getLayers();
           for (const item of layers) {
@@ -132,7 +128,7 @@ export default {
           // this.setHeatMap(this.bMap);
           //绑定事
           this.bindEvents(this.bMap);
-          this.bMap.setView([41.40566, 122.70630], 7)
+          this.bMap.setView([46.69090, 128.13354], 6)
         })
 
         function setData(params) {