1.sbq坐标改；2.风机绩效榜table排序改正序；3.home页点击地图返回不请求ajax的bug改

public/static/config/modeConfig.js

@@ -16,7 +16,7 @@ const tilesMaxLevel = 18;
 const adapterUrl = "http://10.155.32.4:8011/";
 
 // 切换模块时是否提示当前模块名称(用于对内介项目时便捷显示模块名称)
-const showModuleName = true;
+const showModuleName = 0;
 
 if (localTest) {
     // baseURL = "http://192.168.10.13:8082/" // 联机调试 - 石林

src/assets/dataService/arcgis-sbq.json

@@ -1489,8 +1489,8 @@
 		"spatialReference": {
 			"wkid": 4326
 		},
-		"x": 106.5236833,
-		"y": 37.77213333
+		"x": 106.4636833,
+		"y": 37.69213333
 	},
 	"symbol": null,
 	"attributes": {
@@ -1504,7 +1504,7 @@
 		"spatialReference": {
 			"wkid": 4326
 		},
-		"x": 106.2033167,
+		"x": 106.3533167,
 		"y": 37.62301667
 	},
 	"symbol": null,

src/assets/styles/theme/light/zhjx.less

@@ -407,4 +407,39 @@
   // .el-time-panel__btn.cancel {
   //   color: @gray;
   // }
+  .health-6 .header-info .selections .item:hover i svg use, .health-6 .header-info .selections .item.active i svg use {
+      fill: @deepblue;
+  }
+  .health-matrix{
+	  .green{
+		  color:@green;
+	  }
+	  .health-matrix-panel {
+		  .header{
+			  .svg-icon svg use{
+				  fill:@black;
+			  }
+			  .tools .tool-block .legend-value{
+			  		color: @black;
+			  }
+		  } 
+	  }
+  }
+  
+  .wind-site .page-common-body .page-common-body-menu .page-common-body-menu-box {
+	  .page-common-body-menu-item{
+	  	  border: 0.093vh solid rgba(@deepblue, 0.4);
+		  &.active{
+			  background:transparent;
+			  border: 0.093vh solid #edbf03;
+			  &::after{
+				border: 0.093vh solid #edbf03;
+			  }
+		  }
+	  }
+  }
+  .main-body input{
+	  color:@black;
+	  background:@white;
+  }
 }

src/views/Decision/Decision1.vue

@@ -427,6 +427,7 @@ export default {
           sort: "",
         },
         success(res) {
+			console.log(JSON.stringify(res))
           var name = [],
             data = [],
             llfdl = [],
@@ -439,6 +440,16 @@ export default {
               "性能损失",
             ],
             data2 = []; //项目列表
+			if(that.value1.length){
+				let arr = [];
+				let hj = res.data.pop();
+				res.data.forEach((ele,index)=>{
+					arr[ele.id.split('_')[1] - 1] = ele
+				})
+				arr.push(hj);
+				res.data = arr;
+			}
+			
           res.data.forEach((item, index) => {
             name.push(item.name);
             data.push([

src/views/Decision/Decision1Mx.vue

@@ -428,7 +428,6 @@
 						sort: ''
 					},
 					success(res) {
-						console.log(res)
 						var name = [],
 							data = [],
 							llfdl = [],
@@ -436,6 +435,17 @@
 								"手动停机", "正常发电", "缺陷降出"
 							],
 							data2 = []; //项目列表
+							
+							if(that.value1.length){
+								let arr = [];
+								let hj = res.data.pop();
+								res.data.forEach((ele,index)=>{
+									arr[ele.id.split('_')[1] - 1] = ele
+								})
+								arr.push(hj);
+								res.data = arr;
+							}
+							
 						res.data.forEach((item, index) => {
 							name.push(item.name);
 							llfdl.push(item.llfdl);

src/views/Home/Home.vue

@@ -1241,7 +1241,9 @@ export default {
       this.historyPlanBtnName = planBtnName;
       this.changeShowType(wpId, planBtnName);
     },
-    changeShowBackType() {
+    changeShowBackType(wpId, planBtnName) {
+		this.historyWpId = wpId;
+		this.historyPlanBtnName = planBtnName;
       this.changeShowType(this.historyWpId, this.historyPlanBtnName);
     },
     // 打开弹窗

src/views/Home/components/map.vue

@@ -274,7 +274,7 @@ export default {
       this.currentMode = "NX";
       this.mapName = "nx";
       this.mapIndex = -1;
-      this.$emit("mapClickBack");
+      this.$emit("mapClickBack", wpId, planBtnName);
     },
     clickLabel(wpId, planBtnName) {
       this.mapName = wpId;
@@ -283,11 +283,9 @@ export default {
       this.$emit("mapClick", wpId, planBtnName);
     },
     clickFj(wpId, planBtnName,textType) {
-		console.log(textType)
       this.$emit("mapClick", wpId, planBtnName);
     },
     changePeriod: function (name, period,textType) {
-		console.log(textType)
 		if(textType){
 			this.textType = '期次'
 		}else{

src/views/MalfunctionWarning/supervised.vue

@@ -342,7 +342,7 @@ export default {
       let that = this;
       this.API.requestData({
         method: "GET",
-        baseURL: "http://192.168.10.18:8080/",
+        baseURL: "http://10.155.32.14:9090/",
         subUrl: "api/coordinate/algorithm",
         data: {
           type: 1,
@@ -432,7 +432,7 @@ export default {
       that.resultList = [];
       this.API.requestData({
         method: "GET",
-        baseURL: "http://192.168.10.18:8080/",
+        baseURL: "http://10.155.32.14:9090/",
         subUrl: "api/supervised/",
         success(res) {
           if (res.value.length > 0) {
@@ -452,7 +452,7 @@ export default {
       });
       this.API.requestData({
         method: "GET",
-        baseURL: "http://192.168.10.18:8080/",
+        baseURL: "http://10.155.32.14:9090/",
         subUrl: "api/supervised/progress",
         success(res) {
           that.showTraining = true;