zy 1 год назад
Родитель
Сommit
2658483e58

+ 1 - 1
nerpemde-ui/.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 新能源风光资源管理平台
+VUE_APP_TITLE = 新能源资源感知与评估管理系统
 
 # 开发环境配置
 ENV = 'development'

+ 1 - 1
nerpemde-ui/.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 新能源风光资源管理平台
+VUE_APP_TITLE = 新能源资源感知与评估管理系统
 
 # 生产环境配置
 ENV = 'production'

+ 1 - 1
nerpemde-ui/.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 新能源风光资源管理平台
+VUE_APP_TITLE = 新能源资源感知与评估管理系统
 
 NODE_ENV = production
 

+ 1 - 1
nerpemde-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nerp",
   "version": "1.0.0",
-  "description": "新能源风光资源管理平台",
+  "description": "新能源资源感知与评估管理系统",
   "author": "jiayuepowertech",
   "license": "MIT",
   "scripts": {

Разница между файлами не показана из-за своего большого размера
+ 12166 - 397
nerpemde-ui/src/utils/tpMockData/data.js


+ 2 - 2
nerpemde-ui/src/views/largeScreenPage/Subpage/emailResourcesInfo.vue

@@ -234,9 +234,9 @@ export default {
       height: '140',
       wdHeight: '',
       projectId: '1',
-      projectOption: [{id: '1', projectName: '依兰四期'}],//项目列表
+      projectOption: [{id: '1', projectName: '风电项目01'}],//项目列表
       cftNo: '006171',
-      towerOption: [{value: '006171', label: '依兰四期006171'}],//塔列表
+      towerOption: [{value: '006171', label: '四期006171'}],//塔列表
       projectInfo: {
         time: '2021-07-18 — 2022-12-27',
         latitude: '43.34',

+ 3 - 3
nerpemde-ui/src/views/largeScreenPage/Subpage/preProjectResources.vue

@@ -67,10 +67,10 @@
       <bige-map  ref="childMethod" :mapValue="mapValue"/>
     </div>
     <div v-if="mapMark === 'mapBtuThree'">
-<!--      <bige-heat-map  ref="childMethod" :mapValue="mapValue"/>-->
+      <bige-heat-map  ref="childMethod" :mapValue="mapValue"/>
     </div>
     <div v-if="mapMark === 'mapBtuFive'">
-<!--      <bige-heat-sun-map  ref="childMethod" :mapValue="mapValue"/>-->
+      <bige-heat-sun-map  ref="childMethod" :mapValue="mapValue"/>
     </div>
     <div v-if="mapMark === 'mapBtu'">
 <!--      <zai-xian-bige-map ref="childMethod" :mapValue="mapValue"/>-->
@@ -259,7 +259,7 @@ export default {
       }
     },
     clickBtu(id) {
-      console.log(this.$refs.childMethod)
+      // console.log(this.$refs.childMethod)
       let center = this.$refs.childMethod.center
       let level = this.$refs.childMethod.level
       this.mapValue = {

+ 7 - 8
nerpemde-ui/src/views/largeScreenPage/Subpage/projectInfo.vue

@@ -78,10 +78,10 @@
       <bige-map ref="childMethod" :mapValue="mapValue"/>
     </div>
     <div v-if="mapMark === 'mapBtuThree'">
-<!--      <bige-heat-map ref="childMethod" :mapValue="mapValue"/>-->
+      <bige-heat-map ref="childMethod" :mapValue="mapValue"/>
     </div>
     <div v-if="mapMark === 'mapBtuFive'">
-<!--      <bige-heat-sun-map ref="childMethod" :mapValue="mapValue"/>-->
+      <bige-heat-sun-map ref="childMethod" :mapValue="mapValue"/>
     </div>
     <div v-if="mapMark === 'mapBtu'">
 <!--      <zai-xian-bige-map ref="childMethod" :mapValue="mapValue"/>-->
@@ -124,10 +124,9 @@ export default {
       project: {},
       projectName: '',
       coordinates: [],//中心点坐标
-      // projectOverview: '依兰县位于黑龙江省中南部。 黑龙江华电哈尔滨依兰鸡冠山四期200MW风电项目中心位于黑龙江省哈尔滨市依兰县东侧15km的鸡冠砬子山上,整个场址为低山丘陵区,场区实际可利用面积约63km2。',
-      projectOverview: '',
-      // resourcesOverview: '根据风能资源推测120m数据分析,年平均风速为8.007m/s,平均风功率密度为567W/m²,属于3级风场。主风向为WSW,次风向为W,空气密度为1.2kg/m³。'
-      resourcesOverview: '',
+      projectOverview: '整个场址为低山丘陵区,场区实际可利用面积约63km2。',
+      // projectOverview: '',
+      resourcesOverview: '根据风能资源推测120m数据分析,年平均风速为8.007m/s,平均风功率密度为567W/m²,属于3级风场。主风向为WSW,次风向为W,空气密度为1.2kg/m³。',
       mapMark: 'mapBtuOne',
       //地图传值
       mapValue: {
@@ -199,7 +198,7 @@ export default {
       }
       this.mapValue = {
         params: new Date(),
-        level: 10,//地图层级
+        level: 12,//地图层级
         center: center,//中心坐标
         allStationInfo: null,//场站坐标
         projectInfo: null,//项目坐标
@@ -301,7 +300,7 @@ export default {
         id: this.project.id,
         allPointInfo: this.allPointInfo,//所有点位信息
       }
-      // this.mapMark = id
+      this.mapMark = id
       let clickItem = document.getElementById(id)
       let activeItem = document.querySelector('.mapBtuBefore')
       activeItem.classList.remove('mapBtuBefore')

+ 6 - 6
nerpemde-ui/src/views/largeScreenPage/Subpage/provincialEnergyStations.vue

@@ -50,7 +50,7 @@
           <div class="rightBg bottomBox">
             <div class="rightTiltleTextBg">
               <div class="rightMainTitle">
-                <span class="mainTitle">接入新能源信息</span>
+                <span class="mainTitle">某集团新能源信息</span>
               </div>
             </div>
 
@@ -96,10 +96,10 @@
           <bige-map ref="childMethod" :mapValue="mapValue"/>
         </div>
         <div v-if="mapMark === 'mapBtuThree'">
-<!--          <bige-heat-map  ref="childMethod" :mapValue="mapValue"/>-->
+          <bige-heat-map  ref="childMethod" :mapValue="mapValue"/>
         </div>
         <div v-if="mapMark === 'mapBtuFive'">
-<!--          <bige-heat-sun-map  ref="childMethod" :mapValue="mapValue"/>-->
+          <bige-heat-sun-map  ref="childMethod" :mapValue="mapValue"/>
         </div>
         <div v-if="mapMark === 'mapBtu'">
 <!--          <zai-xian-bige-map ref="childMethod" :mapValue="mapValue"/>-->
@@ -135,10 +135,10 @@ export default {
       },
       hdInfo: { //华电信息
         fnum:'10',
-        fename:'风电场',//风场站名称
+        fename:'风电场',//风场站名称
         fhours:'3256h',
         gnum:'4',
-        gename:'光伏',//光伏站名称
+        gename:'光伏场站',//光伏站名称
         ghours:'1636h'
       },
       //地图传值
@@ -221,7 +221,7 @@ export default {
         center: center.length === 0?[]:[center.lat,center.lng],//中心坐标
         allStationInfo: this.allStationSeat,//场站坐标
       }
-      // this.mapMark = id
+      this.mapMark = id
       let clickItem = document.getElementById(id)
       let activeItem = document.querySelector('.mapBtuBefore')
       activeItem.classList.remove('mapBtuBefore')

+ 5 - 1
nerpemde-ui/src/views/largeScreenPage/Subpage/stationInfo.vue

@@ -157,6 +157,7 @@ export default {
   },
   mounted() {
     this.station = JSON.parse(this.$store.getters.stationInfo)
+    console.log(this.station)
     this.formatTime()
     this.getPointMap()
     this.timer = setInterval(this.formatTime, 1000 * 60)
@@ -191,6 +192,9 @@ export default {
           }
         }
       }
+      if(center.length === 0){
+        center = [this.station.latitude,this.station.longitude]
+      }
       // stationInfo({stationId:this.station.id}).then(res=>{
       //   // console.log(res.data)
       //   let data = res.data
@@ -203,7 +207,7 @@ export default {
 
         this.mapValue ={
           params: new Date(),
-          level: 10,//地图层级
+          level: 12,//地图层级
           center: center,//中心坐标
           allStationInfo: null,//场站坐标
           projectInfo: null,//项目坐标

+ 3 - 21
nerpemde-ui/src/views/largeScreenPage/Subpage/stationResources.vue

@@ -144,6 +144,7 @@ import bigeMap from "@/views/largeScreenPage/components/bigeMap";
 import bigeHeatMap from "@/views/largeScreenPage/components/bigeHeatMap";
 import bigeHeatSunMap from "@/views/largeScreenPage/components/bigeHeatSunMap";
 import zaiXianBigeMap from "@/views/largeScreenPage/components/zaiXianBigeMap";
+import defaultData from "@/utils/tpMockData/data";
 export default {
   name: "stationResources",
   components: {
@@ -165,27 +166,7 @@ export default {
         nbqNum:'204'
       },
       //一类项目列表
-      stationOptions: [
-        {
-          "latitude": "41.8503",
-          "stationName": "风电场2",
-          "id": "0b31074d-d23d-ed0a-fb2f-153a9ba9c10b",
-          "type": "风",
-          "longitude": "121.3117"
-        }, {
-          "latitude": "42.0503",
-          "stationName": "风电场3",
-          "id": "3f3f25c6-65f2-db65-fa85-855cb0a9b8d3",
-          "type": "风",
-          "longitude": "121.2553"
-        }, {
-          "latitude": "41.309076",
-          "stationName": "风电场4",
-          "id": "f28b83b0-dd34-faa6-3d89-7d4c87cefdb1",
-          "type": "风",
-          "longitude": "122.534987"
-        }
-      ],
+      stationOptions: [],
       mapMark: 'mapBtuOne',
       //地图传值
       mapValue: {
@@ -202,6 +183,7 @@ export default {
     this.timer = null
   },
   mounted() {
+    this.stationOptions = defaultData.allStationSeat.HDStation
     this.formatTime()
     this.getInfo()
     this.timer = setInterval(this.formatTime, 1000 * 60)

+ 4 - 24
nerpemde-ui/src/views/largeScreenPage/components/bigeHeatSunMap.vue

@@ -64,21 +64,6 @@ export default {
     initBigeMap() {
       let _self = this
       bigemap.then(() => {
-        // window.BM.Config.HTTP_URL = 'http://www.bigemap.com:9000';
-        // window.BM.Config.HTTP_URL = 'http://192.168.1.181:9000';
-        // window.BM.Config.HTTP_URL = 'http://10.124.252.243:9000';
-
-        window.BM.Config.HTTP_URL = process.env.VUE_APP_GIS_API;
-        let ip1 = process.env.VUE_APP_GIS_API;
-        let ip2 = 'http://49.4.78.194:17143';
-        // window.BM.Config.HTTP_URL = 'http://localhost:9000';
-        // let ip1 = 'http://localhost:9000';
-        // let ip2 = 'http://localhost:9000';
-        let mapid = 'bigemap.re-huafu'
-        // arcgis-satellite
-        // amap-satellite
-        // zhongkexingtu
-        // let map = window.BM.map('map', 'bigemap.arcgis-satellite', {
         let map = window.BM.map('map', null, {
           center: [30, 104],
           minZoom: 6,
@@ -88,7 +73,7 @@ export default {
           attributionControl: false,
           preferCanvas: true, //适用于数据量大时 地图反应速度加快
         });
-        var promise = fetch(`${ip1}/tokens/v1?access_token=none`).then(function (response) {
+        var promise = fetch(`http://localhost:9000/tokens/v1?access_token=none`).then(function (response) {
           return response.json();
         }).then(function (body) {
           return body.token
@@ -104,7 +89,7 @@ export default {
                 } = coords;
                 let tile = new Image;
                 tile.style.backgroundColor = 'inherit';
-                tile.src = `${ip2}/${mapid}/tiles/${z}/${x}/${y}.png?access_token=${token}`
+                tile.src = `http://localhost:9000/bigemap.re-huafu/tiles/${z}/${x}/${y}.png?access_token=${token}`
                 setTimeout(function () {
                   done(error, tile);
                   return null
@@ -116,12 +101,7 @@ export default {
           }
         )
         window.Bmap = map;
-        //var layer1=window.BM.tileLayer('bigemap.re-huafu')
-        //var layer2=window.BM.tileLayer('bigemap.heatMapSun',{opacity:0.7});
-        //map.setMaxZoom(12);
-        //layer1.addTo(map);
-        let heatmapid = 'bigemap.heatMapSun';
-        fetch(`${ip1}/tokens/v1?access_token=none`).then(function (response) {
+        fetch(`http://localhost:9000/tokens/v1?access_token=none`).then(function (response) {
           return response.json();
         }).then(function (body) {
           return body.token
@@ -137,7 +117,7 @@ export default {
                 } = coords;
                 let tile = new Image;
                 tile.style.backgroundColor = 'inherit';
-                tile.src = `${ip2}/${heatmapid}/tiles/${z}/${x}/${y}.png?access_token=${token}`
+                tile.src = `http://localhost:9000/bigemap.heatMapSun/tiles/${z}/${x}/${y}.png?access_token=${token}`
                 setTimeout(function () {
                   done(error, tile);
                   return null

+ 17 - 25
nerpemde-ui/src/views/largeScreenPage/index.vue

@@ -2,12 +2,12 @@
   <div style="height:calc(100vh);width:100%;background: #000">
     <div class="page largeScreeanHomePage">
       <div class="timeBox">{{ time }}</div>
-<!--      <div class="kaiguanBox"><img src="../../../public/largeScreenImg/kaiguan.png" style="width: 30px;height: 30px"/>-->
-<!--      </div>-->
-<!--      <div class="mapImg"><img src="../../../public/largeScreenImg/tupian.png" style="width: 30px;height: 30px"-->
-<!--                               @click="clickBtu('mapImg')"/></div>-->
+      <!--      <div class="kaiguanBox"><img src="../../../public/largeScreenImg/kaiguan.png" style="width: 30px;height: 30px"/>-->
+      <!--      </div>-->
+      <!--      <div class="mapImg"><img src="../../../public/largeScreenImg/tupian.png" style="width: 30px;height: 30px"-->
+      <!--                               @click="clickBtu('mapImg')"/></div>-->
       <div class="topTiltle">
-        <span class="title">辽宁省风光资源概况</span>
+        <span class="title">省风光资源概况</span>
       </div>
       <div class="btuGroup">
         <div class="topBtu topLeftBtu" @click="pushNext()">
@@ -31,7 +31,7 @@
               referrerpolicy="no-referrer"
               src="../../assets/largeScreenImg/index/tiltleLeftSign.png"
             />
-            <span class="branckTitle">辽宁省风光资源概况</span>
+            <span class="branckTitle">省风光资源概况</span>
           </div>
           <div class="mainContent">
             <span class="content">{{ resourcesOverview }}</span>
@@ -47,22 +47,22 @@
           <div id="mapBtuSix" class="mapBtu mapBtuAfter" @click="clickBtu('mapBtuSix')">
             <span class="mapBtuText">3D地形图</span>
           </div>
-          <div id="mapBtuThree" class="mapBtu mapBtuAfter" @click="clickBtu1('mapBtuThree')">
+          <div id="mapBtuThree" class="mapBtu mapBtuAfter" @click="clickBtu('mapBtuThree')">
             <span class="mapBtuText">风资源分布图</span>
           </div>
           <!--          <div id="mapBtuFour" class="mapBtu mapBtuAfter" @click="clickBtu('mapBtuFour')">-->
           <!--            <span class="mapBtuText">光辐射气象图</span>-->
           <!--          </div>-->
-          <div id="mapBtuFive" class="mapBtu mapBtuAfter" @click="clickBtu1('mapBtuFive')">
+          <div id="mapBtuFive" class="mapBtu mapBtuAfter" @click="clickBtu('mapBtuFive')">
             <span class="mapBtuText">光资源分布图</span>
           </div>
 
-<!--          <div id="mapImg" class="mapBtu mapBtuBefore" v-show="false"></div>-->
+          <!--          <div id="mapImg" class="mapBtu mapBtuBefore" v-show="false"></div>-->
         </div>
-<!--        <div v-if="mapMark === 'mapImg'">-->
-<!--          <img src="../../../public/largeScreenImg/mapimg.png"-->
-<!--               style="width: 100%;height: calc(91vh);object-fit: cover;"/>-->
-<!--        </div>-->
+        <!--        <div v-if="mapMark === 'mapImg'">-->
+        <!--          <img src="../../../public/largeScreenImg/mapimg.png"-->
+        <!--               style="width: 100%;height: calc(91vh);object-fit: cover;"/>-->
+        <!--        </div>-->
         <div v-if="mapMark === 'mapBtuOne'">
           <bige-map ref="childMethod" :mapValue="mapValue"/>
           <!--          <bige-map-e22 ref="childMethod" :mapValue="mapValue"/>-->
@@ -74,10 +74,10 @@
           <bige-map3-d :mapValue="mapValue"/>
         </div>
         <div v-if="mapMark === 'mapBtuThree'">
-                    <bige-heat-map ref="childMethod" :mapValue="mapValue"/>
+          <bige-heat-map ref="childMethod" :mapValue="mapValue"/>
         </div>
         <div v-if="mapMark === 'mapBtuFive'">
-                    <bige-heat-sun-map ref="childMethod" :mapValue="mapValue"/>
+          <bige-heat-sun-map ref="childMethod" :mapValue="mapValue"/>
         </div>
         <div v-if="mapMark === 'mapBtu'">
           <!--          <zai-xian-bige-map ref="childMethod" :mapValue="mapValue"/>-->
@@ -98,7 +98,7 @@ import windRender from "../windData/windRender";
 export default {
   name: "index",
   components: {
-    bigeMap, bigeHeatMap, bigeHeatSunMap, zaiXianBigeMap, bigeMap3D,windRender
+    bigeMap, bigeHeatMap, bigeHeatSunMap, zaiXianBigeMap, bigeMap3D, windRender
   },
   data() {
     return {
@@ -166,14 +166,6 @@ export default {
         this.mapMark = 'mapBtu'
       }
     },
-    clickBtu1(id) {
-      let clickItem = document.getElementById(id)
-      let activeItem = document.querySelector('.mapBtuBefore')
-      activeItem.classList.remove('mapBtuBefore')
-      activeItem.classList.add('mapBtuAfter')
-      clickItem.classList.remove('mapBtuAfter')
-      clickItem.classList.add('mapBtuBefore')
-    },
     clickBtu(id) {
       let center = [46.69090, 128.13354]
       let level = 7
@@ -187,7 +179,7 @@ export default {
         level: level === '' ? null : level,//地图层级
         center: center,//中心坐标
         allStationInfo: null,//场站坐标
-        allPointInfo:null
+        allPointInfo: null
       }
       this.mapMark = id
       let clickItem = document.getElementById(id)

+ 1 - 1
nerpemde-ui/src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">新能源风资源管理平台</h3>
+      <h3 class="title">新能源资源感知与评估管理系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

+ 1 - 1
nerpemde-ui/vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || 'NEIM资源管理平台' // 网页标题
+const name = process.env.VUE_APP_TITLE || '新能源资源感知与评估管理系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 83 // 端口
 

Некоторые файлы не были показаны из-за большого количества измененных файлов