Bladeren bron

测风塔模块完成

yangxiao 3 jaren geleden
bovenliggende
commit
a3caa67463

+ 11 - 0
sh.exe.stackdump

@@ -0,0 +1,11 @@
+Stack trace:
+Frame        Function    Args
+00000010002  0018006021E (00180241C10, 001802340B9, 00000010002, 000FFFFBA40)
+00000010002  00180048859 (00000000001, 00180328B40, 00000000001, 00180328B40)
+00000010002  00180048892 (00000000001, 00180328E50, 00000010002, 00000000008)
+00000010002  001800598BC (001800C0322, 00000000000, 00000000000, 00000000000)
+000FFFFCCD0  0018005994E (000FFFFCDF0, 000FFFFCCD0, FFFFFFFFFFFFFFD8, 00000000000)
+000FFFFCCD0  00180048FE1 (00000000000, 00000000000, 00000000000, 00000000000)
+00000000000  00180047963 (00000000000, 00000000000, 00000000000, 00000000000)
+000FFFFFFF0  00180047A14 (00000000000, 00000000000, 00000000000, 00000000000)
+End of stack trace

+ 44 - 54
src/views/LightMatrix/LightMatrix.vue

@@ -7,37 +7,37 @@
       <div class="dot right bottom"></div>
       <Row>
         <Col :span="3">
-          <div class="panel-item-gf-new">
-            <div class="panel-left">
-              <i class="svg-icon svg-icon-write">
-                <SvgIcon :svgid="'svg-photovoltaic'"></SvgIcon>
-              </i>
-            </div>
-            <div class="panel-right">
-              <span class="text">接入光伏</span>
-              <span class="value">
-                {{ sourceMap[panelData.first.key] || "---" }}
-                <span class="unit">台</span>
-              </span>
-            </div>
+        <div class="panel-item-gf-new">
+          <div class="panel-left">
+            <i class="svg-icon svg-icon-write">
+              <SvgIcon :svgid="'svg-photovoltaic'"></SvgIcon>
+            </i>
           </div>
+          <div class="panel-right">
+            <span class="text">接入光伏</span>
+            <span class="value">
+              {{ sourceMap[panelData.first.key] || "---" }}
+              <span class="unit">台</span>
+            </span>
+          </div>
+        </div>
         </Col>
         <Col :span="3" v-for="(data, index) of panelData.datas" :key="index">
-          <div class="panel-item-new" :class="data.color">
-            <div class="panel-left">
-              <i class="svg-icon" :class="'svg-icon-' + data.color">
-                <SvgIcon :svgid="data.nameIcon"></SvgIcon>
-              </i>
-              <span class="text">{{ data.text1 }}</span>
-            </div>
-            <div class="panel-right">
-              <span class="text">{{ sourceMap[data.key1] || "---" }}台数</span>
-              <span class="value">
-                {{ data.num }}
-                <span class="unit">台</span>
-              </span>
-            </div>
+        <div class="panel-item-new" :class="data.color">
+          <div class="panel-left">
+            <i class="svg-icon" :class="'svg-icon-' + data.color">
+              <SvgIcon :svgid="data.nameIcon"></SvgIcon>
+            </i>
+            <span class="text">{{ data.text1 }}</span>
           </div>
+          <div class="panel-right">
+            <span class="text">台数</span>
+            <span class="value">
+              {{ sourceMap[data.key1] || "---" }}
+              <span class="unit">台</span>
+            </span>
+          </div>
+        </div>
         </Col>
       </Row>
     </div>
@@ -46,10 +46,10 @@
         <div class="panel-title">
           <div class="panel-title-name">
             <i class="svg-icon svg-icon-sm svg-icon-green">
-              <SvgIcon :svgid="'svg-photovoltaic'"></SvgIcon>
+              <SvgIcon svgid="svg-photovoltaic"></SvgIcon>
             </i>
             <span>{{ sourceMap.fczbmap[pItem[pIndex].wpId].name }}</span>
-            <div class="sub-title-item" v-for="(data, index) of table.subTitleDatas" :key="index">
+            <div class="sub-title-item" v-for="(data, index) of tables.subTitleDatas" :key="index">
               <span class="sub-title">{{ data.text }}</span>
               <span class="sub-count" :class="data.color">{{ sourceMap.fczbmap[pItem[pIndex].wpId][data.key] }}</span>
             </div>
@@ -116,7 +116,7 @@ export default {
   },
 
   // 数据
