Browse Source

AK页面调整

chenminghua 2 years ago
parent
commit
881ebe4c57

+ 2 - 4
public/static/config/modeConfig.js

@@ -1,5 +1,5 @@
 // 本地联调开关
-const localTest = true;
+const localTest = false;
 
 // 服务器地址
 let baseURL = null;
@@ -19,9 +19,7 @@ const adapterUrl = "http://10.155.32.4:8011/";
 const showModuleName = 0;
 
 if (localTest) {   
-    // baseURL = "http://192.168.10.13:8082/" // 联机调试 - 石林
-    // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
-    baseURL = "http://192.168.10.14:8082/" // 联机调试 - 王昌盛
+    baseURL = "http://192.168.10.14:8082/" 
 
     tilesUrl = "http://localhost:8080/static/cesium/Assets/Textures/NaturalEarthII";
 } else {

+ 1 - 1
src/components/chart/line/multiple-line-chart.vue

@@ -410,7 +410,7 @@ export default {
         },
         xAxis: [
           {
-            name: "(m/s)",
+            name: "",
             type: "category",
             boundaryGap: false,
             axisLabel: {

+ 1 - 1
src/views/WindSite/WindSite.vue

@@ -166,7 +166,7 @@ export default {
     .page-common-body-router {
       overflow: auto;
       overflow-x: hidden;
-      height: calc(100vh - 7.037vh);
+      height: calc(100vh - 0vh);
       flex: 1 1 auto;
     }
 

+ 1 - 1
src/views/WindSite/components/boosterstation/ak.vue

@@ -3875,7 +3875,7 @@
               dominant-baseline: middle;
             "
           >
-            {{ (ajaxData.akrf007/1).toFixed(0) }}
+            {{ (ajaxData.akzf008/1).toFixed(0) }}
           </text>
           <text
             x="964.86"

+ 0 - 1
src/views/WindSite/components/generalappearance/ak.vue

@@ -314,7 +314,6 @@
 
 			// 总貌数据
 			zmmap(value) {
-				console.log(value)
 				this.renderData(value);
 			},
 		},

+ 0 - 1
src/views/WindSite/components/generalappearance/hzj.vue

@@ -5220,7 +5220,6 @@
 
 			// 总貌数据
 			zmmap(value) {
-				console.log(value)
 				this.renderData(value);
 			},
 		},

+ 1 - 1
src/views/WindSite/pages/DraughtFanList.vue

@@ -4,7 +4,7 @@
       <BtnGroup2 :btnGroups="btnGroupsss" :rowIndex="rowIndex" :index="selectIndex" @select="select"></BtnGroup2>
     </div>
     <div class="df-table">
-      <table-2 :data="data" :height="'100%'" @headerClick="headerClick"></table-2>
+      <table-2 :data="data" :height="'90%'" @headerClick="headerClick"></table-2>
     </div>
   </div>
 </template>

+ 0 - 1
src/views/WindSite/pages/GeneralAppearance.vue

@@ -187,7 +187,6 @@
 						if (res.code == 200) {
 							that.wpnumMap = res.data.fczbmap.jczbmap;
 							that.fjmap = res.data.fjmap[0];
-							console.log(that.fjmap)
 							that.zmmap = res.data.zmmap;
 						}
 					},

+ 9 - 23
src/views/WindSite/pages/Inverter-Info.vue

@@ -50,8 +50,8 @@
                   </table>
                 </div>
                 <div>
-                  <panel class="line-panel" :title="'开网频率'">
-                    <multiple-line-chart :list="lineValue" :units="['']" height="100%" />
+                  <panel class="line-panel" :title="'功率曲线图'">
+                    <multiple-line-chart :list="lineValue" :units="['单位:Kw', '(min)']" height="100%" />
                   </panel>
                 </div>
               </div>
@@ -59,11 +59,11 @@
                 <div class="counts">
                   <div class="all">
                     <span class="text">全部状态</span>
-                    <span class="value">30</span>
+                    <span class="value">{{ diAll.length }}</span>
                   </div>
                   <div class="error">
                     <span class="text">报警状态</span>
-                    <span class="value">30</span>
+                    <span class="value">{{ warnCount }}</span>
                   </div>
                 </div>
                 <div class="state-list">
@@ -88,8 +88,6 @@
 </template>
 
 <script>
-// import BtnGroup2 from "@com/coms/btn/btn-group-double.vue";
-import List from "@com/coms/list/list.vue";
 import Panel from "../../../components/coms/panel/panel.vue";
 import MultipleLineChart from "../../../components/chart/line/multiple-line-chart.vue";
 import collapseList from "@/components/coms/collapse/collapse-list.vue";
@@ -98,8 +96,6 @@ export default {
   name: "Box",
   // 使用组件
   components: {
-    // BtnGroup2,
-    List,
     Panel,
     MultipleLineChart,
     collapseList
@@ -111,6 +107,7 @@ export default {
       timmer1: null,
       WindSites: [],
       diAll: [],
+      warnCount: 0,
       diOn: [],
       info: {},
       stateColor: "blue",
@@ -141,17 +138,13 @@ export default {
   // 函数
   methods: {
     selectList: function(item) {
-      console.log(item);
     },
     select: function(item) {
-      console.log(item);
     },
     onReturn: function() {
-      console.log("return");
     },
     // 点击左侧菜单
     clickMenu(res) {
-      // console.log(res);
       this.wpId = res.wpId;
       this.wtId = res.wtId;
       this.$router.replace(`/monitor/windsite/inverter-info/${res.wpId}/${res.wtId}`);
@@ -161,13 +154,11 @@ export default {
     async buildSelectList() {
       let res = await this.API.requestData({
         method: "POST",
-        // baseURL: "http://localhost:8082/",
         subUrl: "matrix/findPVSimpleMatrixAll"
       });
       let WindSites = [];
       res.data.data.forEach((ele, index) => {
         ele.inverterls.forEach(function(inver) {
-          // inver["text"] = inver["wtnum"];
           inver["text"] = inver["wtnum"];
           inver["color"] = "blue";
           inver["id"] = inver["wtId"];
@@ -184,7 +175,6 @@ export default {
     async getData() {
       let res = await this.API.requestData({
         method: "POST",
-        // baseURL: "http://localhost:8082/",
         subUrl: "monitorinverter/findInverterInfo",
         data: {
           wtId: this.wtId
@@ -207,13 +197,16 @@ export default {
       if (res.data.data.listDI) {
         this.diAll = res.data.data.listDI.allList;
         this.diOn = res.data.data.listDI.onList;
+        this.warnCount = 0;
+        this.diAll.forEach(item => {
+          item.value == 1 ? this.warnCount += 1 : this.warnCount;
+        })
       }
       this.info = res.data.data.info;
     },
     async getLineChart() {
       let res = await this.API.requestData({
         method: "POST",
-        // baseURL: "http://localhost:8082/",
         subUrl: "monitorinverter/findInverterPowerLine",
         data: {
           wtId: this.wtId
@@ -267,25 +260,18 @@ export default {
       switch (fjzt) {
         case 0:
           return "green";
-          break;
         case 1:
           return "blue";
-          break;
         case 2:
           return "red";
-          break;
         case 3:
           return "gray";
-          break;
         case 4:
           return "orange";
-          break;
         case 5:
           return "purple";
-          break;
         case 6:
           return "write";
-          break;
       }
     }
   },

+ 1 - 1
src/views/WindSite/pages/Tower.vue

@@ -352,7 +352,7 @@ export default {
 .tower {
   position: relative;
   width: 100%;
-  height: 100%;
+  height: 95%;
   overflow: hidden;
 
   .windmill-1,