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

src/views/SandTable/SandTable.vue

@@ -743,6 +743,7 @@ export default {
           stationid: that.wpId,
         },
         success(res) {
+			console.log(res)
           let warnChartData = [];
           for (let key in res.data) {
             const ele = res.data[key];

src/views/Status/Status.vue

@@ -7,7 +7,7 @@
         :key="index"
         :data="data"
       ></StatusPanel>
-      <StatusPanelStatic class="panel-item" />
+      <!-- <StatusPanelStatic class="panel-item" /> -->
     </div>
     <div class="table-box">
       <ComTable :data="tableData"></ComTable>

src/views/WindSite/components/boosterstation/BoosterStation.js

@@ -1852,6 +1852,62 @@ export class BoosterStation {
 			"xhsc314": { tag: "XHDQ.NX_GD_XHG_DQ_P1_L1_001_DI0024" },
 			"xhsc315": { tag: "XHDQ.NX_GD_XHG_DQ_P1_L1_001_DI0026" },
 			"xhsc317": { tag: "XHDQ.NX_GD_XHG_DQ_P1_L1_001_DI0030" },
+		},
+		'HZJ_GDC':{
+			'hzjuab':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0049"},
+			'hzjubc':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0050"},
+			'hzjuca':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0051"},
+			'hzjsc105':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0312"},
+			'hzjkg1055':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0323"},
+			'hzjkg10505':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0339"},
+			'hzjkg10503':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0341"},
+			'hzjkg1053':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0331"},
+			'hzjkg1050':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0343"},
+			'hzjkg1050150':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0681"},
+			'hzjkg1050350':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0683"},
+			'hzjla':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0046"},
+			'hzjp':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0052"},
+			'hzjq':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0053"},
+			'hzjdw':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0002"},
+			'hzjyw1':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0139"},
+			'hzjyw2':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0140"},
+			'hzjrw':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0141"},
+			'hzjuab2':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0017"},
+			'hzjubc2':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0018"},
+			'hzjuca2':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0019"},
+			'hzjdlq361':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1092"},
+			'hzjsc361':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1090"},
+			'hzjkg361':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1091"},
+			'hzjla361':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0295"},
+			'hzjp361':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0284"},
+			'hzjq361':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0285"},
+			'hzjdlq362':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1302"},
+			'hzjsc362':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1300"},
+			'hzjkg362':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1301"},
+			'hzjla362':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0339"},
+			'hzjp362':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0340"},
+			'hzjq362':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0341"},
+			'hzjdlq363':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1512"},
+			'hzjsc363':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1510"},
+			'hzjkg363':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1511"},
+			'hzjla363':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0383"},
+			'hzjp363':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0372"},
+			'hzjq363':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0373"},
+			'hzjdlq364':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1725"},
+			'hzjsc364':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1723"},
+			'hzjkg3640':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1727"},
+			'hzjkg3643':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1720"},
+			'hzjkg36403':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1721"},
+			'hzjdlq3645':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI1719"},
+			'hzjla364':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0433"},
+			'hzjp364':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0421"},
+			'hzjq364':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0422"},
+			'hzjsc369':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0129"},
+			'hzjdlq305':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0497"},
+			'hzjsc305':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_DI0495"},
+			'hzjla305':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0046"},
+			'hzjp305':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0052"},
+			'hzjq305':{tag: "HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0053"}
 		}
 	}
 

src/views/windAnalysis/index.vue

@@ -46,13 +46,9 @@ export default {
       this.tabIndex = state;
     },
     // 请求服务
-    requestData () {
-      
-    }
   },
 
   created () {
-    this.requestData();
   },
 
   mounted () { },

src/views/windAnalysis/tab1.vue

@@ -36,7 +36,6 @@ export default {
   components: {
     NormalScatterChart
   },
-
   // 数据
   data () {
     return {
@@ -64,6 +63,7 @@ export default {
         success (res) {
           that.wpArray = res.data;
           that.wpId = res.data[0].id;
+		  that.$emit('thisWpId', that.wpId)
           that.getChartData();
         }
       });

src/views/windAnalysis/tab2.vue

@@ -103,7 +103,7 @@ export default {
         method: "POST",
         subUrl: "scatter/scatterAjax",
         data: {
-          wpId: "",
+          wpId: that.wpId,
           pjId: that.projectId,
           lnId: "",
           year: (that.recorddate ? new Date(that.recorddate).getFullYear() : ""),

src/views/windAnalysis/tab3.vue

@@ -103,7 +103,7 @@ export default {
         method: "POST",
         subUrl: "scatter/scatterAjax",
         data: {
-          wpId: "",
+          wpId: that.wpId,
           pjId: "",
           lnId: that.lineId,
           year: (that.recorddate ? new Date(that.recorddate).getFullYear() : ""),