-  data() {
+  data () {
     return {
       timmer: null, // 计时器
       sourceMap: {}, // 核心数据
@@ -131,10 +131,9 @@ export default {
             color: "green",
             name: "待机",
             nameIcon: "svg-standby",
-            calcStr: ["gfdjnum", "gfsdtjnum"],
             numIcon: "svg-manual",
             text1: "待风",
-            key1: "gfdjnum",
+            key1: "gfdjts",
             text2: "手动停机",
             key2: "gfsdtjnum",
           },
@@ -142,10 +141,9 @@ export default {
             color: "purple",
             name: "运行",
             nameIcon: "svg-normal-power",
-            calcStr: ["gfzcfdnum", "gfqxjclnum"],
             numIcon: "svg-drop-output",
             text1: "正常发电",
-            key1: "gfzcfdnum",
+            key1: "gfyxts",
             text2: "降出力运行",
             key2: "gfqxjclnum",
           },
@@ -153,10 +151,9 @@ export default {
             color: "purple",
             name: "限电",
             nameIcon: "svg-limit-power",
-            calcStr: ["gfxdjclnum", "gfxdtjnum"],
             numIcon: "svg-downtime",
             text1: "限电降出力",
-            key1: "gfxdjclnum",
+            key1: "gfxdts",
             text2: "停机",
             key2: "gfxdtjnum",
           },
@@ -164,10 +161,9 @@ export default {
             color: "red",
             name: "故障",
             nameIcon: "svg-gz-downtime",
-            calcStr: ["gfgztjnum", "gfcnsltjnum"],
             numIcon: "svg-field-involved",
             text1: "故障停机",
-            key1: "gfgztjnum",
+            key1: "gfgzts",
             text2: "场内受累",
             key2: "gfcnsltjnum",
           },
@@ -175,21 +171,19 @@ export default {
             color: "orange",
             name: "检休",
             nameIcon: "svg-jx-downtime",
-            calcStr: ["gfjcnum", "gfcnsljxnum"],
             numIcon: "svg-field-involved",
             text1: "检修停机",
-            key1: "gfjxtjnum",
+            key1: "gfwhts",
             text2: "产内受累",
             key2: "gfcnsljxnum",
           },
           {
             color: "write",
             name: "受累",
-            calcStr: ["gfdwslnum", "gfhjslnum"],
             nameIcon: "svg-intranet-involvement",
             numIcon: "svg-environment",
             text1: "电网",
-            key1: "gfdwslnum",
+            key1: "gfslts",
             text2: "环境",
             key2: "gfhjslnum",
           },
@@ -200,7 +194,7 @@ export default {
             key: "gflxnum",
             numIcon: "svg-unknown",
             text1: "离线",
-            key1: "gflxnum",
+            key1: "gflxts",
             text2: "未知",
             key2: "gfwznum",
           },
@@ -304,7 +298,7 @@ export default {
   // 函数
   methods: {
     // 根据风机状态码返回对应 class
-    getColor(fjzt) {
+    getColor (fjzt) {
       switch (fjzt) {
         case 0:
           return "green";
@@ -330,18 +324,14 @@ export default {
       }
     },
 
-    calcGfStr(calcStr) {
-      return parseInt(this.sourceMap[calcStr[0]]) + parseInt(this.sourceMap[calcStr[1]]) + "";
-    },
-
     // 请求服务
-    requestData(showLoading) {
+    requestData (showLoading) {
       let that = this;
       that.API.requestData({
         showLoading,
         method: "POST",
         subUrl: "matrix/matrixDetialGfPush",
-        success(res) {
+        success (res) {
           if (res.data) {
             let sourceMap = res.data;
             for (let key in sourceMap) {
@@ -365,7 +355,7 @@ export default {
     },
   },
 
-  created() {
+  created () {
     let that = this;
     that.$nextTick(() => {
       that.requestData(false);
@@ -375,9 +365,9 @@ export default {
     });
   },
 
-  mounted() {},
+  mounted () { },
 
-  unmounted() {
+  unmounted () {
     clearInterval(this.timmer);
     this.timmer = null;
   },
@@ -635,7 +625,7 @@ export default {
 
           .sub-count {
             font-size: 14px;
-            font-family: "Bicubik";
+            font-family: 'Bicubik';
             font-weight: 500;
             flex: 1 0 auto;
 

+ 97 - 96
src/views/LightMatrix1/LightMatrix1.vue

@@ -2,95 +2,95 @@
   <div class="light-matrix">
     <Row class="panel-2" type="">
       <Col :span="12" class="left-50-16">
-        <div class="panel">
-          <div class="dot left top"></div>
-          <div class="dot left bottom"></div>
-          <div class="dot right top"></div>
-          <div class="dot right bottom"></div>
-          <div class="item">
-            <span class="svg-icon svg-icon-gray svg-icon-md">
-              <SvgIcon svgid="svg-wind-site"></SvgIcon>
-            </span>
-          </div>
-          <div class="item write" @click="changeShow('jrfj_FDC')">
-            <div>接入风机</div>
-            <div>{{ sourceMap.fcjrnum || "---" }}</div>
-          </div>
-          <div class="item blue" @click="changeShow('yx_FDC', 1)">
-            <div>· 运行</div>
-            <div>{{ sourceMap.fcyxnum || "---" }}</div>
-          </div>
-          <div class="item green" @click="changeShow('dj_FDC', 0)">
-            <div>· 待机</div>
-            <div>{{ sourceMap.fcdjnum || "---" }}</div>
-          </div>
-          <div class="item purple" @click="changeShow('xd_FDC', 5)">
-            <div>· 限电</div>
-            <div>{{ sourceMap.fcxdnum || "---" }}</div>
-          </div>
-          <div class="item red" @click="changeShow('gz_FDC', 2)">
-            <div>· 故障</div>
-            <div>{{ sourceMap.fcgznum || "---" }}</div>
-          </div>
-          <div class="item orange" @click="changeShow('jx_FDC', 4)">
-            <div>· 检修</div>
-            <div>{{ sourceMap.fcwhnum || "---" }}</div>
-          </div>
-          <div class="item write" @click="changeShow('sl_FDC', 6)">
-            <div>· 受累</div>
-            <div>{{ sourceMap.fcslnum || "---" }}</div>
-          </div>
-          <div class="item gray" @click="changeShow('lx_FDC', 3)">
-            <div>· 离线</div>
-            <div>{{ sourceMap.fclxnum || "---" }}</div>
-          </div>
+      <div class="panel">
+        <div class="dot left top"></div>
+        <div class="dot left bottom"></div>
+        <div class="dot right top"></div>
+        <div class="dot right bottom"></div>
+        <div class="item">
+          <span class="svg-icon svg-icon-gray svg-icon-md">
+            <SvgIcon svgid="svg-wind-site"></SvgIcon>
+          </span>
+        </div>
+        <div class="item write" @click="changeShow('jrfj_FDC')">
+          <div>接入风机</div>
+          <div>{{ sourceMap.fcjrnum || "---" }}</div>
         </div>
+        <div class="item blue" @click="changeShow('yx_FDC', 1)">
+          <div>· 运行</div>
+          <div>{{ sourceMap.fcyxnum || "---" }}</div>
+        </div>
+        <div class="item green" @click="changeShow('dj_FDC', 0)">
+          <div>· 待机</div>
+          <div>{{ sourceMap.fcdjnum || "---" }}</div>
+        </div>
+        <div class="item pink" @click="changeShow('xd_FDC', 5)">
+          <div>· 限电</div>
+          <div>{{ sourceMap.fcxdnum || "---" }}</div>
+        </div>
+        <div class="item red" @click="changeShow('gz_FDC', 2)">
+          <div>· 故障</div>
+          <div>{{ sourceMap.fcgznum || "---" }}</div>
+        </div>
+        <div class="item orange" @click="changeShow('jx_FDC', 4)">
+          <div>· 检修</div>
+          <div>{{ sourceMap.fcwhnum || "---" }}</div>
+        </div>
+        <div class="item write" @click="changeShow('sl_FDC', 6)">
+          <div>· 受累</div>
+          <div>{{ sourceMap.fcslnum || "---" }}</div>
+        </div>
+        <div class="item gray" @click="changeShow('lx_FDC', 3)">
+          <div>· 离线</div>
+          <div>{{ sourceMap.fclxnum || "---" }}</div>
+        </div>
+      </div>
       </Col>
       <Col :span="12" class="left-50-16">
-        <div class="panel">
-          <div class="dot left top"></div>
-          <div class="dot left bottom"></div>
-          <div class="dot right top"></div>
-          <div class="dot right bottom"></div>
-          <div class="item">
-            <div class="loop"></div>
-            <span class="svg-icon svg-icon-gray svg-icon-md">
-              <SvgIcon :svgid="'svg-wind-site'"></SvgIcon>
-            </span>
-          </div>
-          <div class="item write" @click="changeShow('jrfj1_GDC')">
-            <div>接入风机</div>
-            <div>{{ sourceMap.gfjrnum || "---" }}</div>
-          </div>
-          <div class="item blue" @click="changeShow('yx1_GDC', 1)">
-            <div>· 运行</div>
-            <div>{{ sourceMap.gfyxnum || "---" }}</div>
-          </div>
-          <div class="item green" @click="changeShow('dj1_GDC', 0)">
-            <div>· 待机</div>
-            <div>{{ sourceMap.gfdjnum || "---" }}</div>
-          </div>
-          <div class="item purple" @click="changeShow('xd1_GDC', 5)">
-            <div>· 限电</div>
-            <div>{{ sourceMap.gfxdnum || "---" }}</div>
-          </div>
-          <div class="item red" @click="changeShow('gz1_GDC', 2)">
-            <div>· 故障</div>
-            <div>{{ sourceMap.gfgznum || "---" }}</div>
-          </div>
-          <div class="item orange" @click="changeShow('jx1_GDC', 4)">
-            <div>· 检修</div>
-            <div>{{ sourceMap.gfwhnum || "---" }}</div>
-          </div>
-          <div class="item write" @click="changeShow('sl1_GDC', 6)">
-            <div>· 受累</div>
-            <div>{{ sourceMap.gfslnum || "---" }}</div>
-          </div>
-          <div class="item gray" @click="changeShow('lx1_GDC', 3)">
-            <div>· 离线</div>
-            <div>{{ sourceMap.gflxnum || "---" }}</div>
-          </div>
+      <div class="panel">
+        <div class="dot left top"></div>
+        <div class="dot left bottom"></div>
+        <div class="dot right top"></div>
+        <div class="dot right bottom"></div>
+        <div class="item">
+          <div class="loop"></div>
+          <span class="svg-icon svg-icon-gray svg-icon-md">
+            <SvgIcon :svgid="'svg-wind-site'"></SvgIcon>
+          </span>
         </div>
+        <div class="item write" @click="changeShow('jrfj1_GDC')">
+          <div>接入风机</div>
+          <div>{{ sourceMap.gfjrnum || "---" }}</div>
+        </div>
+        <div class="item blue" @click="changeShow('yx1_GDC', 1)">
+          <div>· 运行</div>
+          <div>{{ sourceMap.gfyxnum || "---" }}</div>
+        </div>
+        <div class="item green" @click="changeShow('dj1_GDC', 0)">
+          <div>· 待机</div>
+          <div>{{ sourceMap.gfdjnum || "---" }}</div>
+        </div>
+        <div class="item pink" @click="changeShow('xd1_GDC', 5)">
+          <div>· 限电</div>
+          <div>{{ sourceMap.gfxdnum || "---" }}</div>
+        </div>
+        <div class="item red" @click="changeShow('gz1_GDC', 2)">
+          <div>· 故障</div>
+          <div>{{ sourceMap.gfgznum || "---" }}</div>
+        </div>
+        <div class="item orange" @click="changeShow('jx1_GDC', 4)">
+          <div>· 检修</div>
+          <div>{{ sourceMap.gfwhnum || "---" }}</div>
+        </div>
+        <div class="item write" @click="changeShow('sl1_GDC', 6)">
+          <div>· 受累</div>
+          <div>{{ sourceMap.gfslnum || "---" }}</div>
+        </div>
+        <div class="item gray" @click="changeShow('lx1_GDC', 3)">
+          <div>· 离线</div>
+          <div>{{ sourceMap.gflxnum || "---" }}</div>
+        </div>
+      </div>
       </Col>
     </Row>
     <div class="panel-box">
@@ -103,7 +103,8 @@
             <span>{{ sourceMap.fczbmap[sourceMap.fjmap[pIndex][0].wpId].name || "------" }}</span>
             <div class="sub-title-item" v-for="(fcItem, fcIndex) in fcStateArray" :key="fcIndex">
               <span class="sub-title">{{ fcItem.text }}</span>
-              <span class="sub-count" :class="fcItem.color">{{ sourceMap.fczbmap[sourceMap.fjmap[pIndex][0].wpId][fcItem.key] }}</span>
+              <span class="sub-count" :class="fcItem.color">{{
+                sourceMap.fczbmap[sourceMap.fjmap[pIndex][0].wpId][fcItem.key] }}</span>
             </div>
           </div>
         </div>
@@ -140,7 +141,7 @@ export default {
   },
 
   // 数据
-  data() {
+  data () {
     return {
       timmer: null, // 计时器
       sourceMap: {}, // 核心数据
@@ -229,7 +230,7 @@ export default {
   // 函数
   methods: {
     // 根据风机状态码返回对应 class
-    getColor(fjzt) {
+    getColor (fjzt) {
       switch (fjzt) {
         case 0:
           return "green";
@@ -256,7 +257,7 @@ export default {
     },
 
     // 切换显示种类
-    changeShow(category, fjzt, skipFill) {
+    changeShow (category, fjzt, skipFill) {
       if (!skipFill) {
         if (this.fillCategory === category) {
           this.fillCategory = null;
@@ -289,13 +290,13 @@ export default {
     },
 
     // 请求服务
-    requestData(showLoading) {
+    requestData (showLoading) {
       let that = this;
       that.API.requestData({
         showLoading,
         method: "POST",
         subUrl: "matrix/matrixPush",
-        success(res) {
+        success (res) {
           if (res) {
             let sourceMap = res.data;
             let fjmap = [];
@@ -323,7 +324,7 @@ export default {
     },
   },
 
-  created() {
+  created () {
     let that = this;
     that.$nextTick(() => {
       that.requestData(false);
@@ -333,7 +334,7 @@ export default {
     });
   },
 
-  unmounted() {
+  unmounted () {
     clearInterval(this.timmer);
     this.timmer = null;
   },
@@ -444,7 +445,7 @@ export default {
         }
         &:last-child {
           font-size: @fontsize;
-          font-family: "Bicubik";
+          font-family: 'Bicubik';
         }
       }
     }
@@ -474,7 +475,7 @@ export default {
         position: relative;
 
         &::after {
-          content: "";
+          content: '';
           position: absolute;
           width: 1.481vh;
           height: 0.556vh;
@@ -527,7 +528,7 @@ export default {
           .sub-count {
             flex: 1 0 auto;
             font-size: 14px;
-            font-family: "Bicubik";
+            font-family: 'Bicubik';
             font-weight: 500;
 
             &.write {

+ 10 - 7
src/views/Status/Status.vue

@@ -25,7 +25,7 @@ export default {
     ComTable,
   },
   // 数据
-  data() {
+  data () {
     return {
       timmer: null, // 遮罩开关
       sourceMap: {}, // 核心数据
@@ -180,13 +180,13 @@ export default {
 
   methods: {
     // 请求服务
-    requestData(showLoading) {
+    requestData (showLoading) {
       let that = this;
       that.API.requestData({
         showLoading,
         method: "POST",
         subUrl: "monitor/monitor",
-        success(res) {
+        success (res) {
           if (res.data) {
             let sourceMap = res.data;
             let datas = [];
@@ -194,6 +194,9 @@ export default {
             sourceMap.maps.forEach((ele) => {
               datas.push({
                 title: ele.name,
+                wpId: sourceMap.vos.find(findEle => {
+                  return findEle.wpName === ele.name;
+                }).wpId,
                 weather: {
                   type: "cloudy",
                   temperature: 11,
@@ -277,7 +280,7 @@ export default {
     },
   },
 
-  created() {
+  created () {
     let that = this;
     that.$nextTick(() => {
       that.requestData(false);
@@ -287,9 +290,9 @@ export default {
     });
   },
 
-  mounted() {},
+  mounted () { },
 
-  unmounted() {
+  unmounted () {
     clearInterval(this.timmer);
     this.timmer = null;
   },
@@ -329,7 +332,7 @@ export default {
 
     &::after,
     &::before {
-      content: "";
+      content: '';
       position: absolute;
       width: 0.185vh;
       height: 0.185vh;

+ 12 - 13
src/views/Status/components/status-panel.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="status-panel">
     <div class="pause" v-if="data.breakOff">中断</div>
-    <ComPanel class="status-com-panel" :title="data.title" @click="onClick">
+    <ComPanel class="status-com-panel" :title="data.title" @click="jumpPage(data.wpId)">
       <div class="p-body">
         <div class="category-box">
           <div class="score">
@@ -70,36 +70,35 @@ export default {
     data: Object,
   },
   // 数据
-  data() {
+  data () {
     return {};
   },
   // 函数
   methods: {
-    onClick() {
+    jumpPage (id) {
       this.$router.push({
         path: "/windsite/home",
-        query: { id: "1" },
-        params: { a: "2" },
+        query: { wpId: id }
       });
     },
   },
   // 生命周期钩子
-  beforeCreate() {
+  beforeCreate () {
     // 创建前
   },
-  created() {
+  created () {
     // 创建后
   },
-  beforeMount() {
+  beforeMount () {
     // 渲染前
   },
-  mounted() {
+  mounted () {
     // 渲染后
   },
-  beforeUpdate() {
+  beforeUpdate () {
     // 数据更新前
   },
-  updated() {
+  updated () {
     // 数据更新后
   },
 };
@@ -217,7 +216,7 @@ export default {
 
           .f3,
           .f5 {
-            font-family: "Bicubik";
+            font-family: 'Bicubik';
             text-align: left;
             color: @green;
             justify-content: flex-start;
@@ -251,7 +250,7 @@ export default {
             position: relative;
 
             &::after {
-              content: "";
+              content: '';
               position: absolute;
               height: 100%;
               width: 0.278vh;

+ 11 - 10
src/views/WindSite/pages/Home/Home.vue

@@ -286,7 +286,7 @@ export default {
             value: [],
           },
         ],
-        units: ["",""],
+        units: ["", ""],
       },
 
       // 4小时功率曲线图
@@ -333,7 +333,7 @@ export default {
         method: "POST",
         subUrl: "monitor/findWpInfoBywpId",
         data: {
-          wpId: "MHS_FDC",
+          wpId: that.wpId,
         },
         success (res) {
           if (res.data) {
@@ -429,14 +429,14 @@ export default {
               res.data.glvos.forEach((ele) => {
                 Powertrend.value[keyIndex].value.push({
                   text: "",
-                  value: ele[key] || 0,
+                  value: ele[key],
                 });
               });
             });
 
             dayPieChartKey.forEach((ele) => {
               dayData.push({
-                value: res.data.wxssmap["r" + ele.key] || 0,
+                value: res.data.wxssmap["r" + ele.key],
                 unit: "万kwh",
                 name: ele.name,
               });
@@ -484,14 +484,14 @@ export default {
         method: "POST",
         subUrl: "monitor/findLossWpBar",
         data: {
-          wpId: "MHS_FDC",
+          wpId: that.wpId,
         },
         success (res) {
           let dayLost = [];
           res.data.forEach((ele) => {
             dayLost.push({
               text: ele.timestr,
-              value: ele.value1 || 0,
+              value: ele.value1,
             });
           });
           that.dayLost = dayLost;
@@ -507,7 +507,7 @@ export default {
         method: "POST",
         subUrl: "monitor/findPowerWpBar",
         data: {
-          wpId: "MHS_FDC",
+          wpId: that.wpId,
         },
         success (res) {
           let data = [
@@ -547,7 +547,7 @@ export default {
         method: "POST",
         subUrl: "monitor/findMonthPowerWpBar",
         data: {
-          wpId: "MHS_FDC",
+          wpId: that.wpId,
         },
         success (res) {
           let data = [
@@ -566,11 +566,11 @@ export default {
           res.data.forEach((ele) => {
             data[0].value.push({
               text: ele.timestr,
-              value: ele.value1 || 0,
+              value: ele.value1,
             });
             data[1].value.push({
               text: ele.timestr,
-              value: ele.value2 || 0,
+              value: ele.value2,
             });
           });
 
@@ -582,6 +582,7 @@ export default {
 
   created () {
     let that = this;
+    that.wpId = that.$route.query.wpId;
     that.$nextTick(() => {
       that.requestData(false);
 

+ 153 - 242
src/views/WindSite/pages/Tower.vue

@@ -6,24 +6,24 @@
     <Windmill class="windmill-3"></Windmill>
     <Windmill class="windmill-4"></Windmill>
     <Windmill class="windmill-5"></Windmill>
-    <WindTower></WindTower>
-    <dash-pie-chart class="pie-left" :title="item.title" :value="item.value" height="9.722vh" width="9.722vh" />
-    <dash-pie-chart class="pie-right" :title="item.title" :value="item.value" height="9.722vh" width="9.722vh" />
+    <WindTower :data="cftmap"></WindTower>
+    <dash-pie-chart class="pie-left" title="密度" :value="cftmap.KQMD || 0" height="9.722vh" width="9.722vh" />
+    <dash-pie-chart class="pie-right" title="压强" :value="cftmap.FCCFTYQ || 0" height="9.722vh" width="9.722vh" />
     <Panel class="panel-top" title="日资源玫瑰图">
       <div class="direction-chart">
-        <DirectionRadarChart width="70%" height="152px" :value="ri_value" />
+        <DirectionRadarChart width="70%" height="152px" :value="rmgtmap" />
         <div class="legend">
           <span class="dot bg-purple"></span>
-          <span>静风频率为11</span>
+          <span>{{rmgtTitle || ""}}</span>
         </div>
       </div>
     </Panel>
     <Panel class="panel-bottom" title="月资源玫瑰图">
       <div class="direction-chart">
-        <DirectionRadarChart width="70%" height="152px" :value="ri_value" />
+        <DirectionRadarChart width="70%" height="152px" :value="ymgtmap" />
         <div class="legend">
           <span class="dot bg-purple"></span>
-          <span>静风频率为11</span>
+          <span>{{ymgtTitle || ""}}</span>
         </div>
       </div>
     </Panel>
@@ -92,254 +92,165 @@ export default {
   // 自定义事件
   emits: {},
   // 数据
-  data() {
+  data () {
     return {
-      // 日发电量
-      Powertrend: {
-        // 图表所用单位
-        units: ["(风速)", "(万KWh)", "(万KWh)", "(万KWh)", "(万KWh)", "(万KWh)"],
-        value: [
-          {
-            title: "风速",
-            yAxisIndex: 0, // 使用单位
-            value: [
-              {
-                text: "1日",
-                value: 1,
-              },
-              {
-                text: "2日",
-                value: 10,
-              },
-              {
-                text: "3日",
-                value: 60,
-              },
-              {
-                text: "4日",
-                value: 50,
-              },
-              {
-                text: "5日",
-                value: 55,
-              },
-              {
-                text: "6日",
-                value: 40,
-              },
-              {
-                text: "7日",
-                value: 20,
-              },
-            ],
-          },
-          {
-            title: "实际功率",
-            yAxisIndex: 0,
-            value: [
-              {
-                text: "1日",
-                value: 2,
-              },
-              {
-                text: "2日",
-                value: 22,
-              },
-              {
-                text: "3日",
-                value: 32,
-              },
-              {
-                text: "4日",
-                value: 24,
-              },
-              {
-                text: "5日",
-                value: 56,
-              },
-              {
-                text: "6日",
-                value: 70,
-              },
-              {
-                text: "7日",
-                value: 65,
-              },
-            ],
-          },
-          {
-            title: "理论功率",
-            yAxisIndex: 0,
-            value: [
-              {
-                text: "1日",
-                value: 3,
-              },
-              {
-                text: "2日",
-                value: 33,
-              },
-              {
-                text: "3日",
-                value: 23,
-              },
-              {
-                text: "4日",
-                value: 56,
-              },
-              {
-                text: "5日",
-                value: 43,
-              },
-              {
-                text: "6日",
-                value: 25,
-              },
-              {
-                text: "7日",
-                value: 30,
-              },
-            ],
-          },
-          {
-            title: "保证功率",
-            yAxisIndex: 1,
-            value: [
-              {
-                text: "1日",
-                value: 43,
-              },
-              {
-                text: "2日",
-                value: 14,
-              },
-              {
-                text: "3日",
-                value: 24,
-              },
-              {
-                text: "4日",
-                value: 44,
-              },
-              {
-                text: "5日",
-                value: 34,
-              },
-              {
-                text: "6日",
-                value: 64,
-              },
-              {
-                text: "7日",
-                value: 54,
-              },
-            ],
-          },
-          {
-            title: "预测功率4小时",
-            yAxisIndex: 1,
-            value: [
-              {
-                text: "1日",
-                value: 45,
-              },
-              {
-                text: "2日",
-                value: 55,
-              },
-              {
-                text: "3日",
-                value: 64,
-              },
-              {
-                text: "4日",
-                value: 24,
-              },
-              {
-                text: "5日",
-                value: 34,
-              },
-              {
-                text: "6日",
-                value: 42,
-              },
-              {
-                text: "7日",
-                value: 14,
-              },
-            ],
-          },
+      timmer: null, // 计时器
+      cftmap: {},
+      glvos: [],
+      rmgtmap: {
+        indicator: ["N0", "N1", "N2", "N3", "N4", "N5"],
+        data: [
           {
-            title: "预测功率72小时",
-            yAxisIndex: 1,
-            value: [
-              {
-                text: "1日",
-                value: 46,
-              },
-              {
-                text: "2日",
-                value: 64,
-              },
-              {
-                text: "3日",
-                value: 44,
-              },
-              {
-                text: "4日",
-                value: 24,
-              },
-              {
-                text: "5日",
-                value: 54,
-              },
-              {
-                text: "6日",
-                value: 14,
-              },
-              {
-                text: "7日",
-                value: 34,
-              },
-            ],
-          },
-        ],
-      },
-      item: {
-        title: "风速",
-        value: 12.3,
+            value: [44200, 14200, 20000, 35000, 50000, 38000],
+            name: ""
+          }
+        ]
       },
-      ri_value: {
+      rmgtTitle: "",
+      ymgtmap: {
         indicator: ["N0", "N1", "N2", "N3", "N4", "N5"],
         data: [
           {
             value: [44200, 14200, 20000, 35000, 50000, 38000],
-            name: "NAME",
-          },
-        ],
+            name: ""
+          }
+        ]
       },
+      ymgtTitle: "",
+      // 日发电量
+      Powertrend: {
+        // 图表所用单位
+        units: [""],
+        value: [{
+          title: "",
+          yAxisIndex: 0, // 使用单位
+          value: []
+        }],
+      }
     };
   },
   // 函数
-  methods: {},
-  // 生命周期钩子
-  beforeCreate() {
-    // 创建前
-  },
-  created() {
-    // 创建后
-  },
-  beforeMount() {
-    // 渲染前
-  },
-  mounted() {
-    // 渲染后
+  methods: {
+    // 请求服务
+    requestData (showLoading) {
+      let that = this;
+      that.API.requestData({
+        showLoading,
+        method: "POST",
+        subUrl: "monitor/findCftInfo",
+        data: {
+          wpId: "MHS_FDC"
+        },
+        success (res) {
+          let rmgtmap = {
+            indicator: [],
+            data: [
+              {
+                value: [],
+                name: "",
+              },
+            ],
+          };
+
+          let ymgtmap = {
+            indicator: [],
+            data: [
+              {
+                value: [],
+                name: "",
+              },
+            ],
+          };
+
+          res.data.rmgtmap.data.forEach(ele => {
+            rmgtmap.indicator.push(ele.name);
+            rmgtmap.data[0].value.push(ele.data1);
+          });
+
+          res.data.ymgtmap.data.forEach(ele => {
+            ymgtmap.indicator.push(ele.name);
+            ymgtmap.data[0].value.push(ele.data1);
+          });
+
+          that.rmgtmap = rmgtmap;
+          that.rmgtTitle = res.data.rmgtmap.jfpl;
+
+          that.ymgtmap = ymgtmap;
+          that.ymgtTitle = res.data.ymgtmap.jfpl;
+
+          let units = ["(万kw)", "(米/s)"];
+          let keyArray = ["value1", "value2", "value3", "value4", "value5", "value6"];
+
+          let Powertrend = {
+            units,
+            value: [{
+              title: "应发功率",
+              yAxisIndex: 0, // 使用单位
+              value: []
+            }, {
+              title: "实发功率",
+              yAxisIndex: 0, // 使用单位
+              value: []
+            }, {
+              title: "理论功率",
+              yAxisIndex: 0, // 使用单位
+              value: []
+            }, {
+              title: "预测功率",
+              yAxisIndex: 0, // 使用单位
+              value: []
+            }, {
+              title: "保证功率",
+              yAxisIndex: 0, // 使用单位
+              value: []
+            }, {
+              title: "保证功率",
+              yAxisIndex: 0, // 使用单位
+              value: []
+            }, {
+              title: "平均风速",
+              yAxisIndex: 1, // 使用单位
+              value: []
+            }, {
+              title: "72小时预测功率",
+              yAxisIndex: 0, // 使用单位
+              value: []
+            }, {
+              title: "最优功率",
+              yAxisIndex: 0, // 使用单位
+              value: []
+            }]
+          };
+
+          keyArray.forEach((key, keyIndex) => {
+            res.data.glvos.forEach(ele => {
+              Powertrend.value[keyIndex].value.push({
+                text: new Date(ele.time).formatDate("yyyy-MM-dd"),
+                value: ele[key],
+              })
+            });
+          });
+
+          that.cftmap = res.data.cftmap;
+          that.Powertrend = Powertrend;
+        }
+      });
+    },
   },
-  beforeUpdate() {
-    // 数据更新前
+
+  created () {
+    let that = this;
+    that.$nextTick(() => {
+      that.requestData(false);
+      that.timmer = setInterval(() => {
+        that.requestData(false);
+      }, that.$store.state.websocketTimeSec);
+    });
   },
-  updated() {
-    // 数据更新后
+
+  unmounted () {
+    clearInterval(this.timmer);
+    this.timmer = null;
   },
 };
 </script>

File diff suppressed because it is too large
+ 119 - 130
src/views/WindSite/pages/Tower/WindTower.vue