Merge branch 'mw' of http://124.70.43.205:3000/yangxiao/sis_zhfx

src/components/arcgis/MHS_FDC.vue

@@ -195,13 +195,13 @@ export default {
             that.wpnumMap = res.data.fczbmap.jczbmap;
             that.wpInfoMap = res.data.wxssmap;
             that.fjmap = res.data.fjmap[0];
+			that.when();
           }
         },
       });
     },
     when: function () {
       let jsonObj = dataService.get("arcgis-mhs");
-	  console.log(jsonObj)
       this.fans = jsonObj;
       jsonObj.forEach((item) => {
         let obj = this.fjmap.find((t) => {

src/components/arcgis/NSS_FDC.vue

@@ -195,13 +195,13 @@ export default {
             that.wpnumMap = res.data.fczbmap.jczbmap;
             that.wpInfoMap = res.data.wxssmap;
             that.fjmap = res.data.fjmap[0];
+			that.when();
           }
         },
       });
     },
     when: function () {
       let jsonObj = dataService.get("arcgis-nss");
-	  console.log(jsonObj)
       this.fans = jsonObj;
       jsonObj.forEach((item) => {
         let obj = this.fjmap.find((t) => {
@@ -247,6 +247,7 @@ export default {
             item.attributes.dur = 8;
             break;
         }
+		console.log(item.geometry.x)
         this.$refs.arcgis.addHtmlPoint(
           [item.geometry.x, item.geometry.y],
           item.attributes.code,

src/components/arcgis/QS_FDC.vue

@@ -136,13 +136,13 @@
 							that.wpnumMap = res.data.fczbmap.jczbmap;
 							that.wpInfoMap = res.data.wxssmap;
 							that.fjmap = res.data.fjmap[0];
+							that.when();
 						}
 					},
 				});
 			},
 			when: function() {
 				let jsonObj = dataService.get("arcgis-qs");
-				console.log(jsonObj)
 				this.fans = jsonObj;
 				jsonObj.forEach((item) => {
 					let obj = this.fjmap.find((t) => {
@@ -154,7 +154,6 @@
 					} else {
 						item.attributes.state = "4";
 					}
-					console.log(item.attributes.state)
 					switch (item.attributes.state) {
 						case "0": //待机
 							item.attributes.rotate = false; // 转

src/components/arcgis/SBQ_FDC.vue

@@ -195,6 +195,7 @@ export default {
             that.wpnumMap = res.data.fczbmap.jczbmap;
             that.wpInfoMap = res.data.wxssmap;
             that.fjmap = res.data.fjmap[0];
+			that.when();
           }
         },
       });

src/components/arcgis/XS_FDC.vue

@@ -195,6 +195,7 @@ export default {
             that.wpnumMap = res.data.fczbmap.jczbmap;
             that.wpInfoMap = res.data.wxssmap;
             that.fjmap = res.data.fjmap[0];
+			that.when();
           }
         },
       });

src/components/arcgis/arcgis.vue

@@ -9,7 +9,6 @@
                 </div>
             </div>
         </teleport>
-        
     </div>
 </template>
 

src/components/coms/table/table-qc.vue

@@ -491,7 +491,7 @@ export default {
 
 <style lang="less">
 .chart {
-  width: 1000px;
+  width: 100%;
   height: 500px;
 }
 </style>

src/views/Home/components/power-review.vue

@@ -120,7 +120,6 @@ export default {
 
   watch: {
     data(res) {
-      console.log(11111, res);
       this.PowerLoad = res;
     },
     id(res) {

src/views/WindSite/pages/Map.vue

@@ -312,7 +312,8 @@ export default {
       });
     },
     when: function () {
-      let jsonObj = dataService.get("arcgis-nx-fc1");
+		console.log(this.wpId.toLowerCase())
+      let jsonObj = dataService.get("arcgis-mhs");
       this.fans = jsonObj;
       jsonObj.forEach((item) => {
         let obj = this.fjmap.find((t) => {
@@ -366,7 +367,7 @@ export default {
           false
         );
       });
-      let lineJsonObj = dataService.get("arcgis-nx-fc1-line");
+      let lineJsonObj = dataService.get("arcgis-mhs-line");
       this.$refs.arcgis.addFanByJson(jsonObj, lineJsonObj);
     },
     clickMap: function (info) {