Merge branch 'mw2' of ssh://61.161.152.110:29418/electronic-map into tjj2

src/views/WindSite/WindSite.vue

@@ -116,18 +116,22 @@
 			clickMenu: function(index) {
 				if (index == 7) { //风场
 					this.jumpUrl();
-					this.menu();
+					this.menu(index);
 				}
 				this.activeIndex = index;
 			},
-			menu() {
-				this.menuDatas.forEach((ele) => {
-					if (ele.icon == 'svg-wind-site') {
-						ele.path = this.windsitePath
-					} else {
-						ele.path = ele.path + "/" + this.$route.params.wpId;
-					}
-				});
+			menu(index) {
+				if(index){
+					this.menuDatas[index].path = this.windsitePath;
+				}else{
+					this.menuDatas.forEach((ele) => {
+						if (ele.icon == 'svg-wind-site') {
+							ele.path = this.windsitePath
+						} else {
+							ele.path = ele.path + "/" + this.$route.params.wpId;
+						}
+					});
+				}
 			}
 		},
 		created() {

src/views/WindSite/pages/Info/Base-Info.vue

@@ -68,8 +68,8 @@
       <el-col :span="10" class="background">
         <el-row type="flex" justify="center" :align="'middle'" class="power-load">
           <!-- 功率复核 PowerLoad -->
-          <el-col v-for="item in PowerLoad" :key="item" :span="6">
-            <dash-pie-chart :title="item.title" :value="sourceMap.jczbmap && sourceMap.jczbmap[item.key]" height="9.722vh" />
+          <el-col v-for="(item , index) in PowerLoad" :key="item" :span="6">
+            <dash-pie-chart :title="item.title" :value="sourceMap.jczbmap && sourceMap.jczbmap[item.key]" height="9.722vh" :max="index==0 ? 100 : 2500"/>
           </el-col>
         </el-row>
       </el-col>

src/views/WindSite/pages/Info/Info.vue

@@ -236,16 +236,16 @@ export default {
     that.wpId = that.$route.params.wpId;
     that.$nextTick(() => {
       that.requestData(false);
-      that.timmer = setInterval(() => {
-        that.requestData(false);
-      }, that.$store.state.websocketTimeSec);
+      // that.timmer = setInterval(() => {
+      //   that.requestData(false);
+      // }, that.$store.state.websocketTimeSec);
     });
   },
 
-  unmounted() {
-    clearInterval(this.timmer);
-    this.timmer = null;
-  },
+  // unmounted() {
+  //   clearInterval(this.timmer);
+  //   this.timmer = null;
+  // },
 
   watch:{
     // "$route"(res){